From 5bbb9d11586dad0f368c8b4022f105508e16fbc8 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Sun, 20 Dec 2020 22:58:50 +0100
Subject: [PATCH] Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.
Translation: Git Manpages/Translations
Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/
---
po/documentation.de.po | 609 ++++++------------
po/documentation.es.po | 565 +++++------------
po/documentation.es_MX.po | 567 +++++------------
po/documentation.fr.po | 788 +++++++++--------------
po/documentation.hu.po | 559 +++++------------
po/documentation.id.po | 559 +++++------------
po/documentation.is.po | 559 +++++------------
po/documentation.it.po | 559 +++++------------
po/documentation.ja.po | 559 +++++------------
po/documentation.ko.po | 559 +++++------------
po/documentation.mr.po | 559 +++++------------
po/documentation.nb_NO.po | 565 +++++------------
po/documentation.nl.po | 563 +++++------------
po/documentation.pl.po | 559 +++++------------
po/documentation.pt_BR.po | 1074 +++++++++++++++++---------------
po/documentation.pt_PT.po | 557 +++++------------
po/documentation.ru.po | 565 +++++------------
po/documentation.tr.po | 569 +++++------------
po/documentation.zh_HANS-CN.po | 599 ++++++------------
po/documentation.zh_HANT.po | 565 +++++------------
20 files changed, 3686 insertions(+), 8372 deletions(-)
diff --git a/po/documentation.de.po b/po/documentation.de.po
index 0263a05..e04a5bd 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-12-16 23:08+0100\n"
+"POT-Creation-Date: 2020-12-20 22:54+0100\n"
"PO-Revision-Date: 2020-08-18 02:32+0000\n"
"Last-Translator: Dieter Ziller <max123kl@ziller.de>\n"
"Language-Team: Matthias A횩hauer <mha1993@live.de>\n"
@@ -9670,8 +9670,8 @@ msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#: en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr ""
@@ -16455,18 +16455,11 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, fuzzy
-#| msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr "Das Repository als Bare-Repository behandeln. Wenn die Umgebungsvariable GIT_DIR nicht gestezt ist, wird sie auf das aktuelle Arbeitsverzeichnis gesetzt."
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, fuzzy, no-wrap
+#, fuzzy
#| msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
-msgid "exist, it will be created. Default is the current directory.\n"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr "Das Repository als Bare-Repository behandeln. Wenn die Umgebungsvariable GIT_DIR nicht gestezt ist, wird sie auf das aktuelle Arbeitsverzeichnis gesetzt."
#. type: Labeled list
@@ -19770,14 +19763,9 @@ msgstr "--exclude-from=<Datei>"
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr "--recurse-submodules[=<Pfadspezifikation]"
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -21423,17 +21411,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -21447,18 +21430,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -24515,7 +24492,7 @@ msgstr ""
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K횄쨋nig diet\n"
msgstr ""
#. type: delimited block -
@@ -37137,285 +37114,146 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, fuzzy, no-wrap
#| msgid "Git Commits"
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
msgstr "Git-Commits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, fuzzy, no-wrap
-#| msgid "`context`"
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr "`context`"
+#| msgid "`matchContext`"
+msgid "Context"
+msgstr "`matchContext`"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, fuzzy, no-wrap
#| msgid "Configuration"
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr "Configuration"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap
-msgid "NOTES\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -45863,15 +45701,9 @@ msgstr ""
msgid "checkout"
msgstr "--no-checkout"
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -45885,26 +45717,14 @@ msgstr ""
msgid "rebase"
msgstr "--rebase"
-#. type: Plain text
-#: en/git-submodule.txt:158
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -45918,19 +45738,9 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -49833,18 +49643,12 @@ msgid "<old|new>-file"
msgstr "<alte|neue>-Datei"
#. type: Plain text
-#: en/git.txt:564
+#: en/git.txt:565
#, fuzzy
#| msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr "Dateien sind, die GIT_EXTERNAL_DIFF benutzen kann um"
-#. type: Plain text
-#: en/git.txt:565
-#, no-wrap
-msgid "contents of <old|new>,\n"
-msgstr "den <alten|neuen> Inhalt auszulesen,\n"
-
#. type: Labeled list
#: en/git.txt:565
#, no-wrap
@@ -50607,17 +50411,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-#, fuzzy
-#| msgid "Get the commit objects."
-msgid "the objects."
-msgstr "Zeigt die Geschichte des Projekts"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -50705,14 +50502,9 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -50726,20 +50518,9 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -55171,14 +54952,9 @@ msgstr "Farbe zur체cksetzen"
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
-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."
+msgid "color specification, as described under Values in the \"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 ""
#. type: Labeled list
@@ -55199,31 +54975,21 @@ msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:149
#, fuzzy
#| msgid "ref names, like the --decorate option of linkgit:git-log[1]"
-msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr "Ref-Namen, wie die Option --decorate in linkgit:git-log[1]"
-#. type: Plain text
-#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
-
#. type: Labeled list
#: en/pretty-formats.txt:149
#, no-wrap
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -55232,14 +54998,9 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -55248,14 +55009,9 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -55264,14 +55020,9 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -55280,14 +55031,9 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -55379,17 +55125,12 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
+#: en/pretty-formats.txt:180
#, fuzzy
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
-msgid "or linkgit:git-blame[1])"
-msgstr "oder linkgit:git-blame[1])"
-
#. type: Labeled list
#: en/pretty-formats.txt:180
#, no-wrap
@@ -55408,10 +55149,10 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
+#: en/pretty-formats.txt:183
#, fuzzy
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
#. type: Labeled list
@@ -55432,21 +55173,12 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
+#: en/pretty-formats.txt:186
#, fuzzy
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "author local-part (see '%al') respecting .mailmap, see"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196
-#: en/pretty-formats.txt:199 en/pretty-formats.txt:202
-#: en/pretty-formats.txt:247 en/pretty-formats.txt:250
-#, fuzzy
-#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
-
#. type: Labeled list
#: en/pretty-formats.txt:186
#, no-wrap
@@ -55542,10 +55274,10 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
+#: en/pretty-formats.txt:196
#, fuzzy
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "committer name (respecting .mailmap, see"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
#. type: Labeled list
@@ -55566,10 +55298,10 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
+#: en/pretty-formats.txt:199
#, fuzzy
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "committer email (respecting .mailmap, see"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
#. type: Labeled list
@@ -55590,10 +55322,10 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
+#: en/pretty-formats.txt:202
#, fuzzy
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
#. type: Labeled list
@@ -55695,17 +55427,12 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-msgid "ref name given on the command line by which the commit was reached"
-msgstr "Ref-Name, der in der Befehlszeile angegeben wurde, mit dem der Commit zustande gekommen ist"
-
#. type: Plain text
#: en/pretty-formats.txt:213
#, fuzzy
-#| msgid "'%S': ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
-msgid "(like `git log --source`), only works with `git log`"
-msgstr "Zeigt den Referenznamen f체r jeden dargestellt Commits."
+#| msgid "ref name given on the command line by which the commit was reached"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
+msgstr "Ref-Name, der in der Befehlszeile angegeben wurde, mit dem der Commit zustande gekommen ist"
#. type: Labeled list
#: en/pretty-formats.txt:213
@@ -55784,14 +55511,9 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -55834,17 +55556,12 @@ msgid "'%GP'"
msgstr "'%GP'"
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, fuzzy
#| msgid "show the fingerprint of the primary key whose subkey was used"
-msgid "show the fingerprint of the primary key whose subkey was used"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr "zeige den Fingerabdruck des prim채ren Schl체ssels, dessen Unterschl체ssel zum"
-#. type: Plain text
-#: en/pretty-formats.txt:235
-msgid "to sign a signed commit"
-msgstr "Signieren eines Commits verwendet wurde"
-
#. type: Labeled list
#: en/pretty-formats.txt:235
#, no-wrap
@@ -55862,14 +55579,9 @@ msgstr "zeigt den Grad der Vertraulichkeit f체r den Schl체ssel an, der zum Unter
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -55878,14 +55590,9 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -55906,10 +55613,10 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
+#: en/pretty-formats.txt:247
#, fuzzy
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "reflog identity name (respecting .mailmap, see"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
#. type: Labeled list
@@ -55930,10 +55637,10 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, fuzzy
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "reflog identity email (respecting .mailmap, see"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
#. type: Labeled list
@@ -55953,14 +55660,9 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -60697,6 +60399,84 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, fuzzy
+#~| msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
+#~ msgid "The Git repository to import to. If the directory doesn't"
+#~ msgstr "Das Repository als Bare-Repository behandeln. Wenn die Umgebungsvariable GIT_DIR nicht gestezt ist, wird sie auf das aktuelle Arbeitsverzeichnis gesetzt."
+
+#, fuzzy
+#~| msgid "Git Commits"
+#~ msgid ""
+#~ "Empty commits\n"
+#~ "~~~~~~~~~~~~~\n"
+#~ msgstr "Git-Commits"
+
+#, fuzzy
+#~| msgid "`context`"
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr "`context`"
+
+#, fuzzy
+#~| msgid "Configuration"
+#~ msgid ""
+#~ "Commit Rewording\n"
+#~ "~~~~~~~~~~~~~~~~\n"
+#~ msgstr "Configuration"
+
+#~ msgid "contents of <old|new>,\n"
+#~ msgstr "den <alten|neuen> Inhalt auszulesen,\n"
+
+#, fuzzy
+#~| msgid "Get the commit objects."
+#~ msgid "the objects."
+#~ msgstr "Zeigt die Geschichte des Projekts"
+
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "oder linkgit:git-blame[1])"
+
+#, fuzzy
+#~| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgid "author local-part (see '%al') respecting .mailmap, see"
+#~ msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
+
+#, fuzzy
+#~| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+#~ msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgid "committer name (respecting .mailmap, see"
+#~ msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
+
+#, fuzzy
+#~| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgid "committer email (respecting .mailmap, see"
+#~ msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
+
+#, fuzzy
+#~| msgid "'%S': ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
+#~ msgid "(like `git log --source`), only works with `git log`"
+#~ msgstr "Zeigt den Referenznamen f체r jeden dargestellt Commits."
+
+#~ msgid "to sign a signed commit"
+#~ msgstr "Signieren eines Commits verwendet wurde"
+
+#, fuzzy
+#~| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgid "reflog identity name (respecting .mailmap, see"
+#~ msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
+
+#, fuzzy
+#~| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgid "reflog identity email (respecting .mailmap, see"
+#~ msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
+
#~ msgid "git file is."
#~ msgstr "git-Datei befindet."
@@ -60961,9 +60741,6 @@ msgstr ""
#~ msgid "`match`"
#~ msgstr "`match`"
-#~ msgid "`matchContext`"
-#~ msgstr "`matchContext`"
-
#~ msgid "`matchSelected`"
#~ msgstr "`matchSelected`"
diff --git a/po/documentation.es.po b/po/documentation.es.po
index 6caf850..79ba642 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-12-16 23:08+0100\n"
+"POT-Creation-Date: 2020-12-20 22:54+0100\n"
"PO-Revision-Date: 2020-10-30 12:26+0000\n"
"Last-Translator: Vibo Lavida <vibo@firemail.cc>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -9594,8 +9594,8 @@ msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#: en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr "NOTAS"
@@ -16184,18 +16184,12 @@ msgid "-C <target-dir>"
msgstr ""
#. type: Plain text
-#: en/git-cvsimport.txt:69
+#: en/git-cvsimport.txt:70
#, fuzzy
#| msgid "Clone a repository into a new directory."
-msgid "The Git repository to import to. If the directory doesn't"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr "Clona un repositorio en un directorio nuevo."
-#. type: Plain text
-#: en/git-cvsimport.txt:70
-#, no-wrap
-msgid "exist, it will be created. Default is the current directory.\n"
-msgstr ""
-
#. type: Labeled list
#: en/git-cvsimport.txt:71
#, no-wrap
@@ -19428,14 +19422,9 @@ msgstr "--rewrite-submodules-from=<nombre>:<fichero>"
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr "--rewrite-submodules-to=<nombre>:<fichero>"
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -21075,17 +21064,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -21099,18 +21083,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -24127,7 +24105,7 @@ msgstr ""
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K횄쨋nig diet\n"
msgstr ""
#. type: delimited block -
@@ -36666,286 +36644,146 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, fuzzy, no-wrap
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
msgstr "`commit`"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, fuzzy, no-wrap
#| msgid "--text"
-msgid ""
-"Context\n"
-"~~~~~~~\n"
+msgid "Context"
msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, fuzzy, no-wrap
-#| msgid "NOTES"
-msgid "NOTES\n"
-msgstr "NOTAS"
-
#. type: Plain text
#: en/git-rebase.txt:812
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
@@ -45317,15 +45155,9 @@ msgstr ""
msgid "checkout"
msgstr "checkout"
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -45339,26 +45171,14 @@ msgstr ""
msgid "rebase"
msgstr "rebase"
-#. type: Plain text
-#: en/git-submodule.txt:158
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -45372,19 +45192,9 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -49218,15 +49028,9 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap
-msgid "contents of <old|new>,\n"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -49976,17 +49780,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-#, fuzzy
-#| msgid "--objects"
-msgid "the objects."
-msgstr "--objects"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -50074,14 +49871,9 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -50095,20 +49887,9 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -54509,14 +54290,9 @@ msgstr "restablece el color"
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
-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."
+msgid "color specification, as described under Values in the \"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 ""
#. type: Labeled list
@@ -54536,15 +54312,10 @@ msgstr ""
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:148
-msgid "switch line wrapping, like the -w option of"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -54552,14 +54323,9 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -54568,14 +54334,9 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -54584,14 +54345,9 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -54600,14 +54356,9 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -54616,14 +54367,9 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -54715,14 +54461,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
-msgid "or linkgit:git-blame[1])"
-msgstr "o linkgit:git-blame[1])"
+#: en/pretty-formats.txt:180
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -54742,9 +54485,11 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
+#: en/pretty-formats.txt:183
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -54764,17 +54509,10 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196
-#: en/pretty-formats.txt:199 en/pretty-formats.txt:202
-#: en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, fuzzy
#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
@@ -54872,9 +54610,11 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-msgid "committer name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:196
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -54894,9 +54634,11 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-msgid "committer email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:199
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -54916,9 +54658,11 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:202
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -55019,14 +54763,9 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -55106,14 +54845,9 @@ msgstr ""
msgid "'%G?'"
msgstr "'%G?'"
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -55155,14 +54889,9 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -55182,14 +54911,9 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -55198,14 +54922,9 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -55226,9 +54945,11 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:247
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -55248,9 +54969,11 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:250
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -55269,14 +54992,9 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -59995,6 +59713,29 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, fuzzy
+#~| msgid "--text"
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr "--text"
+
+#, fuzzy
+#~| msgid "NOTES"
+#~ msgid "NOTES\n"
+#~ msgstr "NOTAS"
+
+#, fuzzy
+#~| msgid "--objects"
+#~ msgid "the objects."
+#~ msgstr "--objects"
+
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "o linkgit:git-blame[1])"
+
#~ msgid "--no-signoff"
#~ msgstr "--no-signoff"
diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po
index 655140b..b8dc2bd 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-12-16 23:08+0100\n"
+"POT-Creation-Date: 2020-12-20 22:54+0100\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"
@@ -9698,8 +9698,8 @@ msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#: en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr ""
@@ -16290,17 +16290,11 @@ msgid "-C <target-dir>"
msgstr ""
#. type: Plain text
-#: en/git-cvsimport.txt:69
+#: en/git-cvsimport.txt:70
#, fuzzy
-msgid "The Git repository to import to. If the directory doesn't"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr "Clona un repositorio dentro de un nuevo directorio"
-#. type: Plain text
-#: en/git-cvsimport.txt:70
-#, no-wrap
-msgid "exist, it will be created. Default is the current directory.\n"
-msgstr ""
-
#. type: Labeled list
#: en/git-cvsimport.txt:71
#, no-wrap
@@ -19535,14 +19529,9 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -21183,17 +21172,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -21207,18 +21191,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -24241,7 +24219,7 @@ msgstr ""
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K횄쨋nig diet\n"
msgstr ""
#. type: delimited block -
@@ -36786,283 +36764,144 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, fuzzy, no-wrap
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
msgstr "`commit`"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, fuzzy, no-wrap
#| msgid "--text"
-msgid ""
-"Context\n"
-"~~~~~~~\n"
+msgid "Context"
msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap
-msgid "NOTES\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -45446,15 +45285,9 @@ msgstr ""
msgid "checkout"
msgstr "--checkout"
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -45468,26 +45301,14 @@ msgstr ""
msgid "rebase"
msgstr "--rebase"
-#. type: Plain text
-#: en/git-submodule.txt:158
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -45501,19 +45322,9 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -49352,15 +49163,9 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap
-msgid "contents of <old|new>,\n"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -50110,17 +49915,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-#, fuzzy
-#| msgid "--objects"
-msgid "the objects."
-msgstr "--objects"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -50208,14 +50006,9 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -50229,20 +50022,9 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -54662,14 +54444,9 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
-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."
+msgid "color specification, as described under Values in the \"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 ""
#. type: Labeled list
@@ -54689,15 +54466,12 @@ msgstr ""
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:148
-msgid "switch line wrapping, like the -w option of"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+#, fuzzy
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -54705,14 +54479,9 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -54721,14 +54490,9 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -54737,14 +54501,9 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -54753,14 +54512,9 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -54769,14 +54523,9 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -54876,18 +54625,12 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
+#: en/pretty-formats.txt:180
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
-#, fuzzy
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
-
#. type: Labeled list
#: en/pretty-formats.txt:180
#, no-wrap
@@ -54908,10 +54651,10 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
+#: en/pretty-formats.txt:183
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -54932,21 +54675,12 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
+#: en/pretty-formats.txt:186
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "author local-part (see '%al') respecting .mailmap, see"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196
-#: en/pretty-formats.txt:199 en/pretty-formats.txt:202
-#: en/pretty-formats.txt:247 en/pretty-formats.txt:250
-#, fuzzy
-#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
-
#. type: Labeled list
#: en/pretty-formats.txt:186
#, no-wrap
@@ -55046,10 +54780,10 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
+#: en/pretty-formats.txt:196
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "committer name (respecting .mailmap, see"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -55072,10 +54806,10 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
+#: en/pretty-formats.txt:199
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "committer email (respecting .mailmap, see"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -55096,10 +54830,10 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
+#: en/pretty-formats.txt:202
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -55203,14 +54937,9 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -55294,14 +55023,9 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -55343,14 +55067,9 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -55370,14 +55089,9 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -55386,14 +55100,9 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -55414,10 +55123,10 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
+#: en/pretty-formats.txt:247
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "reflog identity name (respecting .mailmap, see"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -55438,10 +55147,10 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "reflog identity email (respecting .mailmap, see"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -55461,14 +55170,9 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -60189,6 +59893,55 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, fuzzy
+#~| msgid "--text"
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr "--text"
+
+#, fuzzy
+#~| msgid "--objects"
+#~ msgid "the objects."
+#~ msgstr "--objects"
+
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+#~ msgid "author local-part (see '%al') respecting .mailmap, see"
+#~ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+#~ msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+#~ msgid "committer name (respecting .mailmap, see"
+#~ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+#~ msgid "committer email (respecting .mailmap, see"
+#~ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+#~ msgid "reflog identity name (respecting .mailmap, see"
+#~ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+#~ msgid "reflog identity email (respecting .mailmap, see"
+#~ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+
#~ msgid "--no-signoff"
#~ msgstr "--no-signoff"
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index 7000d8b..09cce20 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -3,7 +3,19 @@
# This file is distributed under the same license as the Git package.
# Jean-No챘l Avila <jn.avila@free.fr>, 2019.
msgid ""
-msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2020-12-16 23:08+0100\nPO-Revision-Date: 2020-12-19 21:06+0000\nLast-Translator: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage-Team: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 4.4-dev\n"
+msgstr ""
+"Project-Id-Version: git documentation\n"
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2020-12-20 22:54+0100\n"
+"PO-Revision-Date: 2020-12-19 21:06+0000\n"
+"Last-Translator: Jean-No챘l Avila <jn.avila@free.fr>\n"
+"Language-Team: Jean-No챘l Avila <jn.avila@free.fr>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.4-dev\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:679 en/git-instaweb.txt:45
@@ -9742,8 +9754,8 @@ msgstr "Les motifs devront normalement 챗tre cit챕s."
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#: en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr "NOTES"
@@ -16463,18 +16475,11 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, fuzzy
-#| msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr "Le d챕p척t Git dans lequel importer. Si le r챕pertoire n'existe pas, il sera cr챕챕. La valeur par d챕faut est le r챕pertoire courant."
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, fuzzy, no-wrap
+#, fuzzy
#| msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
-msgid "exist, it will be created. Default is the current directory.\n"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr "Le d챕p척t Git dans lequel importer. Si le r챕pertoire n'existe pas, il sera cr챕챕. La valeur par d챕faut est le r챕pertoire courant."
#. type: Labeled list
@@ -19757,14 +19762,9 @@ msgstr "--rewrite-submodules-from=<nom>:<fichier>"
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr "--rewrite-submodules-to=<nom>:<fichier>"
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -21404,17 +21404,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -21428,18 +21423,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -24469,7 +24458,7 @@ msgstr ""
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K횄쨋nig diet\n"
msgstr ""
#. type: delimited block -
@@ -37066,288 +37055,148 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point et --root"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, fuzzy, no-wrap
-#| msgid "Empty commits"
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr "Commits vides"
+#| msgid "Git Commits"
+msgid "Empty commits"
+msgstr "Commits Git"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, fuzzy, no-wrap
-#| msgid "Context"
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr "Contexte"
+#| msgid "--text"
+msgid "Context"
+msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, fuzzy, no-wrap
-#| msgid "Commit Rewording"
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
-msgstr "Reformulation de commits"
+#| msgid "Commit Ordering"
+msgid "Commit Rewording"
+msgstr "Ordre des commits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, fuzzy, no-wrap
-#| msgid "NOTES"
-msgid "NOTES\n"
-msgstr "NOTES"
-
#. type: Plain text
#: en/git-rebase.txt:812
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
@@ -46024,16 +45873,10 @@ msgstr "Mettre 횪 jour les sous-modules enregistr챕s pour qu'ils correspondent a
msgid "checkout"
msgstr "checkout"
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr "le commit enregistr챕 dans le superprojet sera"
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
-msgstr "extrait dans le sous-module avec une HEAD d챕tach챕e.\n"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
+msgstr "le commit enregistr챕 dans le superprojet sera extrait dans le sous-module sur une HEAD d챕tach챕e."
#. type: Plain text
#: en/git-submodule.txt:156
@@ -46046,31 +45889,15 @@ msgstr "Si `--force` est sp챕cifi챕, le sous-module sera extrait (en utilisant `
msgid "rebase"
msgstr "rebase"
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, fuzzy
-#| msgid "into the current branch in the submodule.\n"
-msgid "the current branch of the submodule will be rebased"
-msgstr "dans la branche actuelle du sous-module.\n"
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr "sur le commit enregistr챕 dans le super-projet.\n"
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-#, fuzzy
-#| msgid "the commit recorded in the superproject will be"
-msgid "the commit recorded in the superproject will be merged"
-msgstr "le commit enregistr챕 dans le superprojet sera"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
+msgstr "la branche actuelle du sous-module sera rebas챕e sur le commit enregistr챕 dans le superprojet."
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
-msgstr "dans la branche actuelle du sous-module.\n"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
+msgstr "le commit enregistr챕 dans le superprojet sera fusionn챕 dans la branche actuelle dans le sous-module."
#. type: Plain text
#: en/git-submodule.txt:165
@@ -46083,20 +45910,11 @@ msgstr "Les proc챕dures 'update' suivantes sont uniquement disponibles via la va
msgid "custom command"
msgstr "commande personnalis챕e"
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr "commande shell arbitraire qui prend un seul"
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, fuzzy, no-wrap
+#, fuzzy
#| msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr "une commande shell arbitraire qui prend un seul argument (le sha1 du commit enregistr챕 dans le superprojet) est ex챕cut챕. Lorsque `submodule.<nom>.update`est r챕gl챕 sur '!command', le reste apr챔s le point d'exclamation est la commande personnalis챕e."
#. type: Plain text
@@ -49958,17 +49776,10 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, fuzzy, no-wrap
-#| msgid "--contents <file>"
-msgid "contents of <old|new>,\n"
-msgstr "--contents <fichier>"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
+msgstr ""
#. type: Labeled list
#: en/git.txt:565
@@ -50717,17 +50528,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-#, fuzzy
-#| msgid "--objects"
-msgid "the objects."
-msgstr "--objects"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -50815,14 +50619,9 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -50836,20 +50635,9 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -55327,16 +55115,11 @@ msgstr "r챕initialise la couleur"
msgid "'%C(...)'"
msgstr "'%C(...)'"
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr "la sp챕cification de la couleur, comme d챕crit sous Valeurs dans la section"
-
#. type: Plain text
#: en/pretty-formats.txt:146
#, fuzzy
#| msgid "color specification, as described under Values in the \"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."
-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."
+msgid "color specification, as described under Values in the \"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 "sp챕cification de couleur, telle que d챕crite sous Valeurs dans la section \"FICHIER DE CONFIGURATION\" de linkgit:git-config[1]. Par d챕faut, les couleurs ne sont affich챕es que lorsqu'elles sont activ챕es pour la sortie des journaux (par `color.diff`, `color.ui`, ou `--color`, et en respectant les param챔tres `auto` du premier si nous allons sur un terminal). `%C(auto,...)` est accept챕 comme synonyme historique de la valeur par d챕faut (par exemple, `%C(auto,red)`). Sp챕cifier `%C(always,...)` affichera les couleurs m챗me si la couleur n'est pas activ챕e autrement (bien qu'il faille toujours utiliser `--color=always` pour activer la couleur pour toute la sortie, y compris ce format et tout ce que git peut colorier). `auto` seul (c'est-횪-dire `%C(auto)`) activera la coloration automatique sur les places suivantes jusqu'횪 ce que la couleur soit 횪 nouveau chang챕e."
#. type: Labeled list
@@ -55357,33 +55140,23 @@ msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr "'%w([<w>[,<i1>[,<i2>]]])'"
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:149
#, fuzzy
#| msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
-msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr "basculer de rebouclage de ligne, comme l�셭ption -w de linkgit:git-shortlog[1]."
-#. type: Plain text
-#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
-
#. type: Labeled list
#: en/pretty-formats.txt:149
#, no-wrap
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr "'%<(<N>[,tronq|tronqg|tronqm])'"
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr "faire le prochain espace r챕serv챕 prendre"
-
#. type: Plain text
#: en/pretty-formats.txt:157
#, fuzzy
#| msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr "faire prendre au prochain espace r챕serv챕 au moins N colonnes, en remplissant les espaces 횪 droite si n챕cessaire. Au choix, tronquer au d챕but (tronqg), au milieu (tronqm) ou 횪 la fin (tronq) si la sortie est plus longue que N colonnes. Notez que la troncation ne fonctionne correctement qu'avec N >= 2."
#. type: Labeled list
@@ -55392,17 +55165,10 @@ msgstr "faire prendre au prochain espace r챕serv챕 au moins N colonnes, en rempl
msgid "'%<|(<N>)'"
msgstr "'%<|(<N>)'"
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, fuzzy
-#| msgid "make the next placeholder take at"
-msgid "make the next placeholder take at least until Nth"
-msgstr "faire le prochain espace r챕serv챕 prendre"
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
-msgstr "colonnes, en ins챕rant des espaces 횪 droite si n챕cessaire"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
+msgstr "faire le prochain espace r챕serv챕 prendre au moins jusqu�쇒� ce qu'aux Ni챔mes colonnes, les espaces d'alignement sur la droite si n챕cessaire"
#. type: Labeled list
#: en/pretty-formats.txt:159
@@ -55410,17 +55176,10 @@ msgstr "colonnes, en ins챕rant des espaces 횪 droite si n챕cessaire"
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr "'%>(<N>)', '%>|(<N>)'"
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, fuzzy
-#| msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr "similaire 횪 '%<(<N>)', '%<|(<N>)'"
-
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
-msgstr "mais en ins챕rant des espaces 횪 gauche"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
+msgstr "similaire 횪 '%<(<N>)', '%<|(<N>)' respectivement, mais les espaces d'alignement 횪 gauche"
#. type: Labeled list
#: en/pretty-formats.txt:161
@@ -55428,16 +55187,11 @@ msgstr "mais en ins챕rant des espaces 횪 gauche"
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr "'%>>(<N>)', '%>>|(<N>)'"
-#. type: Plain text
-#: en/pretty-formats.txt:162
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr "similaire 횪 '%>(<N>)', '%>|(<N>)'"
-
#. type: Plain text
#: en/pretty-formats.txt:166
#, fuzzy
#| msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr "similaire 횪 \"%>(<N>)\", \"%>|(<N>)\" respectivement, sauf que si le prochain espace r챕serv챕 prend plus d'espaces que pr챕vu et qu'il y a des espaces 횪 sa gauche, utiliser ces espaces"
#. type: Labeled list
@@ -55446,17 +55200,12 @@ msgstr "similaire 횪 \"%>(<N>)\", \"%>|(<N>)\" respectivement, sauf que si le pr
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr "'%><(<N>)', '%><|(<N>)'"
-#. type: Plain text
-#: en/pretty-formats.txt:167
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr "similaire 횪 '%<(<N>)', '%<|(<N>)'"
-
#. type: Plain text
#: en/pretty-formats.txt:169
#, fuzzy
-#| msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
-msgid "respectively, but padding both sides (i.e. the text is centered)"
-msgstr "similaire 횪 '%<(<N>)', '%<|(<N>)' respectivement, mais en calant des deux c척t챕s (c'est-횪-dire que le texte est centr챕)"
+#| msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
+msgstr "similaire 횪 '%<(<N>)', '%<|(<N>)' respectivement, mais les espaces d'alignement 횪 gauche"
#. type: Plain text
#: en/pretty-formats.txt:171
@@ -55547,16 +55296,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
+#: en/pretty-formats.txt:180
#, fuzzy
-#| msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr "nom de l'auteur (en respectant .mailmap, voir linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
-msgid "or linkgit:git-blame[1])"
-msgstr "ou linkgit:git-blame[1])"
+#| msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "nom du validateur (en respectant .mailmap, voir linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -55576,11 +55320,11 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
+#: en/pretty-formats.txt:183
#, fuzzy
-#| msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr "e-mail de l'auteur (en respectant .mailmap, voir linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
+#| msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "e-mail du validateur (en respectant .mailmap, voir linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -55600,16 +55344,9 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr "partie locale de l'auteur (voir '%al') en respectant le fichier .mailmap, voir"
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196
-#: en/pretty-formats.txt:199 en/pretty-formats.txt:202
-#: en/pretty-formats.txt:247 en/pretty-formats.txt:250
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgstr "linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
+#: en/pretty-formats.txt:186
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "partie locale de l'auteur (voir '%al') en respectant .mailmap, voir linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:186
@@ -55706,9 +55443,9 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-msgid "committer name (respecting .mailmap, see"
-msgstr "nom du validateur (en respectant .mailmap, voir"
+#: en/pretty-formats.txt:196
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "nom du validateur (en respectant .mailmap, voir linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -55728,9 +55465,9 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-msgid "committer email (respecting .mailmap, see"
-msgstr "e-mail du validateur (en respectant .mailmap, voir"
+#: en/pretty-formats.txt:199
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "e-mail du validateur (en respectant .mailmap, voir linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -55750,10 +55487,9 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-#, fuzzy
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
-msgstr "partie locale de l'auteur (voir '%al') en respectant le fichier .mailmap, voir"
+#: en/pretty-formats.txt:202
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "partie locale du validateur (voir '%cl') en respectant .mailmap, voir linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -55854,17 +55590,10 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr "les noms des refs, sans encadrement par 짬혻(혻쨩 et 짬혻)혻쨩."
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, fuzzy
-#| msgid "Print out the ref name given on the command line by which each commit was reached."
-msgid "ref name given on the command line by which the commit was reached"
-msgstr "Imprimer le nom de la r챕f챕rence donn챕 sur la ligne de commande par lequel chaque commit a 챕t챕 atteint."
-
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid "(like `git log --source`), only works with `git log`"
-msgstr "(comme `git log --source`), ne fonctionne qu'avec `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
+msgstr "nom de ref fourni en ligne de commande par lequel le commit a 챕t챕 atteint (comme `git log --source`), ne fonctionne qu�셙vec `git log`"
#. type: Labeled list
#: en/pretty-formats.txt:213
@@ -55943,16 +55672,11 @@ msgstr "message de v챕rification brut de GPG pour un commit sign챕"
msgid "'%G?'"
msgstr "'%G?'"
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr "afficher \"G\" pour une bonne signature (valide),"
-
#. type: Plain text
#: en/pretty-formats.txt:230
#, fuzzy
#| msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr "afficher \"G\" pour une bonne signature (valide), \"B\" pour une mauvaise signature, \"U\" pour une bonne signature avec une validit챕 inconnue, \"X\" pour une bonne signature qui a expir챕, \"Y\" pour une bonne signature faite par une cl챕 expir챕e, \"R\" pour une bonne signature faite par une cl챕 r챕voqu챕e, \"E\" si la signature ne peut pas 챗tre v챕rifi챕e (par exemple la cl챕 est manquante) et \"N\" pour aucune signature"
#. type: Labeled list
@@ -55995,17 +55719,12 @@ msgid "'%GP'"
msgstr "'%GP'"
#. type: Plain text
-#: en/pretty-formats.txt:234
+#: en/pretty-formats.txt:235
#, fuzzy
#| msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
-msgid "show the fingerprint of the primary key whose subkey was used"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr "afficher l'empreinte digitale de la cl챕 primaire dont la sous-cl챕 a 챕t챕 utilis챕e pour signer un commit sign챕"
-#. type: Plain text
-#: en/pretty-formats.txt:235
-msgid "to sign a signed commit"
-msgstr "pour signer un commit sign챕"
-
#. type: Labeled list
#: en/pretty-formats.txt:235
#, no-wrap
@@ -56023,16 +55742,11 @@ msgstr "afficher le niveau de rouille de la cl챕 utilis챕e pour signer un commit
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr "s챕lecteur de reflog, par exemple, `refs/stash@{1}`` ou `refs/stash@{2"
-
#. type: Plain text
#: en/pretty-formats.txt:241
#, fuzzy
#| msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr "s챕lecteur de reflog, p. ex., `refs/stash@{1}` ou `refs/stash@{2 minutes ago}` ; le format suit les r챔gles d챕crites pour l'option `-g`. La partie avant `@` est le refname tel qu'il est donn챕 sur la ligne de commande (donc `git log -g refs/heads/master` produirait `refs/heads/master@{0}`)."
#. type: Labeled list
@@ -56041,16 +55755,11 @@ msgstr "s챕lecteur de reflog, p. ex., `refs/stash@{1}` ou `refs/stash@{2 minutes
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr "s챕lecteur de reflog raccourci ; identique 횪 `%gD', mais la partie du nom du reflog"
-
#. type: Plain text
#: en/pretty-formats.txt:244
#, fuzzy
#| msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr "s챕lecteur de reflog raccourci ; identique 횪 `%gD`, mais la partie refname est raccourcie pour la lisibilit챕 humaine (ainsi `refs/heads/master` devient simplement `master`)."
#. type: Labeled list
@@ -56071,9 +55780,9 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr "nom de l'identit챕 du reflog (en respectant le fichier.mailmap, voir"
+#: en/pretty-formats.txt:247
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "nom de l'identit챕 reflog (en respectant .mailmap, voir linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -56093,9 +55802,9 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr "adresse de courriel de l'identit챕 reflog (en respectant le fichier .mailmap, voir"
+#: en/pretty-formats.txt:250
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "e-mail de l'identit챕 reflog (en respectant .mailmap, voir linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -56114,16 +55823,11 @@ msgstr "titre du reflog"
msgid "'%(trailers[:options])'"
msgstr "'%(trailers[:options])'"
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr "afficher les lignes d'attribut du corps comme"
-
#. type: Plain text
#: en/pretty-formats.txt:256
#, fuzzy
#| msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr "afficher les lignes ajout챕es du corps comme interpr챕t챕es par linkgit:git-interpret-trailers[1]. La cha챤ne `trailers` peut 챗tre suivie de deux-points et de z챕ro ou plus d'options s챕par챕es par des virgules :"
#. type: Plain text
@@ -60939,6 +60643,166 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, fuzzy
+#~| msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
+#~ msgid "The Git repository to import to. If the directory doesn't"
+#~ msgstr "Le d챕p척t Git dans lequel importer. Si le r챕pertoire n'existe pas, il sera cr챕챕. La valeur par d챕faut est le r챕pertoire courant."
+
+#, fuzzy
+#~| msgid "Empty commits"
+#~ msgid ""
+#~ "Empty commits\n"
+#~ "~~~~~~~~~~~~~\n"
+#~ msgstr "Commits vides"
+
+#, fuzzy
+#~| msgid "Context"
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr "Contexte"
+
+#, fuzzy
+#~| msgid "Commit Rewording"
+#~ msgid ""
+#~ "Commit Rewording\n"
+#~ "~~~~~~~~~~~~~~~~\n"
+#~ msgstr "Reformulation de commits"
+
+#, fuzzy
+#~| msgid "NOTES"
+#~ msgid "NOTES\n"
+#~ msgstr "NOTES"
+
+#~ msgid "the commit recorded in the superproject will be"
+#~ msgstr "le commit enregistr챕 dans le superprojet sera"
+
+#~ msgid "checked out in the submodule on a detached HEAD.\n"
+#~ msgstr "extrait dans le sous-module avec une HEAD d챕tach챕e.\n"
+
+#, fuzzy
+#~| msgid "into the current branch in the submodule.\n"
+#~ msgid "the current branch of the submodule will be rebased"
+#~ msgstr "dans la branche actuelle du sous-module.\n"
+
+#~ msgid "onto the commit recorded in the superproject.\n"
+#~ msgstr "sur le commit enregistr챕 dans le super-projet.\n"
+
+#, fuzzy
+#~| msgid "the commit recorded in the superproject will be"
+#~ msgid "the commit recorded in the superproject will be merged"
+#~ msgstr "le commit enregistr챕 dans le superprojet sera"
+
+#~ msgid "into the current branch in the submodule.\n"
+#~ msgstr "dans la branche actuelle du sous-module.\n"
+
+#~ msgid "arbitrary shell command that takes a single"
+#~ msgstr "commande shell arbitraire qui prend un seul"
+
+#, fuzzy
+#~| msgid "--contents <file>"
+#~ msgid "contents of <old|new>,\n"
+#~ msgstr "--contents <fichier>"
+
+#, fuzzy
+#~| msgid "--objects"
+#~ msgid "the objects."
+#~ msgstr "--objects"
+
+#~ msgid "color specification, as described under Values in the"
+#~ msgstr "la sp챕cification de la couleur, comme d챕crit sous Valeurs dans la section"
+
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#~ msgid "make the next placeholder take at"
+#~ msgstr "faire le prochain espace r챕serv챕 prendre"
+
+#, fuzzy
+#~| msgid "make the next placeholder take at"
+#~ msgid "make the next placeholder take at least until Nth"
+#~ msgstr "faire le prochain espace r챕serv챕 prendre"
+
+#~ msgid "columns, padding spaces on the right if necessary"
+#~ msgstr "colonnes, en ins챕rant des espaces 횪 droite si n챕cessaire"
+
+#, fuzzy
+#~| msgid "similar to '%<(<N>)', '%<|(<N>)'"
+#~ msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
+#~ msgstr "similaire 횪 '%<(<N>)', '%<|(<N>)'"
+
+#~ msgid "but padding spaces on the left"
+#~ msgstr "mais en ins챕rant des espaces 횪 gauche"
+
+#~ msgid "similar to '%>(<N>)', '%>|(<N>)'"
+#~ msgstr "similaire 횪 '%>(<N>)', '%>|(<N>)'"
+
+#~ msgid "similar to '%<(<N>)', '%<|(<N>)'"
+#~ msgstr "similaire 횪 '%<(<N>)', '%<|(<N>)'"
+
+#, fuzzy
+#~| msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
+#~ msgid "respectively, but padding both sides (i.e. the text is centered)"
+#~ msgstr "similaire 횪 '%<(<N>)', '%<|(<N>)' respectivement, mais en calant des deux c척t챕s (c'est-횪-dire que le texte est centr챕)"
+
+#, fuzzy
+#~| msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+#~ msgstr "nom de l'auteur (en respectant .mailmap, voir linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
+
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "ou linkgit:git-blame[1])"
+
+#, fuzzy
+#~| msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+#~ msgstr "e-mail de l'auteur (en respectant .mailmap, voir linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
+
+#~ msgid "author local-part (see '%al') respecting .mailmap, see"
+#~ msgstr "partie locale de l'auteur (voir '%al') en respectant le fichier .mailmap, voir"
+
+#~ msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
+
+#~ msgid "committer name (respecting .mailmap, see"
+#~ msgstr "nom du validateur (en respectant .mailmap, voir"
+
+#~ msgid "committer email (respecting .mailmap, see"
+#~ msgstr "e-mail du validateur (en respectant .mailmap, voir"
+
+#, fuzzy
+#~ msgid "committer local-part (see '%cl') respecting .mailmap, see"
+#~ msgstr "partie locale de l'auteur (voir '%al') en respectant le fichier .mailmap, voir"
+
+#, fuzzy
+#~| msgid "Print out the ref name given on the command line by which each commit was reached."
+#~ msgid "ref name given on the command line by which the commit was reached"
+#~ msgstr "Imprimer le nom de la r챕f챕rence donn챕 sur la ligne de commande par lequel chaque commit a 챕t챕 atteint."
+
+#~ msgid "(like `git log --source`), only works with `git log`"
+#~ msgstr "(comme `git log --source`), ne fonctionne qu'avec `git log`"
+
+#~ msgid "show \"G\" for a good (valid) signature,"
+#~ msgstr "afficher \"G\" pour une bonne signature (valide),"
+
+#~ msgid "to sign a signed commit"
+#~ msgstr "pour signer un commit sign챕"
+
+#~ msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
+#~ msgstr "s챕lecteur de reflog, par exemple, `refs/stash@{1}`` ou `refs/stash@{2"
+
+#~ msgid "shortened reflog selector; same as `%gD`, but the refname"
+#~ msgstr "s챕lecteur de reflog raccourci ; identique 횪 `%gD', mais la partie du nom du reflog"
+
+#~ msgid "reflog identity name (respecting .mailmap, see"
+#~ msgstr "nom de l'identit챕 du reflog (en respectant le fichier.mailmap, voir"
+
+#~ msgid "reflog identity email (respecting .mailmap, see"
+#~ msgstr "adresse de courriel de l'identit챕 reflog (en respectant le fichier .mailmap, voir"
+
+#~ msgid "display the trailers of the body as"
+#~ msgstr "afficher les lignes d'attribut du corps comme"
+
#~ msgid "git file is."
#~ msgstr "se trouve."
@@ -60966,48 +60830,12 @@ msgstr ""
#~ 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 "Tracer l'챕volution de la plage de lignes donn챕e par \"<d챕but>,<fin>\" (ou la regex de nom de la fonction <nom-de-fonction>) dans le fichier <fichier>. Vous ne pouvez pas donner de limiteurs de sp챕cificateur de chemin. Ceci est actuellement limit챕 횪 une marche 횪 partir d'une seule r챕vision, c'est-횪-dire que vous ne pouvez donner qu'aucun ou un seul argument de r챕vision, <d챕but> et <fin> (ou <nom-de-fonction>) doivent exister dans la r챕vision de d챕part. Vous pouvez sp챕cifier cette option plusieurs fois. Cette option implique `--patch`. L'affichage de la rustine peut 챗tre supprim챕 en utilisant `--no-patch`, mai les autres formats de diff (`--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) ne sont pas implant챕s actuellement."
-#~ msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
-#~ msgstr "le commit enregistr챕 dans le superprojet sera extrait dans le sous-module sur une HEAD d챕tach챕e."
-
-#~ msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
-#~ msgstr "la branche actuelle du sous-module sera rebas챕e sur le commit enregistr챕 dans le superprojet."
-
-#~ msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
-#~ msgstr "le commit enregistr챕 dans le superprojet sera fusionn챕 dans la branche actuelle dans le sous-module."
-
#~ msgid "--no-signoff"
#~ msgstr "--no-signoff"
#~ msgid "With --no-signoff do not add a Signed-off-by line."
#~ msgstr "Avec --no-signoff ne pas ajouter de ligne Signed-off-by."
-#~ msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
-#~ msgstr "faire le prochain espace r챕serv챕 prendre au moins jusqu�쇒� ce qu'aux Ni챔mes colonnes, les espaces d'alignement sur la droite si n챕cessaire"
-
-#~ msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
-#~ msgstr "similaire 횪 '%<(<N>)', '%<|(<N>)' respectivement, mais les espaces d'alignement 횪 gauche"
-
-#~ msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-#~ msgstr "partie locale de l'auteur (voir '%al') en respectant .mailmap, voir linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
-
-#~ msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-#~ msgstr "nom du validateur (en respectant .mailmap, voir linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
-
-#~ msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-#~ msgstr "e-mail du validateur (en respectant .mailmap, voir linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
-
-#~ msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-#~ msgstr "partie locale du validateur (voir '%cl') en respectant .mailmap, voir linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
-
-#~ msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
-#~ msgstr "nom de ref fourni en ligne de commande par lequel le commit a 챕t챕 atteint (comme `git log --source`), ne fonctionne qu�셙vec `git log`"
-
-#~ msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-#~ msgstr "nom de l'identit챕 reflog (en respectant .mailmap, voir linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
-
-#~ msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-#~ msgstr "e-mail de l'identit챕 reflog (en respectant .mailmap, voir linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
-
#~ msgid "Thus, the following command:"
#~ msgstr "Ainsi, la commande suivante혻:"
diff --git a/po/documentation.hu.po b/po/documentation.hu.po
index bcdc084..aa840b0 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-12-16 23:08+0100\n"
+"POT-Creation-Date: 2020-12-20 22:54+0100\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"
@@ -9505,8 +9505,8 @@ msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#: en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr ""
@@ -16081,15 +16081,9 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap
-msgid "exist, it will be created. Default is the current directory.\n"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -19317,14 +19311,9 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -20964,17 +20953,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -20988,18 +20972,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -24014,7 +23992,7 @@ msgstr ""
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K횄쨋nig diet\n"
msgstr ""
#. type: delimited block -
@@ -36507,284 +36485,145 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, fuzzy, no-wrap
#| msgid "git-p4.keepEmptyCommits"
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
msgstr "git-p4.keepEmptyCommits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, fuzzy, no-wrap
#| msgid "--text"
-msgid ""
-"Context\n"
-"~~~~~~~\n"
+msgid "Context"
msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap
-msgid "NOTES\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -45142,15 +44981,9 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -45164,26 +44997,14 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -45197,19 +45018,9 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -49038,15 +48849,9 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap
-msgid "contents of <old|new>,\n"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -49796,17 +49601,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-#, fuzzy
-#| msgid "--objects"
-msgid "the objects."
-msgstr "--objects"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -49894,14 +49692,9 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -49915,20 +49708,9 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -54341,14 +54123,9 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
-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."
+msgid "color specification, as described under Values in the \"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 ""
#. type: Labeled list
@@ -54368,15 +54145,10 @@ msgstr ""
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:148
-msgid "switch line wrapping, like the -w option of"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -54384,14 +54156,9 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -54400,14 +54167,9 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -54416,14 +54178,9 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -54432,14 +54189,9 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -54448,14 +54200,9 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -54547,16 +54294,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, fuzzy
-#| msgid "linkgit:git-blame[1]"
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -54576,9 +54318,11 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
+#: en/pretty-formats.txt:183
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -54598,17 +54342,10 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196
-#: en/pretty-formats.txt:199 en/pretty-formats.txt:202
-#: en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, fuzzy
#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
@@ -54706,9 +54443,11 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-msgid "committer name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:196
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -54728,9 +54467,11 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-msgid "committer email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:199
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -54750,9 +54491,11 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:202
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -54853,14 +54596,9 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -54940,14 +54678,9 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -54989,14 +54722,9 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -55016,14 +54744,9 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -55032,14 +54755,9 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -55060,9 +54778,11 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:247
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -55082,9 +54802,11 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:250
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -55103,14 +54825,9 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -59830,6 +59547,26 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, fuzzy
+#~| msgid "--text"
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr "--text"
+
+#, fuzzy
+#~| msgid "--objects"
+#~ msgid "the objects."
+#~ msgstr "--objects"
+
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~| msgid "linkgit:git-blame[1]"
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
#~ msgid "--no-signoff"
#~ msgstr "--no-signoff"
diff --git a/po/documentation.id.po b/po/documentation.id.po
index dbd9240..3bab7e3 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-12-16 23:08+0100\n"
+"POT-Creation-Date: 2020-12-20 22:54+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -9505,8 +9505,8 @@ msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#: en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr ""
@@ -16081,15 +16081,9 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap
-msgid "exist, it will be created. Default is the current directory.\n"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -19317,14 +19311,9 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -20964,17 +20953,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -20988,18 +20972,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -24014,7 +23992,7 @@ msgstr ""
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K횄쨋nig diet\n"
msgstr ""
#. type: delimited block -
@@ -36507,284 +36485,145 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, fuzzy, no-wrap
#| msgid "git-p4.keepEmptyCommits"
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
msgstr "git-p4.keepEmptyCommits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, fuzzy, no-wrap
#| msgid "--text"
-msgid ""
-"Context\n"
-"~~~~~~~\n"
+msgid "Context"
msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap
-msgid "NOTES\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -45142,15 +44981,9 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -45164,26 +44997,14 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -45197,19 +45018,9 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -49038,15 +48849,9 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap
-msgid "contents of <old|new>,\n"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -49796,17 +49601,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-#, fuzzy
-#| msgid "--objects"
-msgid "the objects."
-msgstr "--objects"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -49894,14 +49692,9 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -49915,20 +49708,9 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -54341,14 +54123,9 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
-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."
+msgid "color specification, as described under Values in the \"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 ""
#. type: Labeled list
@@ -54368,15 +54145,10 @@ msgstr ""
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:148
-msgid "switch line wrapping, like the -w option of"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -54384,14 +54156,9 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -54400,14 +54167,9 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -54416,14 +54178,9 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -54432,14 +54189,9 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -54448,14 +54200,9 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -54547,16 +54294,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, fuzzy
-#| msgid "linkgit:git-blame[1]"
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -54576,9 +54318,11 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
+#: en/pretty-formats.txt:183
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -54598,17 +54342,10 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196
-#: en/pretty-formats.txt:199 en/pretty-formats.txt:202
-#: en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, fuzzy
#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
@@ -54706,9 +54443,11 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-msgid "committer name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:196
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -54728,9 +54467,11 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-msgid "committer email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:199
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -54750,9 +54491,11 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:202
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -54853,14 +54596,9 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -54940,14 +54678,9 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -54989,14 +54722,9 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -55016,14 +54744,9 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -55032,14 +54755,9 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -55060,9 +54778,11 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:247
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -55082,9 +54802,11 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:250
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -55103,14 +54825,9 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -59830,6 +59547,26 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, fuzzy
+#~| msgid "--text"
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr "--text"
+
+#, fuzzy
+#~| msgid "--objects"
+#~ msgid "the objects."
+#~ msgstr "--objects"
+
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~| msgid "linkgit:git-blame[1]"
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
#~ msgid "--no-signoff"
#~ msgstr "--no-signoff"
diff --git a/po/documentation.is.po b/po/documentation.is.po
index dddcb40..0f2ebe0 100644
--- a/po/documentation.is.po
+++ b/po/documentation.is.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-12-16 23:08+0100\n"
+"POT-Creation-Date: 2020-12-20 22:54+0100\n"
"PO-Revision-Date: 2020-08-24 14:49+0000\n"
"Last-Translator: 횧처rhalla Gu챨mundsd처ttir Beck <plergux@outlook.com>\n"
"Language-Team: Icelandic\n"
@@ -9540,8 +9540,8 @@ msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#: en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr ""
@@ -16154,15 +16154,9 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap
-msgid "exist, it will be created. Default is the current directory.\n"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -19390,14 +19384,9 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -21037,17 +21026,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -21061,18 +21045,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -24084,7 +24062,7 @@ msgstr ""
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K횄쨋nig diet\n"
msgstr ""
#. type: delimited block -
@@ -36583,284 +36561,145 @@ msgstr ""
msgid "--fork-point and --root"
msgstr ""
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, fuzzy, no-wrap
#| msgid "git-p4.keepEmptyCommits"
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
msgstr "git-p4.keepEmptyCommits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, fuzzy, no-wrap
#| msgid "--text"
-msgid ""
-"Context\n"
-"~~~~~~~\n"
+msgid "Context"
msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap
-msgid "NOTES\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -45217,15 +45056,9 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -45239,26 +45072,14 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -45272,19 +45093,9 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -49112,15 +48923,9 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap
-msgid "contents of <old|new>,\n"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -49870,17 +49675,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-#, fuzzy
-#| msgid "--objects"
-msgid "the objects."
-msgstr "--objects"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -49968,14 +49766,9 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -49989,20 +49782,9 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -54404,14 +54186,9 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
-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."
+msgid "color specification, as described under Values in the \"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 ""
#. type: Labeled list
@@ -54431,15 +54208,10 @@ msgstr ""
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:148
-msgid "switch line wrapping, like the -w option of"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -54447,14 +54219,9 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -54463,14 +54230,9 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -54479,14 +54241,9 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -54495,14 +54252,9 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -54511,14 +54263,9 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -54610,16 +54357,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, fuzzy
-#| msgid "linkgit:git-blame[1]"
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -54639,9 +54381,11 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
+#: en/pretty-formats.txt:183
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -54661,17 +54405,10 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196
-#: en/pretty-formats.txt:199 en/pretty-formats.txt:202
-#: en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, fuzzy
#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
@@ -54769,9 +54506,11 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-msgid "committer name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:196
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -54791,9 +54530,11 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-msgid "committer email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:199
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -54813,9 +54554,11 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:202
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -54916,14 +54659,9 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -55003,14 +54741,9 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -55052,14 +54785,9 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -55079,14 +54807,9 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -55095,14 +54818,9 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -55123,9 +54841,11 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:247
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -55145,9 +54865,11 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:250
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -55166,14 +54888,9 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -59899,6 +59616,26 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, fuzzy
+#~| msgid "--text"
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr "--text"
+
+#, fuzzy
+#~| msgid "--objects"
+#~ msgid "the objects."
+#~ msgstr "--objects"
+
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~| msgid "linkgit:git-blame[1]"
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
#~ msgid "--no-signoff"
#~ msgstr "--no-signoff"
diff --git a/po/documentation.it.po b/po/documentation.it.po
index 81f3478..c6bd39f 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-12-16 23:08+0100\n"
+"POT-Creation-Date: 2020-12-20 22:54+0100\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"
@@ -9953,8 +9953,8 @@ msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#: en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr ""
@@ -16641,17 +16641,11 @@ msgid "-C <target-dir>"
msgstr ""
#. type: Plain text
-#: en/git-cvsimport.txt:69
+#: en/git-cvsimport.txt:70
#, fuzzy
-msgid "The Git repository to import to. If the directory doesn't"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr "Clona un repository in una nuova directory"
-#. type: Plain text
-#: en/git-cvsimport.txt:70
-#, no-wrap
-msgid "exist, it will be created. Default is the current directory.\n"
-msgstr ""
-
#. type: Labeled list
#: en/git-cvsimport.txt:71
#, no-wrap
@@ -19886,14 +19880,9 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -21534,17 +21523,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -21558,18 +21542,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -24590,7 +24568,7 @@ msgstr ""
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K횄쨋nig diet\n"
msgstr ""
#. type: delimited block -
@@ -37168,283 +37146,144 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, fuzzy, no-wrap
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
msgstr "`commit`"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, fuzzy, no-wrap
#| msgid "--text"
-msgid ""
-"Context\n"
-"~~~~~~~\n"
+msgid "Context"
msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap
-msgid "NOTES\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -45825,15 +45664,9 @@ msgstr ""
msgid "checkout"
msgstr "--checkout"
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -45847,26 +45680,14 @@ msgstr ""
msgid "rebase"
msgstr "--rebase"
-#. type: Plain text
-#: en/git-submodule.txt:158
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -45880,19 +45701,9 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -49729,15 +49540,9 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap
-msgid "contents of <old|new>,\n"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -50487,17 +50292,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-#, fuzzy
-#| msgid "--objects"
-msgid "the objects."
-msgstr "--objects"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -50585,14 +50383,9 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -50606,20 +50399,9 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -55036,14 +54818,9 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
-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."
+msgid "color specification, as described under Values in the \"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 ""
#. type: Labeled list
@@ -55063,15 +54840,10 @@ msgstr ""
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:148
-msgid "switch line wrapping, like the -w option of"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -55079,14 +54851,9 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -55095,14 +54862,9 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -55111,14 +54873,9 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -55127,14 +54884,9 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -55143,14 +54895,9 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -55242,15 +54989,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, fuzzy
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -55270,9 +55013,11 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
+#: en/pretty-formats.txt:183
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -55292,17 +55037,10 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196
-#: en/pretty-formats.txt:199 en/pretty-formats.txt:202
-#: en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, fuzzy
#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
@@ -55400,9 +55138,11 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-msgid "committer name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:196
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -55422,9 +55162,11 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-msgid "committer email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:199
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -55444,9 +55186,11 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:202
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -55547,14 +55291,9 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -55635,14 +55374,9 @@ msgstr ""
msgid "'%G?'"
msgstr "'%GG'"
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -55684,14 +55418,9 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -55711,14 +55440,9 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -55727,14 +55451,9 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -55755,9 +55474,11 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:247
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -55777,9 +55498,11 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:250
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -55798,14 +55521,9 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -60573,6 +60291,25 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
+#, fuzzy
+#~| msgid "--text"
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr "--text"
+
+#, fuzzy
+#~| msgid "--objects"
+#~ msgid "the objects."
+#~ msgstr "--objects"
+
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
#, fuzzy
#~ msgid "Show whole surrounding functions of changes."
#~ msgstr "Mostra tutte le funzioni circostanti delle modifiche."
diff --git a/po/documentation.ja.po b/po/documentation.ja.po
index 7a5c46f..39dbcc5 100644
--- a/po/documentation.ja.po
+++ b/po/documentation.ja.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-12-16 23:08+0100\n"
+"POT-Creation-Date: 2020-12-20 22:54+0100\n"
"PO-Revision-Date: 2020-08-15 01:33+0000\n"
"Last-Translator: Yuuki Ebihara <yuuki.ebihara813@gmail.com>\n"
"Language-Team: Japanese\n"
@@ -9509,8 +9509,8 @@ msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#: en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr ""
@@ -16079,15 +16079,9 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap
-msgid "exist, it will be created. Default is the current directory.\n"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -19313,14 +19307,9 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -20960,17 +20949,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -20984,18 +20968,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -24011,7 +23989,7 @@ msgstr ""
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K횄쨋nig diet\n"
msgstr ""
#. type: delimited block -
@@ -36494,284 +36472,145 @@ msgstr ""
msgid "--fork-point and --root"
msgstr ""
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, fuzzy, no-wrap
#| msgid "git-p4.keepEmptyCommits"
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
msgstr "git-p4.keepEmptyCommits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, fuzzy, no-wrap
#| msgid "--text"
-msgid ""
-"Context\n"
-"~~~~~~~\n"
+msgid "Context"
msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap
-msgid "NOTES\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -45126,15 +44965,9 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -45148,26 +44981,14 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -45181,19 +45002,9 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -49021,15 +48832,9 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap
-msgid "contents of <old|new>,\n"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -49779,17 +49584,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-#, fuzzy
-#| msgid "--objects"
-msgid "the objects."
-msgstr "--objects"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -49877,14 +49675,9 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -49898,20 +49691,9 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -54313,14 +54095,9 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
-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."
+msgid "color specification, as described under Values in the \"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 ""
#. type: Labeled list
@@ -54340,15 +54117,10 @@ msgstr ""
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:148
-msgid "switch line wrapping, like the -w option of"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -54356,14 +54128,9 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -54372,14 +54139,9 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -54388,14 +54150,9 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -54404,14 +54161,9 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -54420,14 +54172,9 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -54519,16 +54266,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, fuzzy
-#| msgid "linkgit:git-blame[1]"
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -54548,9 +54290,11 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
+#: en/pretty-formats.txt:183
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -54570,17 +54314,10 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196
-#: en/pretty-formats.txt:199 en/pretty-formats.txt:202
-#: en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, fuzzy
#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
@@ -54678,9 +54415,11 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-msgid "committer name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:196
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -54700,9 +54439,11 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-msgid "committer email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:199
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -54722,9 +54463,11 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:202
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -54825,14 +54568,9 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -54912,14 +54650,9 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -54961,14 +54694,9 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -54988,14 +54716,9 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -55004,14 +54727,9 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -55032,9 +54750,11 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:247
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -55054,9 +54774,11 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:250
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -55075,14 +54797,9 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -59799,5 +59516,25 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, fuzzy
+#~| msgid "--text"
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr "--text"
+
+#, fuzzy
+#~| msgid "--objects"
+#~ msgid "the objects."
+#~ msgstr "--objects"
+
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~| msgid "linkgit:git-blame[1]"
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
#~ msgid "--no-signoff"
#~ msgstr "--no-signoff"
diff --git a/po/documentation.ko.po b/po/documentation.ko.po
index d4892ed..61c429e 100644
--- a/po/documentation.ko.po
+++ b/po/documentation.ko.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git-manpages-l10n\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-12-16 23:08+0100\n"
+"POT-Creation-Date: 2020-12-20 22:54+0100\n"
"PO-Revision-Date: 2020-08-18 02:32+0000\n"
"Last-Translator: JunYeong Park <dahuin000@gmail.com>\n"
"Language-Team: Korean\n"
@@ -9513,8 +9513,8 @@ msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#: en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr ""
@@ -16089,15 +16089,9 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap
-msgid "exist, it will be created. Default is the current directory.\n"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -19325,14 +19319,9 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -20972,17 +20961,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -20996,18 +20980,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -24019,7 +23997,7 @@ msgstr ""
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K횄쨋nig diet\n"
msgstr ""
#. type: delimited block -
@@ -36512,284 +36490,145 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, fuzzy, no-wrap
#| msgid "git-p4.keepEmptyCommits"
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
msgstr "git-p4.keepEmptyCommits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, fuzzy, no-wrap
#| msgid "--text"
-msgid ""
-"Context\n"
-"~~~~~~~\n"
+msgid "Context"
msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap
-msgid "NOTES\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -45144,15 +44983,9 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -45166,26 +44999,14 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -45199,19 +45020,9 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -49039,15 +48850,9 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap
-msgid "contents of <old|new>,\n"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -49797,17 +49602,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-#, fuzzy
-#| msgid "--objects"
-msgid "the objects."
-msgstr "--objects"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -49895,14 +49693,9 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -49916,20 +49709,9 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -54334,14 +54116,9 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
-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."
+msgid "color specification, as described under Values in the \"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 ""
#. type: Labeled list
@@ -54361,15 +54138,10 @@ msgstr ""
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:148
-msgid "switch line wrapping, like the -w option of"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -54377,14 +54149,9 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -54393,14 +54160,9 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -54409,14 +54171,9 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -54425,14 +54182,9 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -54441,14 +54193,9 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -54540,16 +54287,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, fuzzy
-#| msgid "linkgit:git-blame[1]"
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -54569,9 +54311,11 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
+#: en/pretty-formats.txt:183
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -54591,17 +54335,10 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196
-#: en/pretty-formats.txt:199 en/pretty-formats.txt:202
-#: en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, fuzzy
#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
@@ -54699,9 +54436,11 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-msgid "committer name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:196
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -54721,9 +54460,11 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-msgid "committer email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:199
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -54743,9 +54484,11 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:202
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -54846,14 +54589,9 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -54933,14 +54671,9 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -54982,14 +54715,9 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -55009,14 +54737,9 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -55025,14 +54748,9 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -55053,9 +54771,11 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:247
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -55075,9 +54795,11 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:250
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -55096,14 +54818,9 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -59822,6 +59539,26 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, fuzzy
+#~| msgid "--text"
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr "--text"
+
+#, fuzzy
+#~| msgid "--objects"
+#~ msgid "the objects."
+#~ msgstr "--objects"
+
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~| msgid "linkgit:git-blame[1]"
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
#~ msgid "--no-signoff"
#~ msgstr "--no-signoff"
diff --git a/po/documentation.mr.po b/po/documentation.mr.po
index f8c4ac1..ae11f26 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-12-16 23:08+0100\n"
+"POT-Creation-Date: 2020-12-20 22:54+0100\n"
"PO-Revision-Date: 2020-11-26 19:29+0000\n"
"Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n"
"Language-Team: Marathi\n"
@@ -9508,8 +9508,8 @@ msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#: en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr ""
@@ -16084,15 +16084,9 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap
-msgid "exist, it will be created. Default is the current directory.\n"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -19320,14 +19314,9 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -20967,17 +20956,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -20991,18 +20975,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -24014,7 +23992,7 @@ msgstr ""
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K횄쨋nig diet\n"
msgstr ""
#. type: delimited block -
@@ -36507,284 +36485,145 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, fuzzy, no-wrap
#| msgid "git-p4.keepEmptyCommits"
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
msgstr "git-p4.keepEmptyCommits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, fuzzy, no-wrap
#| msgid "--text"
-msgid ""
-"Context\n"
-"~~~~~~~\n"
+msgid "Context"
msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap
-msgid "NOTES\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -45139,15 +44978,9 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -45161,26 +44994,14 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -45194,19 +45015,9 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -49034,15 +48845,9 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap
-msgid "contents of <old|new>,\n"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -49792,17 +49597,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-#, fuzzy
-#| msgid "--objects"
-msgid "the objects."
-msgstr "--objects"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -49890,14 +49688,9 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -49911,20 +49704,9 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -54335,14 +54117,9 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
-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."
+msgid "color specification, as described under Values in the \"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 ""
#. type: Labeled list
@@ -54362,15 +54139,10 @@ msgstr ""
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:148
-msgid "switch line wrapping, like the -w option of"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -54378,14 +54150,9 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -54394,14 +54161,9 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -54410,14 +54172,9 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -54426,14 +54183,9 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -54442,14 +54194,9 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -54541,16 +54288,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, fuzzy
-#| msgid "linkgit:git-blame[1]"
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -54570,9 +54312,11 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
+#: en/pretty-formats.txt:183
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -54592,17 +54336,10 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196
-#: en/pretty-formats.txt:199 en/pretty-formats.txt:202
-#: en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, fuzzy
#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
@@ -54700,9 +54437,11 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-msgid "committer name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:196
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -54722,9 +54461,11 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-msgid "committer email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:199
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -54744,9 +54485,11 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:202
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -54847,14 +54590,9 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -54934,14 +54672,9 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -54983,14 +54716,9 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -55010,14 +54738,9 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -55026,14 +54749,9 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -55054,9 +54772,11 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:247
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -55076,9 +54796,11 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:250
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -55097,14 +54819,9 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -59823,6 +59540,26 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, fuzzy
+#~| msgid "--text"
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr "--text"
+
+#, fuzzy
+#~| msgid "--objects"
+#~ msgid "the objects."
+#~ msgstr "--objects"
+
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~| msgid "linkgit:git-blame[1]"
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
#~ msgid "--no-signoff"
#~ msgstr "--no-signoff"
diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po
index df1e45e..0f19749 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-12-16 23:08+0100\n"
+"POT-Creation-Date: 2020-12-20 22:54+0100\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"
@@ -9509,8 +9509,8 @@ msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#: en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr ""
@@ -16085,15 +16085,9 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap
-msgid "exist, it will be created. Default is the current directory.\n"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -19321,14 +19315,9 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -20968,17 +20957,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -20992,18 +20976,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -24020,7 +23998,7 @@ msgstr ""
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K횄쨋nig diet\n"
msgstr ""
#. type: delimited block -
@@ -36513,284 +36491,145 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, fuzzy, no-wrap
#| msgid "git-p4.keepEmptyCommits"
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
msgstr "git-p4.keepEmptyCommits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, fuzzy, no-wrap
#| msgid "--text"
-msgid ""
-"Context\n"
-"~~~~~~~\n"
+msgid "Context"
msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap
-msgid "NOTES\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -45149,15 +44988,9 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -45171,26 +45004,14 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -45204,19 +45025,9 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -49051,15 +48862,9 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap
-msgid "contents of <old|new>,\n"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -49809,17 +49614,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-#, fuzzy
-#| msgid "--objects"
-msgid "the objects."
-msgstr "--objects"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -49907,14 +49705,9 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -49928,20 +49721,9 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -54357,14 +54139,9 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
-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."
+msgid "color specification, as described under Values in the \"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 ""
#. type: Labeled list
@@ -54384,15 +54161,12 @@ msgstr ""
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:148
-msgid "switch line wrapping, like the -w option of"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+#, fuzzy
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -54400,14 +54174,9 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -54416,14 +54185,9 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -54432,14 +54196,9 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -54448,14 +54207,9 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -54464,14 +54218,9 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -54571,18 +54320,12 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
+#: en/pretty-formats.txt:180
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
-#, fuzzy
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
-
#. type: Labeled list
#: en/pretty-formats.txt:180
#, no-wrap
@@ -54603,10 +54346,10 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
+#: en/pretty-formats.txt:183
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -54627,21 +54370,12 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
+#: en/pretty-formats.txt:186
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "author local-part (see '%al') respecting .mailmap, see"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196
-#: en/pretty-formats.txt:199 en/pretty-formats.txt:202
-#: en/pretty-formats.txt:247 en/pretty-formats.txt:250
-#, fuzzy
-#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
-
#. type: Labeled list
#: en/pretty-formats.txt:186
#, no-wrap
@@ -54741,10 +54475,10 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
+#: en/pretty-formats.txt:196
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "committer name (respecting .mailmap, see"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -54767,10 +54501,10 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
+#: en/pretty-formats.txt:199
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "committer email (respecting .mailmap, see"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -54791,10 +54525,10 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
+#: en/pretty-formats.txt:202
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -54898,14 +54632,9 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -54989,14 +54718,9 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -55038,14 +54762,9 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -55065,14 +54784,9 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -55081,14 +54795,9 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -55109,10 +54818,10 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
+#: en/pretty-formats.txt:247
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "reflog identity name (respecting .mailmap, see"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -55133,10 +54842,10 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "reflog identity email (respecting .mailmap, see"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -55156,14 +54865,9 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -59883,6 +59587,55 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, fuzzy
+#~| msgid "--text"
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr "--text"
+
+#, fuzzy
+#~| msgid "--objects"
+#~ msgid "the objects."
+#~ msgstr "--objects"
+
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+#~ msgid "author local-part (see '%al') respecting .mailmap, see"
+#~ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+#~ msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+#~ msgid "committer name (respecting .mailmap, see"
+#~ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+#~ msgid "committer email (respecting .mailmap, see"
+#~ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+#~ msgid "reflog identity name (respecting .mailmap, see"
+#~ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+#~ msgid "reflog identity email (respecting .mailmap, see"
+#~ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+
#~ msgid "--no-signoff"
#~ msgstr "--no-signoff"
diff --git a/po/documentation.nl.po b/po/documentation.nl.po
index 1d87473..928c438 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-12-16 23:08+0100\n"
+"POT-Creation-Date: 2020-12-20 22:54+0100\n"
"PO-Revision-Date: 2020-08-07 23:32+0000\n"
"Last-Translator: Karel Vanhelden <karelvanhelden@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -9515,8 +9515,8 @@ msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#: en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr ""
@@ -16091,15 +16091,9 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap
-msgid "exist, it will be created. Default is the current directory.\n"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -19327,14 +19321,9 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -20974,17 +20963,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -20998,18 +20982,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -24025,7 +24003,7 @@ msgstr ""
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K횄쨋nig diet\n"
msgstr ""
#. type: delimited block -
@@ -36530,284 +36508,145 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, fuzzy, no-wrap
#| msgid "`commit`"
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
msgstr "`commit`"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, fuzzy, no-wrap
#| msgid "--text"
-msgid ""
-"Context\n"
-"~~~~~~~\n"
+msgid "Context"
msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap
-msgid "NOTES\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -45236,15 +45075,9 @@ msgstr ""
msgid "checkout"
msgstr "--no-checkout"
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -45258,26 +45091,14 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -45291,19 +45112,9 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -49170,15 +48981,9 @@ msgstr "--no-where"
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap
-msgid "contents of <old|new>,\n"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -49931,16 +49736,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-#, fuzzy
-msgid "the objects."
-msgstr "--name-objects"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -50028,14 +49827,9 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -50049,20 +49843,9 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -54493,14 +54276,9 @@ msgstr "color"
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
-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."
+msgid "color specification, as described under Values in the \"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 ""
#. type: Labeled list
@@ -54520,15 +54298,12 @@ msgstr ""
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:148
-msgid "switch line wrapping, like the -w option of"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+#, fuzzy
+#| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -54536,14 +54311,9 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -54552,14 +54322,9 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -54568,14 +54333,9 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -54584,14 +54344,9 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -54600,14 +54355,9 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -54703,18 +54453,12 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
+#: en/pretty-formats.txt:180
#, fuzzy
#| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
-#, fuzzy
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
-
#. type: Labeled list
#: en/pretty-formats.txt:180
#, no-wrap
@@ -54735,10 +54479,10 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
+#: en/pretty-formats.txt:183
#, fuzzy
#| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
#. type: Labeled list
@@ -54759,21 +54503,12 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
+#: en/pretty-formats.txt:186
#, fuzzy
#| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
-msgid "author local-part (see '%al') respecting .mailmap, see"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196
-#: en/pretty-formats.txt:199 en/pretty-formats.txt:202
-#: en/pretty-formats.txt:247 en/pretty-formats.txt:250
-#, fuzzy
-#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
-
#. type: Labeled list
#: en/pretty-formats.txt:186
#, no-wrap
@@ -54871,10 +54606,10 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
+#: en/pretty-formats.txt:196
#, fuzzy
#| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
-msgid "committer name (respecting .mailmap, see"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
#. type: Labeled list
@@ -54897,10 +54632,10 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
+#: en/pretty-formats.txt:199
#, fuzzy
#| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
-msgid "committer email (respecting .mailmap, see"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
#. type: Labeled list
@@ -54921,10 +54656,10 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
+#: en/pretty-formats.txt:202
#, fuzzy
#| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
#. type: Labeled list
@@ -55028,14 +54763,9 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -55121,14 +54851,9 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -55170,14 +54895,9 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -55197,14 +54917,9 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -55213,14 +54928,9 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -55241,10 +54951,10 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
+#: en/pretty-formats.txt:247
#, fuzzy
#| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
-msgid "reflog identity name (respecting .mailmap, see"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
#. type: Labeled list
@@ -55265,10 +54975,10 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, fuzzy
#| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
-msgid "reflog identity email (respecting .mailmap, see"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
#. type: Labeled list
@@ -55288,14 +54998,9 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -60032,6 +59737,54 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, fuzzy
+#~| msgid "--text"
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr "--text"
+
+#, fuzzy
+#~ msgid "the objects."
+#~ msgstr "--name-objects"
+
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
+#~ msgid "author local-part (see '%al') respecting .mailmap, see"
+#~ msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+#~ msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
+#~ msgid "committer name (respecting .mailmap, see"
+#~ msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
+#~ msgid "committer email (respecting .mailmap, see"
+#~ msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
+#~ msgid "reflog identity name (respecting .mailmap, see"
+#~ msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
+#~ msgid "reflog identity email (respecting .mailmap, see"
+#~ msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
+
#~ msgid "--no-signoff"
#~ msgstr "--no-signoff"
diff --git a/po/documentation.pl.po b/po/documentation.pl.po
index 1070e26..9a61141 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-12-16 23:08+0100\n"
+"POT-Creation-Date: 2020-12-20 22:54+0100\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"
@@ -9513,8 +9513,8 @@ msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#: en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr ""
@@ -16097,15 +16097,9 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap
-msgid "exist, it will be created. Default is the current directory.\n"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -19336,14 +19330,9 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -20983,17 +20972,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -21007,18 +20991,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -24033,7 +24011,7 @@ msgstr ""
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K횄쨋nig diet\n"
msgstr ""
#. type: delimited block -
@@ -36538,283 +36516,144 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, fuzzy, no-wrap
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
msgstr "$ git commit\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, fuzzy, no-wrap
#| msgid "--text"
-msgid ""
-"Context\n"
-"~~~~~~~\n"
+msgid "Context"
msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap
-msgid "NOTES\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -45175,15 +45014,9 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -45197,26 +45030,14 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -45230,19 +45051,9 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -49071,15 +48882,9 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap
-msgid "contents of <old|new>,\n"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -49829,17 +49634,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-#, fuzzy
-#| msgid "--objects"
-msgid "the objects."
-msgstr "--objects"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -49927,14 +49725,9 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -49948,20 +49741,9 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -54375,14 +54157,9 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
-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."
+msgid "color specification, as described under Values in the \"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 ""
#. type: Labeled list
@@ -54402,15 +54179,10 @@ msgstr ""
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:148
-msgid "switch line wrapping, like the -w option of"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -54418,14 +54190,9 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -54434,14 +54201,9 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -54450,14 +54212,9 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -54466,14 +54223,9 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -54482,14 +54234,9 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -54581,16 +54328,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, fuzzy
-#| msgid "linkgit:git-blame[1]"
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -54610,9 +54352,11 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
+#: en/pretty-formats.txt:183
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -54632,17 +54376,10 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196
-#: en/pretty-formats.txt:199 en/pretty-formats.txt:202
-#: en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, fuzzy
#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
@@ -54740,9 +54477,11 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-msgid "committer name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:196
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -54762,9 +54501,11 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-msgid "committer email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:199
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -54784,9 +54525,11 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:202
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -54887,14 +54630,9 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -54974,14 +54712,9 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -55023,14 +54756,9 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -55050,14 +54778,9 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -55066,14 +54789,9 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -55094,9 +54812,11 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:247
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -55116,9 +54836,11 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:250
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -55137,14 +54859,9 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -59918,6 +59635,26 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, fuzzy
+#~| msgid "--text"
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr "--text"
+
+#, fuzzy
+#~| msgid "--objects"
+#~ msgid "the objects."
+#~ msgstr "--objects"
+
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~| msgid "linkgit:git-blame[1]"
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
#~ msgid "--no-signoff"
#~ msgstr "--no-signoff"
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 1e19e95..259f01b 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -3,7 +3,18 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
-msgstr "Report-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2020-12-16 23:08+0100\nPO-Revision-Date: 2020-12-19 21:07+0000\nLast-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\nLanguage-Team: none\nLanguage: pt_BR\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 4.4-dev\n"
+msgstr ""
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2020-12-20 22:54+0100\n"
+"PO-Revision-Date: 2020-12-19 21:07+0000\n"
+"Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.4-dev\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:679 en/git-instaweb.txt:45
@@ -9234,7 +9245,22 @@ msgid ""
"'git branch' (-c | -C) [<oldbranch>] <newbranch>\n"
"'git branch' (-d | -D) [-r] <branchname>...\n"
"'git branch' --edit-description [<branchname>]\n"
-msgstr "'git branch' [--color[=<quando>] | --no-color] [--show-current]\n\t[-v [--abbrev=<n> | --no-abbrev]]\n\t[--column[=<op챌천es>] | --no-column] [--sort=<chaves>]\n\t[--merged [<commit>]] [--no-merged [<commit>]]\n\t[--contains [<commit>]] [--no-contains [<commit>]]\n\t[--points-at <objeto>] [--format=<formato>]\n\t[(-r | --remotes) | (-a | --all)]\n\t[--list] [<padr찾o>...]\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'git branch' (-d | -D) [-r] <nome-do-ramo>...\n'git branch' --edit-description [<nome-do-ramo>]\n"
+msgstr ""
+"'git branch' [--color[=<quando>] | --no-color] [--show-current]\n"
+"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
+"\t[--column[=<op챌천es>] | --no-column] [--sort=<chaves>]\n"
+"\t[--merged [<commit>]] [--no-merged [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
+"\t[--points-at <objeto>] [--format=<formato>]\n"
+"\t[(-r | --remotes) | (-a | --all)]\n"
+"\t[--list] [<padr찾o>...]\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"
+"'git branch' (-d | -D) [-r] <nome-do-ramo>...\n"
+"'git branch' --edit-description [<nome-do-ramo>]\n"
#. type: Plain text
#: en/git-branch.txt:36
@@ -9773,8 +9799,8 @@ msgstr "Os padr천es normalmente precisam ser citados."
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#: en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr "OBSERVA횉횛ES"
@@ -14958,7 +14984,22 @@ msgid ""
"'git config' [<file-option>] --get-color name [default]\n"
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
-msgstr "'git config' [<op챌찾o-do-arquivo>] [--type=<tipo>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] nome [valor [value-pattern]]\n'git config' [<op챌찾o-do-arquivo>] [--type=<tipo>] --add nome valor\n'git config' [<op챌찾o-do-arquivo>] [--type=<tipo>] [--fixed-value] --replace-all nome valor [value-pattern]\n'git config' [<op챌찾o-do-arquivo>] [--type=<tipo>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get nome [value-pattern]\n'git config' [<op챌찾o-do-arquivo>] [--type=<tipo>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all nome [value-pattern]\n'git config' [<op챌찾o-do-arquivo>] [--type=<tipo>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp name_regex [value-pattern]\n'git config' [<op챌찾o-do-arquivo>] [--type=<tipo>] [-z|--null] --get-urlmatch nome URL\n'git config' [<op챌찾o-do-arquivo>] [--fixed-value] --unset nome [value-pattern]\n'git config' [<op챌찾o-do-arquivo>] [--fixed-value] --unset-all nome [value-pattern]\n'git config' [<op챌찾o-do-arquivo>] --rename-section nome_antigo novo_nome\n'git config' [<op챌찾o-do-arquivo>] --remove-section nome\n'git config' [<op챌찾o-do-arquivo>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n'git config' [<op챌찾o-do-arquivo>] --get-color nome [default]\n'git config' [<op챌찾o-do-arquivo>] --get-colorbool nome [stdout-is-tty]\n'git config' [<op챌찾o-do-arquivo>] -e | --edit\n"
+msgstr ""
+"'git config' [<op챌찾o-do-arquivo>] [--type=<tipo>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] nome [valor [value-pattern]]\n"
+"'git config' [<op챌찾o-do-arquivo>] [--type=<tipo>] --add nome valor\n"
+"'git config' [<op챌찾o-do-arquivo>] [--type=<tipo>] [--fixed-value] --replace-all nome valor [value-pattern]\n"
+"'git config' [<op챌찾o-do-arquivo>] [--type=<tipo>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get nome [value-pattern]\n"
+"'git config' [<op챌찾o-do-arquivo>] [--type=<tipo>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all nome [value-pattern]\n"
+"'git config' [<op챌찾o-do-arquivo>] [--type=<tipo>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp name_regex [value-pattern]\n"
+"'git config' [<op챌찾o-do-arquivo>] [--type=<tipo>] [-z|--null] --get-urlmatch nome URL\n"
+"'git config' [<op챌찾o-do-arquivo>] [--fixed-value] --unset nome [value-pattern]\n"
+"'git config' [<op챌찾o-do-arquivo>] [--fixed-value] --unset-all nome [value-pattern]\n"
+"'git config' [<op챌찾o-do-arquivo>] --rename-section nome_antigo novo_nome\n"
+"'git config' [<op챌찾o-do-arquivo>] --remove-section nome\n"
+"'git config' [<op챌찾o-do-arquivo>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
+"'git config' [<op챌찾o-do-arquivo>] --get-color nome [default]\n"
+"'git config' [<op챌찾o-do-arquivo>] --get-colorbool nome [stdout-is-tty]\n"
+"'git config' [<op챌찾o-do-arquivo>] -e | --edit\n"
#. type: Plain text
#: en/git-config.txt:33
@@ -16698,15 +16739,11 @@ msgstr "O m처dulo CVS que deseja importar. Relativo ao <CVSROOT>. Caso n찾o sej
msgid "-C <target-dir>"
msgstr "-C <diret처rio-de-destino>"
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr "O reposit처rio Git para o qual ir찼 importar. Se o diret처rio n찾o"
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap
-msgid "exist, it will be created. Default is the current directory.\n"
+#, fuzzy
+#| msgid "exist, it will be created. Default is the current directory.\n"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr "exista, este ser찼 criado. A predefini챌찾o 챕 o diret처rio atual.\n"
#. type: Labeled list
@@ -19036,7 +19073,10 @@ msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
"\t [<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\n"
-msgstr "'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n\t [<op챌천es-comuns-ao-diff>] <tree-ish> [<tree-ish>] [<caminho>...]\n"
+msgstr ""
+"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
+"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
+"\t [<op챌천es-comuns-ao-diff>] <tree-ish> [<tree-ish>] [<caminho>...]\n"
#. type: Plain text
#: en/git-diff-tree.txt:19
@@ -20035,14 +20075,11 @@ msgstr "--rewrite-submodules-from=<nome>:<arquivo>"
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr "--rewrite-submodules-to=<nome>:<arquivo>"
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr "Reescreva as IDs dos objetos para o subm처dulo definido pelo <nome> vindo dos valores"
-
#. type: Plain text
#: en/git-fast-import.txt:134
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+#, fuzzy
+#| msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr "usados a partir de um <arquivo> para aqueles usado para o <arquivo>. As marca챌천es de origem deveriam ter sido criadas por pelo comando `git fast-export` e as marca챌천es to deveriam ter sido criadas pelo `git fast-import` durante a importa챌찾o do mesmo subm처dulo."
#. type: Plain text
@@ -21762,21 +21799,19 @@ msgid "M 777 inline bob\n"
msgstr "M 777 inline bob\n"
#. type: delimited block =
-#: en/git-fast-import.txt:1320
-#, no-wrap
+#: en/git-fast-import.txt:1321
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Active Branch LRU\n"
+#| "-----------------\n"
msgid ""
"Active Branch LRU\n"
"-----------------\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
"Ramo Ativo LRU\n"
"--------------\n"
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
-msgstr "active_branches = 1 cur, 5 max\n"
-
#. type: delimited block =
#: en/git-fast-import.txt:1324
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
@@ -21788,21 +21823,19 @@ msgid "0 refs/heads/master"
msgstr "0 refs/heads/master"
#. type: delimited block =
-#: en/git-fast-import.txt:1329
-#, no-wrap
+#: en/git-fast-import.txt:1335
+#, fuzzy, no-wrap
+#| msgid ""
+#| "status : active loaded dirty\n"
+#| "tip commit : 0000000000000000000000000000000000000000\n"
+#| "old tree : 0000000000000000000000000000000000000000\n"
+#| "cur tree : 0000000000000000000000000000000000000000\n"
+#| "commit clock: 0\n"
+#| "last pack :\n"
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-"Ramos Inativos\n"
-"--------------\n"
-"refs/heads/master:\n"
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -25020,11 +25053,16 @@ msgstr "Faz sentido para mim. Que tal este patch?\n"
#. type: delimited block -
#: en/git-format-patch.txt:438
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "-- >8 --\n"
+#| "Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
-msgstr "-> 8 -\nAssunto: [IA64] Coloque os arquivos da configura챌찾o do ia64 na dieta Uwe Kleine-K철nig\n"
+"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"
#. type: delimited block -
#: en/git-format-patch.txt:441
@@ -29935,7 +29973,18 @@ msgid ""
"\t\t[--error-unmatch] [--with-tree=<tree-ish>]\n"
"\t\t[--full-name] [--recurse-submodules]\n"
"\t\t[--abbrev[=<n>]] [--] [<file>...]\n"
-msgstr "'git ls-files' [-z] [-t] [-v] [-f]\n\t\t(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*\n\t\t(-[c|d|o|i|s|u|k|m])*\n\t\t[--eol]\n\t\t[-x <padr찾o>|--exclude=<padr찾o>]\n\t\t[-X <arquivo>|--exclude-from=<arquivo>]\n\t\t[--exclude-per-directory=<arquivo>]\n\t\t[--exclude-standard]\n\t\t[--error-unmatch] [--with-tree=<tree-ish>]\n\t\t[--full-name] [--recurse-submodules]\n\t\t[--abbrev[=<n>]] [--] [<arquivo>...]\n"
+msgstr ""
+"'git ls-files' [-z] [-t] [-v] [-f]\n"
+"\t\t(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*\n"
+"\t\t(-[c|d|o|i|s|u|k|m])*\n"
+"\t\t[--eol]\n"
+"\t\t[-x <padr찾o>|--exclude=<padr찾o>]\n"
+"\t\t[-X <arquivo>|--exclude-from=<arquivo>]\n"
+"\t\t[--exclude-per-directory=<arquivo>]\n"
+"\t\t[--exclude-standard]\n"
+"\t\t[--error-unmatch] [--with-tree=<tree-ish>]\n"
+"\t\t[--full-name] [--recurse-submodules]\n"
+"\t\t[--abbrev[=<n>]] [--] [<arquivo>...]\n"
#. type: Plain text
#: en/git-ls-files.txt:29
@@ -35587,7 +35636,13 @@ msgid ""
"\t [--[no-]signed|--signed=(true|false|if-asked)]\n"
"\t [--force-with-lease[=<refname>[:<expect>]] [--force-if-includes]]\n"
"\t [--no-verify] [<repository> [<refspec>...]]\n"
-msgstr "'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]\n\t [--repo=<reposit처rio>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]\n\t [-u | --set-upstream] [-o <texto> | --push-option=<texto>]\n\t [--[no-]signed|--signed=(true|false|if-asked)]\n\t [--force-with-lease[=<refname>[:<expect>]]] [--force-if-includes]]\n\t [--no-verify] [<reposit처rio> [<refspec>...]]\n"
+msgstr ""
+"'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]\n"
+"\t [--repo=<reposit처rio>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]\n"
+"\t [-u | --set-upstream] [-o <texto> | --push-option=<texto>]\n"
+"\t [--[no-]signed|--signed=(true|false|if-asked)]\n"
+"\t [--force-with-lease[=<refname>[:<expect>]]] [--force-if-includes]]\n"
+"\t [--no-verify] [<reposit처rio> [<refspec>...]]\n"
#. type: Plain text
#: en/git-push.txt:24
@@ -38064,22 +38119,24 @@ msgstr "--keep-base e --root"
msgid "--fork-point and --root"
msgstr "--fork-point e --root"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr "DIFEREN횉AS COMPORTAMENTAIS"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+#, fuzzy
+#| msgid ""
+#| "git rebase has two primary backends: apply and merge. (The apply\n"
+#| "backend used to be known as the 'am' backend, but the name led to\n"
+#| "confusion as it looks like a verb instead of a noun. Also, the merge\n"
+#| "backend used to be known as the interactive backend, but it is now\n"
+#| "used for non-interactive cases as well. Both were renamed based on\n"
+#| "lower-level functionality that underpinned each.) There are some\n"
+#| "subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
"O git rebase possui duas estruturas prim찼rias: `apply` e `merge`. (A aplica챌찾o\n"
"da estrutura era conhecido como 'am', por챕m o nome causava confus찾o j찼 que\n"
@@ -38089,51 +38146,50 @@ msgstr ""
"na funcionalidade de baixo n챠vel que sustentava cada um.) H찼 algumas\n"
"diferen챌as sutis em como estes dois processos internos se comportam:\n"
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, no-wrap
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
-"Commits vazios\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
+msgstr "Os commits vazios"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+#, fuzzy
+#| msgid ""
+#| "The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+#| "commits that started empty, though these are rare in practice. It\n"
+#| "also drops commits that become empty and has no option for controlling\n"
+#| "this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
"A estrutura aplicada infelizmente descarta os commits vazios de forma intencional, ou seja,\n"
"os commits que come챌aram vazios, contudo na pr찼tica 챕 algo raro. Tamb챕m\n"
"descarta os commits que se tornam vazios e n찾o h찼 uma op챌찾o para controlar\n"
"este comportamento.\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#, fuzzy
+#| msgid ""
+#| "The merge backend keeps intentionally empty commits by default (though\n"
+#| "with -i they are marked as empty in the todo list editor, or they can\n"
+#| "be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
"횋 predefinido que a estrutura da mesclagem mantenha os commits intencionalmente vazios (com\n"
"`-i` s찾o marcados como vazio no editor da lista de tarefas ou podem ser\n"
"descartados automaticamente com a op챌찾o `--no-keep-empty`).\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+#, fuzzy
+#| msgid ""
+#| "Similar to the apply backend, by default the merge backend drops\n"
+#| "commits that become empty unless -i/--interactive is specified (in\n"
+#| "which case it stops and asks the user what to do). The merge backend\n"
+#| "also has an --empty={drop,keep,ask} option for changing the behavior\n"
+#| "of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
"Semelhante 횪 estrutura aplicada, 챕 predefinido que a estrutura da mesclagem derrube\n"
"os commits que se tornaram vazios a menos que as op챌천es `-i` ou `--interactive` sejam utilizadas (nesse\n"
@@ -38141,28 +38197,30 @@ msgstr ""
"possui uma op챌찾o --empty={drop,keep,ask} para alterar o comportamento\n"
"da manipula챌찾o dos commits que ficam vazios.\n"
-#. type: delimited block -
-#: en/git-rebase.txt:696
-#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+#. type: Title ~
+#: en/git-rebase.txt:695
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Directory rename detection\n"
+#| "~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
"Detec챌찾o da renomea챌찾o do diret처rio\n"
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#, fuzzy
+#| msgid ""
+#| "Due to the lack of accurate tree information (arising from\n"
+#| "constructing fake ancestors with the limited information available in\n"
+#| "patches), directory rename detection is disabled in the apply backend.\n"
+#| "Disabled directory rename detection means that if one side of history\n"
+#| "renames a directory and the other adds new files to the old directory,\n"
+#| "then the new files will be left behind in the old directory without\n"
+#| "any warning at the time of rebasing that you may want to move these\n"
+#| "files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
"Devido 횪 falta de informa챌천es precisas sobre as 찼rvores (que\n"
"surge das constru챌천es dos ancestrais falsos com informa챌천es limitadas dispon챠veis\n"
@@ -38173,44 +38231,42 @@ msgstr ""
"qualquer aviso durante a reconstru챌찾o onde voc챗 talvez queira mover estes\n"
"arquivos para o novo diret처rio.\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#, fuzzy
+#| msgid ""
+#| "Directory rename detection works with the merge backend to provide you\n"
+#| "warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
"A detec챌찾o da renomea챌찾o do diret처rio funciona com a estrutura da mesclagem, neste caso,\n"
"fornecendo informa챌천es para voc챗.\n"
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, no-wrap
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr ""
-"Contexto\n"
-"~~~~~~~~\n"
+msgid "Context"
+msgstr "Contexto"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#, fuzzy
+#| msgid ""
+#| "The apply backend works by creating a sequence of patches (by calling\n"
+#| "`format-patch` internally), and then applying the patches in sequence\n"
+#| "(calling `am` internally). Patches are composed of multiple hunks,\n"
+#| "each with line numbers, a context region, and the actual changes. The\n"
+#| "line numbers have to be taken with some fuzz, since the other side\n"
+#| "will likely have inserted or deleted lines earlier in the file. The\n"
+#| "context region is meant to help find how to adjust the line numbers in\n"
+#| "order to apply the changes to the right lines. However, if multiple\n"
+#| "areas of the code have the same surrounding lines of context, the\n"
+#| "wrong one can be picked. There are real-world cases where this has\n"
+#| "caused commits to be reapplied incorrectly with no conflicts reported.\n"
+#| "Setting diff.context to a larger value may prevent such types of\n"
+#| "problems, but increases the chance of spurious conflicts (since it\n"
+#| "will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
"A aplica챌찾o da estrutura funciona durante a cria챌찾o de uma sequencia de patches (chamando\n"
"o `format-patch` internalmente), ent찾o os patches s찾o aplicados em sequ챗ncia\n"
@@ -38227,40 +38283,43 @@ msgstr ""
"de problemas ocorram, por챕m aumenta a chance de conflitos esp첬rios (uma\n"
"vez que exigir찼 mais linhas que coincidam com o contexto para serem aplicados).\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#, fuzzy
+#| msgid ""
+#| "The merge backend works with a full copy of each relevant file,\n"
+#| "insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
"A estrutura da mesclagem trabalha com a c처pia completa de casa arquivo\n"
"relevante isolando-os destes tipos de problemas.\n"
-#. type: delimited block -
-#: en/git-rebase.txt:732
-#, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+#. type: Title ~
+#: en/git-rebase.txt:731
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Labelling of conflicts markers\n"
+#| "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
"A rotulagem dos marcadores de conflitos\n"
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#, fuzzy
+#| msgid ""
+#| "When there are content conflicts, the merge machinery tries to\n"
+#| "annotate each side's conflict markers with the commits where the\n"
+#| "content came from. Since the apply backend drops the original\n"
+#| "information about the rebased commits and their parents (and instead\n"
+#| "generates new fake commits based off limited information in the\n"
+#| "generated patches), those commits cannot be identified; instead it has\n"
+#| "to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+#| "set to diff3, the apply backend will use \"constructed merge base\" to\n"
+#| "label the content from the merge base, and thus provide no information\n"
+#| "about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
"Quando h찼 conte첬dos conflitantes o mecanismo da mesclagem tenta\n"
"anotar os marcadores de conflito de cada lado com os commits de onde\n"
@@ -38273,42 +38332,40 @@ msgstr ""
"rotular o conte첬do da base mesclada e portanto, n찾o fornecer qualquer informa챌천es\n"
"sobre o commit da base mesclada.\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+#, fuzzy
+#| msgid ""
+#| "The merge backend works with the full commits on both sides of history\n"
+#| "and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
"A estrutura da mesclagem funciona com commits completos nos dois lados da hist처ria\n"
"e portanto n찾o possuem tais limita챌천es.\n"
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-"Ganchos\n"
-"~~~~~~~\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#, fuzzy
+#| msgid ""
+#| "The apply backend has not traditionally called the post-commit hook,\n"
+#| "while the merge backend has. Both have called the post-checkout hook,\n"
+#| "though the merge backend has squelched its output. Further, both\n"
+#| "backends only call the post-checkout hook with the starting point\n"
+#| "commit of the rebase, not the intermediate commits nor the final\n"
+#| "commit. In each case, the calling of these hooks was by accident of\n"
+#| "implementation rather than by design (both backends were originally\n"
+#| "implemented as shell scripts and happened to invoke other commands\n"
+#| "like 'git checkout' or 'git commit' that would call the hooks). Both\n"
+#| "backends should have the same behavior, though it is not entirely\n"
+#| "clear which, if any, is correct. We will likely make rebase stop\n"
+#| "calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
"A estrutura da aplica챌찾o n찾o chama tradicionalmente o gancho p처s-commit,\n"
"enquanto a estrutura da mesclagem chama. Ambos chamaram o gancho\n"
@@ -38323,25 +38380,24 @@ msgstr ""
"claro qual (caso existam), est찼 correto. Provavelmente faremos o rebase parar\n"
"chamando um destes ganchos no futuro.\n"
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
-msgstr "Interruptabilidade\n~~~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
+msgstr "Interruptabilidade"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#, fuzzy
+#| msgid ""
+#| "The apply backend has safety problems with an ill-timed interrupt; if\n"
+#| "the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+#| "the rebase can enter a state where it cannot be aborted with a\n"
+#| "subsequent `git rebase --abort`. The merge backend does not appear to\n"
+#| "suffer from the same shortcoming. (See\n"
+#| "https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+#| "details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
"A aplica챌찾o da estrutura possui problemas de seguran챌a relacionada com interrup챌찾o de tempo; caso\n"
"o usu찼rio pressione Ctrl+C no momento errado ao tentar interromper o processo rebase,\n"
@@ -38351,26 +38407,23 @@ msgstr ""
"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ para\n"
"obter mais detalhes.)\n"
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
-msgstr ""
-"Reformulando o Commit\n"
-"~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
+msgstr "Reescrevendo os Commits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#, fuzzy
+#| msgid ""
+#| "When a conflict occurs while rebasing, rebase stops and asks the user\n"
+#| "to resolve. Since the user may need to make notable changes while\n"
+#| "resolving conflicts, after conflicts are resolved and the user has run\n"
+#| "`git rebase --continue`, the rebase should open an editor and ask the\n"
+#| "user to update the commit message. The merge backend does this, while\n"
+#| "the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
"Quando ocorre um conflito durante o processo 'rebase', o processo para e pergunta ao usu찼rio\n"
"para resolver o problema. Como o usu찼rio pode precisar fazer muitas altera챌천es enquanto\n"
@@ -38379,49 +38432,53 @@ msgstr ""
"ao usu찼rio para atualizar a mensagem do commit. A estrutura da mesclagem faz isso, enquanto\n"
"a estrutura aplica cegamente a mensagem do commit original.\n"
-#. type: delimited block -
-#: en/git-rebase.txt:786
-#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+#. type: Title ~
+#: en/git-rebase.txt:785
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Miscellaneous differences\n"
+#| "~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
"Diferen챌as diversas\n"
"~~~~~~~~~~~~~~~~~~~~\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#, fuzzy
+#| msgid ""
+#| "There are a few more behavioral differences that most folks would\n"
+#| "probably consider inconsequential but which are mentioned for\n"
+#| "completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
"Existem mais algumas diferen챌as comportamentais que a maioria das pessoas considerariam\n"
"fazer de forma inconsequente, por챕m s찾o mencionadas por quest천es de\n"
"integridade:\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+#, fuzzy
+#| msgid ""
+#| "* Reflog: The two backends will use different wording when describing\n"
+#| " the changes made in the reflog, though both will make use of the\n"
+#| " word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
"* Reflog: As duas estruturas que utilizar찾o palavras diferentes durante a descri챌찾o\n"
" das altera챌천es feitas no reflog, embora ambos fa챌am a utiliza챌찾o da\n"
" palavra \"rebase\".\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#, fuzzy
+#| msgid ""
+#| "* Progress, informational, and error messages: The two backends\n"
+#| " provide slightly different progress and informational messages.\n"
+#| " Also, the apply backend writes error messages (such as \"Your files\n"
+#| " would be overwritten...\") to stdout, while the merge backend writes\n"
+#| " them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
"* As mensagens de progresso, informacionais e de erro: As duas estruturas\n"
" fornecem um progresso ligeiramente diferente das mensagens\n"
@@ -38429,28 +38486,17 @@ msgstr ""
" arquivos ser찾o substitu챠dos...\") para o stdout, enquanto a mesclagem da estrutura escrevem\n"
" eles no stderr.\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
+#, fuzzy
+#| msgid ""
+#| "* State directories: The two backends keep their state in different\n"
+#| " directories under .git/\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
"* Diret처rios de estado: As duas estruturas mant챗m a sua condi챌찾o em diferentes\n"
" diret처rios dentro do `.git/`\n"
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
-msgstr "include::merge-strategies.txt[]\n"
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap
-msgid "NOTES\n"
-msgstr "OBSERVA횉횛ES\n"
-
#. type: Plain text
#: en/git-rebase.txt:812
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
@@ -47435,16 +47481,10 @@ msgstr "Atualize os subm처dulos registrados para que coincidam com o que o super
msgid "checkout"
msgstr "checkout"
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr "o commit registrado no superprojeto ser찼"
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
-msgstr "verificado no subm처dulo em um HEAD desanexado.\n"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
+msgstr "o commit registrado no superprojeto ser찼 verificado no subm처dulo do HEAD desanexado."
#. type: Plain text
#: en/git-submodule.txt:156
@@ -47457,27 +47497,15 @@ msgstr "Caso a op챌찾o `--force` utilizado, o subm처dulo ser찼 averiguado (utili
msgid "rebase"
msgstr "rebase"
-#. type: Plain text
-#: en/git-submodule.txt:158
-msgid "the current branch of the submodule will be rebased"
-msgstr "a ramifica챌찾o atual no subm처dulo onde o rebase ser찼 feito"
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr "no commit registrado no superprojeto.\n"
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-msgid "the commit recorded in the superproject will be merged"
-msgstr "o commit registrado no superprojeto que ser찼 mesclado"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
+msgstr "a funda챌찾o do subm처dulo do ramo atual ser찼 refeito no commit registrado no superproject."
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
-msgstr "na ramifica챌찾o atual no subm처dulo.\n"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
+msgstr "o commit registrado no superprojeto ser찼 mesclado no subm처dulo do ramo atual."
#. type: Plain text
#: en/git-submodule.txt:165
@@ -47490,19 +47518,15 @@ msgstr "Os seguintes procedimentos de 'atualiza챌찾o' est찾o dispon챠veis apenas
msgid "custom command"
msgstr "comando personalizado"
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr "comando shell arbitr찼rio que utiliza um 첬nico"
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, fuzzy
+#| msgid ""
+#| "argument (the sha1 of the commit recorded in the\n"
+#| "superproject) is executed. When `submodule.<name>.update`\n"
+#| "is set to '!command', the remainder after the exclamation mark\n"
+#| "is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
"o argumento (o sha1 do commit registrado no\n"
"superprojeto) 챕 executado. Quando o `submodule.<nome>.update`\n"
@@ -51479,16 +51503,12 @@ msgstr "onde:"
msgid "<old|new>-file"
msgstr "<old|new>-file"
-#. type: Plain text
-#: en/git.txt:564
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr "s찾o os arquivos que `GIT_EXTERNAL_DIFF` pode utilizar para ler o"
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap
-msgid "contents of <old|new>,\n"
-msgstr "conte첬do do <antigo|novo>,\n"
+#, fuzzy
+#| msgid "are files GIT_EXTERNAL_DIFF can use to read the"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
+msgstr "s찾o os arquivos que `GIT_EXTERNAL_DIFF` pode utilizar para ler o"
#. type: Labeled list
#: en/git.txt:565
@@ -52249,15 +52269,12 @@ msgstr "Os objetos que j찼 existam no reposit처rio *n찾o* ser찾o descompactados
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr "Para as op챌천es de gera챌찾o de novos pacotes e reposi챌찾o dos existentes, consulte linkgit:git-repack[1]."
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr "Ensaio. Verifique o arquivo do pacote sem de fato descompact찼-los"
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-msgid "the objects."
-msgstr "os objetos."
+#, fuzzy
+#| msgid "Dry run. Check the pack file without actually unpacking"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr "Ensaio. Verifique o arquivo do pacote sem de fato descompact찼-los"
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -52363,15 +52380,12 @@ msgstr "Caso um arquivo especificado estiver no 챠ndice, por챕m esteja ausente,
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr "Examina o 챠ndice atual e verifica se as mesclagens s찾o necess찼rias ou atualiza챌천es, verificando as informa챌천es do stat()."
-#. type: Plain text
-#: en/git-update-index.txt:62
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr "Sil챗ncio. Caso a op챌찾o `--refresh` descobra que o 챠ndice precisa de uma atualiza챌찾o, o comportamento padr찾o 챕 gerar um erro. Esta op챌찾o faz com que"
-
#. type: Plain text
#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
-msgstr "'git update-index' continue mesmo assim."
+#, fuzzy
+#| msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
+msgstr "Sil챗ncio. Caso a op챌찾o `--refresh` descobra que o 챠ndice precisa de uma atualiza챌찾o, o comportamento padr찾o 챕 gerar um erro. Esta op챌찾o faz com que"
#. type: Labeled list
#: en/git-update-index.txt:64
@@ -52384,21 +52398,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr "N찾o tente atualizar os subm처dulos. Esta op챌찾o 챕 respeitada apenas quando encaminhada antes da op챌찾o `--refresh`."
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr "Caso a op챌찾o `--refresh` encontre altera챌천es n찾o mescladas no 챠ndice, 챕 a predefini챌찾o"
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr "o comportamento gerar um erro. Est찼 op챌찾o faz 'git update-index'"
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
-msgstr "continue mesmo assim.\n"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
+msgstr "Caso a op챌찾o `--refresh` descubra altera챌천es n찾o mescladas no 챠ndice, o comportamento padr찾o 챕 gerar um erro. Esta op챌찾o faz com que o comando 'git update-index' continue mesmo assim."
#. type: Plain text
#: en/git-update-index.txt:75
@@ -56916,14 +56919,11 @@ msgstr "redefine a cor"
msgid "'%C(...)'"
msgstr "'%C(...)'"
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr "defini챌천es das cores, conforme descrito em Valores no"
-
#. type: Plain text
#: en/pretty-formats.txt:146
-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."
+#, fuzzy
+#| 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."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr "\"ARQUIVO DE CONFIGURA횉횄O\" se챌찾o do linkgit:git-config[1]. 횋 predefinido que as cores sejam exibidas apenas quando ativadas para na sa챠da do registro log (em `color.diff`,` color.ui` ou `color`, e respeitando as configura챌천es `auto` da primeira se estivermos indo para um terminal). `%C(auto,...)` 챕 aceito como um sin척nimo hist처rico do padr찾o (exemplo., `%C(auto,red)`). Especificar `%C(always,...)` exibir찼 as cores mesmo quando a cor n찾o estiver ativada (embora considere apenas usar `--color=always` para sempre ativar a cor na sa챠da incluindo este formato e qualquer outro que o git possa colorir). `auto` sozinho (ou seja,`%C(auto)`) ativar찼 a colora챌찾o autom찼tica nos pr처ximos espa챌os reservados at챕 que a cor seja trocada novamente."
#. type: Labeled list
@@ -56943,15 +56943,12 @@ msgstr "marca esquerda (`<`), direita (`>`) ou limite (`-`)"
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr "'%w([<w>[,<i1>[,<i2>]]])'"
-#. type: Plain text
-#: en/pretty-formats.txt:148
-msgid "switch line wrapping, like the -w option of"
-msgstr "alterna a quebra da linha, como a op챌찾o `-w`"
-
#. type: Plain text
#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+#, fuzzy
+#| msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr "alterna a quebra da linha, como a op챌찾o `-w`"
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -56959,14 +56956,11 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr "'%<(<N>[,trunc|ltrunc|mtrunc])'"
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr "fa챌a com que o pr처ximo espa챌o reservado leve em"
-
#. type: Plain text
#: en/pretty-formats.txt:157
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+#, fuzzy
+#| msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr "pelo menos N colunas, preenchendo espa챌os 횪 direita, se necess찼rio. Opcionalmente, truncar no in챠cio (ltrunc), no meio (mtrunc) ou no final (trunc) caso a sa챠da seja maior que N colunas. Observe que o truncamento funciona corretamente com N >= 2."
#. type: Labeled list
@@ -56975,15 +56969,10 @@ msgstr "pelo menos N colunas, preenchendo espa챌os 횪 direita, se necess찼rio.
msgid "'%<|(<N>)'"
msgstr "'%<|(<N>)'"
-#. type: Plain text
-#: en/pretty-formats.txt:158
-msgid "make the next placeholder take at least until Nth"
-msgstr "fa챌a com que o pr처ximo espa챌o reservado dure at챕 Nth"
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
-msgstr "colunas, preenchimento de espa챌os 횪 direita se necess찼rio"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
+msgstr "fa챌a com que o pr처ximo espa챌o reservado leve pelo menos at챕 a en챕sima coluna, preenchendo os espa챌os 횪 direita caso seja necess찼rio"
#. type: Labeled list
#: en/pretty-formats.txt:159
@@ -56991,15 +56980,10 @@ msgstr "colunas, preenchimento de espa챌os 횪 direita se necess찼rio"
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr "'%>(<N>)', '%>|(<N>)'"
-#. type: Plain text
-#: en/pretty-formats.txt:160
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr "semelhante a '%<(<N>)', '%<|(<N>)' respectivamente,"
-
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
-msgstr "mas com espa챌os de preenchimento 횪 esquerda"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
+msgstr "semelhante ao '%<(<N>)', '%<|(<N>)' respectivamente, mas preenchendo os espa챌os 횪 esquerda"
#. type: Labeled list
#: en/pretty-formats.txt:161
@@ -57007,14 +56991,11 @@ msgstr "mas com espa챌os de preenchimento 횪 esquerda"
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr "'%>>(<N>)', '%>>|(<N>)'"
-#. type: Plain text
-#: en/pretty-formats.txt:162
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr "semelhante a '%>(<N>)', '%>|(<N>)'"
-
#. type: Plain text
#: en/pretty-formats.txt:166
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+#, fuzzy
+#| msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' 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"
#. type: Labeled list
@@ -57023,15 +57004,12 @@ msgstr "respectivamente, exceto caso o pr처ximo espa챌o reservado ocupe mais esp
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr "'%><(<N>)', '%><|(<N>)'"
-#. type: Plain text
-#: en/pretty-formats.txt:167
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr "semelhante a '%<(<N>)', '%<|(<N>)'"
-
#. type: Plain text
#: en/pretty-formats.txt:169
-msgid "respectively, but padding both sides (i.e. the text is centered)"
-msgstr "respectivamente, mas preenchendo os dois lados (ou seja, o texto 챕 centralizado)"
+#, fuzzy
+#| msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
+msgstr "semelhante ao '%<(<N>)', '%<|(<N>)' respectivamente, mas preenchendo os espa챌os 횪 esquerda"
#. type: Plain text
#: en/pretty-formats.txt:171
@@ -57122,14 +57100,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr "nome do autor (respeitando .mailmap, consulte linkgit:git-shortlog[1]"
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
-msgid "or linkgit:git-blame[1])"
-msgstr "ou linkgit:git-blame[1])"
+#: en/pretty-formats.txt:180
+#, fuzzy
+#| msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "o nome de quem fez o commit (respeitando .mailmap, consulte linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -57149,9 +57124,11 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr "e-mail do autor (respeitando .mailmap, consulte linkgit:git-shortlog[1]"
+#: en/pretty-formats.txt:183
+#, fuzzy
+#| msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "o e-mail de quem fez o commit (respeitando .mailmap, consulte linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -57171,16 +57148,9 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr "parte local do autor (consulte '%al') respeitando .mailmap, consulte"
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196
-#: en/pretty-formats.txt:199 en/pretty-formats.txt:202
-#: en/pretty-formats.txt:247 en/pretty-formats.txt:250
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgstr "linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
+#: en/pretty-formats.txt:186
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "parte do autor local (rconsulte '%al') espeitando o .mailmap, consulte linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:186
@@ -57277,9 +57247,9 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-msgid "committer name (respecting .mailmap, see"
-msgstr "nome de quem fez o commit (respeitando .mailmap, consulte"
+#: en/pretty-formats.txt:196
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "o nome de quem fez o commit (respeitando .mailmap, consulte linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -57299,9 +57269,9 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-msgid "committer email (respecting .mailmap, see"
-msgstr "e-mail de quem fez o commit (respeitando .mailmap, consulte"
+#: en/pretty-formats.txt:199
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "o e-mail de quem fez o commit (respeitando .mailmap, consulte linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -57321,9 +57291,9 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
-msgstr "parte local do autor do commit (consulte '%cl') respeitando .mailmap, consulte"
+#: en/pretty-formats.txt:202
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "a parte local de quem fez o commit (consulte '%cl') respeitando o .mailmap, consulte see linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -57424,15 +57394,10 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr "nomes de refer챗ncia \"ref\" sem quebra autom찼tica \" (\", \")\"."
-#. type: Plain text
-#: en/pretty-formats.txt:212
-msgid "ref name given on the command line by which the commit was reached"
-msgstr "o nome \"ref\" utilizado na linha de comando pela qual cada commit foi alcan챌ado"
-
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid "(like `git log --source`), only works with `git log`"
-msgstr "(como `git log --source`), s처 funciona com `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
+msgstr "os nomes \"ref\" dado na linha de comando pela qual o commit foi alcan챌ado (como `git log --source`), s처 funciona com o comando `git log`"
#. type: Labeled list
#: en/pretty-formats.txt:213
@@ -57511,14 +57476,11 @@ msgstr "verifica챌찾o bruta da mensagem vinda do GPG para um commit assinado"
msgid "'%G?'"
msgstr "'%G?'"
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr "exibe \"G\" para obter uma boa assinatura (v찼lida),"
-
#. type: Plain text
#: en/pretty-formats.txt:230
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+#, fuzzy
+#| msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr "\"B\" para uma assinatura ruim, \"U\" para uma boa assinatura com validade desconhecida, \"X\" para uma boa assinatura que expirou, \"Y\" para uma boa assinatura feita por uma chave expirada, \"R\" para uma boa assinatura feita por uma chave revogada, \"E\" caso a assinatura n찾o possa ser verificada (por exemplo, uma chave ausente) e \"N\" sem assinatura"
#. type: Labeled list
@@ -57560,15 +57522,12 @@ msgstr "exiba a impress찾o digital da chave utilizada para assinar um commit j찼
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr "exiba a impress찾o digital da chave prim찼ria cuja subchave foi utilizada"
-
#. type: Plain text
#: en/pretty-formats.txt:235
-msgid "to sign a signed commit"
-msgstr "para assinar um commit assinado"
+#, fuzzy
+#| msgid "show the fingerprint of the primary key whose subkey was used"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
+msgstr "exiba a impress찾o digital da chave prim찼ria cuja subchave foi utilizada"
#. type: Labeled list
#: en/pretty-formats.txt:235
@@ -57587,14 +57546,11 @@ msgstr "exiba o n챠vel de confian챌a da chave utilizada para assinar um commit a
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr "seletor do \"reflog\", por exemplo, `refs/stash@{1}` ou `refs/stash@{2"
-
#. type: Plain text
#: en/pretty-formats.txt:241
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+#, fuzzy
+#| msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr "minutos atr찼s}`; o formato segue as regras descritas para a op챌찾o `-g`. A parte antes ao `@` 챕 o \"refname\", conforme indicado na linha de comando (portanto, `git log -g refs/heads/master` produziria `refs/heads/master@{0}`)."
#. type: Labeled list
@@ -57603,14 +57559,11 @@ msgstr "minutos atr찼s}`; o formato segue as regras descritas para a op챌찾o `-g
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr "seletor do reflog encurtado; o mesmo que '%gD', menos o \"refname\""
-
#. type: Plain text
#: en/pretty-formats.txt:244
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+#, fuzzy
+#| msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr "a parte 챕 reduzida visando a legibilidade humana (assim, o `refs/heads/master` se torna apenas `master`)."
#. type: Labeled list
@@ -57631,9 +57584,9 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr "nome da identidade reflog (respeitando .mailmap, consulte"
+#: en/pretty-formats.txt:247
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "nome da identidade do reflog (respeitando .mailmap, consulte linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -57653,9 +57606,9 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr "e-mail da identidade reflog (respeitando .mailmap, consulte"
+#: en/pretty-formats.txt:250
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "e-mail da identidade do reflog (respeitando .mailmap, consulte linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -57674,14 +57627,11 @@ msgstr "assunto reflog"
msgid "'%(trailers[:options])'"
msgstr "'%(trailers[:options])'"
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr "exiba os sinais de resposta no corpo da mensagem como"
-
#. type: Plain text
#: en/pretty-formats.txt:256
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+#, fuzzy
+#| msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr "como interpretado por linkgit:git-interpret-trailers[1]. Os trechos do texto da resposta podem ser seguidas por dois pontos, zero ou mais op챌천es separadas por v챠rgula:"
#. type: Plain text
@@ -62700,6 +62650,185 @@ msgstr "[[[8]]] https://www.kernel.org/pub/software/scm/git/docs/git-bisect.html
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
+#~ msgid "The Git repository to import to. If the directory doesn't"
+#~ msgstr "O reposit처rio Git para o qual ir찼 importar. Se o diret처rio n찾o"
+
+#~ msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
+#~ msgstr "Reescreva as IDs dos objetos para o subm처dulo definido pelo <nome> vindo dos valores"
+
+#~ msgid "active_branches = 1 cur, 5 max\n"
+#~ msgstr "active_branches = 1 cur, 5 max\n"
+
+#~ msgid ""
+#~ "Inactive Branches\n"
+#~ "-----------------\n"
+#~ "refs/heads/master:\n"
+#~ msgstr ""
+#~ "Ramos Inativos\n"
+#~ "--------------\n"
+#~ "refs/heads/master:\n"
+
+#~ msgid ""
+#~ "Empty commits\n"
+#~ "~~~~~~~~~~~~~\n"
+#~ msgstr ""
+#~ "Commits vazios\n"
+#~ "~~~~~~~~~~~~~\n"
+
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr ""
+#~ "Contexto\n"
+#~ "~~~~~~~~\n"
+
+#~ msgid ""
+#~ "Hooks\n"
+#~ "~~~~~\n"
+#~ msgstr ""
+#~ "Ganchos\n"
+#~ "~~~~~~~\n"
+
+#~ msgid ""
+#~ "Interruptability\n"
+#~ "~~~~~~~~~~~~~~~~\n"
+#~ msgstr ""
+#~ "Interruptabilidade\n"
+#~ "~~~~~~~~~~~~~~~~~~\n"
+
+#~ msgid ""
+#~ "Commit Rewording\n"
+#~ "~~~~~~~~~~~~~~~~\n"
+#~ msgstr ""
+#~ "Reformulando o Commit\n"
+#~ "~~~~~~~~~~~~~~~~~~~~~\n"
+
+#~ msgid "include::merge-strategies.txt[]\n"
+#~ msgstr "include::merge-strategies.txt[]\n"
+
+#~ msgid "NOTES\n"
+#~ msgstr "OBSERVA횉횛ES\n"
+
+#~ msgid "the commit recorded in the superproject will be"
+#~ msgstr "o commit registrado no superprojeto ser찼"
+
+#~ msgid "checked out in the submodule on a detached HEAD.\n"
+#~ msgstr "verificado no subm처dulo em um HEAD desanexado.\n"
+
+#~ msgid "the current branch of the submodule will be rebased"
+#~ msgstr "a ramifica챌찾o atual no subm처dulo onde o rebase ser찼 feito"
+
+#~ msgid "onto the commit recorded in the superproject.\n"
+#~ msgstr "no commit registrado no superprojeto.\n"
+
+#~ msgid "the commit recorded in the superproject will be merged"
+#~ msgstr "o commit registrado no superprojeto que ser찼 mesclado"
+
+#~ msgid "into the current branch in the submodule.\n"
+#~ msgstr "na ramifica챌찾o atual no subm처dulo.\n"
+
+#~ msgid "arbitrary shell command that takes a single"
+#~ msgstr "comando shell arbitr찼rio que utiliza um 첬nico"
+
+#~ msgid "contents of <old|new>,\n"
+#~ msgstr "conte첬do do <antigo|novo>,\n"
+
+#~ msgid "the objects."
+#~ msgstr "os objetos."
+
+#~ msgid "'git update-index' continue anyway."
+#~ msgstr "'git update-index' continue mesmo assim."
+
+#~ msgid "If --refresh finds unmerged changes in the index, the default"
+#~ msgstr "Caso a op챌찾o `--refresh` encontre altera챌천es n찾o mescladas no 챠ndice, 챕 a predefini챌찾o"
+
+#~ msgid "behavior is to error out. This option makes 'git update-index'"
+#~ msgstr "o comportamento gerar um erro. Est찼 op챌찾o faz 'git update-index'"
+
+#~ msgid "continue anyway.\n"
+#~ msgstr "continue mesmo assim.\n"
+
+#~ msgid "color specification, as described under Values in the"
+#~ msgstr "defini챌천es das cores, conforme descrito em Valores no"
+
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#~ msgid "make the next placeholder take at"
+#~ msgstr "fa챌a com que o pr처ximo espa챌o reservado leve em"
+
+#~ msgid "make the next placeholder take at least until Nth"
+#~ msgstr "fa챌a com que o pr처ximo espa챌o reservado dure at챕 Nth"
+
+#~ msgid "columns, padding spaces on the right if necessary"
+#~ msgstr "colunas, preenchimento de espa챌os 횪 direita se necess찼rio"
+
+#~ msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
+#~ msgstr "semelhante a '%<(<N>)', '%<|(<N>)' respectivamente,"
+
+#~ msgid "but padding spaces on the left"
+#~ msgstr "mas com espa챌os de preenchimento 횪 esquerda"
+
+#~ msgid "similar to '%>(<N>)', '%>|(<N>)'"
+#~ msgstr "semelhante a '%>(<N>)', '%>|(<N>)'"
+
+#~ msgid "similar to '%<(<N>)', '%<|(<N>)'"
+#~ msgstr "semelhante a '%<(<N>)', '%<|(<N>)'"
+
+#~ msgid "respectively, but padding both sides (i.e. the text is centered)"
+#~ msgstr "respectivamente, mas preenchendo os dois lados (ou seja, o texto 챕 centralizado)"
+
+#~ msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+#~ msgstr "nome do autor (respeitando .mailmap, consulte linkgit:git-shortlog[1]"
+
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "ou linkgit:git-blame[1])"
+
+#~ msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+#~ msgstr "e-mail do autor (respeitando .mailmap, consulte linkgit:git-shortlog[1]"
+
+#~ msgid "author local-part (see '%al') respecting .mailmap, see"
+#~ msgstr "parte local do autor (consulte '%al') respeitando .mailmap, consulte"
+
+#~ msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
+
+#~ msgid "committer name (respecting .mailmap, see"
+#~ msgstr "nome de quem fez o commit (respeitando .mailmap, consulte"
+
+#~ msgid "committer email (respecting .mailmap, see"
+#~ msgstr "e-mail de quem fez o commit (respeitando .mailmap, consulte"
+
+#~ msgid "committer local-part (see '%cl') respecting .mailmap, see"
+#~ msgstr "parte local do autor do commit (consulte '%cl') respeitando .mailmap, consulte"
+
+#~ msgid "ref name given on the command line by which the commit was reached"
+#~ msgstr "o nome \"ref\" utilizado na linha de comando pela qual cada commit foi alcan챌ado"
+
+#~ msgid "(like `git log --source`), only works with `git log`"
+#~ msgstr "(como `git log --source`), s처 funciona com `git log`"
+
+#~ msgid "show \"G\" for a good (valid) signature,"
+#~ msgstr "exibe \"G\" para obter uma boa assinatura (v찼lida),"
+
+#~ msgid "to sign a signed commit"
+#~ msgstr "para assinar um commit assinado"
+
+#~ msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
+#~ msgstr "seletor do \"reflog\", por exemplo, `refs/stash@{1}` ou `refs/stash@{2"
+
+#~ msgid "shortened reflog selector; same as `%gD`, but the refname"
+#~ msgstr "seletor do reflog encurtado; o mesmo que '%gD', menos o \"refname\""
+
+#~ msgid "reflog identity name (respecting .mailmap, see"
+#~ msgstr "nome da identidade reflog (respeitando .mailmap, consulte"
+
+#~ msgid "reflog identity email (respecting .mailmap, see"
+#~ msgstr "e-mail da identidade reflog (respeitando .mailmap, consulte"
+
+#~ msgid "display the trailers of the body as"
+#~ msgstr "exiba os sinais de resposta no corpo da mensagem como"
+
#~ msgid "git file is."
#~ msgstr "o que o arquivo git seja."
@@ -62730,63 +62859,12 @@ msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
#~ 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."
-#~ msgid "Empty commits"
-#~ msgstr "Os commits vazios"
-
-#~ msgid "Context"
-#~ msgstr "Contexto"
-
-#~ msgid "Interruptability"
-#~ msgstr "Interruptabilidade"
-
-#~ msgid "Commit Rewording"
-#~ msgstr "Reescrevendo os Commits"
-
-#~ msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
-#~ msgstr "o commit registrado no superprojeto ser찼 verificado no subm처dulo do HEAD desanexado."
-
-#~ msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
-#~ msgstr "a funda챌찾o do subm처dulo do ramo atual ser찼 refeito no commit registrado no superproject."
-
-#~ msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
-#~ msgstr "o commit registrado no superprojeto ser찼 mesclado no subm처dulo do ramo atual."
-
-#~ msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
-#~ msgstr "Caso a op챌찾o `--refresh` descubra altera챌천es n찾o mescladas no 챠ndice, o comportamento padr찾o 챕 gerar um erro. Esta op챌찾o faz com que o comando 'git update-index' continue mesmo assim."
-
#~ msgid "--no-signoff"
#~ msgstr "--no-signoff"
#~ msgid "With --no-signoff do not add a Signed-off-by line."
#~ msgstr "A op챌찾o `--no-signoff` n찾o adiciona a linha de assinatura \"Signed-off-by\"."
-#~ msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
-#~ msgstr "fa챌a com que o pr처ximo espa챌o reservado leve pelo menos at챕 a en챕sima coluna, preenchendo os espa챌os 횪 direita caso seja necess찼rio"
-
-#~ msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
-#~ msgstr "semelhante ao '%<(<N>)', '%<|(<N>)' respectivamente, mas preenchendo os espa챌os 횪 esquerda"
-
-#~ msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-#~ msgstr "parte do autor local (rconsulte '%al') espeitando o .mailmap, consulte linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
-
-#~ msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-#~ msgstr "o nome de quem fez o commit (respeitando .mailmap, consulte linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
-
-#~ msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-#~ msgstr "o e-mail de quem fez o commit (respeitando .mailmap, consulte linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
-
-#~ msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-#~ msgstr "a parte local de quem fez o commit (consulte '%cl') respeitando o .mailmap, consulte see linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
-
-#~ msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
-#~ msgstr "os nomes \"ref\" dado na linha de comando pela qual o commit foi alcan챌ado (como `git log --source`), s처 funciona com o comando `git log`"
-
-#~ msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-#~ msgstr "nome da identidade do reflog (respeitando .mailmap, consulte linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
-
-#~ msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-#~ msgstr "e-mail da identidade do reflog (respeitando .mailmap, consulte linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
-
#~ msgid "Boolean true literals are `yes`, `on`, `true`,"
#~ msgstr "Os literais booleanos verdadeiros s찾o `yes`, `on`, `true`,"
diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index 1d908cf..77712bd 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-12-16 23:08+0100\n"
+"POT-Creation-Date: 2020-12-20 22:54+0100\n"
"PO-Revision-Date: 2020-02-08 19:43+0100\n"
"Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
"Language-Team: pt_PT\n"
@@ -9505,8 +9505,8 @@ msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#: en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr ""
@@ -16080,15 +16080,9 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap
-msgid "exist, it will be created. Default is the current directory.\n"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -19316,14 +19310,9 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -20964,17 +20953,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -20988,18 +20972,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -24014,7 +23992,7 @@ msgstr ""
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K횄쨋nig diet\n"
msgstr ""
#. type: delimited block -
@@ -36510,283 +36488,144 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, fuzzy, no-wrap
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
msgstr "`commit`"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, fuzzy, no-wrap
#| msgid "--text"
-msgid ""
-"Context\n"
-"~~~~~~~\n"
+msgid "Context"
msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap
-msgid "NOTES\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -45144,15 +44983,9 @@ msgstr ""
msgid "checkout"
msgstr "--checkout"
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -45166,26 +44999,14 @@ msgstr ""
msgid "rebase"
msgstr "--rebase"
-#. type: Plain text
-#: en/git-submodule.txt:158
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -45199,19 +45020,9 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -49040,15 +48851,9 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap
-msgid "contents of <old|new>,\n"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -49798,17 +49603,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-#, fuzzy
-#| msgid "--objects"
-msgid "the objects."
-msgstr "--objects"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -49896,14 +49694,9 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -49917,20 +49710,9 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -54343,14 +54125,9 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
-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."
+msgid "color specification, as described under Values in the \"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 ""
#. type: Labeled list
@@ -54370,15 +54147,10 @@ msgstr ""
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:148
-msgid "switch line wrapping, like the -w option of"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -54386,14 +54158,9 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -54402,14 +54169,9 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -54418,14 +54180,9 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -54434,14 +54191,9 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -54450,14 +54202,9 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -54549,15 +54296,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, fuzzy
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -54577,9 +54320,11 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
+#: en/pretty-formats.txt:183
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -54599,17 +54344,10 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196
-#: en/pretty-formats.txt:199 en/pretty-formats.txt:202
-#: en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, fuzzy
#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
@@ -54707,9 +54445,11 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-msgid "committer name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:196
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -54729,9 +54469,11 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-msgid "committer email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:199
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -54751,9 +54493,11 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:202
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -54854,14 +54598,9 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -54942,14 +54681,9 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -54991,14 +54725,9 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -55018,14 +54747,9 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -55034,14 +54758,9 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -55062,9 +54781,11 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:247
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -55084,9 +54805,11 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:250
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -55105,14 +54828,9 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -59832,6 +59550,25 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, fuzzy
+#~| msgid "--text"
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr "--text"
+
+#, fuzzy
+#~| msgid "--objects"
+#~ msgid "the objects."
+#~ msgstr "--objects"
+
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
#~ msgid "--no-signoff"
#~ msgstr "--no-signoff"
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index dbfcadd..66d671d 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-12-16 23:08+0100\n"
+"POT-Creation-Date: 2020-12-20 22:54+0100\n"
"PO-Revision-Date: 2020-12-16 04:29+0000\n"
"Last-Translator: Golubev Alexander <fatzer2@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -9667,8 +9667,8 @@ msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#: en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr ""
@@ -16272,18 +16272,12 @@ msgid "-C <target-dir>"
msgstr ""
#. type: Plain text
-#: en/git-cvsimport.txt:69
+#: en/git-cvsimport.txt:70
#, fuzzy
#| msgid "Clone a repository into a new directory."
-msgid "The Git repository to import to. If the directory doesn't"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr "�剋棘戟龜��筠� �筠極棘鈞龜�棘�龜橘 勻 戟棘勻�� 畇龜�筠克�棘�龜�."
-#. type: Plain text
-#: en/git-cvsimport.txt:70
-#, no-wrap
-msgid "exist, it will be created. Default is the current directory.\n"
-msgstr ""
-
#. type: Labeled list
#: en/git-cvsimport.txt:71
#, no-wrap
@@ -19529,14 +19523,9 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -21177,17 +21166,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -21201,18 +21185,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -24242,7 +24220,7 @@ msgstr ""
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K횄쨋nig diet\n"
msgstr ""
#. type: delimited block -
@@ -36797,283 +36775,144 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, fuzzy, no-wrap
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
msgstr "`commit`"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, fuzzy, no-wrap
#| msgid "--text"
-msgid ""
-"Context\n"
-"~~~~~~~\n"
+msgid "Context"
msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap
-msgid "NOTES\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -45450,15 +45289,9 @@ msgstr ""
msgid "checkout"
msgstr "checkout"
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -45472,26 +45305,14 @@ msgstr ""
msgid "rebase"
msgstr "rebase"
-#. type: Plain text
-#: en/git-submodule.txt:158
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -45505,19 +45326,9 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -49355,15 +49166,9 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap
-msgid "contents of <old|new>,\n"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -50113,17 +49918,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-#, fuzzy
-#| msgid "--objects"
-msgid "the objects."
-msgstr "--objects"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -50211,14 +50009,9 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -50232,20 +50025,9 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -54666,14 +54448,9 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
-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."
+msgid "color specification, as described under Values in the \"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 ""
#. type: Labeled list
@@ -54693,15 +54470,12 @@ msgstr ""
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:148
-msgid "switch line wrapping, like the -w option of"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+#, fuzzy
+#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -54709,14 +54483,9 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -54725,14 +54494,9 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -54741,14 +54505,9 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -54757,14 +54516,9 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -54773,14 +54527,9 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -54872,17 +54621,12 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
+#: en/pretty-formats.txt:180
#, fuzzy
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
-msgid "or linkgit:git-blame[1])"
-msgstr "龜剋龜 linkgit:git-blame[1]"
-
#. type: Labeled list
#: en/pretty-formats.txt:180
#, no-wrap
@@ -54901,10 +54645,10 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
+#: en/pretty-formats.txt:183
#, fuzzy
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
#. type: Labeled list
@@ -54925,21 +54669,12 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
+#: en/pretty-formats.txt:186
#, fuzzy
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "author local-part (see '%al') respecting .mailmap, see"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196
-#: en/pretty-formats.txt:199 en/pretty-formats.txt:202
-#: en/pretty-formats.txt:247 en/pretty-formats.txt:250
-#, fuzzy
-#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
-
#. type: Labeled list
#: en/pretty-formats.txt:186
#, no-wrap
@@ -55036,10 +54771,10 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
+#: en/pretty-formats.txt:196
#, fuzzy
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "committer name (respecting .mailmap, see"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
#. type: Labeled list
@@ -55060,10 +54795,10 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
+#: en/pretty-formats.txt:199
#, fuzzy
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "committer email (respecting .mailmap, see"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
#. type: Labeled list
@@ -55084,10 +54819,10 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
+#: en/pretty-formats.txt:202
#, fuzzy
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
#. type: Labeled list
@@ -55190,14 +54925,9 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -55277,14 +55007,9 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -55326,14 +55051,9 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -55353,14 +55073,9 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -55369,14 +55084,9 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -55397,10 +55107,10 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
+#: en/pretty-formats.txt:247
#, fuzzy
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "reflog identity name (respecting .mailmap, see"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
#. type: Labeled list
@@ -55421,10 +55131,10 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, fuzzy
#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgid "reflog identity email (respecting .mailmap, see"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
#. type: Labeled list
@@ -55444,14 +55154,9 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -60172,6 +59877,54 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, fuzzy
+#~| msgid "--text"
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr "--text"
+
+#, fuzzy
+#~| msgid "--objects"
+#~ msgid "the objects."
+#~ msgstr "--objects"
+
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "龜剋龜 linkgit:git-blame[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgid "author local-part (see '%al') respecting .mailmap, see"
+#~ msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
+
+#, fuzzy
+#~| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+#~ msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgid "committer name (respecting .mailmap, see"
+#~ msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
+
+#, fuzzy
+#~| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgid "committer email (respecting .mailmap, see"
+#~ msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
+
+#, fuzzy
+#~| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgid "reflog identity name (respecting .mailmap, see"
+#~ msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
+
+#, fuzzy
+#~| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgid "reflog identity email (respecting .mailmap, see"
+#~ msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])"
+
#~ msgid "--no-signoff"
#~ msgstr "--no-signoff"
diff --git a/po/documentation.tr.po b/po/documentation.tr.po
index 8eabdf9..4aacd30 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-12-16 23:08+0100\n"
+"POT-Creation-Date: 2020-12-20 22:54+0100\n"
"PO-Revision-Date: 2020-10-11 09:26+0000\n"
"Last-Translator: O휓uz Ersen <oguzersen@protonmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -9511,8 +9511,8 @@ msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#: en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr ""
@@ -16082,18 +16082,12 @@ msgid "-C <target-dir>"
msgstr ""
#. type: Plain text
-#: en/git-cvsimport.txt:69
+#: en/git-cvsimport.txt:70
#, fuzzy
#| msgid "Clone a repository into a new directory."
-msgid "The Git repository to import to. If the directory doesn't"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr "Bir depoyu yeni bir dizine klonla."
-#. type: Plain text
-#: en/git-cvsimport.txt:70
-#, no-wrap
-msgid "exist, it will be created. Default is the current directory.\n"
-msgstr ""
-
#. type: Labeled list
#: en/git-cvsimport.txt:71
#, no-wrap
@@ -19317,14 +19311,9 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr "--rewrite-submodules-to=<ad>:<dosya>"
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -20964,17 +20953,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -20988,18 +20972,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -24010,7 +23988,7 @@ msgstr ""
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K횄쨋nig diet\n"
msgstr ""
#. type: delimited block -
@@ -36486,284 +36464,145 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point ve --root"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, fuzzy, no-wrap
#| msgid "git-p4.keepEmptyCommits"
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
msgstr "git-p4.keepEmptyCommits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, fuzzy, no-wrap
#| msgid "--text"
-msgid ""
-"Context\n"
-"~~~~~~~\n"
+msgid "Context"
msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap
-msgid "NOTES\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -45119,15 +44958,9 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -45141,26 +44974,14 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -45174,19 +44995,9 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -49013,17 +48824,10 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, fuzzy, no-wrap
-#| msgid "--contents <file>"
-msgid "contents of <old|new>,\n"
-msgstr "--contents <dosya>"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
+msgstr ""
#. type: Labeled list
#: en/git.txt:565
@@ -49772,17 +49576,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-#, fuzzy
-#| msgid "--objects"
-msgid "the objects."
-msgstr "--objects"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -49870,14 +49667,9 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -49891,20 +49683,9 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -54300,14 +54081,9 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
-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."
+msgid "color specification, as described under Values in the \"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 ""
#. type: Labeled list
@@ -54327,15 +54103,10 @@ msgstr ""
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:148
-msgid "switch line wrapping, like the -w option of"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -54343,14 +54114,9 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -54359,14 +54125,9 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -54375,14 +54136,9 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -54391,14 +54147,9 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -54407,14 +54158,9 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -54506,16 +54252,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, fuzzy
-#| msgid "linkgit:git-blame[1]"
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -54535,9 +54276,11 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
+#: en/pretty-formats.txt:183
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -54557,17 +54300,10 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196
-#: en/pretty-formats.txt:199 en/pretty-formats.txt:202
-#: en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, fuzzy
#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
@@ -54665,9 +54401,11 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-msgid "committer name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:196
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -54687,9 +54425,11 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-msgid "committer email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:199
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -54709,9 +54449,11 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:202
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -54812,14 +54554,9 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -54899,14 +54636,9 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -54948,14 +54680,9 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -54975,14 +54702,9 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -54991,14 +54713,9 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -55019,9 +54736,11 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:247
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -55041,9 +54760,11 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:250
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -55062,14 +54783,9 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -59786,6 +59502,31 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, fuzzy
+#~| msgid "--text"
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr "--text"
+
+#, fuzzy
+#~| msgid "--contents <file>"
+#~ msgid "contents of <old|new>,\n"
+#~ msgstr "--contents <dosya>"
+
+#, fuzzy
+#~| msgid "--objects"
+#~ msgid "the objects."
+#~ msgstr "--objects"
+
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~| msgid "linkgit:git-blame[1]"
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
#~ msgid "--no-signoff"
#~ msgstr "--no-signoff"
diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po
index b6a893d..09e69d0 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-12-16 23:08+0100\n"
+"POT-Creation-Date: 2020-12-20 22:54+0100\n"
"PO-Revision-Date: 2020-11-05 09:27+0000\n"
"Last-Translator: taotieren <admin@taotieren.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -9906,8 +9906,8 @@ msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#: en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, fuzzy, no-wrap
msgid "NOTES"
msgstr "力③뇢"
@@ -16713,17 +16713,11 @@ msgid "-C <target-dir>"
msgstr "-C <target-dir>"
#. type: Plain text
-#: en/git-cvsimport.txt:69
+#: en/git-cvsimport.txt:70
#, fuzzy
-msgid "The Git repository to import to. If the directory doesn't"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr "Clone a repository into a new directory."
-#. type: Plain text
-#: en/git-cvsimport.txt:70
-#, no-wrap
-msgid "exist, it will be created. Default is the current directory.\n"
-msgstr ""
-
#. type: Labeled list
#: en/git-cvsimport.txt:71
#, fuzzy, no-wrap
@@ -20014,14 +20008,9 @@ msgstr "--rewrite-submodules-from=<name>:<file>"
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr "--rewrite-submodules-to=<name>:<file>"
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -21685,17 +21674,12 @@ msgid "M 777 inline bob\n"
msgstr "M 777 inline bob\n"
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -21711,18 +21695,12 @@ msgid "0 refs/heads/master"
msgstr "0 refs/heads/master"
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -24791,7 +24769,7 @@ msgstr ""
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K횄쨋nig diet\n"
msgstr ""
#. type: delimited block -
@@ -37610,285 +37588,146 @@ msgstr "--keep-base and --root"
msgid "--fork-point and --root"
msgstr "--fork-point and --root"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, fuzzy, no-wrap
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
msgstr "Empty commits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, fuzzy, no-wrap
#| msgid "--text"
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr "訝듾툔��"
+msgid "Context"
+msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, fuzzy, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
-#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:748
+#, fuzzy, no-wrap
+msgid "Hooks"
+msgstr "�⒴춴"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, fuzzy, no-wrap
-msgid "NOTES\n"
-msgstr "力③뇢"
-
#. type: Plain text
#: en/git-rebase.txt:812
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
@@ -46490,15 +46329,9 @@ msgstr ""
msgid "checkout"
msgstr "瀯볢뇹"
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -46512,26 +46345,14 @@ msgstr ""
msgid "rebase"
msgstr "--rebase"
-#. type: Plain text
-#: en/git-submodule.txt:158
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -46545,19 +46366,9 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -50455,16 +50266,10 @@ msgstr "鵝띸쉰竊�"
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, fuzzy, no-wrap
-msgid "contents of <old|new>,\n"
-msgstr "--contents <file>"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
+msgstr ""
#. type: Labeled list
#: en/git.txt:565
@@ -51213,17 +51018,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-#, fuzzy
-#| msgid "--objects"
-msgid "the objects."
-msgstr "--objects"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -51311,14 +51109,9 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -51332,20 +51125,9 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -55804,14 +55586,9 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
-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."
+msgid "color specification, as described under Values in the \"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 ""
#. type: Labeled list
@@ -55831,15 +55608,10 @@ msgstr ""
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:148
-msgid "switch line wrapping, like the -w option of"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -55847,14 +55619,9 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr "'%<(<N>[,trunc|ltrunc|mtrunc])'"
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -55863,14 +55630,9 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr "'%<|(<N>)'"
-#. type: Plain text
-#: en/pretty-formats.txt:158
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -55880,31 +55642,20 @@ msgid "'%>(<N>)', '%>|(<N>)'"
msgstr "'%>(<N>)', '%>|(<N>)'"
#. type: Plain text
-#: en/pretty-formats.txt:160
+#: en/pretty-formats.txt:161
#, fuzzy
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr "'%><(<N>)', '%><|(<N>)'"
-#. type: Plain text
-#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
-msgstr ""
-
#. type: Labeled list
#: en/pretty-formats.txt:161
#, fuzzy, no-wrap
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr "'%>>(<N>)', '%>>|(<N>)'"
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, fuzzy
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr "'%>(<N>)', '%>|(<N>)'"
-
#. type: Plain text
#: en/pretty-formats.txt:166
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -55914,16 +55665,11 @@ msgid "'%><(<N>)', '%><|(<N>)'"
msgstr "'%><(<N>)', '%><|(<N>)'"
#. type: Plain text
-#: en/pretty-formats.txt:167
+#: en/pretty-formats.txt:169
#, fuzzy
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr "'%><(<N>)', '%><|(<N>)'"
-#. type: Plain text
-#: en/pretty-formats.txt:169
-msgid "respectively, but padding both sides (i.e. the text is centered)"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:171
msgid "Placeholders that expand to information extracted from the commit:"
@@ -56016,15 +55762,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, fuzzy
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -56045,9 +55787,11 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
+#: en/pretty-formats.txt:183
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -56067,17 +55811,10 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196
-#: en/pretty-formats.txt:199 en/pretty-formats.txt:202
-#: en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, fuzzy
#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
@@ -56176,9 +55913,11 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-msgid "committer name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:196
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -56199,9 +55938,11 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-msgid "committer email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:199
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -56221,9 +55962,11 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:202
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -56324,14 +56067,9 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -56414,14 +56152,9 @@ msgstr ""
msgid "'%G?'"
msgstr "'%G?'"
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -56463,16 +56196,10 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
-#, fuzzy
-msgid "to sign a signed commit"
-msgstr "--origin <commit>"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
+msgstr ""
#. type: Labeled list
#: en/pretty-formats.txt:235
@@ -56491,14 +56218,9 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -56507,14 +56229,9 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -56535,9 +56252,11 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:247
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -56557,9 +56276,11 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:250
+#, fuzzy
+#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -56578,14 +56299,9 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -61476,6 +61192,45 @@ msgstr "[[[8]]] https://www.kernel.org/pub/software/scm/git/docs/git-bisect.html
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
+#, fuzzy
+#~| msgid "--text"
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr "訝듾툔��"
+
+#, fuzzy
+#~ msgid "NOTES\n"
+#~ msgstr "力③뇢"
+
+#, fuzzy
+#~ msgid "contents of <old|new>,\n"
+#~ msgstr "--contents <file>"
+
+#, fuzzy
+#~| msgid "--objects"
+#~ msgid "the objects."
+#~ msgstr "--objects"
+
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~ msgid "similar to '%>(<N>)', '%>|(<N>)'"
+#~ msgstr "'%>(<N>)', '%>|(<N>)'"
+
+#, fuzzy
+#~ msgid "similar to '%<(<N>)', '%<|(<N>)'"
+#~ msgstr "'%><(<N>)', '%><|(<N>)'"
+
+#, fuzzy
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
+#, fuzzy
+#~ msgid "to sign a signed commit"
+#~ msgstr "--origin <commit>"
+
#, fuzzy
#~ msgid "git file is."
#~ msgstr "git file is."
@@ -61484,10 +61239,6 @@ msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
#~ msgid "-L :<funcname>:<file>"
#~ msgstr "-L :<funcname>:<file>"
-#, fuzzy
-#~ msgid "Hooks"
-#~ msgstr "�⒴춴"
-
#~ msgid "--no-signoff"
#~ msgstr "--no-signoff"
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index cbfc813..4d66e01 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-12-16 23:08+0100\n"
+"POT-Creation-Date: 2020-12-20 22:54+0100\n"
"PO-Revision-Date: 2020-10-14 05:26+0000\n"
"Last-Translator: 泳�땟�� <appiedavid777@gmail.com>\n"
"Language-Team: French\n"
@@ -9517,8 +9517,8 @@ msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54
-#: en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr ""
@@ -16093,15 +16093,9 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap
-msgid "exist, it will be created. Default is the current directory.\n"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -19329,14 +19323,9 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -20976,17 +20965,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -21000,18 +20984,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -24028,7 +24006,7 @@ msgstr ""
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K횄쨋nig diet\n"
msgstr ""
#. type: delimited block -
@@ -36531,284 +36509,145 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, fuzzy, no-wrap
#| msgid "git-p4.keepEmptyCommits"
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
msgstr "git-p4.keepEmptyCommits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, fuzzy, no-wrap
#| msgid "--text"
-msgid ""
-"Context\n"
-"~~~~~~~\n"
+msgid "Context"
msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap
-msgid "NOTES\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -45170,15 +45009,9 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -45192,26 +45025,14 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -45225,19 +45046,9 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -49072,15 +48883,9 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap
-msgid "contents of <old|new>,\n"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -49830,17 +49635,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-#, fuzzy
-#| msgid "--objects"
-msgid "the objects."
-msgstr "--objects"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -49928,14 +49726,9 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -49949,20 +49742,9 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -54380,14 +54162,9 @@ msgstr "color"
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
-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."
+msgid "color specification, as described under Values in the \"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 ""
#. type: Labeled list
@@ -54407,15 +54184,12 @@ msgstr ""
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:148
-msgid "switch line wrapping, like the -w option of"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+#, fuzzy
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -54423,14 +54197,9 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -54439,14 +54208,9 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -54455,14 +54219,9 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -54471,14 +54230,9 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -54487,14 +54241,9 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -54594,18 +54343,12 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
+#: en/pretty-formats.txt:180
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
-#, fuzzy
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
-
#. type: Labeled list
#: en/pretty-formats.txt:180
#, no-wrap
@@ -54626,10 +54369,10 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
+#: en/pretty-formats.txt:183
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -54650,21 +54393,12 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
+#: en/pretty-formats.txt:186
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "author local-part (see '%al') respecting .mailmap, see"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196
-#: en/pretty-formats.txt:199 en/pretty-formats.txt:202
-#: en/pretty-formats.txt:247 en/pretty-formats.txt:250
-#, fuzzy
-#| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
-
#. type: Labeled list
#: en/pretty-formats.txt:186
#, no-wrap
@@ -54764,10 +54498,10 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
+#: en/pretty-formats.txt:196
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "committer name (respecting .mailmap, see"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -54790,10 +54524,10 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
+#: en/pretty-formats.txt:199
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "committer email (respecting .mailmap, see"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -54814,10 +54548,10 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
+#: en/pretty-formats.txt:202
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -54921,14 +54655,9 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -55012,14 +54741,9 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -55061,14 +54785,9 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -55088,14 +54807,9 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -55104,14 +54818,9 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -55132,10 +54841,10 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
+#: en/pretty-formats.txt:247
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "reflog identity name (respecting .mailmap, see"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -55156,10 +54865,10 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, fuzzy
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "reflog identity email (respecting .mailmap, see"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -55179,14 +54888,9 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -59906,6 +59610,55 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, fuzzy
+#~| msgid "--text"
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr "--text"
+
+#, fuzzy
+#~| msgid "--objects"
+#~ msgid "the objects."
+#~ msgstr "--objects"
+
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+#~ msgid "author local-part (see '%al') respecting .mailmap, see"
+#~ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
+#~ msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+#~ msgid "committer name (respecting .mailmap, see"
+#~ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+#~ msgid "committer email (respecting .mailmap, see"
+#~ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+#~ msgid "reflog identity name (respecting .mailmap, see"
+#~ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+
+#, fuzzy
+#~| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+#~ msgid "reflog identity email (respecting .mailmap, see"
+#~ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+
#~ msgid "--no-signoff"
#~ msgstr "--no-signoff"
--
GitLab