diff --git a/en/diff-format.txt b/en/diff-format.txt
index 706916c94c1d930ef1fe476c7a16c140aeef7420..c4edc5accf655643740d7f1a0597e7409d72957e 100644
--- a/en/diff-format.txt
+++ b/en/diff-format.txt
@@ -61,7 +61,7 @@ Possible status letters are:
- R: renaming of a file
- T: change in the type of the file
- U: file is unmerged (you must complete the merge before it can
-be committed)
+ be committed)
- X: "unknown" change type (most probably a bug, please report it)
Status letters C and R are always followed by a score (denoting the
diff --git a/po/documentation.de.po b/po/documentation.de.po
index d1650c15726b7ae404eb364fa4ff3fbbcf61b1ce..18792446aa248fc443a972dbedf23938c8aaea04 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-01-03 23:03+0100\n"
+"POT-Creation-Date: 2019-01-04 23:29+0100\n"
"PO-Revision-Date: 2019-01-04 21:54+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,7 +36,7 @@ msgstr ""
#: en/git-fsck.txt:38 en/git-rebase.txt:415
#, no-wrap
msgid "--root"
-msgstr ""
+msgstr "--root"
#. type: Plain text
#: en/blame-options.txt:8
@@ -49,7 +49,7 @@ msgstr ""
#: en/blame-options.txt:9
#, no-wrap
msgid "--show-stats"
-msgstr ""
+msgstr "--show-stats"
#. type: Plain text
#: en/blame-options.txt:11
@@ -79,8 +79,8 @@ msgstr ""
#. type: Plain text
#: en/blame-options.txt:19
msgid ""
-"<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans from "
-"<start> to end of file. ``-L ,<end>'' spans from start of file to <end>."
+"<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans from"
+" <start> to end of file. ``-L ,<end>'' spans from start of file to <end>."
msgstr ""
#. type: Labeled list
@@ -92,14 +92,14 @@ msgstr ""
msgid "-l"
msgstr "-l"
-#
#. type: Plain text
#: en/blame-options.txt:24
#, fuzzy
#| msgid "Show untracked files (Default: 'all')."
msgid "Show long rev (Default: off)."
msgstr ""
-"Zeige alle von git nicht verwalteten (untracked) Dateien an (Standard: 'all')"
+"Zeige alle von git nicht verwalteten (untracked) Dateien an (Standard: "
+"'all')"
#. type: Labeled list
#: en/blame-options.txt:25 en/fetch-options.txt:98 en/git-branch.txt:170
@@ -110,14 +110,14 @@ msgstr ""
msgid "-t"
msgstr "-t"
-#
#. type: Plain text
#: en/blame-options.txt:27
#, fuzzy
#| msgid "Show untracked files (Default: 'all')."
msgid "Show raw timestamp (Default: off)."
msgstr ""
-"Zeige alle von git nicht verwalteten (untracked) Dateien an (Standard: 'all')"
+"Zeige alle von git nicht verwalteten (untracked) Dateien an (Standard: "
+"'all')"
#. type: Labeled list
#: en/blame-options.txt:28
@@ -141,11 +141,11 @@ msgstr ""
#. type: Plain text
#: en/blame-options.txt:38
msgid ""
-"Walk history forward instead of backward. Instead of showing the revision in "
-"which a line appeared, this shows the last revision in which a line has "
-"existed. This requires a range of revision like START..END where the path to "
-"blame exists in START. `git blame --reverse START` is taken as `git blame --"
-"reverse START..HEAD` for convenience."
+"Walk history forward instead of backward. Instead of showing the revision in"
+" which a line appeared, this shows the last revision in which a line has "
+"existed. This requires a range of revision like START..END where the path to"
+" blame exists in START. `git blame --reverse START` is taken as `git blame "
+"--reverse START..HEAD` for convenience."
msgstr ""
#. type: Labeled list
@@ -162,10 +162,9 @@ msgstr "-p"
#. type: Labeled list
#: en/blame-options.txt:40 en/git-commit.txt:109 en/git-push.txt:121
#: en/git-worktree.txt:115
-#, fuzzy, no-wrap
-#| msgid "--force"
+#, no-wrap
msgid "--porcelain"
-msgstr "--force"
+msgstr "--porcelain"
#. type: Plain text
#: en/blame-options.txt:42
@@ -176,7 +175,7 @@ msgstr ""
#: en/blame-options.txt:43
#, no-wrap
msgid "--line-porcelain"
-msgstr ""
+msgstr "--line-porcelain"
#. type: Plain text
#: en/blame-options.txt:47
@@ -189,7 +188,7 @@ msgstr ""
#: en/blame-options.txt:48 en/git-pack-objects.txt:123 en/git-svn.txt:357
#, no-wrap
msgid "--incremental"
-msgstr ""
+msgstr "--incremental"
#. type: Plain text
#: en/blame-options.txt:51
@@ -247,7 +246,7 @@ msgstr ""
#: en/blame-options.txt:73 en/git-checkout.txt:110 en/git-fsck.txt:92
#, no-wrap
msgid "--[no-]progress"
-msgstr ""
+msgstr "--[no-]progress"
#. type: Plain text
#: en/blame-options.txt:79
@@ -270,8 +269,8 @@ msgid ""
"Detect moved or copied lines within a file. When a commit moves or copies a "
"block of lines (e.g. the original file has A and then B, and the commit "
"changes it to B and then A), the traditional 'blame' algorithm notices only "
-"half of the movement and typically blames the lines that were moved up (i.e. "
-"B) to the parent and assigns blame to the lines that were moved down (i.e. "
+"half of the movement and typically blames the lines that were moved up (i.e."
+" B) to the parent and assigns blame to the lines that were moved down (i.e. "
"A) to the child commit. With this option, both groups of lines are blamed "
"on the parent by running extra passes of inspection."
msgstr ""
@@ -293,10 +292,10 @@ msgstr ""
#. type: Plain text
#: en/blame-options.txt:105
msgid ""
-"In addition to `-M`, detect lines moved or copied from other files that were "
-"modified in the same commit. This is useful when you reorganize your "
-"program and move code around across files. When this option is given twice, "
-"the command additionally looks for copies from other files in the commit "
+"In addition to `-M`, detect lines moved or copied from other files that were"
+" modified in the same commit. This is useful when you reorganize your "
+"program and move code around across files. When this option is given twice,"
+" the command additionally looks for copies from other files in the commit "
"that creates the file. When this option is given three times, the command "
"additionally looks for copies from other files in any commit."
msgstr ""
@@ -316,120 +315,102 @@ msgstr ""
#: en/git-cvsserver.txt:48 en/git-grep.txt:141 en/git-ls-remote.txt:24
#, no-wrap
msgid "-h"
-msgstr ""
+msgstr "-h"
#. type: Plain text
#: en/blame-options.txt:114
msgid "Show help message."
msgstr ""
-#
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:234
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-annotate[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-annotate[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:3
msgid "Annotate file lines with commit information."
msgstr ""
-#
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:4 en/git-annotate.txt:31
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-blame[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-blame[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:6
msgid "Show what revision and author last modified each line of a file."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-cherry[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-cherry[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:9
msgid "Find commits yet to be applied to upstream."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:10
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-count-objects[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:12
msgid "Count unpacked number of objects and their disk consumption."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:13
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-difftool[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-difftool[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:15
msgid "Show changes using common diff tools."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:16
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-fsck[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-fsck[1]"
-#
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
#, fuzzy
#| msgid ""
-#| "git-fsck-objects - Verifies the connectivity and validity of the objects "
-#| "in the database"
+#| "git-fsck-objects - Verifies the connectivity and validity of the objects in "
+#| "the database"
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr ""
"git-fsck-objects - 체berpr체ft die Verbundenheit und Korrektheit der Objekte "
"in der Datenbank"
-#
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:19
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-get-tar-commit-id[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-get-tar-commit-id[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:21
msgid "Extract commit ID from an archive created using git-archive."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:22
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-help[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-help[1]"
-#
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:24
#, fuzzy
@@ -437,13 +418,11 @@ msgstr "linkgit:git-add[1]"
msgid "Display help information about Git."
msgstr "Gibt Informationen 체ber das entfernte Repository <Name> aus."
-#
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:25
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-instaweb[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:27
@@ -452,54 +431,45 @@ msgstr "linkgit:git-add[1]"
msgid "Instantly browse your working repository in gitweb."
msgstr "Initialized empty Git repository in .git/\n"
-#
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:28
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-merge-tree[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:30
msgid "Show three-way merge without touching index."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:31
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-rerere[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-rerere[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:33
msgid "Reuse recorded resolution of conflicted merges."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:34
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-rev-parse[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-rev-parse[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:36
msgid "Pick out and massage parameters."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:37
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-show-branch[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-show-branch[1]"
-#
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:39
#, fuzzy
@@ -507,15 +477,12 @@ msgstr "linkgit:git-add[1]"
msgid "Show branches and their commits."
msgstr "Zeigt die Geschichte des Projekts"
-#
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:40
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-verify-commit[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-verify-commit[1]"
-#
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:42
#, fuzzy
@@ -523,15 +490,12 @@ msgstr "linkgit:git-add[1]"
msgid "Check the GPG signature of commits."
msgstr "git-verify-tag - Die GPG-Signaturen von Markierungs 체berpr체fen"
-#
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:43
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-verify-tag[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-verify-tag[1]"
-#
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:45
#, fuzzy
@@ -539,20 +503,17 @@ msgstr "linkgit:git-add[1]"
msgid "Check the GPG signature of tags."
msgstr "git-verify-tag - Die GPG-Signaturen von Markierungs 체berpr체fen"
-#
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:46
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-whatchanged[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:48
msgid "Show logs with difference each commit introduces."
msgstr ""
-#
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:49 en/git-instaweb.txt:90
#, fuzzy, no-wrap
@@ -565,15 +526,12 @@ msgstr "linkgit:git-add[1]"
msgid "Git web interface (web frontend to Git repositories)."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:142
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-config[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-config[1]"
-#
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:3
#, fuzzy
@@ -582,41 +540,34 @@ msgid "Get and set repository or global options."
msgstr ""
"git-config - Repositoryeigene oder globale Optionen auslesen und setzen"
-#
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1472
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-fast-export[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-fast-export[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:6
msgid "Git data exporter."
msgstr ""
-#
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:215
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-fast-import[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-fast-import[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:9
msgid "Backend for fast Git data importers."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:10
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-filter-branch[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-filter-branch[1]"
-#
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:12
#, fuzzy
@@ -624,67 +575,56 @@ msgstr "linkgit:git-add[1]"
msgid "Rewrite branches."
msgstr "switch branch"
-#
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:139
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-mergetool[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-mergetool[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:15
msgid "Run merge conflict resolution tools to resolve merge conflicts."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:16
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-pack-refs[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-pack-refs[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:18
msgid "Pack heads and tags for efficient repository access."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:19
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-prune[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-prune[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:21
msgid "Prune all unreachable objects from the object database."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:22
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-reflog[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-reflog[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:24
msgid "Manage reflog information."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:25
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-remote[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-remote[1]"
-#
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:27
#, fuzzy
@@ -692,106 +632,89 @@ msgstr "linkgit:git-add[1]"
msgid "Manage set of tracked repositories."
msgstr "git-remote - Einen Satz entfernter Repositories verwalten"
-#
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:28
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-repack[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-repack[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:30
msgid "Pack unpacked objects in a repository."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:31
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-replace[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-replace[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:33
msgid "Create, list, delete refs to replace objects."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:1
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-archimport[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-archimport[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:3
msgid "Import an Arch repository into Git."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:4
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-cvsexportcommit[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-cvsexportcommit[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:6
msgid "Export a single commit to a CVS checkout."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:7
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-cvsimport[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-cvsimport[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:9
msgid "Salvage your data out of another SCM people love to hate."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:10
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-cvsserver[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-cvsserver[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:12
msgid "A CVS server emulator for Git."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:13
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-imap-send[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-imap-send[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:15
msgid "Send a collection of patches from stdin to an IMAP folder."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:16
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-p4[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-p4[1]"
-#
#. type: Plain text
#: en/cmds-foreignscminterface.txt:18
#, fuzzy
@@ -799,66 +722,56 @@ msgstr "linkgit:git-add[1]"
msgid "Import from and submit to Perforce repositories."
msgstr "git-remote - Einen Satz entfernter Repositories verwalten"
-#
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:19
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-quiltimport[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-quiltimport[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:21
msgid "Applies a quilt patchset onto the current branch."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:22
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-request-pull[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-request-pull[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:24
msgid "Generates a summary of pending changes."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:25
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-send-email[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-send-email[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:27
msgid "Send a collection of patches as emails."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:28
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-svn[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-svn[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:30
msgid "Bidirectional operation between a Subversion repository and Git."
msgstr ""
-#
#. type: Plain text
#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:185
#, no-wrap
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
-#
#. type: Plain text
#: en/cmds-mainporcelain.txt:3
#, fuzzy
@@ -866,54 +779,45 @@ msgstr "linkgit:git-add[1]"
msgid "Add file contents to the index."
msgstr "git-add - F체ge Dateiinhalte zum Index hinzu."
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:4
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-am[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-am[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:6
msgid "Apply a series of patches from a mailbox."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:7
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-archive[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-archive[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:9
msgid "Create an archive of files from a named tree."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:10
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-bisect[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-bisect[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:12
msgid "Use binary search to find the commit that introduced a bug."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:13
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-branch[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-branch[1]"
-#
#. type: Plain text
#: en/cmds-mainporcelain.txt:15
#, fuzzy
@@ -923,54 +827,45 @@ msgstr ""
"git-branch - Auflisten, Erzeugen oder L철schen von Entwicklungszweigen "
"(branches)"
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:16
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-bundle[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-bundle[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:18
msgid "Move objects and refs by archive."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:19
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-checkout[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-checkout[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:21
msgid "Switch branches or restore working tree files."
msgstr ""
-#
#. type: Plain text
#: en/cmds-mainporcelain.txt:22 en/git-revert.txt:126
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-cherry-pick[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-cherry-pick[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:24
msgid "Apply the changes introduced by some existing commits."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:25
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-citool[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-citool[1]"
-#
#. type: Plain text
#: en/cmds-mainporcelain.txt:27
#, fuzzy
@@ -978,31 +873,26 @@ msgstr "linkgit:git-add[1]"
msgid "Graphical alternative to git-commit."
msgstr "git-gitool - Graphische Alternative zu git-commit"
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:28
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-clean[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-clean[1]"
-#
#. type: Plain text
#: en/cmds-mainporcelain.txt:30
#, fuzzy
-#| msgid "git-rm - Remove files from the working tree and from the index"
+#| msgid ""
+#| "git-rm - Remove files from the working tree and from the index"
msgid "Remove untracked files from the working tree."
msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:31
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-clone[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-clone[1]"
-#
#. type: Plain text
#: en/cmds-mainporcelain.txt:33
#, fuzzy
@@ -1011,15 +901,12 @@ msgid "Clone a repository into a new directory."
msgstr ""
"git-clone - Klone ein Projektarchiv (repository) in ein neues Verzeichnis."
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:34
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-commit[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-commit[1]"
-#
#. type: Plain text
#: en/cmds-mainporcelain.txt:36
#, fuzzy
@@ -1027,28 +914,23 @@ msgstr "linkgit:git-add[1]"
msgid "Record changes to the repository."
msgstr "git-commit - Trage 횆nderungen im Projektarchiv (repository) ein"
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:37
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-describe[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-describe[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:39
msgid "Give an object a human readable name based on an available ref."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:136
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-diff[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-diff[1]"
-#
#. type: Plain text
#: en/cmds-mainporcelain.txt:42
#, fuzzy
@@ -1059,93 +941,78 @@ msgstr ""
"git-diff - Zeige Unterschiede zwischen Eintragungen (commits), Eintragung "
"und Arbeitsbereich, etc"
-#
#. type: Plain text
#: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-fetch[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-fetch[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:45
msgid "Download objects and refs from another repository."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:46
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-format-patch[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-format-patch[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:48
msgid "Prepare patches for e-mail submission."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:49
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-gc[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-gc[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:51
msgid "Cleanup unnecessary files and optimize the local repository."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:52
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-grep[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-grep[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:54
msgid "Print lines matching a pattern."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:55
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-gui[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-gui[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:57
msgid "A portable graphical interface to Git."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:58
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-init[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-init[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:60
msgid "Create an empty Git repository or reinitialize an existing one."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:61
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-log[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-log[1]"
-#
#. type: Plain text
#: en/cmds-mainporcelain.txt:63
#, fuzzy
@@ -1153,28 +1020,23 @@ msgstr "linkgit:git-add[1]"
msgid "Show commit logs."
msgstr "Zeigt die Geschichte des Projekts"
-#
#. type: Plain text
#: en/cmds-mainporcelain.txt:64 en/git-fmt-merge-msg.txt:75
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-merge[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-merge[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:66
msgid "Join two or more development histories together."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:67
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-mv[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-mv[1]"
-#
#. type: Plain text
#: en/cmds-mainporcelain.txt:69
#, fuzzy
@@ -1184,192 +1046,163 @@ msgstr ""
"git-mv - Eine Datei, ein Verzeichnis oder einen Symlink verschieben oder "
"umbenennen"
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:70
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-notes[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-notes[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:72
msgid "Add or inspect object notes."
msgstr ""
-#
#. type: Plain text
#: en/cmds-mainporcelain.txt:73 en/git-fetch.txt:209
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-pull[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-pull[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:75
msgid "Fetch from and integrate with another repository or a local branch."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:76
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-push[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-push[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:78
msgid "Update remote refs along with associated objects."
msgstr ""
-#
#. type: Plain text
#: en/cmds-mainporcelain.txt:79 en/git-svn.txt:1133
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-rebase[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-rebase[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:81
msgid "Reapply commits on top of another base tip."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:82
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-reset[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-reset[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:84
msgid "Reset current HEAD to the specified state."
msgstr ""
-#
#. type: Plain text
#: en/cmds-mainporcelain.txt:85 en/git-cherry-pick.txt:230
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-revert[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-revert[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:87
msgid "Revert some existing commits."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:88
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-rm[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-rm[1]"
-#
#. type: Plain text
#: en/cmds-mainporcelain.txt:90
#, fuzzy
-#| msgid "git-rm - Remove files from the working tree and from the index"
+#| msgid ""
+#| "git-rm - Remove files from the working tree and from the index"
msgid "Remove files from the working tree and from the index."
msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:91
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-shortlog[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-shortlog[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:93
msgid "Summarize 'git log' output."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:94
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-show[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-show[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:96
msgid "Show various types of objects."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:97
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-stash[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-stash[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:99
msgid "Stash the changes in a dirty working directory away."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:100
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-status[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-status[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:102
msgid "Show the working tree status."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-submodule[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-submodule[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:105
msgid "Initialize, update or inspect submodules."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:106
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-tag[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-tag[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:108
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:109
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-worktree[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-worktree[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:111
msgid "Manage multiple working trees."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-mainporcelain.txt:112 en/git-gui.txt:104
#, fuzzy, no-wrap
@@ -1382,44 +1215,37 @@ msgstr "linkgit:git-add[1]"
msgid "The Git repository browser."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:1
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-cat-file[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-cat-file[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:3
msgid "Provide content or type and size information for repository objects."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:4
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-diff-files[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-diff-files[1]"
-#
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:6
#, fuzzy
-#| msgid "git-rm - Remove files from the working tree and from the index"
+#| msgid ""
+#| "git-rm - Remove files from the working tree and from the index"
msgid "Compares files in the working tree and the index."
msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
-#
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:7
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-diff-index[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-diff-index[1]"
-#
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:9
#, fuzzy
@@ -1427,52 +1253,44 @@ msgstr "linkgit:git-add[1]"
msgid "Compare a tree to the working tree or index."
msgstr "Erstellt ein Baumobjekt mit dem aktuellen Index."
-#
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:10
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-diff-tree[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-diff-tree[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:12
msgid "Compares the content and mode of blobs found via two tree objects."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:13
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-for-each-ref[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-for-each-ref[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:15
msgid "Output information on each ref."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:16
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-ls-files[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-ls-files[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:18
msgid "Show information about files in the index and the working tree."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:19
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-ls-remote[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-ls-remote[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:21
@@ -1481,91 +1299,77 @@ msgstr "linkgit:git-add[1]"
msgid "List references in a remote repository."
msgstr "--reference <repository>"
-#
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:22
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-ls-tree[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-ls-tree[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:24
msgid "List the contents of a tree object."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:25
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-merge-base[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-merge-base[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:27
msgid "Find as good common ancestors as possible for a merge."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:28
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-name-rev[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-name-rev[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:30
msgid "Find symbolic names for given revs."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:31
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-pack-redundant[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-pack-redundant[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:33
msgid "Find redundant pack files."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:34
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-rev-list[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-rev-list[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:36
msgid "Lists commit objects in reverse chronological order."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:37
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-show-index[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-show-index[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:39
msgid "Show packed archive index."
msgstr ""
-#
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:40 en/git-for-each-ref.txt:341
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-show-ref[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-show-ref[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:42
@@ -1574,197 +1378,166 @@ msgstr "linkgit:git-add[1]"
msgid "List references in a local repository."
msgstr "--reference <repository>"
-#
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:43
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-unpack-file[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-unpack-file[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:45
msgid "Creates a temporary file with a blob's contents."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:46
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-var[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-var[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:48
msgid "Show a Git logical variable."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:49
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-verify-pack[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-verify-pack[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:51
msgid "Validate packed Git archive files."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:1
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-apply[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-apply[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:3
msgid "Apply a patch to files and/or to the index."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:4
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-checkout-index[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-checkout-index[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:6
msgid "Copy files from the index to the working tree."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:7
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-commit-tree[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-commit-tree[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:9
msgid "Create a new commit object."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:10
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-hash-object[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-hash-object[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:12
msgid "Compute object ID and optionally creates a blob from a file."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:13
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-index-pack[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-index-pack[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:15
msgid "Build pack index file for an existing packed archive."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:16
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-merge-file[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-merge-file[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:18
msgid "Run a three-way file merge."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:19
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-merge-index[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-merge-index[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:21
msgid "Run a merge for files needing merging."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:22
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-mktag[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-mktag[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:24
msgid "Creates a tag object."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:25
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-mktree[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-mktree[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:27
msgid "Build a tree-object from ls-tree formatted text."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:28
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-pack-objects[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-pack-objects[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:30
msgid "Create a packed archive of objects."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:31
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-prune-packed[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-prune-packed[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:33
msgid "Remove extra objects that are already in pack files."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:34
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-read-tree[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-read-tree[1]"
-#
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:36
#, fuzzy
@@ -1772,55 +1545,47 @@ msgstr "linkgit:git-add[1]"
msgid "Reads tree information into the index."
msgstr "Gibt Informationen 체ber das entfernte Repository <Name> aus."
-#
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:37
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-symbolic-ref[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-symbolic-ref[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:39
msgid "Read, modify and delete symbolic refs."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:40
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-unpack-objects[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-unpack-objects[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:42
msgid "Unpack objects from a packed archive."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:43
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-update-index[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-update-index[1]"
-#
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:45
#, fuzzy
-#| msgid "git-rm - Remove files from the working tree and from the index"
+#| msgid ""
+#| "git-rm - Remove files from the working tree and from the index"
msgid "Register file contents in the working tree to the index."
msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
-#
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:46
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-update-ref[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-update-ref[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:48
@@ -1829,12 +1594,10 @@ msgstr ""
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:49 en/git-commit-tree.txt:115
-#, fuzzy, no-wrap
-#| msgid "git-write-tree(1)"
+#, no-wrap
msgid "linkgit:git-write-tree[1]"
-msgstr "git-write-tree(1)"
+msgstr "linkgit:git-write-tree[1]"
-#
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:51
#, fuzzy
@@ -1842,119 +1605,100 @@ msgstr "git-write-tree(1)"
msgid "Create a tree object from the current index."
msgstr "Erstellt ein Baumobjekt mit dem aktuellen Index."
-#
#. type: Labeled list
#: en/cmds-purehelpers.txt:1
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-check-attr[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-check-attr[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:3
msgid "Display gitattributes information."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-purehelpers.txt:4
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-check-ignore[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-check-ignore[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:6
msgid "Debug gitignore / exclude files."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-purehelpers.txt:7
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-check-mailmap[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-check-mailmap[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:9
msgid "Show canonical names and email addresses of contacts."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-purehelpers.txt:10
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-check-ref-format[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-check-ref-format[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:12
msgid "Ensures that a reference name is well formed."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-purehelpers.txt:13
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-column[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-column[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:15
msgid "Display data in columns."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-purehelpers.txt:16
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-credential[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-credential[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:18
msgid "Retrieve and store user credentials."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-purehelpers.txt:19
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-credential-cache[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-credential-cache[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:21
msgid "Helper to temporarily store passwords in memory."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-purehelpers.txt:22
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-credential-store[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-credential-store[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:24
msgid "Helper to store credentials on disk."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-purehelpers.txt:25
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-fmt-merge-msg[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-fmt-merge-msg[1]"
-#
#. type: Plain text
#: en/cmds-purehelpers.txt:27
#, fuzzy
@@ -1962,39 +1706,33 @@ msgstr "linkgit:git-add[1]"
msgid "Produce a merge commit message."
msgstr "Unterdr체cke die zusammenfassende Nachricht 체ber die Eintragung."
-#
#. type: Labeled list
#: en/cmds-purehelpers.txt:28
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-interpret-trailers[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-interpret-trailers[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:30
msgid "add or parse structured information in commit messages."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-purehelpers.txt:31
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-mailinfo[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-mailinfo[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:33
msgid "Extracts patch and authorship from a single e-mail message."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-purehelpers.txt:34
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-mailsplit[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-mailsplit[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:36
@@ -2003,225 +1741,190 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:37
-#, fuzzy, no-wrap
-#| msgid "git-merge-one-file(1)"
+#, no-wrap
msgid "linkgit:git-merge-one-file[1]"
-msgstr "git-merge-one-file(1)"
+msgstr "linkgit:git-merge-one-file[1]"
-#
#. type: Plain text
#: en/cmds-purehelpers.txt:39
#, fuzzy
#| msgid ""
-#| "git-merge-one-file - The standard helper program to use with git-merge-"
-#| "index"
+#| "git-merge-one-file - The standard helper program to use with git-merge-index"
msgid "The standard helper program to use with git-merge-index."
msgstr ""
"git-merge-one-file - Das Standardhilfsprogramm welches in Kombination mit "
"git-merge-index verwendet wird"
-#
#. type: Plain text
#: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-patch-id[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-patch-id[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:42
msgid "Compute unique ID for a patch."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-purehelpers.txt:43
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-sh-i18n[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-sh-i18n[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:45
msgid "Git's i18n setup code for shell scripts."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-purehelpers.txt:46
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-sh-setup[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-sh-setup[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:48
msgid "Common Git shell script setup code."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-purehelpers.txt:49
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-stripspace[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-stripspace[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:51
msgid "Remove unnecessary whitespace."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-synchelpers.txt:1
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-http-fetch[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-http-fetch[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:3
msgid "Download from a remote Git repository via HTTP."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-synchelpers.txt:4
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-http-push[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-http-push[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:6
msgid "Push objects over HTTP/DAV to another repository."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-synchelpers.txt:7
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-parse-remote[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-parse-remote[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:9
msgid "Routines to help parsing remote repository access parameters."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-synchelpers.txt:10
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-receive-pack[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-receive-pack[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:12
msgid "Receive what is pushed into the repository."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-synchelpers.txt:13
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-shell[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-shell[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:15
msgid "Restricted login shell for Git-only SSH access."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-synchelpers.txt:16
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-upload-archive[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-upload-archive[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:18
msgid "Send archive back to git-archive."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-synchelpers.txt:19
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-upload-pack[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-upload-pack[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:21
msgid "Send objects packed back to git-fetch-pack."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:1
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-daemon[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-daemon[1]"
#. type: Plain text
#: en/cmds-synchingrepositories.txt:3
msgid "A really simple server for Git repositories."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:4
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-fetch-pack[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-fetch-pack[1]"
#. type: Plain text
#: en/cmds-synchingrepositories.txt:6
msgid "Receive missing objects from another repository."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:7
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-http-backend[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-http-backend[1]"
#. type: Plain text
#: en/cmds-synchingrepositories.txt:9
msgid "Server side implementation of Git over HTTP."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:10
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-send-pack[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-send-pack[1]"
#. type: Plain text
#: en/cmds-synchingrepositories.txt:12
msgid "Push objects over Git protocol to another repository."
msgstr ""
-#
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:13
-#, fuzzy, no-wrap
-#| msgid "linkgit:git-add[1]"
+#, no-wrap
msgid "linkgit:git-update-server-info[1]"
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-update-server-info[1]"
#. type: Plain text
#: en/cmds-synchingrepositories.txt:15
@@ -2238,9 +1941,9 @@ msgstr ""
#: en/config.txt:10
msgid ""
"The Git configuration file contains a number of variables that affect the "
-"Git commands' behavior. The `.git/config` file in each repository is used to "
-"store the configuration for that repository, and `$HOME/.gitconfig` is used "
-"to store a per-user configuration as fallback values for the `.git/config` "
+"Git commands' behavior. The `.git/config` file in each repository is used to"
+" store the configuration for that repository, and `$HOME/.gitconfig` is used"
+" to store a per-user configuration as fallback values for the `.git/config` "
"file. The file `/etc/gitconfig` can be used to store a system-wide default "
"configuration."
msgstr ""
@@ -2251,10 +1954,10 @@ msgid ""
"The configuration variables are used by both the Git plumbing and the "
"porcelains. The variables are divided into sections, wherein the fully "
"qualified variable name of the variable itself is the last dot-separated "
-"segment and the section name is everything before the last dot. The variable "
-"names are case-insensitive, allow only alphanumeric characters and `-`, and "
-"must start with an alphabetic character. Some variables may appear multiple "
-"times; we say then that the variable is multivalued."
+"segment and the section name is everything before the last dot. The variable"
+" names are case-insensitive, allow only alphanumeric characters and `-`, and"
+" must start with an alphabetic character. Some variables may appear "
+"multiple times; we say then that the variable is multivalued."
msgstr ""
#. type: Title ~
@@ -2274,20 +1977,20 @@ msgstr ""
#. type: Plain text
#: en/config.txt:33
msgid ""
-"The file consists of sections and variables. A section begins with the name "
-"of the section in square brackets and continues until the next section "
+"The file consists of sections and variables. A section begins with the name"
+" of the section in square brackets and continues until the next section "
"begins. Section names are case-insensitive. Only alphanumeric characters, "
-"`-` and `.` are allowed in section names. Each variable must belong to some "
-"section, which means that there must be a section header before the first "
+"`-` and `.` are allowed in section names. Each variable must belong to some"
+" section, which means that there must be a section header before the first "
"setting of a variable."
msgstr ""
#. type: Plain text
#: en/config.txt:37
msgid ""
-"Sections can be further divided into subsections. To begin a subsection put "
-"its name in double quotes, separated by space from the section name, in the "
-"section header, like in the example below:"
+"Sections can be further divided into subsections. To begin a subsection put"
+" its name in double quotes, separated by space from the section name, in the"
+" section header, like in the example below:"
msgstr ""
#. type: delimited block -
@@ -2300,11 +2003,11 @@ msgstr ""
#: en/config.txt:49
msgid ""
"Subsection names are case sensitive and can contain any characters except "
-"newline (doublequote `\"` and backslash can be included by escaping them as `"
-"\\\"` and `\\\\`, respectively). Section headers cannot span multiple "
-"lines. Variables may belong directly to a section or to a given "
-"subsection. You can have `[section]` if you have `[section \"subsection"
-"\"]`, but you don't need to."
+"newline (doublequote `\"` and backslash can be included by escaping them as "
+"`\\\"` and `\\\\`, respectively). Section headers cannot span multiple "
+"lines. Variables may belong directly to a section or to a given subsection."
+" You can have `[section]` if you have `[section \"subsection\"]`, but you "
+"don't need to."
msgstr ""
#. type: Plain text
@@ -2319,11 +2022,11 @@ msgstr ""
#. type: Plain text
#: en/config.txt:61
msgid ""
-"All the other lines (and the remainder of the line after the section header) "
-"are recognized as setting variables, in the form 'name = value' (or just "
-"'name', which is a short-hand to say that the variable is the boolean \"true"
-"\"). The variable names are case-insensitive, allow only alphanumeric "
-"characters and `-`, and must start with an alphabetic character."
+"All the other lines (and the remainder of the line after the section header)"
+" are recognized as setting variables, in the form 'name = value' (or just "
+"'name', which is a short-hand to say that the variable is the boolean "
+"\"true\"). The variable names are case-insensitive, allow only alphanumeric"
+" characters and `-`, and must start with an alphabetic character."
msgstr ""
#. type: Plain text
@@ -2347,10 +2050,10 @@ msgstr ""
#. type: Plain text
#: en/config.txt:77
msgid ""
-"The following escape sequences (beside `\\\"` and `\\\\`) are recognized: `"
-"\\n` for newline character (NL), `\\t` for horizontal tabulation (HT, TAB) "
-"and `\\b` for backspace (BS). Other char escape sequences (including octal "
-"escape sequences) are invalid."
+"The following escape sequences (beside `\\\"` and `\\\\`) are recognized: "
+"`\\n` for newline character (NL), `\\t` for horizontal tabulation (HT, TAB)"
+" and `\\b` for backspace (BS). Other char escape sequences (including "
+"octal escape sequences) are invalid."
msgstr ""
#. type: Title ~
@@ -2363,20 +2066,20 @@ msgstr "--include"
#. type: Plain text
#: en/config.txt:86
msgid ""
-"You can include a config file from another by setting the special `include."
-"path` variable to the name of the file to be included. The variable takes a "
-"pathname as its value, and is subject to tilde expansion. `include.path` can "
-"be given multiple times."
+"You can include a config file from another by setting the special "
+"`include.path` variable to the name of the file to be included. The variable"
+" takes a pathname as its value, and is subject to tilde expansion. "
+"`include.path` can be given multiple times."
msgstr ""
#. type: Plain text
#: en/config.txt:92
msgid ""
-"The included file is expanded immediately, as if its contents had been found "
-"at the location of the include directive. If the value of the `include.path` "
-"variable is a relative path, the path is considered to be relative to the "
-"configuration file in which the include directive was found. See below for "
-"examples."
+"The included file is expanded immediately, as if its contents had been found"
+" at the location of the include directive. If the value of the "
+"`include.path` variable is a relative path, the path is considered to be "
+"relative to the configuration file in which the include directive was found."
+" See below for examples."
msgstr ""
#. type: Title ~
@@ -2420,8 +2123,8 @@ msgstr ""
msgid ""
"The .git location may be auto-discovered, or come from `$GIT_DIR` "
"environment variable. If the repository is auto discovered via a .git file "
-"(e.g. from submodules, or a linked worktree), the .git location would be the "
-"final location where the .git directory is, not where the"
+"(e.g. from submodules, or a linked worktree), the .git location would be the"
+" final location where the .git directory is, not where the"
msgstr ""
#. type: Block title
@@ -2433,16 +2136,16 @@ msgstr ""
#. type: Plain text
#: en/config.txt:120
msgid ""
-"The pattern can contain standard globbing wildcards and two additional ones, "
-"`**/` and `/**`, that can match multiple path components. Please refer to "
+"The pattern can contain standard globbing wildcards and two additional ones,"
+" `**/` and `/**`, that can match multiple path components. Please refer to "
"linkgit:gitignore[5] for details. For convenience:"
msgstr ""
#. type: Plain text
#: en/config.txt:123
msgid ""
-"If the pattern starts with `~/`, `~` will be substituted with the content of "
-"the environment variable `HOME`."
+"If the pattern starts with `~/`, `~` will be substituted with the content of"
+" the environment variable `HOME`."
msgstr ""
#. type: Plain text
@@ -2456,16 +2159,16 @@ msgstr ""
#: en/config.txt:130
msgid ""
"If the pattern does not start with either `~/`, `./` or `/`, `**/` will be "
-"automatically prepended. For example, the pattern `foo/bar` becomes `**/foo/"
-"bar` and would match `/any/path/to/foo/bar`."
+"automatically prepended. For example, the pattern `foo/bar` becomes "
+"`**/foo/bar` and would match `/any/path/to/foo/bar`."
msgstr ""
#. type: Plain text
#: en/config.txt:134
msgid ""
-"If the pattern ends with `/`, `**` will be automatically added. For example, "
-"the pattern `foo/` becomes `foo/**`. In other words, it matches \"foo\" and "
-"everything inside, recursively."
+"If the pattern ends with `/`, `**` will be automatically added. For example,"
+" the pattern `foo/` becomes `foo/**`. In other words, it matches \"foo\" and"
+" everything inside, recursively."
msgstr ""
#. type: Labeled list
@@ -2477,8 +2180,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:138
msgid ""
-"This is the same as `gitdir` except that matching is done case-insensitively "
-"(e.g. on case-insensitive file sytems)"
+"This is the same as `gitdir` except that matching is done case-insensitively"
+" (e.g. on case-insensitive file sytems)"
msgstr ""
#. type: Plain text
@@ -2494,8 +2197,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:145
msgid ""
-"Note that \"../\" is not special and will match literally, which is unlikely "
-"what you want."
+"Note that \"../\" is not special and will match literally, which is unlikely"
+" what you want."
msgstr ""
#. type: Title ~
@@ -2656,7 +2359,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:201
-msgid "or `1`. Also, a variable defined without `= <value>` is taken as true."
+msgid ""
+"or `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2692,8 +2396,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:213
msgid ""
-"The value for many variables that specify various sizes can be suffixed with "
-"`k`, `M`,... to mean \"scale the number by 1024\", \"by 1024x1024\", etc."
+"The value for many variables that specify various sizes can be suffixed with"
+" `k`, `M`,... to mean \"scale the number by 1024\", \"by 1024x1024\", etc."
msgstr ""
#. type: Labeled list
@@ -2722,8 +2426,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:227
msgid ""
-"Colors may also be given as numbers between 0 and 255; these use ANSI 256-"
-"color mode (but note that not all terminals may support this). If your "
+"Colors may also be given as numbers between 0 and 255; these use ANSI "
+"256-color mode (but note that not all terminals may support this). If your "
"terminal supports it, you may also specify 24-bit RGB values as hex, like "
"`#ff0ab3`."
msgstr ""
@@ -2734,8 +2438,8 @@ msgid ""
"The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, "
"`italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The "
"position of any attributes with respect to the colors (before, after, or in "
-"between), doesn't matter. Specific attributes may be turned off by prefixing "
-"them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
+"between), doesn't matter. Specific attributes may be turned off by prefixing"
+" them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
@@ -2749,13 +2453,13 @@ msgstr ""
#: en/config.txt:246
msgid ""
"For git's pre-defined color slots, the attributes are meant to be reset at "
-"the beginning of each item in the colored output. So setting `color.decorate."
-"branch` to `black` will paint that branch name in a plain `black`, even if "
-"the previous thing on the same output line (e.g. opening parenthesis before "
-"the list of branch names in `log --decorate` output) is set to be painted "
-"with `bold` or some other attribute. However, custom log formats may do "
-"more complicated and layered coloring, and the negated forms may be useful "
-"there."
+"the beginning of each item in the colored output. So setting "
+"`color.decorate.branch` to `black` will paint that branch name in a plain "
+"`black`, even if the previous thing on the same output line (e.g. opening "
+"parenthesis before the list of branch names in `log --decorate` output) is "
+"set to be painted with `bold` or some other attribute. However, custom log "
+"formats may do more complicated and layered coloring, and the negated forms "
+"may be useful there."
msgstr ""
#. type: Labeled list
@@ -2769,8 +2473,8 @@ msgstr "<branchname>"
#: en/config.txt:253
msgid ""
"A variable that takes a pathname value can be given a string that begins "
-"with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such "
-"a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the "
+"with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such"
+" a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the "
"specified user's home directory."
msgstr ""
@@ -2784,8 +2488,8 @@ msgstr ""
#: en/config.txt:261
msgid ""
"Note that this list is non-comprehensive and not necessarily complete. For "
-"command-specific variables, you will find a more detailed description in the "
-"appropriate manual page."
+"command-specific variables, you will find a more detailed description in the"
+" appropriate manual page."
msgstr ""
#. type: Plain text
@@ -2793,8 +2497,8 @@ msgstr ""
msgid ""
"Other git-related tools may and do use their own variables. When inventing "
"new variables for use in your own tool, make sure their names do not "
-"conflict with those that are used by Git itself and other popular tools, and "
-"describe them in your documentation."
+"conflict with those that are used by Git itself and other popular tools, and"
+" describe them in your documentation."
msgstr ""
#. type: Labeled list
@@ -2807,8 +2511,8 @@ msgstr ""
#: en/config.txt:272
msgid ""
"These variables control various optional help messages designed to aid new "
-"users. All 'advice.*' variables default to 'true', and you can tell Git that "
-"you do not need help by setting these to 'false':"
+"users. All 'advice.*' variables default to 'true', and you can tell Git that"
+" you do not need help by setting these to 'false':"
msgstr ""
#. type: Labeled list
@@ -3026,10 +2730,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:332
-#, fuzzy, no-wrap
-#| msgid "% git config core.filemode\n"
+#, no-wrap
msgid "core.fileMode"
-msgstr "% git config core.filemode\n"
+msgstr "core.fileMode"
#. type: Plain text
#: en/config.txt:335
@@ -3052,31 +2755,32 @@ msgstr ""
#: en/config.txt:351
msgid ""
"A repository, however, may be on a filesystem that handles the filemode "
-"correctly, and this variable is set to 'true' when created, but later may be "
-"made accessible from another environment that loses the filemode (e.g. "
-"exporting ext4 via CIFS mount, visiting a Cygwin created repository with Git "
-"for Windows or Eclipse). In such a case it may be necessary to set this "
+"correctly, and this variable is set to 'true' when created, but later may be"
+" made accessible from another environment that loses the filemode (e.g. "
+"exporting ext4 via CIFS mount, visiting a Cygwin created repository with Git"
+" for Windows or Eclipse). In such a case it may be necessary to set this "
"variable to 'false'. See linkgit:git-update-index[1]."
msgstr ""
#. type: Plain text
#: en/config.txt:353
msgid ""
-"The default is true (when core.filemode is not specified in the config file)."
+"The default is true (when core.filemode is not specified in the config "
+"file)."
msgstr ""
#. type: Labeled list
#: en/config.txt:354
#, no-wrap
msgid "core.hideDotFiles"
-msgstr ""
+msgstr "core.hideDotFiles"
#. type: Plain text
#: en/config.txt:359
msgid ""
"(Windows-only) If true, mark newly-created directories and files whose name "
-"starts with a dot as hidden. If 'dotGitOnly', only the `.git/` directory is "
-"hidden, but no other files starting with a dot. The default mode is "
+"starts with a dot as hidden. If 'dotGitOnly', only the `.git/` directory is"
+" hidden, but no other files starting with a dot. The default mode is "
"'dotGitOnly'."
msgstr ""
@@ -3084,14 +2788,14 @@ msgstr ""
#: en/config.txt:360
#, no-wrap
msgid "core.ignoreCase"
-msgstr ""
+msgstr "core.ignoreCase"
#. type: Plain text
#: en/config.txt:367
msgid ""
"If true, this option enables various workarounds to enable Git to work "
-"better on filesystems that are not case sensitive, like FAT. For example, if "
-"a directory listing finds \"makefile\" when Git expects \"Makefile\", Git "
+"better on filesystems that are not case sensitive, like FAT. For example, if"
+" a directory listing finds \"makefile\" when Git expects \"Makefile\", Git "
"will assume it is really the same file, and continue to remember it as "
"\"Makefile\"."
msgstr ""
@@ -3108,24 +2812,24 @@ msgstr ""
#: en/config.txt:372
#, no-wrap
msgid "core.precomposeUnicode"
-msgstr ""
+msgstr "core.precomposeUnicode"
#. type: Plain text
#: en/config.txt:380
msgid ""
-"This option is only used by Mac OS implementation of Git. When core."
-"precomposeUnicode=true, Git reverts the unicode decomposition of filenames "
-"done by Mac OS. This is useful when sharing a repository between Mac OS and "
-"Linux or Windows. (Git for Windows 1.7.10 or higher is needed, or Git under "
-"cygwin 1.7). When false, file names are handled fully transparent by Git, "
-"which is backward compatible with older versions of Git."
+"This option is only used by Mac OS implementation of Git. When "
+"core.precomposeUnicode=true, Git reverts the unicode decomposition of "
+"filenames done by Mac OS. This is useful when sharing a repository between "
+"Mac OS and Linux or Windows. (Git for Windows 1.7.10 or higher is needed, "
+"or Git under cygwin 1.7). When false, file names are handled fully "
+"transparent by Git, which is backward compatible with older versions of Git."
msgstr ""
#. type: Labeled list
#: en/config.txt:381
#, no-wrap
msgid "core.protectHFS"
-msgstr ""
+msgstr "core.protectHFS"
#. type: Plain text
#: en/config.txt:385
@@ -3139,7 +2843,7 @@ msgstr ""
#: en/config.txt:386
#, no-wrap
msgid "core.protectNTFS"
-msgstr ""
+msgstr "core.protectNTFS"
#. type: Plain text
#: en/config.txt:391
@@ -3153,7 +2857,7 @@ msgstr ""
#: en/config.txt:392
#, no-wrap
msgid "core.trustctime"
-msgstr ""
+msgstr "core.trustctime"
#. type: Plain text
#: en/config.txt:398
@@ -3168,20 +2872,20 @@ msgstr ""
#: en/config.txt:399
#, no-wrap
msgid "core.splitIndex"
-msgstr ""
+msgstr "core.splitIndex"
#. type: Plain text
#: en/config.txt:402
msgid ""
-"If true, the split-index feature of the index will be used. See linkgit:git-"
-"update-index[1]. False by default."
+"If true, the split-index feature of the index will be used. See "
+"linkgit:git-update-index[1]. False by default."
msgstr ""
#. type: Labeled list
#: en/config.txt:403
#, no-wrap
msgid "core.untrackedCache"
-msgstr ""
+msgstr "core.untrackedCache"
#. type: Plain text
#: en/config.txt:411
@@ -3198,7 +2902,7 @@ msgstr ""
#: en/config.txt:412
#, no-wrap
msgid "core.checkStat"
-msgstr ""
+msgstr "core.checkStat"
#. type: Plain text
#: en/config.txt:417
@@ -3213,20 +2917,20 @@ msgstr ""
#: en/config.txt:418
#, no-wrap
msgid "core.quotePath"
-msgstr ""
+msgstr "core.quotePath"
#. type: Plain text
#: en/config.txt:432
msgid ""
-"Commands that output paths (e.g. 'ls-files', 'diff'), will quote \"unusual\" "
-"characters in the pathname by enclosing the pathname in double-quotes and "
-"escaping those characters with backslashes in the same way C escapes control "
-"characters (e.g. `\\t` for TAB, `\\n` for LF, `\\\\` for backslash) or "
-"bytes with values larger than 0x80 (e.g. octal `\\302\\265` for \"micro\" in "
-"UTF-8). If this variable is set to false, bytes higher than 0x80 are not "
+"Commands that output paths (e.g. 'ls-files', 'diff'), will quote \"unusual\""
+" characters in the pathname by enclosing the pathname in double-quotes and "
+"escaping those characters with backslashes in the same way C escapes control"
+" characters (e.g. `\\t` for TAB, `\\n` for LF, `\\\\` for backslash) or "
+"bytes with values larger than 0x80 (e.g. octal `\\302\\265` for \"micro\" in"
+" UTF-8). If this variable is set to false, bytes higher than 0x80 are not "
"considered \"unusual\" any more. Double-quotes, backslash and control "
-"characters are always escaped regardless of the setting of this variable. A "
-"simple space character is not considered \"unusual\". Many commands can "
+"characters are always escaped regardless of the setting of this variable. A"
+" simple space character is not considered \"unusual\". Many commands can "
"output pathnames completely verbatim using the `-z` option. The default "
"value is true."
msgstr ""
@@ -3235,7 +2939,7 @@ msgstr ""
#: en/config.txt:433
#, no-wrap
msgid "core.eol"
-msgstr ""
+msgstr "core.eol"
#. type: Plain text
#: en/config.txt:440
@@ -3251,19 +2955,19 @@ msgstr ""
#: en/config.txt:441
#, no-wrap
msgid "core.safecrlf"
-msgstr ""
+msgstr "core.safecrlf"
#. type: Plain text
#: en/config.txt:451
msgid ""
-"If true, makes Git check if converting `CRLF` is reversible when end-of-line "
-"conversion is active. Git will verify if a command modifies a file in the "
+"If true, makes Git check if converting `CRLF` is reversible when end-of-line"
+" conversion is active. Git will verify if a command modifies a file in the "
"work tree either directly or indirectly. For example, committing a file "
-"followed by checking out the same file should yield the original file in the "
-"work tree. If this is not the case for the current setting of `core."
-"autocrlf`, Git will reject the file. The variable can be set to \"warn\", "
-"in which case Git will only warn about an irreversible conversion but "
-"continue the operation."
+"followed by checking out the same file should yield the original file in the"
+" work tree. If this is not the case for the current setting of "
+"`core.autocrlf`, Git will reject the file. The variable can be set to "
+"\"warn\", in which case Git will only warn about an irreversible conversion "
+"but continue the operation."
msgstr ""
#. type: Plain text
@@ -3293,8 +2997,8 @@ msgstr ""
msgid ""
"Unfortunately, the desired effect of cleaning up text files with mixed line "
"endings and the undesired effect of corrupting binary files cannot be "
-"distinguished. In both cases CRLFs are removed in an irreversible way. For "
-"text files this is the right thing to do because CRLFs are line endings, "
+"distinguished. In both cases CRLFs are removed in an irreversible way. For"
+" text files this is the right thing to do because CRLFs are line endings, "
"while for binary files converting CRLFs corrupts data."
msgstr ""
@@ -3316,14 +3020,14 @@ msgstr ""
#: en/config.txt:486
#, no-wrap
msgid "core.autocrlf"
-msgstr ""
+msgstr "core.autocrlf"
#. type: Plain text
#: en/config.txt:493
msgid ""
"Setting this variable to \"true\" is the same as setting the `text` "
-"attribute to \"auto\" on all files and core.eol to \"crlf\". Set to true if "
-"you want to have `CRLF` line endings in your working directory and the "
+"attribute to \"auto\" on all files and core.eol to \"crlf\". Set to true if"
+" you want to have `CRLF` line endings in your working directory and the "
"repository has LF line endings. This variable can be set to 'input', in "
"which case no output conversion is performed."
msgstr ""
@@ -3332,7 +3036,7 @@ msgstr ""
#: en/config.txt:494
#, no-wrap
msgid "core.symlinks"
-msgstr ""
+msgstr "core.symlinks"
#. type: Plain text
#: en/config.txt:500
@@ -3346,8 +3050,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:504
msgid ""
-"The default is true, except linkgit:git-clone[1] or linkgit:git-init[1] will "
-"probe and set core.symlinks false if appropriate when the repository is "
+"The default is true, except linkgit:git-clone[1] or linkgit:git-init[1] will"
+" probe and set core.symlinks false if appropriate when the repository is "
"created."
msgstr ""
@@ -3355,15 +3059,15 @@ msgstr ""
#: en/config.txt:505
#, no-wrap
msgid "core.gitProxy"
-msgstr ""
+msgstr "core.gitProxy"
#. type: Plain text
#: en/config.txt:513
msgid ""
"A \"proxy command\" to execute (as 'command host port') instead of "
"establishing direct connection to the remote server when using the Git "
-"protocol for fetching. If the variable value is in the \"COMMAND for DOMAIN"
-"\" format, the command is applied only on hostnames ending with the "
+"protocol for fetching. If the variable value is in the \"COMMAND for "
+"DOMAIN\" format, the command is applied only on hostnames ending with the "
"specified domain string. This variable may be set multiple times and is "
"matched in the given order; the first match wins."
msgstr ""
@@ -3380,15 +3084,15 @@ msgstr ""
msgid ""
"The special string `none` can be used as the proxy command to specify that "
"no proxy be used for a given domain pattern. This is useful for excluding "
-"servers inside a firewall from proxy use, while defaulting to a common proxy "
-"for external domains."
+"servers inside a firewall from proxy use, while defaulting to a common proxy"
+" for external domains."
msgstr ""
#. type: Labeled list
#: en/config.txt:523
#, no-wrap
msgid "core.sshCommand"
-msgstr ""
+msgstr "core.sshCommand"
#. type: Plain text
#: en/config.txt:529
@@ -3403,29 +3107,29 @@ msgstr ""
#: en/config.txt:530
#, no-wrap
msgid "core.ignoreStat"
-msgstr ""
+msgstr "core.ignoreStat"
#. type: Plain text
#: en/config.txt:534
msgid ""
"If true, Git will avoid using lstat() calls to detect if files have changed "
-"by setting the \"assume-unchanged\" bit for those tracked files which it has "
-"updated identically in both the index and working tree."
+"by setting the \"assume-unchanged\" bit for those tracked files which it has"
+" updated identically in both the index and working tree."
msgstr ""
#. type: Plain text
#: en/config.txt:539
msgid ""
"When files are modified outside of Git, the user will need to stage the "
-"modified files explicitly (e.g. see 'Examples' section in linkgit:git-update-"
-"index[1]). Git will not normally detect changes to those files."
+"modified files explicitly (e.g. see 'Examples' section in linkgit:git-"
+"update-index[1]). Git will not normally detect changes to those files."
msgstr ""
#. type: Plain text
#: en/config.txt:542
msgid ""
-"This is useful on systems where lstat() calls are very slow, such as CIFS/"
-"Microsoft Windows."
+"This is useful on systems where lstat() calls are very slow, such as "
+"CIFS/Microsoft Windows."
msgstr ""
#. type: Plain text
@@ -3437,7 +3141,7 @@ msgstr ""
#: en/config.txt:545
#, no-wrap
msgid "core.preferSymlinkRefs"
-msgstr ""
+msgstr "core.preferSymlinkRefs"
#. type: Plain text
#: en/config.txt:550
@@ -3451,24 +3155,24 @@ msgstr ""
#: en/config.txt:551
#, no-wrap
msgid "core.bare"
-msgstr ""
+msgstr "core.bare"
#. type: Plain text
#: en/config.txt:556
msgid ""
-"If true this repository is assumed to be 'bare' and has no working directory "
-"associated with it. If this is the case a number of commands that require a "
-"working directory will be disabled, such as linkgit:git-add[1] or linkgit:"
-"git-merge[1]."
+"If true this repository is assumed to be 'bare' and has no working directory"
+" associated with it. If this is the case a number of commands that require "
+"a working directory will be disabled, such as linkgit:git-add[1] or "
+"linkgit:git-merge[1]."
msgstr ""
#. type: Plain text
#: en/config.txt:561
msgid ""
-"This setting is automatically guessed by linkgit:git-clone[1] or linkgit:git-"
-"init[1] when the repository was created. By default a repository that ends "
-"in \"/.git\" is assumed to be not bare (bare = false), while all other "
-"repositories are assumed to be bare (bare"
+"This setting is automatically guessed by linkgit:git-clone[1] or "
+"linkgit:git-init[1] when the repository was created. By default a "
+"repository that ends in \"/.git\" is assumed to be not bare (bare = false), "
+"while all other repositories are assumed to be bare (bare"
msgstr ""
#. type: Title =
@@ -3481,7 +3185,7 @@ msgstr ""
#: en/config.txt:563
#, no-wrap
msgid "core.worktree"
-msgstr ""
+msgstr "core.worktree"
#. type: Plain text
#: en/config.txt:576
@@ -3490,8 +3194,8 @@ msgid ""
"environment variable is set, core.worktree is ignored and not used for "
"determining the root of working tree. This can be overridden by the "
"`GIT_WORK_TREE` environment variable and the `--work-tree` command-line "
-"option. The value can be an absolute path or relative to the path to the ."
-"git directory, which is either specified by --git-dir or GIT_DIR, or "
+"option. The value can be an absolute path or relative to the path to the "
+".git directory, which is either specified by --git-dir or GIT_DIR, or "
"automatically discovered. If --git-dir or GIT_DIR is specified but none of "
"--work-tree, GIT_WORK_TREE and core.worktree is specified, the current "
"working directory is regarded as the top level of your working tree."
@@ -3501,32 +3205,32 @@ msgstr ""
#: en/config.txt:586
msgid ""
"Note that this variable is honored even when set in a configuration file in "
-"a \".git\" subdirectory of a directory and its value differs from the latter "
-"directory (e.g. \"/path/to/.git/config\" has core.worktree set to \"/"
-"different/path\"), which is most likely a misconfiguration. Running Git "
-"commands in the \"/path/to\" directory will still use \"/different/path\" as "
-"the root of the work tree and can cause confusion unless you know what you "
-"are doing (e.g. you are creating a read-only snapshot of the same index to a "
-"location different from the repository's usual working tree)."
+"a \".git\" subdirectory of a directory and its value differs from the latter"
+" directory (e.g. \"/path/to/.git/config\" has core.worktree set to "
+"\"/different/path\"), which is most likely a misconfiguration. Running Git "
+"commands in the \"/path/to\" directory will still use \"/different/path\" as"
+" the root of the work tree and can cause confusion unless you know what you "
+"are doing (e.g. you are creating a read-only snapshot of the same index to a"
+" location different from the repository's usual working tree)."
msgstr ""
#. type: Labeled list
#: en/config.txt:587
#, no-wrap
msgid "core.logAllRefUpdates"
-msgstr ""
+msgstr "core.logAllRefUpdates"
#. type: Plain text
#: en/config.txt:598
msgid ""
-"Enable the reflog. Updates to a ref <ref> is logged to the file \"`$GIT_DIR/"
-"logs/<ref>`\", by appending the new and old SHA-1, the date/time and the "
-"reason of the update, but only when the file exists. If this configuration "
-"variable is set to `true`, missing \"`$GIT_DIR/logs/<ref>`\" file is "
-"automatically created for branch heads (i.e. under `refs/heads/`), remote "
-"refs (i.e. under `refs/remotes/`), note refs (i.e. under `refs/notes/`), and "
-"the symbolic ref `HEAD`. If it is set to `always`, then a missing reflog is "
-"automatically created for any ref under `refs/`."
+"Enable the reflog. Updates to a ref <ref> is logged to the file "
+"\"`$GIT_DIR/logs/<ref>`\", by appending the new and old SHA-1, the date/time"
+" and the reason of the update, but only when the file exists. If this "
+"configuration variable is set to `true`, missing \"`$GIT_DIR/logs/<ref>`\" "
+"file is automatically created for branch heads (i.e. under `refs/heads/`), "
+"remote refs (i.e. under `refs/remotes/`), note refs (i.e. under "
+"`refs/notes/`), and the symbolic ref `HEAD`. If it is set to `always`, then"
+" a missing reflog is automatically created for any ref under `refs/`."
msgstr ""
#. type: Plain text
@@ -3547,29 +3251,29 @@ msgstr ""
#: en/config.txt:606
#, no-wrap
msgid "core.repositoryFormatVersion"
-msgstr ""
+msgstr "core.repositoryFormatVersion"
#. type: Plain text
#: en/config.txt:609
-msgid "Internal variable identifying the repository format and layout version."
+msgid ""
+"Internal variable identifying the repository format and layout version."
msgstr ""
#. type: Labeled list
#: en/config.txt:610
-#, fuzzy, no-wrap
-#| msgid "<repository>"
+#, no-wrap
msgid "core.sharedRepository"
-msgstr "<repository>"
+msgstr "core.sharedRepository"
#. type: Plain text
#: en/config.txt:624
msgid ""
"When 'group' (or 'true'), the repository is made shareable between several "
-"users in a group (making sure all the files and objects are group-writable). "
-"When 'all' (or 'world' or 'everybody'), the repository will be readable by "
-"all users, additionally to being group-shareable. When 'umask' (or 'false'), "
-"Git will use permissions reported by umask(2). When '0xxx', where '0xxx' is "
-"an octal number, files in the repository will have this mode value. '0xxx' "
+"users in a group (making sure all the files and objects are group-writable)."
+" When 'all' (or 'world' or 'everybody'), the repository will be readable by "
+"all users, additionally to being group-shareable. When 'umask' (or 'false'),"
+" Git will use permissions reported by umask(2). When '0xxx', where '0xxx' is"
+" an octal number, files in the repository will have this mode value. '0xxx' "
"will override user's umask value (whereas the other options will only "
"override requested parts of the user's umask value). Examples: '0660' will "
"make the repo read/write-able for the owner and group, but inaccessible to "
@@ -3582,7 +3286,7 @@ msgstr ""
#: en/config.txt:625
#, no-wrap
msgid "core.warnAmbiguousRefs"
-msgstr ""
+msgstr "core.warnAmbiguousRefs"
#. type: Plain text
#: en/config.txt:628
@@ -3595,7 +3299,7 @@ msgstr ""
#: en/config.txt:629
#, no-wrap
msgid "core.compression"
-msgstr ""
+msgstr "core.compression"
#. type: Plain text
#: en/config.txt:635
@@ -3610,22 +3314,22 @@ msgstr ""
#: en/config.txt:636
#, no-wrap
msgid "core.looseCompression"
-msgstr ""
+msgstr "core.looseCompression"
#. type: Plain text
#: en/config.txt:642
msgid ""
"An integer -1..9, indicating the compression level for objects that are not "
-"in a pack file. -1 is the zlib default. 0 means no compression, and 1..9 are "
-"various speed/size tradeoffs, 9 being slowest. If not set, defaults to core."
-"compression. If that is not set, defaults to 1 (best speed)."
+"in a pack file. -1 is the zlib default. 0 means no compression, and 1..9 are"
+" various speed/size tradeoffs, 9 being slowest. If not set, defaults to "
+"core.compression. If that is not set, defaults to 1 (best speed)."
msgstr ""
#. type: Labeled list
#: en/config.txt:643
#, no-wrap
msgid "core.packedGitWindowSize"
-msgstr ""
+msgstr "core.packedGitWindowSize"
#. type: Plain text
#: en/config.txt:651
@@ -3655,7 +3359,7 @@ msgstr ""
#: en/config.txt:659
#, no-wrap
msgid "core.packedGitLimit"
-msgstr ""
+msgstr "core.packedGitLimit"
#. type: Plain text
#: en/config.txt:664
@@ -3678,7 +3382,7 @@ msgstr ""
#: en/config.txt:671
#, no-wrap
msgid "core.deltaBaseCacheLimit"
-msgstr ""
+msgstr "core.deltaBaseCacheLimit"
#. type: Plain text
#: en/config.txt:677
@@ -3692,23 +3396,23 @@ msgstr ""
#. type: Plain text
#: en/config.txt:681
msgid ""
-"Default is 96 MiB on all platforms. This should be reasonable for all users/"
-"operating systems, except on the largest projects. You probably do not need "
-"to adjust this value."
+"Default is 96 MiB on all platforms. This should be reasonable for all "
+"users/operating systems, except on the largest projects. You probably do "
+"not need to adjust this value."
msgstr ""
#. type: Labeled list
#: en/config.txt:684
#, no-wrap
msgid "core.bigFileThreshold"
-msgstr ""
+msgstr "core.bigFileThreshold"
#. type: Plain text
#: en/config.txt:690
msgid ""
"Files larger than this size are stored deflated, without attempting delta "
-"compression. Storing large files without delta compression avoids excessive "
-"memory usage, at the slight expense of increased disk usage. Additionally "
+"compression. Storing large files without delta compression avoids excessive"
+" memory usage, at the slight expense of increased disk usage. Additionally "
"files larger than this size are always treated as binary."
msgstr ""
@@ -3724,23 +3428,23 @@ msgstr ""
#: en/config.txt:697
#, no-wrap
msgid "core.excludesFile"
-msgstr ""
+msgstr "core.excludesFile"
#. type: Plain text
#: en/config.txt:704
msgid ""
"Specifies the pathname to the file that contains patterns to describe paths "
"that are not meant to be tracked, in addition to '.gitignore' (per-"
-"directory) and '.git/info/exclude'. Defaults to `$XDG_CONFIG_HOME/git/"
-"ignore`. If `$XDG_CONFIG_HOME` is either not set or empty, `$HOME/.config/"
-"git/ignore` is used instead. See linkgit:gitignore[5]."
+"directory) and '.git/info/exclude'. Defaults to "
+"`$XDG_CONFIG_HOME/git/ignore`. If `$XDG_CONFIG_HOME` is either not set or "
+"empty, `$HOME/.config/git/ignore` is used instead. See linkgit:gitignore[5]."
msgstr ""
#. type: Labeled list
#: en/config.txt:705
#, no-wrap
msgid "core.askPass"
-msgstr ""
+msgstr "core.askPass"
#. type: Plain text
#: en/config.txt:713
@@ -3758,14 +3462,14 @@ msgstr ""
#: en/config.txt:714
#, no-wrap
msgid "core.attributesFile"
-msgstr ""
+msgstr "core.attributesFile"
#. type: Plain text
#: en/config.txt:721
msgid ""
"In addition to '.gitattributes' (per-directory) and '.git/info/attributes', "
-"Git looks into this file for attributes (see linkgit:gitattributes[5]). Path "
-"expansions are made the same way as for `core.excludesFile`. Its default "
+"Git looks into this file for attributes (see linkgit:gitattributes[5]). Path"
+" expansions are made the same way as for `core.excludesFile`. Its default "
"value is `$XDG_CONFIG_HOME/git/attributes`. If `$XDG_CONFIG_HOME` is either "
"not set or empty, `$HOME/.config/git/attributes` is used instead."
msgstr ""
@@ -3774,7 +3478,7 @@ msgstr ""
#: en/config.txt:722
#, no-wrap
msgid "core.hooksPath"
-msgstr ""
+msgstr "core.hooksPath"
#. type: Plain text
#: en/config.txt:728
@@ -3796,23 +3500,23 @@ msgstr ""
#. type: Plain text
#: en/config.txt:738
msgid ""
-"This configuration variable is useful in cases where you'd like to centrally "
-"configure your Git hooks instead of configuring them on a per-repository "
-"basis, or as a more flexible and centralized alternative to having an `init."
-"templateDir` where you've changed default hooks."
+"This configuration variable is useful in cases where you'd like to centrally"
+" configure your Git hooks instead of configuring them on a per-repository "
+"basis, or as a more flexible and centralized alternative to having an "
+"`init.templateDir` where you've changed default hooks."
msgstr ""
#. type: Labeled list
#: en/config.txt:739
#, no-wrap
msgid "core.editor"
-msgstr ""
+msgstr "core.editor"
#. type: Plain text
#: en/config.txt:744
msgid ""
-"Commands such as `commit` and `tag` that lets you edit messages by launching "
-"an editor uses the value of this variable when it is set, and the "
+"Commands such as `commit` and `tag` that lets you edit messages by launching"
+" an editor uses the value of this variable when it is set, and the "
"environment variable `GIT_EDITOR` is not set. See linkgit:git-var[1]."
msgstr ""
@@ -3820,7 +3524,7 @@ msgstr ""
#: en/config.txt:745
#, no-wrap
msgid "core.commentChar"
-msgstr ""
+msgstr "core.commentChar"
#. type: Plain text
#: en/config.txt:750
@@ -3841,7 +3545,7 @@ msgstr ""
#: en/config.txt:754
#, no-wrap
msgid "core.packedRefsTimeout"
-msgstr ""
+msgstr "core.packedRefsTimeout"
#. type: Plain text
#: en/config.txt:759
@@ -3860,17 +3564,17 @@ msgstr ""
#. type: Plain text
#: en/config.txt:765
msgid ""
-"Text editor used by `git rebase -i` for editing the rebase instruction "
-"file. The value is meant to be interpreted by the shell when it is used. "
-"It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable. "
-"When not configured the default commit message editor is used instead."
+"Text editor used by `git rebase -i` for editing the rebase instruction file."
+" The value is meant to be interpreted by the shell when it is used. It can"
+" be overridden by the `GIT_SEQUENCE_EDITOR` environment variable. When not "
+"configured the default commit message editor is used instead."
msgstr ""
#. type: Labeled list
#: en/config.txt:766
#, no-wrap
msgid "core.pager"
-msgstr ""
+msgstr "core.pager"
#. type: Plain text
#: en/config.txt:772 en/git-var.txt:58
@@ -3894,15 +3598,15 @@ msgid ""
"`less -+F` will deactivate the `F` option specified by the environment from "
"the command-line, deactivating the \"quit if one screen\" behavior of "
"`less`. One can specifically activate some flags for particular commands: "
-"for example, setting `pager.blame` to `less -S` enables line truncation only "
-"for `git blame`."
+"for example, setting `pager.blame` to `less -S` enables line truncation only"
+" for `git blame`."
msgstr ""
#. type: Plain text
#: en/config.txt:790
msgid ""
-"Likewise, when the `LV` environment variable is unset, Git sets it to `-c`. "
-"You can override this setting by exporting `LV` with another value or "
+"Likewise, when the `LV` environment variable is unset, Git sets it to `-c`."
+" You can override this setting by exporting `LV` with another value or "
"setting `core.pager` to `lv +c`."
msgstr ""
@@ -3910,14 +3614,14 @@ msgstr ""
#: en/config.txt:791
#, no-wrap
msgid "core.whitespace"
-msgstr ""
+msgstr "core.whitespace"
#. type: Plain text
#: en/config.txt:797
msgid ""
"A comma separated list of common whitespace problems to notice. 'git diff' "
-"will use `color.diff.whitespace` to highlight them, and 'git apply --"
-"whitespace=error' will consider them as errors. You can prefix `-` to "
+"will use `color.diff.whitespace` to highlight them, and 'git apply "
+"--whitespace=error' will consider them as errors. You can prefix `-` to "
"disable any of them (e.g. `-trailing-space`):"
msgstr ""
@@ -3968,8 +3672,8 @@ msgstr ""
#: en/config.txt:816
msgid ""
"`cr-at-eol` treats a carriage-return at the end of line as part of the line "
-"terminator, i.e. with it, `trailing-space` does not trigger if the character "
-"before such a carriage-return is not a whitespace (not enabled by default)."
+"terminator, i.e. with it, `trailing-space` does not trigger if the character"
+" before such a carriage-return is not a whitespace (not enabled by default)."
msgstr ""
#. type: Plain text
@@ -3984,7 +3688,7 @@ msgstr ""
#: en/config.txt:820
#, no-wrap
msgid "core.fsyncObjectFiles"
-msgstr ""
+msgstr "core.fsyncObjectFiles"
#. type: Plain text
#: en/config.txt:822
@@ -3996,15 +3700,15 @@ msgstr ""
msgid ""
"This is a total waste of time and effort on a filesystem that orders data "
"writes properly, but can be useful for filesystems that do not use "
-"journalling (traditional UNIX filesystems) or that only journal metadata and "
-"not file contents (OS X's HFS+, or Linux ext3 with \"data=writeback\")."
+"journalling (traditional UNIX filesystems) or that only journal metadata and"
+" not file contents (OS X's HFS+, or Linux ext3 with \"data=writeback\")."
msgstr ""
#. type: Labeled list
#: en/config.txt:828
#, no-wrap
msgid "core.preloadIndex"
-msgstr ""
+msgstr "core.preloadIndex"
#. type: Plain text
#: en/config.txt:830
@@ -4024,13 +3728,13 @@ msgstr ""
#: en/config.txt:837
#, no-wrap
msgid "core.createObject"
-msgstr ""
+msgstr "core.createObject"
#. type: Plain text
#: en/config.txt:841
msgid ""
-"You can set this to 'link', in which case a hardlink followed by a delete of "
-"the source are used to make sure that object creation will not overwrite "
+"You can set this to 'link', in which case a hardlink followed by a delete of"
+" the source are used to make sure that object creation will not overwrite "
"existing objects."
msgstr ""
@@ -4046,7 +3750,7 @@ msgstr ""
#: en/config.txt:846 en/git-notes.txt:313
#, no-wrap
msgid "core.notesRef"
-msgstr ""
+msgstr "core.notesRef"
#. type: Plain text
#: en/config.txt:851
@@ -4059,15 +3763,15 @@ msgstr ""
#. type: Plain text
#: en/config.txt:854
msgid ""
-"This setting defaults to \"refs/notes/commits\", and it can be overridden by "
-"the `GIT_NOTES_REF` environment variable. See linkgit:git-notes[1]."
+"This setting defaults to \"refs/notes/commits\", and it can be overridden by"
+" the `GIT_NOTES_REF` environment variable. See linkgit:git-notes[1]."
msgstr ""
#. type: Labeled list
#: en/config.txt:855
#, no-wrap
msgid "core.sparseCheckout"
-msgstr ""
+msgstr "core.sparseCheckout"
#. type: Plain text
#: en/config.txt:858
@@ -4078,10 +3782,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:859
-#, fuzzy, no-wrap
-#| msgid "--no-abbrev"
+#, no-wrap
msgid "core.abbrev"
-msgstr "--no-abbrev"
+msgstr "core.abbrev"
#. type: Plain text
#: en/config.txt:865
@@ -4108,10 +3811,10 @@ msgstr ""
#. type: Plain text
#: en/config.txt:873
msgid ""
-"Tells 'git add' to continue adding files when some files cannot be added due "
-"to indexing errors. Equivalent to the `--ignore-errors` option of linkgit:"
-"git-add[1]. `add.ignore-errors` is deprecated, as it does not follow the "
-"usual naming convention for configuration variables."
+"Tells 'git add' to continue adding files when some files cannot be added due"
+" to indexing errors. Equivalent to the `--ignore-errors` option of "
+"linkgit:git-add[1]. `add.ignore-errors` is deprecated, as it does not "
+"follow the usual naming convention for configuration variables."
msgstr ""
#. type: Labeled list
@@ -4127,18 +3830,18 @@ msgid ""
"defining \"alias.last = cat-file commit HEAD\", the invocation \"git last\" "
"is equivalent to \"git cat-file commit HEAD\". To avoid confusion and "
"troubles with script usage, aliases that hide existing Git commands are "
-"ignored. Arguments are split by spaces, the usual shell quoting and escaping "
-"is supported. A quote pair or a backslash can be used to quote them."
+"ignored. Arguments are split by spaces, the usual shell quoting and escaping"
+" is supported. A quote pair or a backslash can be used to quote them."
msgstr ""
#. type: Plain text
#: en/config.txt:892
msgid ""
"If the alias expansion is prefixed with an exclamation point, it will be "
-"treated as a shell command. For example, defining \"alias.new = !gitk --all "
-"--not ORIG_HEAD\", the invocation \"git new\" is equivalent to running the "
-"shell command \"gitk --all --not ORIG_HEAD\". Note that shell commands will "
-"be executed from the top-level directory of a repository, which may not "
+"treated as a shell command. For example, defining \"alias.new = !gitk --all"
+" --not ORIG_HEAD\", the invocation \"git new\" is equivalent to running the "
+"shell command \"gitk --all --not ORIG_HEAD\". Note that shell commands will"
+" be executed from the top-level directory of a repository, which may not "
"necessarily be the current directory. `GIT_PREFIX` is set as returned by "
"running 'git rev-parse --show-prefix' from the original current directory. "
"See linkgit:git-rev-parse[1]."
@@ -4154,9 +3857,9 @@ msgstr ""
#: en/config.txt:899
msgid ""
"If true, git-am will call git-mailsplit for patches in mbox format with "
-"parameter `--keep-cr`. In this case git-mailsplit will not remove `\\r` from "
-"lines ending with `\\r\\n`. Can be overridden by giving `--no-keep-cr` from "
-"the command line. See linkgit:git-am[1], linkgit:git-mailsplit[1]."
+"parameter `--keep-cr`. In this case git-mailsplit will not remove `\\r` from"
+" lines ending with `\\r\\n`. Can be overridden by giving `--no-keep-cr` from"
+" the command line. See linkgit:git-am[1], linkgit:git-mailsplit[1]."
msgstr ""
#. type: Labeled list
@@ -4168,11 +3871,11 @@ msgstr ""
#. type: Plain text
#: en/config.txt:907
msgid ""
-"By default, `git am` will fail if the patch does not apply cleanly. When set "
-"to true, this setting tells `git am` to fall back on 3-way merge if the "
+"By default, `git am` will fail if the patch does not apply cleanly. When set"
+" to true, this setting tells `git am` to fall back on 3-way merge if the "
"patch records the identity of blobs it is supposed to apply to and we have "
-"those blobs available locally (equivalent to giving the `--3way` option from "
-"the command line). Defaults to `false`. See linkgit:git-am[1]."
+"those blobs available locally (equivalent to giving the `--3way` option from"
+" the command line). Defaults to `false`. See linkgit:git-am[1]."
msgstr ""
#. type: Labeled list
@@ -4185,9 +3888,9 @@ msgstr ""
#: en/config.txt:915
msgid ""
"When set to 'change', tells 'git apply' to ignore changes in whitespace, in "
-"the same way as the `--ignore-space-change` option. When set to one of: no, "
-"none, never, false tells 'git apply' to respect all whitespace differences. "
-"See linkgit:git-apply[1]."
+"the same way as the `--ignore-space-change` option. When set to one of: no,"
+" none, never, false tells 'git apply' to respect all whitespace differences."
+" See linkgit:git-apply[1]."
msgstr ""
#. type: Labeled list
@@ -4199,24 +3902,24 @@ msgstr ""
#. type: Plain text
#: en/config.txt:919
msgid ""
-"Tells 'git apply' how to handle whitespaces, in the same way as the `--"
-"whitespace` option. See linkgit:git-apply[1]."
+"Tells 'git apply' how to handle whitespaces, in the same way as the "
+"`--whitespace` option. See linkgit:git-apply[1]."
msgstr ""
#. type: Labeled list
#: en/config.txt:920
#, no-wrap
msgid "branch.autoSetupMerge"
-msgstr ""
+msgstr "branch.autoSetupMerge"
#. type: Plain text
#: en/config.txt:931
msgid ""
-"Tells 'git branch' and 'git checkout' to set up new branches so that linkgit:"
-"git-pull[1] will appropriately merge from the starting point branch. Note "
-"that even if this option is not set, this behavior can be chosen per-branch "
-"using the `--track` and `--no-track` options. The valid settings are: "
-"`false` -- no automatic setup is done; `true` -- automatic setup is done "
+"Tells 'git branch' and 'git checkout' to set up new branches so that "
+"linkgit:git-pull[1] will appropriately merge from the starting point branch."
+" Note that even if this option is not set, this behavior can be chosen per-"
+"branch using the `--track` and `--no-track` options. The valid settings are:"
+" `false` -- no automatic setup is done; `true` -- automatic setup is done "
"when the starting point is a remote-tracking branch; `always` -- automatic "
"setup is done when the starting point is either a local branch or remote-"
"tracking branch. This option defaults to true."
@@ -4226,18 +3929,18 @@ msgstr ""
#: en/config.txt:932
#, no-wrap
msgid "branch.autoSetupRebase"
-msgstr ""
+msgstr "branch.autoSetupRebase"
#. type: Plain text
#: en/config.txt:946
msgid ""
-"When a new branch is created with 'git branch' or 'git checkout' that tracks "
-"another branch, this variable tells Git to set up pull to rebase instead of "
-"merge (see \"branch.<name>.rebase\"). When `never`, rebase is never "
+"When a new branch is created with 'git branch' or 'git checkout' that tracks"
+" another branch, this variable tells Git to set up pull to rebase instead of"
+" merge (see \"branch.<name>.rebase\"). When `never`, rebase is never "
"automatically set to true. When `local`, rebase is set to true for tracked "
"branches of other local branches. When `remote`, rebase is set to true for "
-"tracked branches of remote-tracking branches. When `always`, rebase will be "
-"set to true for all tracking branches. See \"branch.autoSetupMerge\" for "
+"tracked branches of remote-tracking branches. When `always`, rebase will be"
+" set to true for all tracking branches. See \"branch.autoSetupMerge\" for "
"details on how to set up a branch to track another branch. This option "
"defaults to never."
msgstr ""
@@ -4253,13 +3956,13 @@ msgstr "<branchname>"
#: en/config.txt:957
msgid ""
"When on branch <name>, it tells 'git fetch' and 'git push' which remote to "
-"fetch from/push to. The remote to push to may be overridden with `remote."
-"pushDefault` (for all branches). The remote to push to, for the current "
-"branch, may be further overridden by `branch.<name>.pushRemote`. If no "
-"remote is configured, or if you are not on any branch, it defaults to "
-"`origin` for fetching and `remote.pushDefault` for pushing. Additionally, `."
-"` (a period) is the current local repository (a dot-repository), see `branch."
-"<name>.merge`'s final note below."
+"fetch from/push to. The remote to push to may be overridden with "
+"`remote.pushDefault` (for all branches). The remote to push to, for the "
+"current branch, may be further overridden by `branch.<name>.pushRemote`. If"
+" no remote is configured, or if you are not on any branch, it defaults to "
+"`origin` for fetching and `remote.pushDefault` for pushing. Additionally, "
+"`.` (a period) is the current local repository (a dot-repository), see "
+"`branch.<name>.merge`'s final note below."
msgstr ""
#. type: Labeled list
@@ -4274,9 +3977,9 @@ msgstr "<branchname>"
msgid ""
"When on branch <name>, it overrides `branch.<name>.remote` for pushing. It "
"also overrides `remote.pushDefault` for pushing from branch <name>. When "
-"you pull from one place (e.g. your upstream) and push to another place (e.g. "
-"your own publishing repository), you would want to set `remote.pushDefault` "
-"to specify the remote to push to for all branches, and use this option to "
+"you pull from one place (e.g. your upstream) and push to another place (e.g."
+" your own publishing repository), you would want to set `remote.pushDefault`"
+" to specify the remote to push to for all branches, and use this option to "
"override it for a specific branch."
msgstr ""
@@ -4293,16 +3996,16 @@ msgid ""
"Defines, together with branch.<name>.remote, the upstream branch for the "
"given branch. It tells 'git fetch'/'git pull'/'git rebase' which branch to "
"merge and can also affect 'git push' (see push.default). When in branch "
-"<name>, it tells 'git fetch' the default refspec to be marked for merging in "
-"FETCH_HEAD. The value is handled like the remote part of a refspec, and must "
-"match a ref which is fetched from the remote given by \"branch.<name>.remote"
-"\". The merge information is used by 'git pull' (which at first calls 'git "
-"fetch') to lookup the default branch for merging. Without this option, 'git "
-"pull' defaults to merge the first refspec fetched. Specify multiple values "
-"to get an octopus merge. If you wish to setup 'git pull' so that it merges "
-"into <name> from another branch in the local repository, you can point "
-"branch.<name>.merge to the desired branch, and use the relative path setting "
-"`.` (a period) for branch.<name>.remote."
+"<name>, it tells 'git fetch' the default refspec to be marked for merging in"
+" FETCH_HEAD. The value is handled like the remote part of a refspec, and "
+"must match a ref which is fetched from the remote given by "
+"\"branch.<name>.remote\". The merge information is used by 'git pull' "
+"(which at first calls 'git fetch') to lookup the default branch for merging."
+" Without this option, 'git pull' defaults to merge the first refspec "
+"fetched. Specify multiple values to get an octopus merge. If you wish to "
+"setup 'git pull' so that it merges into <name> from another branch in the "
+"local repository, you can point branch.<name>.merge to the desired branch, "
+"and use the relative path setting `.` (a period) for branch.<name>.remote."
msgstr ""
#. type: Labeled list
@@ -4329,9 +4032,9 @@ msgstr "<branchname>"
#. type: Plain text
#: en/config.txt:996
msgid ""
-"When true, rebase the branch <name> on top of the fetched branch, instead of "
-"merging the default branch from the default remote when \"git pull\" is run. "
-"See \"pull.rebase\" for doing this in a non branch-specific manner."
+"When true, rebase the branch <name> on top of the fetched branch, instead of"
+" merging the default branch from the default remote when \"git pull\" is "
+"run. See \"pull.rebase\" for doing this in a non branch-specific manner."
msgstr ""
#. type: Plain text
@@ -4343,7 +4046,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1002 en/config.txt:2489
-msgid "When the value is `interactive`, the rebase is run in interactive mode."
+msgid ""
+"When the value is `interactive`, the rebase is run in interactive mode."
msgstr ""
#. type: Plain text
@@ -4422,8 +4126,8 @@ msgstr "<oldbranch>"
#: en/config.txt:1033
msgid ""
"A boolean to enable/disable color in the output of linkgit:git-branch[1]. "
-"May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which "
-"case colors are used only when the output is to a terminal. If unset, then "
+"May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which"
+" case colors are used only when the output is to a terminal. If unset, then "
"the value of `color.ui` is used (`auto` by default)."
msgstr ""
@@ -4462,9 +4166,9 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1053
msgid ""
-"This does not affect linkgit:git-format-patch[1] or the 'git-diff-"
-"{asterisk}' plumbing commands. Can be overridden on the command line with "
-"the `--color[=<when>]` option."
+"This does not affect linkgit:git-format-patch[1] or the 'git-"
+"diff-{asterisk}' plumbing commands. Can be overridden on the command line "
+"with the `--color[=<when>]` option."
msgstr ""
#. type: Labeled list
@@ -4638,9 +4342,9 @@ msgstr "--interactive"
#. type: Plain text
#: en/config.txt:1107
msgid ""
-"When set to `always`, always use colors for interactive prompts and displays "
-"(such as those used by \"git-add --interactive\" and \"git-clean --"
-"interactive\"). When false (or `never`), never. When set to `true` or "
+"When set to `always`, always use colors for interactive prompts and displays"
+" (such as those used by \"git-add --interactive\" and \"git-clean "
+"--interactive\"). When false (or `never`), never. When set to `true` or "
"`auto`, use colors only when the output is to the terminal. If unset, then "
"the value of `color.ui` is used (`auto` by default)."
msgstr ""
@@ -4654,9 +4358,9 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1113
msgid ""
-"Use customized color for 'git add --interactive' and 'git clean --"
-"interactive' output. `<slot>` may be `prompt`, `header`, `help` or `error`, "
-"for four distinct types of normal output from interactive commands."
+"Use customized color for 'git add --interactive' and 'git clean "
+"--interactive' output. `<slot>` may be `prompt`, `header`, `help` or "
+"`error`, for four distinct types of normal output from interactive commands."
msgstr ""
#. type: Labeled list
@@ -4668,8 +4372,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1117
msgid ""
-"A boolean to enable/disable colored output when the pager is in use (default "
-"is true)."
+"A boolean to enable/disable colored output when the pager is in use (default"
+" is true)."
msgstr ""
#. type: Labeled list
@@ -4684,7 +4388,8 @@ msgid ""
"A boolean to enable/disable color in the output of linkgit:git-show-"
"branch[1]. May be set to `always`, `false` (or `never`) or `auto` (or "
"`true`), in which case colors are used only when the output is to a "
-"terminal. If unset, then the value of `color.ui` is used (`auto` by default)."
+"terminal. If unset, then the value of `color.ui` is used (`auto` by "
+"default)."
msgstr ""
#. type: Labeled list
@@ -4698,8 +4403,8 @@ msgstr "status"
#: en/config.txt:1131
msgid ""
"A boolean to enable/disable color in the output of linkgit:git-status[1]. "
-"May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which "
-"case colors are used only when the output is to a terminal. If unset, then "
+"May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which"
+" case colors are used only when the output is to a terminal. If unset, then "
"the value of `color.ui` is used (`auto` by default)."
msgstr ""
@@ -4716,8 +4421,8 @@ msgid ""
"(the header text of the status message), `added` or `updated` (files which "
"are added but not committed), `changed` (files which are changed but not "
"added in the index), `untracked` (files which are not tracked by Git), "
-"`branch` (the current branch), `nobranch` (the color the 'no branch' warning "
-"is shown in, defaulting to red), or `unmerged` (files which have unmerged "
+"`branch` (the current branch), `nobranch` (the color the 'no branch' warning"
+" is shown in, defaulting to red), or `unmerged` (files which have unmerged "
"changes)."
msgstr ""
@@ -4731,13 +4436,13 @@ msgstr "--color"
#. type: Plain text
#: en/config.txt:1154
msgid ""
-"This variable determines the default value for variables such as `color."
-"diff` and `color.grep` that control the use of color per command family. Its "
-"scope will expand as more commands learn configuration to set a default for "
-"the `--color` option. Set it to `false` or `never` if you prefer Git "
-"commands not to use color unless enabled explicitly with some other "
-"configuration or the `--color` option. Set it to `always` if you want all "
-"output not intended for machine consumption to use color, to `true` or "
+"This variable determines the default value for variables such as "
+"`color.diff` and `color.grep` that control the use of color per command "
+"family. Its scope will expand as more commands learn configuration to set a "
+"default for the `--color` option. Set it to `false` or `never` if you "
+"prefer Git commands not to use color unless enabled explicitly with some "
+"other configuration or the `--color` option. Set it to `always` if you want "
+"all output not intended for machine consumption to use color, to `true` or "
"`auto` (this is the default since Git 1.8.4) if you want such output to use "
"color when written to the terminal."
msgstr ""
@@ -4915,8 +4620,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1210
msgid ""
-"Specify whether to output tag listing in `git tag` in columns. See `column."
-"ui` for details."
+"Specify whether to output tag listing in `git tag` in columns. See "
+"`column.ui` for details."
msgstr ""
#. type: Labeled list
@@ -4931,9 +4636,9 @@ msgid ""
"This setting overrides the default of the `--cleanup` option in `git "
"commit`. See linkgit:git-commit[1] for details. Changing the default can be "
"useful when you always want to keep lines that begin with comment character "
-"`#` in your log message, in which case you would do `git config commit."
-"cleanup whitespace` (note that you will have to remove the help lines that "
-"begin with `#` in the commit log template yourself, if you do this)."
+"`#` in your log message, in which case you would do `git config "
+"commit.cleanup whitespace` (note that you will have to remove the help lines"
+" that begin with `#` in the commit log template yourself, if you do this)."
msgstr ""
#. type: Labeled list
@@ -5128,8 +4833,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1302
msgid ""
-"This option can be either set to a boolean value or to 'on-demand'. Setting "
-"it to a boolean changes the behavior of fetch and pull to unconditionally "
+"This option can be either set to a boolean value or to 'on-demand'. Setting"
+" it to a boolean changes the behavior of fetch and pull to unconditionally "
"recurse into submodules when set to true or to not recurse at all when set "
"to false. When set to 'on-demand' (the default value), fetch and pull will "
"only recurse into a populated submodule when its superproject retrieves a "
@@ -5146,8 +4851,8 @@ msgstr "git-fsck-objects(1)"
#. type: Plain text
#: en/config.txt:1309
msgid ""
-"If it is set to true, git-fetch-pack will check all fetched objects. It will "
-"abort in the case of a malformed object or a broken link. The result of an "
+"If it is set to true, git-fetch-pack will check all fetched objects. It will"
+" abort in the case of a malformed object or a broken link. The result of an "
"abort are only dangling objects. Defaults to false. If not set, the value "
"of `transfer.fsckObjects` is used instead."
msgstr ""
@@ -5162,12 +4867,12 @@ msgstr ""
#: en/config.txt:1320
msgid ""
"If the number of objects fetched over the Git native transfer is below this "
-"limit, then the objects will be unpacked into loose object files. However if "
-"the number of received objects equals or exceeds this limit then the "
+"limit, then the objects will be unpacked into loose object files. However if"
+" the number of received objects equals or exceeds this limit then the "
"received pack will be stored as a pack, after adding any missing delta "
"bases. Storing the pack from a push can make the push operation complete "
-"faster, especially on slow filesystems. If not set, the value of `transfer."
-"unpackLimit` is used instead."
+"faster, especially on slow filesystems. If not set, the value of "
+"`transfer.unpackLimit` is used instead."
msgstr ""
#. type: Labeled list
@@ -5221,8 +4926,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1346
msgid ""
-"Provides the default value for the `--from` option to format-patch. Accepts "
-"a boolean value, or a name and email address. If false, format-patch "
+"Provides the default value for the `--from` option to format-patch. Accepts"
+" a boolean value, or a name and email address. If false, format-patch "
"defaults to `--no-from`, using commit authors directly in the \"From:\" "
"field of patch mails. If true, format-patch defaults to `--from`, using "
"your committer identity in the \"From:\" field of patch mails and including "
@@ -5243,7 +4948,8 @@ msgid ""
"A boolean which can enable or disable sequence numbers in patch subjects. "
"It defaults to \"auto\" which enables it only if there is more than one "
"patch. It can be enabled or disabled for all messages by setting it to "
-"\"true\" or \"false\". See --numbered option in linkgit:git-format-patch[1]."
+"\"true\" or \"false\". See --numbered option in linkgit:git-format-"
+"patch[1]."
msgstr ""
#. type: Labeled list
@@ -5255,8 +4961,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1357
msgid ""
-"Additional email headers to include in a patch to be submitted by mail. See "
-"linkgit:git-format-patch[1]."
+"Additional email headers to include in a patch to be submitted by mail. See"
+" linkgit:git-format-patch[1]."
msgstr ""
#. type: Labeled list
@@ -5301,8 +5007,8 @@ msgstr ""
#: en/config.txt:1373
msgid ""
"The default for format-patch is to output a signature containing the Git "
-"version number. Use this variable to change that default. Set this variable "
-"to the empty string (\"\") to suppress signature generation."
+"version number. Use this variable to change that default. Set this variable"
+" to the empty string (\"\") to suppress signature generation."
msgstr ""
#. type: Labeled list
@@ -5328,8 +5034,8 @@ msgstr ""
#: en/config.txt:1382
msgid ""
"The default for format-patch is to output files with the suffix `.patch`. "
-"Use this variable to change that suffix (make sure to include the dot if you "
-"want it)."
+"Use this variable to change that suffix (make sure to include the dot if you"
+" want it)."
msgstr ""
#. type: Labeled list
@@ -5354,10 +5060,10 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1397
msgid ""
-"The default threading style for 'git format-patch'. Can be a boolean value, "
-"or `shallow` or `deep`. `shallow` threading makes every mail a reply to the "
-"head of the series, where the head is chosen from the cover letter, the `--"
-"in-reply-to`, and the first patch mail, in this order. `deep` threading "
+"The default threading style for 'git format-patch'. Can be a boolean value,"
+" or `shallow` or `deep`. `shallow` threading makes every mail a reply to "
+"the head of the series, where the head is chosen from the cover letter, the "
+"`--in-reply-to`, and the first patch mail, in this order. `deep` threading "
"makes every mail a reply to the previous one. A true boolean value is the "
"same as `shallow`, and a false value disables threading."
msgstr ""
@@ -5387,8 +5093,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1409
msgid ""
-"A boolean that controls whether to generate a cover-letter when format-patch "
-"is invoked, but in addition can be set to \"auto\", to generate a cover-"
+"A boolean that controls whether to generate a cover-letter when format-patch"
+" is invoked, but in addition can be set to \"auto\", to generate a cover-"
"letter only when there's more than one patch."
msgstr ""
@@ -5481,11 +5187,12 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1446 en/config.txt:2679
msgid ""
-"The path to a sorted list of object names (i.e. one SHA-1 per line) that are "
-"known to be broken in a non-fatal way and should be ignored. This feature is "
-"useful when an established project should be accepted despite early commits "
-"containing errors that can be safely ignored such as invalid committer email "
-"addresses. Note: corrupt objects cannot be skipped with this setting."
+"The path to a sorted list of object names (i.e. one SHA-1 per line) that are"
+" known to be broken in a non-fatal way and should be ignored. This feature "
+"is useful when an established project should be accepted despite early "
+"commits containing errors that can be safely ignored such as invalid "
+"committer email addresses. Note: corrupt objects cannot be skipped with "
+"this setting."
msgstr ""
#. type: Labeled list
@@ -5525,8 +5232,8 @@ msgstr ""
msgid ""
"When there are approximately more than this many loose objects in the "
"repository, `git gc --auto` will pack them. Some Porcelain commands use "
-"this command to perform a light-weight garbage collection from time to "
-"time. The default value is 6700. Setting this to 0 disables it."
+"this command to perform a light-weight garbage collection from time to time."
+" The default value is 6700. Setting this to 0 disables it."
msgstr ""
#. type: Labeled list
@@ -5566,8 +5273,8 @@ msgstr ""
#: en/config.txt:1479
msgid ""
"If the file gc.log exists, then `git gc --auto` won't run unless that file "
-"is more than 'gc.logExpiry' old. Default is \"1.day\". See `gc."
-"pruneExpire` for more ways to specify its value."
+"is more than 'gc.logExpiry' old. Default is \"1.day\". See "
+"`gc.pruneExpire` for more ways to specify its value."
msgstr ""
#. type: Labeled list
@@ -5615,8 +5322,9 @@ msgstr ""
msgid ""
"When 'git gc' is run, it calls 'git worktree prune --expire 3.months.ago'. "
"This config variable can be used to set a different grace period. The value "
-"\"now\" may be used to disable the grace period and prune `$GIT_DIR/"
-"worktrees` immediately, or \"never\" may be used to suppress pruning."
+"\"now\" may be used to disable the grace period and prune "
+"`$GIT_DIR/worktrees` immediately, or \"never\" may be used to suppress "
+"pruning."
msgstr ""
#. type: Labeled list
@@ -5634,8 +5342,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1513
msgid ""
-"'git reflog expire' removes reflog entries older than this time; defaults to "
-"90 days. The value \"now\" expires all entries immediately, and \"never\" "
+"'git reflog expire' removes reflog entries older than this time; defaults to"
+" 90 days. The value \"now\" expires all entries immediately, and \"never\" "
"suppresses expiration altogether. With \"<pattern>\" (e.g. \"refs/stash\") "
"in the middle the setting applies only to the refs that match the <pattern>."
msgstr ""
@@ -5671,8 +5379,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1528
msgid ""
-"Records of conflicted merge you resolved earlier are kept for this many days "
-"when 'git rerere gc' is run. The default is 60 days. See linkgit:git-"
+"Records of conflicted merge you resolved earlier are kept for this many days"
+" when 'git rerere gc' is run. The default is 60 days. See linkgit:git-"
"rerere[1]."
msgstr ""
@@ -5743,8 +5451,8 @@ msgid ""
"treat a file as text, the `-k` mode will be left blank so CVS clients will "
"treat it as text. If they suppress text conversion, the file will be set "
"with '-kb' mode, which suppresses any newline munging the client might "
-"otherwise do. If the attributes do not allow the file type to be determined, "
-"then `gitcvs.allBinary` is used. See linkgit:gitattributes[5]."
+"otherwise do. If the attributes do not allow the file type to be determined,"
+" then `gitcvs.allBinary` is used. See linkgit:gitattributes[5]."
msgstr ""
#. type: Labeled list
@@ -5756,12 +5464,12 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1566
msgid ""
-"This is used if `gitcvs.usecrlfattr` does not resolve the correct '-kb' mode "
-"to use. If true, all unresolved files are sent to the client in mode '-kb'. "
-"This causes the client to treat them as binary files, which suppresses any "
-"newline munging it otherwise might do. Alternatively, if it is set to \"guess"
-"\", then the contents of the file are examined to decide if it is binary, "
-"similar to `core.autocrlf`."
+"This is used if `gitcvs.usecrlfattr` does not resolve the correct '-kb' mode"
+" to use. If true, all unresolved files are sent to the client in mode '-kb'."
+" This causes the client to treat them as binary files, which suppresses any "
+"newline munging it otherwise might do. Alternatively, if it is set to "
+"\"guess\", then the contents of the file are examined to decide if it is "
+"binary, similar to `core.autocrlf`."
msgstr ""
#. type: Labeled list
@@ -5943,8 +5651,8 @@ msgstr ""
#: en/config.txt:1627 en/git-grep.txt:52
msgid ""
"Set the default matching behavior. Using a value of 'basic', 'extended', "
-"'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`, `--"
-"fixed-strings`, or `--perl-regexp` option accordingly, while the value "
+"'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`, "
+"`--fixed-strings`, or `--perl-regexp` option accordingly, while the value "
"'default' will return to the default matching behavior."
msgstr ""
@@ -5957,8 +5665,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1632 en/git-grep.txt:57
msgid ""
-"If set to true, enable `--extended-regexp` option by default. This option is "
-"ignored when the `grep.patternType` option is set to a value other than "
+"If set to true, enable `--extended-regexp` option by default. This option is"
+" ignored when the `grep.patternType` option is set to a value other than "
"'default'."
msgstr ""
@@ -5997,14 +5705,14 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1651
msgid ""
-"Use this custom program instead of \"`gpg`\" found on `$PATH` when making or "
-"verifying a PGP signature. The program must support the same command-line "
+"Use this custom program instead of \"`gpg`\" found on `$PATH` when making or"
+" verifying a PGP signature. The program must support the same command-line "
"interface as GPG, namely, to verify a detached signature, \"`gpg --verify "
"$file - <$signature`\" is run, and the program is expected to signal a good "
"signature by exiting with code 0, and to generate an ASCII-armored detached "
"signature, the standard input of \"`gpg -bsau $key`\" is fed with the "
-"contents to be signed, and the program is expected to send the result to its "
-"standard output."
+"contents to be signed, and the program is expected to send the result to its"
+" standard output."
msgstr ""
#. type: Labeled list
@@ -6029,8 +5737,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1659
msgid ""
-"Specifies how many context lines should be used in calls to diff made by the "
-"linkgit:git-gui[1]. The default is \"5\"."
+"Specifies how many context lines should be used in calls to diff made by the"
+" linkgit:git-gui[1]. The default is \"5\"."
msgstr ""
#. type: Labeled list
@@ -6042,8 +5750,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1663
msgid ""
-"Determines if linkgit:git-gui[1] shows untracked files in the file list. The "
-"default is \"true\"."
+"Determines if linkgit:git-gui[1] shows untracked files in the file list. The"
+" default is \"true\"."
msgstr ""
#. type: Labeled list
@@ -6056,9 +5764,9 @@ msgstr ""
#: en/config.txt:1671
msgid ""
"Specifies the default encoding to use for displaying of file contents in "
-"linkgit:git-gui[1] and linkgit:gitk[1]. It can be overridden by setting the "
-"'encoding' attribute for relevant files (see linkgit:gitattributes[5]). If "
-"this option is not set, the tools default to the locale encoding."
+"linkgit:git-gui[1] and linkgit:gitk[1]. It can be overridden by setting the"
+" 'encoding' attribute for relevant files (see linkgit:gitattributes[5]). If"
+" this option is not set, the tools default to the locale encoding."
msgstr ""
#. type: Labeled list
@@ -6070,8 +5778,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1676
msgid ""
-"Determines if new branches created with linkgit:git-gui[1] should default to "
-"tracking remote branches with matching names or not. Default: \"false\"."
+"Determines if new branches created with linkgit:git-gui[1] should default to"
+" tracking remote branches with matching names or not. Default: \"false\"."
msgstr ""
#. type: Labeled list
@@ -6150,8 +5858,8 @@ msgstr ""
#: en/config.txt:1703
msgid ""
"Specifies the threshold to use in 'git gui blame' original location "
-"detection, measured in alphanumeric characters. See the linkgit:git-blame[1] "
-"manual for more information on copy detection."
+"detection, measured in alphanumeric characters. See the linkgit:git-blame[1]"
+" manual for more information on copy detection."
msgstr ""
#. type: Labeled list
@@ -6179,9 +5887,9 @@ msgstr ""
#: en/config.txt:1718
msgid ""
"Specifies the shell command line to execute when the corresponding item of "
-"the linkgit:git-gui[1] `Tools` menu is invoked. This option is mandatory for "
-"every tool. The command is executed from the root of the working directory, "
-"and in the environment it receives the name of the tool as `GIT_GUITOOL`, "
+"the linkgit:git-gui[1] `Tools` menu is invoked. This option is mandatory for"
+" every tool. The command is executed from the root of the working directory,"
+" and in the environment it receives the name of the tool as `GIT_GUITOOL`, "
"the name of the currently selected file as 'FILENAME', and the name of the "
"current branch as 'CUR_BRANCH' (if the head is detached, 'CUR_BRANCH' is "
"empty)."
@@ -6245,8 +5953,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1741
msgid ""
-"Request a string argument from the user, and pass it to the tool through the "
-"`ARGS` environment variable. Since requesting an argument implies "
+"Request a string argument from the user, and pass it to the tool through the"
+" `ARGS` environment variable. Since requesting an argument implies "
"confirmation, the 'confirm' option has no effect if this is enabled. If the "
"option is set to 'true', 'yes', or '1', the dialog uses a built-in generic "
"prompt; otherwise the exact value of the variable is used."
@@ -6329,8 +6037,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1769
msgid ""
-"Override the default help format used by linkgit:git-help[1]. Values 'man', "
-"'info', 'web' and 'html' are supported. 'man' is the default. 'web' and "
+"Override the default help format used by linkgit:git-help[1]. Values 'man',"
+" 'info', 'web' and 'html' are supported. 'man' is the default. 'web' and "
"'html' are the same."
msgstr ""
@@ -6346,8 +6054,8 @@ msgid ""
"Automatically correct and execute mistyped commands after waiting for the "
"given number of deciseconds (0.1 sec). If more than one command can be "
"deduced from the entered text, nothing will be executed. If the value of "
-"this option is negative, the corrected command will be executed immediately. "
-"If the value is 0 - the command will be just shown but not executed. This "
+"this option is negative, the corrected command will be executed immediately."
+" If the value is 0 - the command will be just shown but not executed. This "
"is the default."
msgstr ""
@@ -6360,9 +6068,9 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1784
msgid ""
-"Specify the path where the HTML documentation resides. File system paths and "
-"URLs are supported. HTML pages will be prefixed with this path when help is "
-"displayed in the 'web' format. This defaults to the documentation path of "
+"Specify the path where the HTML documentation resides. File system paths and"
+" URLs are supported. HTML pages will be prefixed with this path when help is"
+" displayed in the 'web' format. This defaults to the documentation path of "
"your Git installation."
msgstr ""
@@ -6377,12 +6085,12 @@ msgstr ""
msgid ""
"Override the HTTP proxy, normally configured using the 'http_proxy', "
"'https_proxy', and 'all_proxy' environment variables (see `curl(1)`). In "
-"addition to the syntax understood by curl, it is possible to specify a proxy "
-"string with a user name but no password, in which case git will attempt to "
-"acquire one in the same way it does for other credentials. See linkgit:"
-"gitcredentials[7] for more information. The syntax thus is '[protocol://]"
-"[user[:password]@]proxyhost[:port]'. This can be overridden on a per-remote "
-"basis; see remote.<name>.proxy"
+"addition to the syntax understood by curl, it is possible to specify a proxy"
+" string with a user name but no password, in which case git will attempt to "
+"acquire one in the same way it does for other credentials. See "
+"linkgit:gitcredentials[7] for more information. The syntax thus is "
+"'[protocol://][user[:password]@]proxyhost[:port]'. This can be overridden on"
+" a per-remote basis; see remote.<name>.proxy"
msgstr ""
#. type: Labeled list
@@ -6396,8 +6104,8 @@ msgstr ""
msgid ""
"Set the method with which to authenticate against the HTTP proxy. This only "
"takes effect if the configured proxy string contains a user name part (i.e. "
-"is of the form 'user@host' or 'user@host:port'). This can be overridden on a "
-"per-remote basis; see `remote.<name>.proxyAuthMethod`. Both can be "
+"is of the form 'user@host' or 'user@host:port'). This can be overridden on a"
+" per-remote basis; see `remote.<name>.proxyAuthMethod`. Both can be "
"overridden by the `GIT_HTTP_PROXY_AUTHMETHOD` environment variable. "
"Possible values are:"
msgstr ""
@@ -6419,8 +6127,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1811
msgid ""
-"`digest` - HTTP Digest authentication; this prevents the password from being "
-"transmitted to the proxy in clear text"
+"`digest` - HTTP Digest authentication; this prevents the password from being"
+" transmitted to the proxy in clear text"
msgstr ""
#. type: Plain text
@@ -6459,9 +6167,9 @@ msgstr ""
#: en/config.txt:1827
msgid ""
"Control GSSAPI credential delegation. The delegation is disabled by default "
-"in libcurl since version 7.21.7. Set parameter to tell the server what it is "
-"allowed to delegate when it comes to user credentials. Used with GSS/"
-"kerberos. Possible values are:"
+"in libcurl since version 7.21.7. Set parameter to tell the server what it is"
+" allowed to delegate when it comes to user credentials. Used with "
+"GSS/kerberos. Possible values are:"
msgstr ""
#. type: Plain text
@@ -6509,8 +6217,8 @@ msgid ""
"should be used in the Git http session, if they match the server. The file "
"format of the file to read cookies from should be plain HTTP headers or the "
"Netscape/Mozilla cookie file format (see `curl(1)`). NOTE that the file "
-"specified with http.cookieFile is used only as input unless http.saveCookies "
-"is set."
+"specified with http.cookieFile is used only as input unless http.saveCookies"
+" is set."
msgstr ""
#. type: Labeled list
@@ -6522,8 +6230,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1854
msgid ""
-"If set, store cookies received during requests to the file specified by http."
-"cookieFile. Has no effect if http.cookieFile is unset."
+"If set, store cookies received during requests to the file specified by "
+"http.cookieFile. Has no effect if http.cookieFile is unset."
msgstr ""
#. type: Labeled list
@@ -6537,10 +6245,10 @@ msgstr ""
msgid ""
"The SSL version to use when negotiating an SSL connection, if you want to "
"force the default. The available and default version depend on whether "
-"libcurl was built against NSS or OpenSSL and the particular configuration of "
-"the crypto library in use. Internally this sets the 'CURLOPT_SSL_VERSION' "
-"option; see the libcurl documentation for more details on the format of this "
-"option and for the ssl version supported. Actually the possible values of "
+"libcurl was built against NSS or OpenSSL and the particular configuration of"
+" the crypto library in use. Internally this sets the 'CURLOPT_SSL_VERSION' "
+"option; see the libcurl documentation for more details on the format of this"
+" option and for the ssl version supported. Actually the possible values of "
"this option are:"
msgstr ""
@@ -6578,8 +6286,8 @@ msgstr ""
#: en/config.txt:1877
msgid ""
"Can be overridden by the `GIT_SSL_VERSION` environment variable. To force "
-"git to use libcurl's default ssl version and ignore any explicit http."
-"sslversion option, set `GIT_SSL_VERSION` to the empty string."
+"git to use libcurl's default ssl version and ignore any explicit "
+"http.sslversion option, set `GIT_SSL_VERSION` to the empty string."
msgstr ""
#. type: Labeled list
@@ -6592,8 +6300,8 @@ msgstr ""
#: en/config.txt:1885
msgid ""
"A list of SSL ciphers to use when negotiating an SSL connection. The "
-"available ciphers depend on whether libcurl was built against NSS or OpenSSL "
-"and the particular configuration of the crypto library in use. Internally "
+"available ciphers depend on whether libcurl was built against NSS or OpenSSL"
+" and the particular configuration of the crypto library in use. Internally "
"this sets the 'CURLOPT_SSL_CIPHER_LIST' option; see the libcurl "
"documentation for more details on the format of this list."
msgstr ""
@@ -6602,8 +6310,8 @@ msgstr ""
#: en/config.txt:1890
msgid ""
"Can be overridden by the `GIT_SSL_CIPHER_LIST` environment variable. To "
-"force git to use libcurl's default cipher list and ignore any explicit http."
-"sslCipherList option, set `GIT_SSL_CIPHER_LIST` to the empty string."
+"force git to use libcurl's default cipher list and ignore any explicit "
+"http.sslCipherList option, set `GIT_SSL_CIPHER_LIST` to the empty string."
msgstr ""
#. type: Labeled list
@@ -6628,8 +6336,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1900
msgid ""
-"File containing the SSL certificate when fetching or pushing over HTTPS. Can "
-"be overridden by the `GIT_SSL_CERT` environment variable."
+"File containing the SSL certificate when fetching or pushing over HTTPS. Can"
+" be overridden by the `GIT_SSL_CERT` environment variable."
msgstr ""
#. type: Labeled list
@@ -6641,8 +6349,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1905
msgid ""
-"File containing the SSL private key when fetching or pushing over HTTPS. Can "
-"be overridden by the `GIT_SSL_KEY` environment variable."
+"File containing the SSL private key when fetching or pushing over HTTPS. Can"
+" be overridden by the `GIT_SSL_KEY` environment variable."
msgstr ""
#. type: Labeled list
@@ -6655,8 +6363,8 @@ msgstr ""
#: en/config.txt:1911
msgid ""
"Enable Git's password prompt for the SSL certificate. Otherwise OpenSSL "
-"will prompt the user, possibly many times, if the certificate or private key "
-"is encrypted. Can be overridden by the `GIT_SSL_CERT_PASSWORD_PROTECTED` "
+"will prompt the user, possibly many times, if the certificate or private key"
+" is encrypted. Can be overridden by the `GIT_SSL_CERT_PASSWORD_PROTECTED` "
"environment variable."
msgstr ""
@@ -6698,10 +6406,10 @@ msgstr ""
#: en/config.txt:1929
msgid ""
"Public key of the https service. It may either be the filename of a PEM or "
-"DER encoded public key file or a string starting with 'sha256//' followed by "
-"the base64 encoded sha256 hash of the public key. See also libcurl "
-"'CURLOPT_PINNEDPUBLICKEY'. git will exit with an error if this option is set "
-"but not supported by cURL."
+"DER encoded public key file or a string starting with 'sha256//' followed by"
+" the base64 encoded sha256 hash of the public key. See also libcurl "
+"'CURLOPT_PINNEDPUBLICKEY'. git will exit with an error if this option is set"
+" but not supported by cURL."
msgstr ""
#. type: Labeled list
@@ -6713,10 +6421,10 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1937
msgid ""
-"Attempt to use AUTH SSL/TLS and encrypted data transfers when connecting via "
-"regular FTP protocol. This might be needed if the FTP server requires it for "
-"security reasons or you wish to connect securely whenever remote FTP server "
-"supports it. Default is false since it might trigger certificate "
+"Attempt to use AUTH SSL/TLS and encrypted data transfers when connecting via"
+" regular FTP protocol. This might be needed if the FTP server requires it "
+"for security reasons or you wish to connect securely whenever remote FTP "
+"server supports it. Default is false since it might trigger certificate "
"verification errors on misconfigured servers."
msgstr ""
@@ -6744,8 +6452,8 @@ msgstr ""
msgid ""
"The number of curl sessions (counted across slots) to be kept across "
"requests. They will not be ended with curl_easy_cleanup() until "
-"http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this value will "
-"be capped at 1. Defaults to 1."
+"http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this value will"
+" be capped at 1. Defaults to 1."
msgstr ""
#. type: Labeled list
@@ -6773,9 +6481,9 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1961
msgid ""
-"If the HTTP transfer speed is less than 'http.lowSpeedLimit' for longer than "
-"'http.lowSpeedTime' seconds, the transfer is aborted. Can be overridden by "
-"the `GIT_HTTP_LOW_SPEED_LIMIT` and `GIT_HTTP_LOW_SPEED_TIME` environment "
+"If the HTTP transfer speed is less than 'http.lowSpeedLimit' for longer than"
+" 'http.lowSpeedTime' seconds, the transfer is aborted. Can be overridden by"
+" the `GIT_HTTP_LOW_SPEED_LIMIT` and `GIT_HTTP_LOW_SPEED_TIME` environment "
"variables."
msgstr ""
@@ -6789,8 +6497,8 @@ msgstr ""
#: en/config.txt:1967
msgid ""
"A boolean which disables using of EPSV ftp command by curl. This can "
-"helpful with some \"poor\" ftp servers which don't support EPSV mode. Can be "
-"overridden by the `GIT_CURL_FTP_NO_EPSV` environment variable. Default is "
+"helpful with some \"poor\" ftp servers which don't support EPSV mode. Can be"
+" overridden by the `GIT_CURL_FTP_NO_EPSV` environment variable. Default is "
"false (curl will use EPSV)."
msgstr ""
@@ -6823,11 +6531,11 @@ msgstr ""
msgid ""
"Whether git should follow HTTP redirects. If set to `true`, git will "
"transparently follow any redirect issued by a server it encounters. If set "
-"to `false`, git will treat all redirects as errors. If set to `initial`, git "
-"will follow redirects only for the initial request to a remote, but not for "
-"subsequent follow-up HTTP requests. Since git uses the redirected URL as the "
-"base for the follow-up requests, this is generally sufficient. The default "
-"is `initial`."
+"to `false`, git will treat all redirects as errors. If set to `initial`, git"
+" will follow redirects only for the initial request to a remote, but not for"
+" subsequent follow-up HTTP requests. Since git uses the redirected URL as "
+"the base for the follow-up requests, this is generally sufficient. The "
+"default is `initial`."
msgstr ""
#. type: Labeled list
@@ -6857,8 +6565,8 @@ msgid ""
"Host/domain name (e.g., `example.com` in `https://example.com/`). This "
"field must match between the config key and the URL. It is possible to "
"specify a `*` as part of the host name to match all subdomains at this "
-"level. `https://*.example.com/` for example would match `https://foo.example."
-"com/`, but not `https://foo.bar.example.com/`."
+"level. `https://*.example.com/` for example would match "
+"`https://foo.example.com/`, but not `https://foo.bar.example.com/`."
msgstr ""
#. type: Plain text
@@ -6873,13 +6581,13 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2014
msgid ""
-"Path (e.g., `repo.git` in `https://example.com/repo.git`). The path field of "
-"the config key must match the path field of the URL either exactly or as a "
+"Path (e.g., `repo.git` in `https://example.com/repo.git`). The path field of"
+" the config key must match the path field of the URL either exactly or as a "
"prefix of slash-delimited path elements. This means a config key with path "
-"`foo/` matches URL path `foo/bar`. A prefix can only match on a slash (`/`) "
-"boundary. Longer matches take precedence (so a config key with path `foo/"
-"bar` is a better match to URL path `foo/bar` than a config key with just "
-"path `foo/`)."
+"`foo/` matches URL path `foo/bar`. A prefix can only match on a slash (`/`)"
+" boundary. Longer matches take precedence (so a config key with path "
+"`foo/bar` is a better match to URL path `foo/bar` than a config key with "
+"just path `foo/`)."
msgstr ""
#. type: Plain text
@@ -6897,8 +6605,8 @@ msgstr ""
msgid ""
"The list above is ordered by decreasing precedence; a URL that matches a "
"config key's path is preferred to one that matches its user name. For "
-"example, if the URL is `https://user@example.com/foo/bar` a config key match "
-"of `https://example.com/foo` will be preferred over a config key match of "
+"example, if the URL is `https://user@example.com/foo/bar` a config key match"
+" of `https://example.com/foo` will be preferred over a config key match of "
"`https://user@example.com`."
msgstr ""
@@ -6910,7 +6618,8 @@ msgid ""
"equivalent URLs that are simply spelled differently will match properly. "
"Environment variable settings always override any matches. The URLs that "
"are matched against are those given directly to Git commands. This means "
-"any URLs visited as a result of a redirection do not participate in matching."
+"any URLs visited as a result of a redirection do not participate in "
+"matching."
msgstr ""
#. type: Labeled list
@@ -6923,8 +6632,8 @@ msgstr ""
#: en/config.txt:2040
msgid ""
"Depending on the value of the environment variables `GIT_SSH` or "
-"`GIT_SSH_COMMAND`, or the config setting `core.sshCommand`, Git auto-detects "
-"whether to adjust its command-line parameters for use with plink or "
+"`GIT_SSH_COMMAND`, or the config setting `core.sshCommand`, Git auto-detects"
+" whether to adjust its command-line parameters for use with plink or "
"tortoiseplink, as opposed to the default (OpenSSH)."
msgstr ""
@@ -6975,8 +6684,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2060
msgid ""
-"The configuration variables in the 'imap' section are described in linkgit:"
-"git-imap-send[1]."
+"The configuration variables in the 'imap' section are described in "
+"linkgit:git-imap-send[1]."
msgstr ""
#. type: Labeled list
@@ -7027,8 +6736,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2076
msgid ""
-"The HTTP daemon command-line to start gitweb on your working repository. See "
-"linkgit:git-instaweb[1]."
+"The HTTP daemon command-line to start gitweb on your working repository. See"
+" linkgit:git-instaweb[1]."
msgstr ""
#. type: Labeled list
@@ -7053,8 +6762,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2085
msgid ""
-"The default module path for linkgit:git-instaweb[1] to use instead of /usr/"
-"lib/apache2/modules. Only used if httpd is Apache."
+"The default module path for linkgit:git-instaweb[1] to use instead of "
+"/usr/lib/apache2/modules. Only used if httpd is Apache."
msgstr ""
#. type: Labeled list
@@ -7080,8 +6789,8 @@ msgstr "--interactive"
#: en/config.txt:2098
msgid ""
"In interactive commands, allow the user to provide one-letter input with a "
-"single key (i.e., without hitting enter). Currently this is used by the `--"
-"patch` mode of linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-"
+"single key (i.e., without hitting enter). Currently this is used by the "
+"`--patch` mode of linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-"
"commit[1], linkgit:git-reset[1], and linkgit:git-stash[1]. Note that this "
"setting is silently ignored if portable keystroke input is not available; "
"requires the Perl module Term::ReadKey."
@@ -7142,13 +6851,13 @@ msgstr "--decorate"
#. type: Plain text
#: en/config.txt:2126
msgid ""
-"Print out the ref names of any commits that are shown by the log command. If "
-"'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and "
-"'refs/remotes/' will not be printed. If 'full' is specified, the full ref "
+"Print out the ref names of any commits that are shown by the log command. If"
+" 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and"
+" 'refs/remotes/' will not be printed. If 'full' is specified, the full ref "
"name (including prefix) will be printed. If 'auto' is specified, then if "
"the output is going to a terminal, the ref names are shown as if 'short' "
-"were given, otherwise no ref names are shown. This is the same as the `--"
-"decorate` option of the `git log`."
+"were given, otherwise no ref names are shown. This is the same as the "
+"`--decorate` option of the `git log`."
msgstr ""
#. type: Labeled list
@@ -7217,10 +6926,10 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2153
msgid ""
-"If true, makes linkgit:git-mailinfo[1] (and therefore linkgit:git-am[1]) act "
-"by default as if the --scissors option was provided on the command-line. "
-"When active, this features removes everything from the message body before a "
-"scissors line (i.e. consisting mainly of \">8\", \"8<\" and \"-\")."
+"If true, makes linkgit:git-mailinfo[1] (and therefore linkgit:git-am[1]) act"
+" by default as if the --scissors option was provided on the command-line. "
+"When active, this features removes everything from the message body before a"
+" scissors line (i.e. consisting mainly of \">8\", \"8<\" and \"-\")."
msgstr ""
#. type: Labeled list
@@ -7235,8 +6944,8 @@ msgid ""
"The location of an augmenting mailmap file. The default mailmap, located in "
"the root of the repository, is loaded first, then the mailmap file pointed "
"to by this variable. The location of the mailmap file may be in a "
-"repository subdirectory, or somewhere outside of the repository itself. See "
-"linkgit:git-shortlog[1] and linkgit:git-blame[1]."
+"repository subdirectory, or somewhere outside of the repository itself. See"
+" linkgit:git-shortlog[1] and linkgit:git-blame[1]."
msgstr ""
#. type: Labeled list
@@ -7291,8 +7000,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2182
msgid ""
-"Override the path for the given tool that may be used to display help in the "
-"'man' format. See linkgit:git-help[1]."
+"Override the path for the given tool that may be used to display help in the"
+" 'man' format. See linkgit:git-help[1]."
msgstr ""
#. type: Labeled list
@@ -7311,8 +7020,8 @@ msgstr ""
#: en/config.txt:2199
msgid ""
"Specify the command to invoke the specified merge tool. The specified "
-"command is evaluated in shell with the following variables available: 'BASE' "
-"is the name of a temporary file containing the common base of the files to "
+"command is evaluated in shell with the following variables available: 'BASE'"
+" is the name of a temporary file containing the common base of the files to "
"be merged, if available; 'LOCAL' is the name of a temporary file containing "
"the contents of the file on the current branch; 'REMOTE' is the name of a "
"temporary file containing the contents of the file from the branch being "
@@ -7349,8 +7058,8 @@ msgid ""
"attempt to detect whether `meld` supports `--output` by inspecting the "
"output of `meld --help`. Configuring `mergetool.meld.hasOutput` will make "
"Git skip these checks and use the configured value instead. Setting "
-"`mergetool.meld.hasOutput` to `true` tells Git to unconditionally use the `--"
-"output` option, and `false` avoids using `--output`."
+"`mergetool.meld.hasOutput` to `true` tells Git to unconditionally use the "
+"`--output` option, and `false` avoids using `--output`."
msgstr ""
#. type: Labeled list
@@ -7377,10 +7086,10 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2229
msgid ""
-"When invoking a custom merge tool, Git uses a set of temporary files to pass "
-"to the tool. If the tool returns an error and this variable is set to "
-"`true`, then these temporary files will be preserved, otherwise they will be "
-"removed after the tool has exited. Defaults to `false`."
+"When invoking a custom merge tool, Git uses a set of temporary files to pass"
+" to the tool. If the tool returns an error and this variable is set to "
+"`true`, then these temporary files will be preserved, otherwise they will be"
+" removed after the tool has exited. Defaults to `false`."
msgstr ""
#. type: Labeled list
@@ -7419,8 +7128,8 @@ msgstr ""
msgid ""
"Which merge strategy to choose by default when resolving notes conflicts. "
"Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. "
-"Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section of linkgit:git-"
-"notes[1] for more information on each strategy."
+"Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section of "
+"linkgit:git-notes[1] for more information on each strategy."
msgstr ""
#. type: Labeled list
@@ -7432,10 +7141,10 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2250
msgid ""
-"Which merge strategy to choose when doing a notes merge into refs/notes/"
-"<name>. This overrides the more general \"notes.mergeStrategy\". See the "
-"\"NOTES MERGE STRATEGIES\" section in linkgit:git-notes[1] for more "
-"information on the available strategies."
+"Which merge strategy to choose when doing a notes merge into "
+"refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\"."
+" See the \"NOTES MERGE STRATEGIES\" section in linkgit:git-notes[1] for "
+"more information on the available strategies."
msgstr ""
#. type: Labeled list
@@ -7479,9 +7188,9 @@ msgstr ""
#: en/config.txt:2274
msgid ""
"When rewriting commits with <command> (currently `amend` or `rebase`) and "
-"this variable is set to `true`, Git automatically copies your notes from the "
-"original to the rewritten commit. Defaults to `true`, but see \"notes."
-"rewriteRef\" below."
+"this variable is set to `true`, Git automatically copies your notes from the"
+" original to the rewritten commit. Defaults to `true`, but see "
+"\"notes.rewriteRef\" below."
msgstr ""
#. type: Labeled list
@@ -7502,8 +7211,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2284 en/git-notes.txt:359
msgid ""
-"This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment "
-"variable."
+"This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment"
+" variable."
msgstr ""
#. type: Labeled list
@@ -7516,8 +7225,8 @@ msgstr ""
#: en/config.txt:2290
msgid ""
"When copying notes during a rewrite, specifies the (fully qualified) ref "
-"whose notes should be copied. The ref may be a glob, in which case notes in "
-"all matching refs will be copied. You may also specify this configuration "
+"whose notes should be copied. The ref may be a glob, in which case notes in"
+" all matching refs will be copied. You may also specify this configuration "
"several times."
msgstr ""
@@ -7572,8 +7281,8 @@ msgstr ""
#: en/config.txt:2313
msgid ""
"The maximum size of memory that is consumed by each thread in linkgit:git-"
-"pack-objects[1] for pack window memory when no limit is given on the command "
-"line. The value can be suffixed with \"k\", \"m\", or \"g\". When left "
+"pack-objects[1] for pack window memory when no limit is given on the command"
+" line. The value can be suffixed with \"k\", \"m\", or \"g\". When left "
"unconfigured (or set explicitly to 0), there will be no limit."
msgstr ""
@@ -7588,10 +7297,10 @@ msgstr ""
msgid ""
"An integer -1..9, indicating the compression level for objects in a pack "
"file. -1 is the zlib default. 0 means no compression, and 1..9 are various "
-"speed/size tradeoffs, 9 being slowest. If not set, defaults to core."
-"compression. If that is not set, defaults to -1, the zlib default, which is "
-"\"a default compromise between speed and compression (currently equivalent "
-"to level 6).\""
+"speed/size tradeoffs, 9 being slowest. If not set, defaults to "
+"core.compression. If that is not set, defaults to -1, the zlib default, "
+"which is \"a default compromise between speed and compression (currently "
+"equivalent to level 6).\""
msgstr ""
#. type: Plain text
@@ -7615,9 +7324,9 @@ msgid ""
"objects[1] before writing them out to a pack. This cache is used to speed "
"up the writing object phase by not having to recompute the final delta "
"result once the best match for all objects is found. Repacking large "
-"repositories on machines which are tight with memory might be badly impacted "
-"by this though, especially if this cache pushes the system into swapping. A "
-"value of 0 means no limit. The smallest size of 1 byte may be used to "
+"repositories on machines which are tight with memory might be badly impacted"
+" by this though, especially if this cache pushes the system into swapping. "
+"A value of 0 means no limit. The smallest size of 1 byte may be used to "
"virtually disable this cache. Defaults to 256 MiB."
msgstr ""
@@ -7650,8 +7359,8 @@ msgid ""
"pthreads otherwise this option is ignored with a warning. This is meant to "
"reduce packing time on multiprocessor machines. The required amount of "
"memory for the delta search window is however multiplied by the number of "
-"threads. Specifying 0 will cause Git to auto-detect the number of CPU's and "
-"set the number of threads accordingly."
+"threads. Specifying 0 will cause Git to auto-detect the number of CPU's and"
+" set the number of threads accordingly."
msgstr ""
#. type: Labeled list
@@ -7664,10 +7373,10 @@ msgstr ""
#: en/config.txt:2362
msgid ""
"Specify the default pack index version. Valid values are 1 for legacy pack "
-"index used by Git versions prior to 1.5.2, and 2 for the new pack index with "
-"capabilities for packs larger than 4 GB as well as proper protection against "
-"the repacking of corrupted packs. Version 2 is the default. Note that "
-"version 2 is enforced and this config option ignored whenever the "
+"index used by Git versions prior to 1.5.2, and 2 for the new pack index with"
+" capabilities for packs larger than 4 GB as well as proper protection "
+"against the repacking of corrupted packs. Version 2 is the default. Note "
+"that version 2 is enforced and this config option ignored whenever the "
"corresponding pack is larger than 2 GB."
msgstr ""
@@ -7677,9 +7386,9 @@ msgid ""
"If you have an old Git that does not understand the version 2 `*.idx` file, "
"cloning or fetching over a non native protocol (e.g. \"http\") that will "
"copy both `*.pack` file and corresponding `*.idx` file from the other side "
-"may give you a repository that cannot be accessed with your older version of "
-"Git. If the `*.pack` file is smaller than 2 GB, however, you can use linkgit:"
-"git-index-pack[1] on the *.pack file to regenerate the `*.idx` file."
+"may give you a repository that cannot be accessed with your older version of"
+" Git. If the `*.pack` file is smaller than 2 GB, however, you can use "
+"linkgit:git-index-pack[1] on the *.pack file to regenerate the `*.idx` file."
msgstr ""
#. type: Labeled list
@@ -7734,8 +7443,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2402
msgid ""
-"When true, git will include a \"hash cache\" section in the bitmap index (if "
-"one is written). This cache can be used to feed git's delta heuristics, "
+"When true, git will include a \"hash cache\" section in the bitmap index (if"
+" one is written). This cache can be used to feed git's delta heuristics, "
"potentially leading to better deltas between bitmapped and non-bitmapped "
"objects (e.g., when serving a fetch between an older, bitmapped pack and "
"objects that have been pushed since the last gc). The downside is that it "
@@ -7770,10 +7479,10 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2421
msgid ""
-"Alias for a --pretty= format string, as specified in linkgit:git-log[1]. Any "
-"aliases defined here can be used just as the built-in pretty formats could. "
-"For example, running `git config pretty.changelog \"format:* %H %s\"` would "
-"cause the invocation `git log --pretty=changelog` to be equivalent to "
+"Alias for a --pretty= format string, as specified in linkgit:git-log[1]. Any"
+" aliases defined here can be used just as the built-in pretty formats could."
+" For example, running `git config pretty.changelog \"format:* %H %s\"` would"
+" cause the invocation `git log --pretty=changelog` to be equivalent to "
"running `git log \"--pretty=format:* %H %s\"`. Note that an alias with the "
"same name as a built-in format will be silently ignored."
msgstr ""
@@ -7791,7 +7500,8 @@ msgid ""
"explicitly have a policy (`protocol.<name>.allow`). By default, if unset, "
"known-safe protocols (http, https, git, ssh, file) have a default policy of "
"`always`, known-dangerous protocols (ext) have a default policy of `never`, "
-"and all other protocols have a default policy of `user`. Supported policies:"
+"and all other protocols have a default policy of `user`. Supported "
+"policies:"
msgstr ""
#. type: Plain text
@@ -7823,8 +7533,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2447
msgid ""
-"Set a policy to be used by protocol `<name>` with clone/fetch/push commands. "
-"See `protocol.allow` above for the available policies."
+"Set a policy to be used by protocol `<name>` with clone/fetch/push commands."
+" See `protocol.allow` above for the available policies."
msgstr ""
#. type: Plain text
@@ -7841,8 +7551,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2456
msgid ""
-"`git`: the anonymous git protocol over a direct TCP connection (or proxy, if "
-"configured)"
+"`git`: the anonymous git protocol over a direct TCP connection (or proxy, if"
+" configured)"
msgstr ""
#. type: Plain text
@@ -7879,8 +7589,8 @@ msgid ""
"branch is fast-forwarded. When set to `false`, this variable tells Git to "
"create an extra merge commit in such a case (equivalent to giving the `--no-"
"ff` option from the command line). When set to `only`, only such fast-"
-"forward merges are allowed (equivalent to giving the `--ff-only` option from "
-"the command line). This setting overrides `merge.ff` when pulling."
+"forward merges are allowed (equivalent to giving the `--ff-only` option from"
+" the command line). This setting overrides `merge.ff` when pulling."
msgstr ""
#. type: Labeled list
@@ -7929,11 +7639,10 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2507
msgid ""
-"Defines the action `git push` should take if no refspec is explicitly "
-"given. Different values are well-suited for specific workflows; for "
-"instance, in a purely central workflow (i.e. the fetch source is equal to "
-"the push destination), `upstream` is probably what you want. Possible "
-"values are:"
+"Defines the action `git push` should take if no refspec is explicitly given."
+" Different values are well-suited for specific workflows; for instance, in "
+"a purely central workflow (i.e. the fetch source is equal to the push "
+"destination), `upstream` is probably what you want. Possible values are:"
msgstr ""
#. type: Plain text
@@ -7947,16 +7656,16 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2517
msgid ""
-"`current` - push the current branch to update a branch with the same name on "
-"the receiving end. Works in both central and non-central workflows."
+"`current` - push the current branch to update a branch with the same name on"
+" the receiving end. Works in both central and non-central workflows."
msgstr ""
#. type: Plain text
#: en/config.txt:2523
msgid ""
"`upstream` - push the current branch back to the branch whose changes are "
-"usually integrated into the current branch (which is called `@{upstream}`). "
-"This mode only makes sense if you are pushing to the same repository you "
+"usually integrated into the current branch (which is called `@{upstream}`)."
+" This mode only makes sense if you are pushing to the same repository you "
"would normally pull from (i.e. central workflow)."
msgstr ""
@@ -7969,15 +7678,15 @@ msgstr ""
#: en/config.txt:2529
msgid ""
"`simple` - in centralized workflow, work like `upstream` with an added "
-"safety to refuse to push if the upstream branch's name is different from the "
-"local one."
+"safety to refuse to push if the upstream branch's name is different from the"
+" local one."
msgstr ""
#. type: Plain text
#: en/config.txt:2533
msgid ""
-"When pushing to a remote that is different from the remote you normally pull "
-"from, work as `current`. This is the safest option and is suited for "
+"When pushing to a remote that is different from the remote you normally pull"
+" from, work as `current`. This is the safest option and is suited for "
"beginners."
msgstr ""
@@ -8038,8 +7747,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2571
msgid ""
-"May be set to a boolean value, or the string 'if-asked'. A true value causes "
-"all pushes to be GPG signed, as if `--signed` is passed to linkgit:git-"
+"May be set to a boolean value, or the string 'if-asked'. A true value causes"
+" all pushes to be GPG signed, as if `--signed` is passed to linkgit:git-"
"push[1]. The string 'if-asked' causes pushes to be signed if the server "
"supports it, as if `--signed=if-asked` is passed to 'git push'. A false "
"value may override a value from a lower-priority config file. An explicit "
@@ -8056,12 +7765,12 @@ msgstr ""
#: en/config.txt:2585
msgid ""
"Make sure all submodule commits used by the revisions to be pushed are "
-"available on a remote-tracking branch. If the value is 'check' then Git will "
-"verify that all submodule commits that changed in the revisions to be pushed "
-"are available on at least one remote of the submodule. If any commits are "
-"missing, the push will be aborted and exit with non-zero status. If the "
-"value is 'on-demand' then all submodules that changed in the revisions to be "
-"pushed will be pushed. If on-demand was not able to push all necessary "
+"available on a remote-tracking branch. If the value is 'check' then Git will"
+" verify that all submodule commits that changed in the revisions to be "
+"pushed are available on at least one remote of the submodule. If any commits"
+" are missing, the push will be aborted and exit with non-zero status. If the"
+" value is 'on-demand' then all submodules that changed in the revisions to "
+"be pushed will be pushed. If on-demand was not able to push all necessary "
"revisions it will also be aborted and exit with non-zero status. If the "
"value is 'no' then default behavior of ignoring submodules when pushing is "
"retained. You may override this configuration at time of push by specifying "
@@ -8118,11 +7827,11 @@ msgstr ""
#: en/config.txt:2611
msgid ""
"If set to \"warn\", git rebase -i will print a warning if some commits are "
-"removed (e.g. a line was deleted), however the rebase will still proceed. If "
-"set to \"error\", it will print the previous warning and stop the rebase, "
+"removed (e.g. a line was deleted), however the rebase will still proceed. If"
+" set to \"error\", it will print the previous warning and stop the rebase, "
"'git rebase --edit-todo' can then be used to correct the error. If set to "
-"\"ignore\", no checking is done. To drop a commit without warning or error, "
-"use the `drop` command in the todo-list. Defaults to \"ignore\"."
+"\"ignore\", no checking is done. To drop a commit without warning or error,"
+" use the `drop` command in the todo-list. Defaults to \"ignore\"."
msgstr ""
#. type: Labeled list
@@ -8176,8 +7885,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2631
msgid ""
-"By default, git-receive-pack will run \"git-gc --auto\" after receiving data "
-"from git-push and updating refs. You can stop it by setting this variable "
+"By default, git-receive-pack will run \"git-gc --auto\" after receiving data"
+" from git-push and updating refs. You can stop it by setting this variable "
"to false."
msgstr ""
@@ -8204,15 +7913,15 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2650
msgid ""
-"When a `git push --signed` sent a push certificate with a \"nonce\" that was "
-"issued by a receive-pack serving the same repository within this many "
+"When a `git push --signed` sent a push certificate with a \"nonce\" that was"
+" issued by a receive-pack serving the same repository within this many "
"seconds, export the \"nonce\" found in the certificate to "
"`GIT_PUSH_CERT_NONCE` to the hooks (instead of what the receive-pack asked "
"the sending side to include). This may allow writing checks in `pre-"
"receive` and `post-receive` a bit easier. Instead of checking "
"`GIT_PUSH_CERT_NONCE_SLOP` environment variable that records by how many "
-"seconds the nonce is stale to decide if they want to accept the certificate, "
-"they only can check `GIT_PUSH_CERT_NONCE_STATUS` is `OK`."
+"seconds the nonce is stale to decide if they want to accept the certificate,"
+" they only can check `GIT_PUSH_CERT_NONCE_STATUS` is `OK`."
msgstr ""
#. type: Labeled list
@@ -8225,8 +7934,8 @@ msgstr ""
#: en/config.txt:2657
msgid ""
"If it is set to true, git-receive-pack will check all received objects. It "
-"will abort in the case of a malformed object or a broken link. The result of "
-"an abort are only dangling objects. Defaults to false. If not set, the "
+"will abort in the case of a malformed object or a broken link. The result of"
+" an abort are only dangling objects. Defaults to false. If not set, the "
"value of `transfer.fsckObjects` is used instead."
msgstr ""
@@ -8241,10 +7950,10 @@ msgstr ""
msgid ""
"When `receive.fsckObjects` is set to true, errors can be switched to "
"warnings and vice versa by configuring the `receive.fsck.<msg-id>` setting "
-"where the `<msg-id>` is the fsck message ID and the value is one of `error`, "
-"`warn` or `ignore`. For convenience, fsck prefixes the error/warning with "
-"the message ID, e.g. \"missingEmail: invalid author/committer line - missing "
-"email\" means that setting `receive.fsck.missingEmail = ignore` will hide "
+"where the `<msg-id>` is the fsck message ID and the value is one of `error`,"
+" `warn` or `ignore`. For convenience, fsck prefixes the error/warning with "
+"the message ID, e.g. \"missingEmail: invalid author/committer line - missing"
+" email\" means that setting `receive.fsck.missingEmail = ignore` will hide "
"that issue."
msgstr ""
@@ -8291,8 +8000,8 @@ msgstr ""
msgid ""
"If the number of objects received in a push is below this limit then the "
"objects will be unpacked into loose object files. However if the number of "
-"received objects equals or exceeds this limit then the received pack will be "
-"stored as a pack, after adding any missing delta bases. Storing the pack "
+"received objects equals or exceeds this limit then the received pack will be"
+" stored as a pack, after adding any missing delta bases. Storing the pack "
"from a push can make the push operation complete faster, especially on slow "
"filesystems. If not set, the value of `transfer.unpackLimit` is used "
"instead."
@@ -8347,8 +8056,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2721
msgid ""
-"If set to true or \"refuse\", git-receive-pack will deny a ref update to the "
-"currently checked out branch of a non-bare repository. Such a push is "
+"If set to true or \"refuse\", git-receive-pack will deny a ref update to the"
+" currently checked out branch of a non-bare repository. Such a push is "
"potentially dangerous because it brings the HEAD out of sync with the index "
"and working tree. If set to \"warn\", print a warning of such a push to "
"stderr, but allow the push to proceed. If set to false or \"ignore\", allow "
@@ -8362,16 +8071,16 @@ msgid ""
"pushing into the current branch. This option is intended for synchronizing "
"working directories when one side is not easily accessible via interactive "
"ssh (e.g. a live web site, hence the requirement that the working directory "
-"be clean). This mode also comes in handy when developing inside a VM to test "
-"and fix code on different Operating Systems."
+"be clean). This mode also comes in handy when developing inside a VM to test"
+" and fix code on different Operating Systems."
msgstr ""
#. type: Plain text
#: en/config.txt:2732
msgid ""
"By default, \"updateInstead\" will refuse the push if the working tree or "
-"the index have any difference from the HEAD, but the `push-to-checkout` hook "
-"can be used to customize this. See linkgit:githooks[5]."
+"the index have any difference from the HEAD, but the `push-to-checkout` hook"
+" can be used to customize this. See linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
@@ -8384,8 +8093,8 @@ msgstr ""
#: en/config.txt:2738
msgid ""
"If set to true, git-receive-pack will deny a ref update which is not a fast-"
-"forward. Use this to prevent such an update via a push, even if that push is "
-"forced. This configuration variable is set when initializing a shared "
+"forward. Use this to prevent such an update via a push, even if that push is"
+" forced. This configuration variable is set when initializing a shared "
"repository."
msgstr ""
@@ -8476,8 +8185,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2769
msgid ""
-"For remotes that require curl (http, https and ftp), the URL to the proxy to "
-"use for that remote. Set to the empty string to disable proxying for that "
+"For remotes that require curl (http, https and ftp), the URL to the proxy to"
+" use for that remote. Set to the empty string to disable proxying for that "
"remote."
msgstr ""
@@ -8491,8 +8200,8 @@ msgstr ""
#: en/config.txt:2774
msgid ""
"For remotes that require curl (http, https and ftp), the method to use for "
-"authenticating against the proxy in use (probably set in `remote.<name>."
-"proxy`). See `http.proxyAuthMethod`."
+"authenticating against the proxy in use (probably set in "
+"`remote.<name>.proxy`). See `http.proxyAuthMethod`."
msgstr ""
#. type: Labeled list
@@ -8530,8 +8239,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2786
msgid ""
-"If true, pushing to this remote will automatically behave as if the `--"
-"mirror` option was given on the command line."
+"If true, pushing to this remote will automatically behave as if the "
+"`--mirror` option was given on the command line."
msgstr ""
#. type: Labeled list
@@ -8543,8 +8252,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2791 en/config.txt:2796
msgid ""
-"If true, this remote will be skipped by default when updating using linkgit:"
-"git-fetch[1] or the `update` subcommand of linkgit:git-remote[1]."
+"If true, this remote will be skipped by default when updating using "
+"linkgit:git-fetch[1] or the `update` subcommand of linkgit:git-remote[1]."
msgstr ""
#. type: Labeled list
@@ -8575,8 +8284,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2804
msgid ""
-"The default program to execute on the remote side when fetching. See option "
-"--upload-pack of linkgit:git-fetch-pack[1]."
+"The default program to execute on the remote side when fetching. See option"
+" --upload-pack of linkgit:git-fetch-pack[1]."
msgstr ""
#. type: Labeled list
@@ -8618,8 +8327,8 @@ msgstr ""
#: en/config.txt:2822
msgid ""
"When set to true, fetching from this remote by default will also remove any "
-"remote-tracking references that no longer exist on the remote (as if the `--"
-"prune` option was given on the command line). Overrides `fetch.prune` "
+"remote-tracking references that no longer exist on the remote (as if the "
+"`--prune` option was given on the command line). Overrides `fetch.prune` "
"settings, if any."
msgstr ""
@@ -8632,8 +8341,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2826
msgid ""
-"The list of remotes which are fetched by \"git remote update <group>\". See "
-"linkgit:git-remote[1]."
+"The list of remotes which are fetched by \"git remote update <group>\". See"
+" linkgit:git-remote[1]."
msgstr ""
#. type: Labeled list
@@ -8662,8 +8371,8 @@ msgstr ""
#: en/config.txt:2841
msgid ""
"If set to true, makes `git repack` act as if `--pack-kept-objects` was "
-"passed. See linkgit:git-repack[1] for details. Defaults to `false` normally, "
-"but `true` if a bitmap index is being written (either via `--write-bitmap-"
+"passed. See linkgit:git-repack[1] for details. Defaults to `false` normally,"
+" but `true` if a bitmap index is being written (either via `--write-bitmap-"
"index` or `repack.writeBitmaps`)."
msgstr ""
@@ -8676,9 +8385,9 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2850
msgid ""
-"When true, git will write a bitmap index when packing all objects to disk (e."
-"g., when `git repack -a` is run). This index can speed up the \"counting "
-"objects\" phase of subsequent packs created for clones and fetches, at the "
+"When true, git will write a bitmap index when packing all objects to disk "
+"(e.g., when `git repack -a` is run). This index can speed up the \"counting"
+" objects\" phase of subsequent packs created for clones and fetches, at the "
"cost of some disk space and extra time spent on the initial repack. This "
"has no effect if multiple packfiles are created. Defaults to false."
msgstr ""
@@ -8692,8 +8401,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2855
msgid ""
-"When set to true, `git-rerere` updates the index with the resulting contents "
-"after it cleanly resolves conflicts using previously recorded resolution. "
+"When set to true, `git-rerere` updates the index with the resulting contents"
+" after it cleanly resolves conflicts using previously recorded resolution. "
"Defaults to false."
msgstr ""
@@ -8722,9 +8431,10 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2869 en/git-send-email.txt:279
msgid ""
-"A configuration identity. When given, causes values in the 'sendemail."
-"<identity>' subsection to take precedence over values in the 'sendemail' "
-"section. The default identity is the value of `sendemail.identity`."
+"A configuration identity. When given, causes values in the "
+"'sendemail.<identity>' subsection to take precedence over values in the "
+"'sendemail' section. The default identity is the value of "
+"`sendemail.identity`."
msgstr ""
#. type: Labeled list
@@ -8760,8 +8470,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2880
msgid ""
-"Path to ca-certificates (either a directory or a single file). Set it to an "
-"empty string to disable certificate verification."
+"Path to ca-certificates (either a directory or a single file). Set it to an"
+" empty string to disable certificate verification."
msgstr ""
#. type: Labeled list
@@ -8953,8 +8663,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2920
msgid ""
-"The default set of branches for linkgit:git-show-branch[1]. See linkgit:git-"
-"show-branch[1]."
+"The default set of branches for linkgit:git-show-branch[1]. See "
+"linkgit:git-show-branch[1]."
msgstr ""
#. type: Labeled list
@@ -8990,8 +8700,9 @@ msgid ""
"shared index file is created. The value \"now\" expires all entries "
"immediately, and \"never\" suppresses expiration altogether. The default "
"value is \"2.weeks.ago\". Note that a shared index file is considered "
-"modified (for the purpose of expiration) each time a new split-index file is "
-"either created based on it or read from it. See linkgit:git-update-index[1]."
+"modified (for the purpose of expiration) each time a new split-index file is"
+" either created based on it or read from it. See linkgit:git-update-"
+"index[1]."
msgstr ""
#. type: Labeled list
@@ -9060,11 +8771,11 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2975
msgid ""
-"By default, linkgit:git-status[1] and linkgit:git-commit[1] show files which "
-"are not currently tracked by Git. Directories which contain only untracked "
-"files, are shown with the directory name only. Showing untracked files means "
-"that Git needs to lstat() all the files in the whole repository, which might "
-"be slow on some systems. So, this variable controls how the commands "
+"By default, linkgit:git-status[1] and linkgit:git-commit[1] show files which"
+" are not currently tracked by Git. Directories which contain only untracked "
+"files, are shown with the directory name only. Showing untracked files means"
+" that Git needs to lstat() all the files in the whole repository, which "
+"might be slow on some systems. So, this variable controls how the commands "
"displays the untracked files. Possible values are:"
msgstr ""
@@ -9085,7 +8796,8 @@ msgstr "'normal' - zeige unverwaltete Dateien und Verzeichnisse\n"
#. type: Plain text
#: en/config.txt:2980
#, fuzzy
-#| msgid "'all' - Also shows individual files in untracked directories.\n"
+#| msgid ""
+#| "'all' - Also shows individual files in untracked directories.\n"
msgid "`all` - Show also individual files in untracked directories."
msgstr ""
"'all' - zeige zus채tzlich die einzelnen Dateien in den unverwalteten "
@@ -9112,13 +8824,13 @@ msgid ""
"to -1 or an unlimited number), the submodule summary will be enabled and a "
"summary of commits for modified submodules will be shown (see --summary-"
"limit option of linkgit:git-submodule[1]). Please note that the summary "
-"output command will be suppressed for all submodules when `diff."
-"ignoreSubmodules` is set to 'all' or only for those submodules where "
+"output command will be suppressed for all submodules when "
+"`diff.ignoreSubmodules` is set to 'all' or only for those submodules where "
"`submodule.<name>.ignore=all`. The only exception to that rule is that "
"status and commit will show staged submodule changes. To also view the "
"summary for ignored submodules you can either use the --ignore-"
-"submodules=dirty command-line option or the 'git submodule summary' command, "
-"which shows a similar output but does not honor these settings."
+"submodules=dirty command-line option or the 'git submodule summary' command,"
+" which shows a similar output but does not honor these settings."
msgstr ""
#. type: Labeled list
@@ -9131,8 +8843,8 @@ msgstr ""
#: en/config.txt:3006
msgid ""
"If this is set to true, the `git stash show` command without an option will "
-"show the stash in patch form. Defaults to false. See description of 'show' "
-"command in linkgit:git-stash[1]."
+"show the stash in patch form. Defaults to false. See description of 'show'"
+" command in linkgit:git-stash[1]."
msgstr ""
#. type: Labeled list
@@ -9176,8 +8888,8 @@ msgstr ""
#: en/config.txt:3025
msgid ""
"The default update procedure for a submodule. This variable is populated by "
-"`git submodule init` from the linkgit:gitmodules[5] file. See description of "
-"'update' command in linkgit:git-submodule[1]."
+"`git submodule init` from the linkgit:gitmodules[5] file. See description of"
+" 'update' command in linkgit:git-submodule[1]."
msgstr ""
#. type: Labeled list
@@ -9189,9 +8901,9 @@ msgstr ""
#. type: Plain text
#: en/config.txt:3031
msgid ""
-"The remote branch name for a submodule, used by `git submodule update --"
-"remote`. Set this option to override the value found in the `.gitmodules` "
-"file. See linkgit:git-submodule[1] and linkgit:gitmodules[5] for details."
+"The remote branch name for a submodule, used by `git submodule update "
+"--remote`. Set this option to override the value found in the `.gitmodules`"
+" file. See linkgit:git-submodule[1] and linkgit:gitmodules[5] for details."
msgstr ""
#. type: Labeled list
@@ -9204,9 +8916,9 @@ msgstr ""
#: en/config.txt:3038
msgid ""
"This option can be used to control recursive fetching of this submodule. It "
-"can be overridden by using the --[no-]recurse-submodules command-line option "
-"to \"git fetch\" and \"git pull\". This setting will override that from in "
-"the linkgit:gitmodules[5] file."
+"can be overridden by using the --[no-]recurse-submodules command-line option"
+" to \"git fetch\" and \"git pull\". This setting will override that from in"
+" the linkgit:gitmodules[5] file."
msgstr ""
#. type: Labeled list
@@ -9220,16 +8932,16 @@ msgstr ""
msgid ""
"Defines under what circumstances \"git status\" and the diff family show a "
"submodule as modified. When set to \"all\", it will never be considered "
-"modified (but it will nonetheless show up in the output of status and commit "
-"when it has been staged), \"dirty\" will ignore all changes to the "
+"modified (but it will nonetheless show up in the output of status and commit"
+" when it has been staged), \"dirty\" will ignore all changes to the "
"submodules work tree and takes only differences between the HEAD of the "
"submodule and the commit recorded in the superproject into account. "
"\"untracked\" will additionally let submodules with modified tracked files "
-"in their work tree show up. Using \"none\" (the default when this option is "
-"not set) also shows submodules that have untracked files in their work tree "
-"as changed. This setting overrides any setting made in .gitmodules for this "
-"submodule, both settings can be overridden on the command line by using the "
-"\"--ignore-submodules\" option. The 'git submodule' commands are not "
+"in their work tree show up. Using \"none\" (the default when this option is"
+" not set) also shows submodules that have untracked files in their work tree"
+" as changed. This setting overrides any setting made in .gitmodules for "
+"this submodule, both settings can be overridden on the command line by using"
+" the \"--ignore-submodules\" option. The 'git submodule' commands are not "
"affected by this setting."
msgstr ""
@@ -9243,8 +8955,9 @@ msgstr ""
#: en/config.txt:3060
msgid ""
"Specifies how many submodules are fetched/cloned at the same time. A "
-"positive integer allows up to that number of submodules fetched in parallel. "
-"A value of 0 will give some reasonable default. If unset, it defaults to 1."
+"positive integer allows up to that number of submodules fetched in parallel."
+" A value of 0 will give some reasonable default. If unset, it defaults to "
+"1."
msgstr ""
#. type: Labeled list
@@ -9257,8 +8970,8 @@ msgstr ""
#: en/config.txt:3067
msgid ""
"Specifies how the submodules obtain alternates when submodules are cloned. "
-"Possible values are `no`, `superproject`. By default `no` is assumed, which "
-"doesn't add references. When the value is set to `superproject` the "
+"Possible values are `no`, `superproject`. By default `no` is assumed, which"
+" doesn't add references. When the value is set to `superproject` the "
"submodule to be cloned computes its alternates location relative to the "
"superprojects alternate."
msgstr ""
@@ -9300,9 +9013,9 @@ msgstr ""
#. type: Plain text
#: en/config.txt:3082
msgid ""
-"This variable controls the sort ordering of tags when displayed by linkgit:"
-"git-tag[1]. Without the \"--sort=<value>\" option provided, the value of "
-"this variable will be used as the default."
+"This variable controls the sort ordering of tags when displayed by "
+"linkgit:git-tag[1]. Without the \"--sort=<value>\" option provided, the "
+"value of this variable will be used as the default."
msgstr ""
#. type: Labeled list
@@ -9366,10 +9079,10 @@ msgid ""
"reference before it is matched against `transfer.hiderefs` patterns. For "
"example, if `refs/heads/master` is specified in `transfer.hideRefs` and the "
"current namespace is `foo`, then `refs/namespaces/foo/refs/heads/master` is "
-"omitted from the advertisements but `refs/heads/master` and `refs/namespaces/"
-"bar/refs/heads/master` are still advertised as so-called \"have\" lines. In "
-"order to match refs before stripping, add a `^` in front of the ref name. If "
-"you combine `!` and `^`, `!` must be specified first."
+"omitted from the advertisements but `refs/heads/master` and "
+"`refs/namespaces/bar/refs/heads/master` are still advertised as so-called "
+"\"have\" lines. In order to match refs before stripping, add a `^` in front "
+"of the ref name. If you combine `!` and `^`, `!` must be specified first."
msgstr ""
#. type: Plain text
@@ -9420,8 +9133,8 @@ msgstr ""
msgid ""
"This variable is the same as `transfer.hideRefs`, but applies only to "
"`upload-pack` (and so affects only fetches, not pushes). An attempt to "
-"fetch a hidden ref by `git fetch` will fail. See also `uploadpack."
-"allowTipSHA1InWant`."
+"fetch a hidden ref by `git fetch` will fail. See also "
+"`uploadpack.allowTipSHA1InWant`."
msgstr ""
#. type: Labeled list
@@ -9435,8 +9148,8 @@ msgstr ""
msgid ""
"When `uploadpack.hideRefs` is in effect, allow `upload-pack` to accept a "
"fetch request that asks for an object at the tip of a hidden ref (by "
-"default, such a request is rejected). See also `uploadpack.hideRefs`. Even "
-"if this is false, a client may be able to steal objects via the techniques "
+"default, such a request is rejected). See also `uploadpack.hideRefs`. Even"
+" if this is false, a client may be able to steal objects via the techniques "
"described in the \"SECURITY\" section of the linkgit:gitnamespaces[7] man "
"page; it's best to keep private data in a separate repository."
msgstr ""
@@ -9485,9 +9198,9 @@ msgid ""
"information, but if `--quiet` was used for the fetch, `pack-objects` will "
"output nothing at all until the pack data begins. Some clients and networks "
"may consider the server to be hung and give up. Setting this option "
-"instructs `upload-pack` to send an empty keepalive packet every `uploadpack."
-"keepAlive` seconds. Setting this option to 0 disables keepalive packets "
-"entirely. The default is 5 seconds."
+"instructs `upload-pack` to send an empty keepalive packet every "
+"`uploadpack.keepAlive` seconds. Setting this option to 0 disables keepalive "
+"packets entirely. The default is 5 seconds."
msgstr ""
#. type: Labeled list
@@ -9500,12 +9213,12 @@ msgstr ""
#: en/config.txt:3185
msgid ""
"If this option is set, when `upload-pack` would run `git pack-objects` to "
-"create a packfile for a client, it will run this shell command instead. The "
-"`pack-objects` command and arguments it _would_ have run (including the `git "
-"pack-objects` at the beginning) are appended to the shell command. The stdin "
-"and stdout of the hook are treated as if `pack-objects` itself was run. I."
-"e., `upload-pack` will feed input intended for `pack-objects` to the hook, "
-"and expects a completed packfile on stdout."
+"create a packfile for a client, it will run this shell command instead. The"
+" `pack-objects` command and arguments it _would_ have run (including the "
+"`git pack-objects` at the beginning) are appended to the shell command. The "
+"stdin and stdout of the hook are treated as if `pack-objects` itself was "
+"run. I.e., `upload-pack` will feed input intended for `pack-objects` to the "
+"hook, and expects a completed packfile on stdout."
msgstr ""
#. type: Plain text
@@ -9526,12 +9239,12 @@ msgstr ""
#: en/config.txt:3200
msgid ""
"Any URL that starts with this value will be rewritten to start, instead, "
-"with <base>. In cases where some site serves a large number of repositories, "
-"and serves them with multiple access methods, and some users need to use "
+"with <base>. In cases where some site serves a large number of repositories,"
+" and serves them with multiple access methods, and some users need to use "
"different access methods, this feature allows people to specify any of the "
"equivalent URLs and have Git automatically rewrite the URL to the best "
-"alternative for the particular user, even for a never-before-seen repository "
-"on the site. When more than one insteadOf strings match a given URL, the "
+"alternative for the particular user, even for a never-before-seen repository"
+" on the site. When more than one insteadOf strings match a given URL, the "
"longest match is used."
msgstr ""
@@ -9551,8 +9264,8 @@ msgid ""
"feature allows people to specify a pull-only URL and have Git automatically "
"use an appropriate URL to push, even for a never-before-seen repository on "
"the site. When more than one pushInsteadOf strings match a given URL, the "
-"longest match is used. If a remote has an explicit pushurl, Git will ignore "
-"this setting for that remote."
+"longest match is used. If a remote has an explicit pushurl, Git will ignore"
+" this setting for that remote."
msgstr ""
#. type: Labeled list
@@ -9592,12 +9305,12 @@ msgstr ""
#. type: Plain text
#: en/config.txt:3233
msgid ""
-"Instruct Git to avoid trying to guess defaults for `user.email` and `user."
-"name`, and instead retrieve the values only from the configuration. For "
-"example, if you have multiple email addresses and would like to use a "
+"Instruct Git to avoid trying to guess defaults for `user.email` and "
+"`user.name`, and instead retrieve the values only from the configuration. "
+"For example, if you have multiple email addresses and would like to use a "
"different one for each repository, then with this configuration option set "
-"to `true` in the global config along with a name, Git will prompt you to set "
-"up an email before making new commits in a newly cloned repository. "
+"to `true` in the global config along with a name, Git will prompt you to set"
+" up an email before making new commits in a newly cloned repository. "
"Defaults to `false`."
msgstr ""
@@ -9639,11 +9352,11 @@ msgstr ""
#. type: Plain text
#: en/config.txt:3252
msgid ""
-"Even when version sort is used in linkgit:git-tag[1], tagnames with the same "
-"base version but different suffixes are still sorted lexicographically, "
+"Even when version sort is used in linkgit:git-tag[1], tagnames with the same"
+" base version but different suffixes are still sorted lexicographically, "
"resulting e.g. in prerelease tags appearing after the main release (e.g. "
-"\"1.0-rc1\" after \"1.0\"). This variable can be specified to determine the "
-"sorting order of tags with different suffixes."
+"\"1.0-rc1\" after \"1.0\"). This variable can be specified to determine the"
+" sorting order of tags with different suffixes."
msgstr ""
#. type: Plain text
@@ -9655,13 +9368,13 @@ msgid ""
"\"1.0\". If specified multiple times, once per suffix, then the order of "
"suffixes in the configuration will determine the sorting order of tagnames "
"with those suffixes. E.g. if \"-pre\" appears before \"-rc\" in the "
-"configuration, then all \"1.0-preX\" tags will be listed before any \"1.0-rcX"
-"\" tags. The placement of the main release tag relative to tags with "
-"various suffixes can be determined by specifying the empty suffix among "
-"those other suffixes. E.g. if the suffixes \"-rc\", \"\", \"-ck\" and \"-bfs"
-"\" appear in the configuration in this order, then all \"v4.8-rcX\" tags are "
-"listed first, followed by \"v4.8\", then \"v4.8-ckX\" and finally \"v4.8-bfsX"
-"\"."
+"configuration, then all \"1.0-preX\" tags will be listed before any "
+"\"1.0-rcX\" tags. The placement of the main release tag relative to tags "
+"with various suffixes can be determined by specifying the empty suffix among"
+" those other suffixes. E.g. if the suffixes \"-rc\", \"\", \"-ck\" and "
+"\"-bfs\" appear in the configuration in this order, then all \"v4.8-rcX\" "
+"tags are listed first, followed by \"v4.8\", then \"v4.8-ckX\" and finally "
+"\"v4.8-bfsX\"."
msgstr ""
#. type: Plain text
@@ -9670,8 +9383,8 @@ msgid ""
"If more than one suffixes match the same tagname, then that tagname will be "
"sorted according to the suffix which starts at the earliest position in the "
"tagname. If more than one different matching suffixes start at that "
-"earliest position, then that tagname will be sorted according to the longest "
-"of those suffixes. The sorting order between different suffixes is "
+"earliest position, then that tagname will be sorted according to the longest"
+" of those suffixes. The sorting order between different suffixes is "
"undefined if they are in multiple config files."
msgstr ""
@@ -9718,10 +9431,10 @@ msgstr ""
#. type: Plain text
#: en/date-formats.txt:15
msgid ""
-"It is `<unix timestamp> <time zone offset>`, where `<unix timestamp>` is the "
-"number of seconds since the UNIX epoch. `<time zone offset>` is a positive "
-"or negative offset from UTC. For example CET (which is 1 hour ahead of UTC) "
-"is `+0100`."
+"It is `<unix timestamp> <time zone offset>`, where `<unix timestamp>` is the"
+" number of seconds since the UNIX epoch. `<time zone offset>` is a positive"
+" or negative offset from UTC. For example CET (which is 1 hour ahead of "
+"UTC) is `+0100`."
msgstr ""
#. type: Labeled list
@@ -9733,8 +9446,8 @@ msgstr ""
#. type: Plain text
#: en/date-formats.txt:19
msgid ""
-"The standard email format as described by RFC 2822, for example `Thu, 07 Apr "
-"2005 22:13:13 +0200`."
+"The standard email format as described by RFC 2822, for example `Thu, 07 Apr"
+" 2005 22:13:13 +0200`."
msgstr ""
#. type: Labeled list
@@ -9754,15 +9467,15 @@ msgstr ""
#. type: Plain text
#: en/date-formats.txt:26
msgid ""
-"In addition, the date part is accepted in the following formats: `YYYY.MM."
-"DD`, `MM/DD/YYYY` and `DD.MM.YYYY`."
+"In addition, the date part is accepted in the following formats: "
+"`YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:1
#, no-wrap
msgid "diff.autoRefreshIndex"
-msgstr ""
+msgstr "diff.autoRefreshIndex"
#. type: Plain text
#: en/diff-config.txt:10
@@ -9779,16 +9492,17 @@ msgstr ""
#: en/diff-config.txt:11
#, no-wrap
msgid "diff.dirstat"
-msgstr ""
+msgstr "diff.dirstat"
#. type: Plain text
#: en/diff-config.txt:18
msgid ""
"A comma separated list of `--dirstat` parameters specifying the default "
"behavior of the `--dirstat` option to linkgit:git-diff[1]` and friends. The "
-"defaults can be overridden on the command line (using `--dirstat=<param1,"
-"param2,...>`). The fallback defaults (when not changed by `diff.dirstat`) "
-"are `changes,noncumulative,3`. The following parameters are available:"
+"defaults can be overridden on the command line (using "
+"`--dirstat=<param1,param2,...>`). The fallback defaults (when not changed by"
+" `diff.dirstat`) are `changes,noncumulative,3`. The following parameters "
+"are available:"
msgstr ""
#. type: Labeled list
@@ -9820,8 +9534,8 @@ msgid ""
"Compute the dirstat numbers by doing the regular line-based diff analysis, "
"and summing the removed/added line counts. (For binary files, count 64-byte "
"chunks instead, since binary files have no natural concept of lines). This "
-"is a more expensive `--dirstat` behavior than the `changes` behavior, but it "
-"does count rearranged lines within a file as much as other changes. The "
+"is a more expensive `--dirstat` behavior than the `changes` behavior, but it"
+" does count rearranged lines within a file as much as other changes. The "
"resulting output is consistent with what you get from the other `--*stat` "
"options."
msgstr ""
@@ -9851,8 +9565,8 @@ msgstr ""
#: en/diff-config.txt:44 en/diff-options.txt:161
msgid ""
"Count changes in a child directory for the parent directory as well. Note "
-"that when using `cumulative`, the sum of the percentages reported may exceed "
-"100%. The default (non-cumulative) behavior can be specified with the "
+"that when using `cumulative`, the sum of the percentages reported may exceed"
+" 100%. The default (non-cumulative) behavior can be specified with the "
"`noncumulative` parameter."
msgstr ""
@@ -9882,7 +9596,7 @@ msgstr ""
#: en/diff-config.txt:55
#, no-wrap
msgid "diff.statGraphWidth"
-msgstr ""
+msgstr "diff.statGraphWidth"
#. type: Plain text
#: en/diff-config.txt:58
@@ -9895,7 +9609,7 @@ msgstr ""
#: en/diff-config.txt:59
#, no-wrap
msgid "diff.context"
-msgstr ""
+msgstr "diff.context"
#. type: Plain text
#: en/diff-config.txt:62
@@ -9908,21 +9622,21 @@ msgstr ""
#: en/diff-config.txt:63
#, no-wrap
msgid "diff.interHunkContext"
-msgstr ""
+msgstr "diff.interHunkContext"
#. type: Plain text
#: en/diff-config.txt:68
msgid ""
"Show the context between diff hunks, up to the specified number of lines, "
-"thereby fusing the hunks that are close to each other. This value serves as "
-"the default for the `--inter-hunk-context` command line option."
+"thereby fusing the hunks that are close to each other. This value serves as"
+" the default for the `--inter-hunk-context` command line option."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:69
#, no-wrap
msgid "diff.external"
-msgstr ""
+msgstr "diff.external"
#. type: Plain text
#: en/diff-config.txt:77
@@ -9939,7 +9653,7 @@ msgstr ""
#: en/diff-config.txt:78
#, no-wrap
msgid "diff.ignoreSubmodules"
-msgstr ""
+msgstr "diff.ignoreSubmodules"
#. type: Plain text
#: en/diff-config.txt:87
@@ -9957,7 +9671,7 @@ msgstr ""
#: en/diff-config.txt:88
#, no-wrap
msgid "diff.mnemonicPrefix"
-msgstr ""
+msgstr "diff.mnemonicPrefix"
#. type: Plain text
#: en/diff-config.txt:93
@@ -10031,7 +9745,7 @@ msgstr ""
#: en/diff-config.txt:104
#, no-wrap
msgid "diff.noprefix"
-msgstr ""
+msgstr "diff.noprefix"
#. type: Plain text
#: en/diff-config.txt:106
@@ -10042,7 +9756,7 @@ msgstr ""
#: en/diff-config.txt:107
#, no-wrap
msgid "diff.orderFile"
-msgstr ""
+msgstr "diff.orderFile"
#. type: Plain text
#: en/diff-config.txt:112
@@ -10056,7 +9770,7 @@ msgstr ""
#: en/diff-config.txt:113
#, no-wrap
msgid "diff.renameLimit"
-msgstr ""
+msgstr "diff.renameLimit"
#. type: Plain text
#: en/diff-config.txt:116
@@ -10069,7 +9783,7 @@ msgstr ""
#: en/diff-config.txt:117
#, no-wrap
msgid "diff.renames"
-msgstr ""
+msgstr "diff.renames"
#. type: Plain text
#: en/diff-config.txt:125
@@ -10078,15 +9792,15 @@ msgid ""
"is disabled. If set to \"true\", basic rename detection is enabled. If set "
"to \"copies\" or \"copy\", Git will detect copies, as well. Defaults to "
"true. Note that this affects only 'git diff' Porcelain like linkgit:git-"
-"diff[1] and linkgit:git-log[1], and not lower level commands such as linkgit:"
-"git-diff-files[1]."
+"diff[1] and linkgit:git-log[1], and not lower level commands such as "
+"linkgit:git-diff-files[1]."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:126
#, no-wrap
msgid "diff.suppressBlankEmpty"
-msgstr ""
+msgstr "diff.suppressBlankEmpty"
#. type: Plain text
#: en/diff-config.txt:129
@@ -10099,23 +9813,23 @@ msgstr ""
#: en/diff-config.txt:130
#, no-wrap
msgid "diff.submodule"
-msgstr ""
+msgstr "diff.submodule"
#. type: Plain text
#: en/diff-config.txt:137
msgid ""
-"Specify the format in which differences in submodules are shown. The \"short"
-"\" format just shows the names of the commits at the beginning and end of "
-"the range. The \"log\" format lists the commits in the range like linkgit:"
-"git-submodule[1] `summary` does. The \"diff\" format shows an inline diff of "
-"the changed contents of the submodule. Defaults to \"short\"."
+"Specify the format in which differences in submodules are shown. The "
+"\"short\" format just shows the names of the commits at the beginning and "
+"end of the range. The \"log\" format lists the commits in the range like "
+"linkgit:git-submodule[1] `summary` does. The \"diff\" format shows an inline"
+" diff of the changed contents of the submodule. Defaults to \"short\"."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:138
#, no-wrap
msgid "diff.wordRegex"
-msgstr ""
+msgstr "diff.wordRegex"
#. type: Plain text
#: en/diff-config.txt:143
@@ -10147,9 +9861,9 @@ msgstr ""
#. type: Plain text
#: en/diff-config.txt:152
msgid ""
-"The regular expression that the diff driver should use to recognize the hunk "
-"header. A built-in pattern may also be used. See linkgit:gitattributes[5] "
-"for details."
+"The regular expression that the diff driver should use to recognize the hunk"
+" header. A built-in pattern may also be used. See linkgit:gitattributes[5]"
+" for details."
msgstr ""
#. type: Labeled list
@@ -10175,8 +9889,8 @@ msgstr ""
#: en/diff-config.txt:162
msgid ""
"The command that the diff driver should call to generate the text-converted "
-"version of a file. The result of the conversion is used to generate a human-"
-"readable diff. See linkgit:gitattributes[5] for details."
+"version of a file. The result of the conversion is used to generate a "
+"human-readable diff. See linkgit:gitattributes[5] for details."
msgstr ""
#. type: Labeled list
@@ -10207,25 +9921,24 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:172 en/git-difftool.txt:111
-#, fuzzy, no-wrap
-#| msgid "diff"
+#, no-wrap
msgid "diff.tool"
-msgstr "diff"
+msgstr "diff.tool"
#. type: Plain text
#: en/diff-config.txt:178
msgid ""
"Controls which diff tool is used by linkgit:git-difftool[1]. This variable "
"overrides the value configured in `merge.tool`. The list below shows the "
-"valid built-in values. Any other value is treated as a custom diff tool and "
-"requires that a corresponding difftool.<tool>.cmd variable is defined."
+"valid built-in values. Any other value is treated as a custom diff tool and"
+" requires that a corresponding difftool.<tool>.cmd variable is defined."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:181
#, no-wrap
msgid "diff.indentHeuristic"
-msgstr ""
+msgstr "diff.indentHeuristic"
#. type: Plain text
#: en/diff-config.txt:184
@@ -10238,7 +9951,7 @@ msgstr ""
#: en/diff-config.txt:185
#, no-wrap
msgid "diff.algorithm"
-msgstr ""
+msgstr "diff.algorithm"
#. type: Plain text
#: en/diff-config.txt:187
@@ -10295,7 +10008,7 @@ msgstr ""
#: en/diff-config.txt:202
#, no-wrap
msgid "diff.wsErrorHighlight"
-msgstr ""
+msgstr "diff.wsErrorHighlight"
#. type: Plain text
#: en/diff-config.txt:206
@@ -10315,8 +10028,8 @@ msgstr "Output format"
#. type: Plain text
#: en/diff-format.txt:6
msgid ""
-"The raw output format from \"git-diff-index\", \"git-diff-tree\", \"git-diff-"
-"files\" and \"git diff --raw\" are very similar."
+"The raw output format from \"git-diff-index\", \"git-diff-tree\", \"git-"
+"diff-files\" and \"git diff --raw\" are very similar."
msgstr ""
#. type: Plain text
@@ -10373,8 +10086,8 @@ msgstr ""
#. type: Plain text
#: en/diff-format.txt:25
msgid ""
-"The \"git-diff-tree\" command begins its output by printing the hash of what "
-"is being compared. After that, all the commands print one output line per "
+"The \"git-diff-tree\" command begins its output by printing the hash of what"
+" is being compared. After that, all the commands print one output line per "
"changed file."
msgstr ""
@@ -10428,8 +10141,7 @@ msgstr ""
#. type: Plain text
#: en/diff-format.txt:47
-msgid ""
-"sha1 for \"dst\"; 0\\{40\\} if creation, unmerged or \"look at work tree\"."
+msgid "sha1 for \"dst\"; 0\\{40\\} if creation, unmerged or \"look at work tree\"."
msgstr ""
#. type: Plain text
@@ -10512,9 +10224,9 @@ msgstr ""
#: en/diff-format.txt:71
msgid ""
"Status letters C and R are always followed by a score (denoting the "
-"percentage of similarity between the source and target of the move or "
-"copy). Status letter M may be followed by a score (denoting the percentage "
-"of dissimilarity) for file rewrites."
+"percentage of similarity between the source and target of the move or copy)."
+" Status letter M may be followed by a score (denoting the percentage of "
+"dissimilarity) for file rewrites."
msgstr ""
#. type: Plain text
@@ -10548,8 +10260,8 @@ msgstr ""
#. type: Plain text
#: en/diff-format.txt:85 en/git-ls-files.txt:204 en/git-ls-tree.txt:101
msgid ""
-"Without the `-z` option, pathnames with \"unusual\" characters are quoted as "
-"explained for the configuration variable `core.quotePath` (see linkgit:git-"
+"Without the `-z` option, pathnames with \"unusual\" characters are quoted as"
+" explained for the configuration variable `core.quotePath` (see linkgit:git-"
"config[1]). Using `-z` the filename is output verbatim and the line is "
"terminated by a NUL byte."
msgstr ""
@@ -10564,8 +10276,8 @@ msgstr ""
#: en/diff-format.txt:93
msgid ""
"\"git-diff-tree\", \"git-diff-files\" and \"git-diff --raw\" can take `-c` "
-"or `--cc` option to generate diff output also for merge commits. The output "
-"differs from the format described above in the following way:"
+"or `--cc` option to generate diff output also for merge commits. The output"
+" differs from the format described above in the following way:"
msgstr ""
#. type: Plain text
@@ -10625,9 +10337,9 @@ msgstr ""
#: en/diff-format.txt:125
msgid ""
"When showing a change that involves a rename or a copy, `--stat` output "
-"formats the pathnames compactly by combining common prefix and suffix of the "
-"pathnames. For example, a change that moves `arch/i386/Makefile` to `arch/"
-"x86/Makefile` while modifying 4 lines will be shown like this:"
+"formats the pathnames compactly by combining common prefix and suffix of the"
+" pathnames. For example, a change that moves `arch/i386/Makefile` to "
+"`arch/x86/Makefile` while modifying 4 lines will be shown like this:"
msgstr ""
#. type: delimited block -
@@ -10639,8 +10351,9 @@ msgstr ""
#. type: Plain text
#: en/diff-format.txt:133
msgid ""
-"The `--numstat` option gives the diffstat(1) information but is designed for "
-"easier machine consumption. An entry in `--numstat` output looks like this:"
+"The `--numstat` option gives the diffstat(1) information but is designed for"
+" easier machine consumption. An entry in `--numstat` output looks like "
+"this:"
msgstr ""
#. type: delimited block -
@@ -10684,7 +10397,8 @@ msgstr ""
#. type: Plain text
#: en/diff-format.txt:149
-msgid "When `-z` output option is in effect, the output is formatted this way:"
+msgid ""
+"When `-z` output option is in effect, the output is formatted this way:"
msgstr ""
#. type: delimited block -
@@ -10723,8 +10437,8 @@ msgstr ""
#. type: Plain text
#: en/diff-format.txt:171
msgid ""
-"The extra `NUL` before the preimage path in renamed case is to allow scripts "
-"that read the output to tell if the current record being read is a single-"
+"The extra `NUL` before the preimage path in renamed case is to allow scripts"
+" that read the output to tell if the current record being read is a single-"
"path record or a rename/copy record without reading ahead. After reading "
"added and deleted lines, reading up to `NUL` would yield the pathname, but "
"if that is `NUL`, the record will show two paths."
@@ -10830,8 +10544,8 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:55
msgid ""
-"The index line includes the SHA-1 checksum before and after the change. The "
-"<mode> is included if the file mode does not change; otherwise, separate "
+"The index line includes the SHA-1 checksum before and after the change. The"
+" <mode> is included if the file mode does not change; otherwise, separate "
"lines indicate the old and the new mode."
msgstr ""
@@ -10996,8 +10710,8 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:146
msgid ""
-"Similar to two-line header for traditional 'unified' diff format, `/dev/"
-"null` is used to signal created or deleted files."
+"Similar to two-line header for traditional 'unified' diff format, "
+"`/dev/null` is used to signal created or deleted files."
msgstr ""
#. type: Plain text
@@ -11026,12 +10740,12 @@ msgstr ""
#: en/diff-generate-patch.txt:166
msgid ""
"Unlike the traditional 'unified' diff format, which shows two files A and B "
-"with a single column that has `-` (minus -- appears in A but removed in B), `"
-"+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) "
+"with a single column that has `-` (minus -- appears in A but removed in B), "
+"`+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) "
"prefix, this format compares two or more files file1, file2,... with one "
"file X, and shows how X differs from each of fileN. One column for each of "
-"fileN is prepended to the output line to note how X's line is different from "
-"it."
+"fileN is prepended to the output line to note how X's line is different from"
+" it."
msgstr ""
#. type: Plain text
@@ -11059,16 +10773,15 @@ msgid ""
"When shown by `git diff-tree -c`, it compares the parents of a merge commit "
"with the merge result (i.e. file1..fileN are the parents). When shown by "
"`git diff-files -c`, it compares the two unresolved merge parents with the "
-"working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage "
-"3 aka \"their version\")."
+"working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage"
+" 3 aka \"their version\")."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:17 en/git-rebase.txt:319 en/merge-options.txt:57
-#, fuzzy, no-wrap
-#| msgid "--no-track"
+#, no-wrap
msgid "--no-stat"
-msgstr "--no-track"
+msgstr "--no-stat"
#. type: Plain text
#: en/diff-options.txt:19
@@ -11115,10 +10828,9 @@ msgstr "-s"
#. type: Labeled list
#: en/diff-options.txt:31
-#, fuzzy, no-wrap
-#| msgid "--patch"
+#, no-wrap
msgid "--no-patch"
-msgstr "--patch"
+msgstr "--no-patch"
#. type: Plain text
#: en/diff-options.txt:34
@@ -11155,7 +10867,7 @@ msgstr ""
#: en/git-verify-tag.txt:19
#, no-wrap
msgid "--raw"
-msgstr ""
+msgstr "--raw"
#. type: Plain text
#: en/diff-options.txt:48
@@ -11176,10 +10888,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:62
-#, fuzzy, no-wrap
-#| msgid "--patch"
+#, no-wrap
msgid "--patch-with-raw"
-msgstr "--patch"
+msgstr "--patch-with-raw"
#. type: Plain text
#: en/diff-options.txt:64
@@ -11190,14 +10901,13 @@ msgstr ""
#: en/diff-options.txt:68
#, no-wrap
msgid "--minimal"
-msgstr ""
+msgstr "--minimal"
#. type: Labeled list
#: en/diff-options.txt:72
-#, fuzzy, no-wrap
-#| msgid "--patch"
+#, no-wrap
msgid "--patience"
-msgstr "--patch"
+msgstr "--patience"
#. type: Plain text
#: en/diff-options.txt:74
@@ -11208,7 +10918,7 @@ msgstr ""
#: en/diff-options.txt:75
#, no-wrap
msgid "--histogram"
-msgstr ""
+msgstr "--histogram"
#. type: Plain text
#: en/diff-options.txt:77
@@ -11243,16 +10953,16 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:112
msgid ""
-"Generate a diffstat. By default, as much space as necessary will be used for "
-"the filename part, and the rest for the graph part. Maximum width defaults "
+"Generate a diffstat. By default, as much space as necessary will be used for"
+" the filename part, and the rest for the graph part. Maximum width defaults "
"to terminal width, or 80 columns if not connected to a terminal, and can be "
"overridden by `<width>`. The width of the filename part can be limited by "
"giving another width `<name-width>` after a comma. The width of the graph "
"part can be limited by using `--stat-graph-width=<width>` (affects all "
-"commands generating a stat graph) or by setting `diff."
-"statGraphWidth=<width>` (does not affect `git format-patch`). By giving a "
-"third parameter `<count>`, you can limit the output to the first `<count>` "
-"lines, followed by `...` if there are more."
+"commands generating a stat graph) or by setting "
+"`diff.statGraphWidth=<width>` (does not affect `git format-patch`). By "
+"giving a third parameter `<count>`, you can limit the output to the first "
+"`<count>` lines, followed by `...` if there are more."
msgstr ""
#. type: Plain text
@@ -11266,7 +10976,7 @@ msgstr ""
#: en/diff-options.txt:116 en/git-apply.txt:45
#, no-wrap
msgid "--numstat"
-msgstr ""
+msgstr "--numstat"
#. type: Plain text
#: en/diff-options.txt:122
@@ -11280,7 +10990,7 @@ msgstr ""
#: en/diff-options.txt:123
#, no-wrap
msgid "--shortstat"
-msgstr ""
+msgstr "--shortstat"
#. type: Plain text
#: en/diff-options.txt:127
@@ -11310,8 +11020,8 @@ msgstr ""
msgid ""
"Example: The following will count changed files, while ignoring directories "
"with less than 10% of the total amount of changed files, and accumulating "
-"child directory counts in the parent directories: `--dirstat=files,10,"
-"cumulative`."
+"child directory counts in the parent directories: "
+"`--dirstat=files,10,cumulative`."
msgstr ""
#. type: Labeled list
@@ -11319,20 +11029,20 @@ msgstr ""
#: en/merge-options.txt:98
#, no-wrap
msgid "--summary"
-msgstr ""
+msgstr "--summary"
#. type: Plain text
#: en/diff-options.txt:175
msgid ""
-"Output a condensed summary of extended header information such as creations, "
-"renames and mode changes."
+"Output a condensed summary of extended header information such as creations,"
+" renames and mode changes."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:177
#, no-wrap
msgid "--patch-with-stat"
-msgstr ""
+msgstr "--patch-with-stat"
#. type: Plain text
#: en/diff-options.txt:179
@@ -11358,8 +11068,8 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:189
msgid ""
-"Also, when `--raw` or `--numstat` has been given, do not munge pathnames and "
-"use NULs as output field terminators."
+"Also, when `--raw` or `--numstat` has been given, do not munge pathnames and"
+" use NULs as output field terminators."
msgstr ""
#. type: Plain text
@@ -11381,10 +11091,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:199 en/git-config.txt:192 en/git-grep.txt:178
#: en/git-ls-tree.txt:59 en/git-name-rev.txt:51
-#, fuzzy, no-wrap
-#| msgid "--only"
+#, no-wrap
msgid "--name-only"
-msgstr "--only"
+msgstr "--name-only"
#. type: Plain text
#: en/diff-options.txt:201
@@ -11393,16 +11102,15 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:202 en/git-ls-tree.txt:60
-#, fuzzy, no-wrap
-#| msgid "status"
+#, no-wrap
msgid "--name-status"
-msgstr "status"
+msgstr "--name-status"
#. type: Plain text
#: en/diff-options.txt:205
msgid ""
-"Show only names and status of changed files. See the description of the `--"
-"diff-filter` option on what the status letters mean."
+"Show only names and status of changed files. See the description of the "
+"`--diff-filter` option on what the status letters mean."
msgstr ""
#. type: Labeled list
@@ -11414,10 +11122,10 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:217
msgid ""
-"Specify how differences in submodules are shown. When specifying `--"
-"submodule=short` the 'short' format is used. This format just shows the "
-"names of the commits at the beginning and end of the range. When `--"
-"submodule` or `--submodule=log` is specified, the 'log' format is used. "
+"Specify how differences in submodules are shown. When specifying "
+"`--submodule=short` the 'short' format is used. This format just shows the "
+"names of the commits at the beginning and end of the range. When "
+"`--submodule` or `--submodule=log` is specified, the 'log' format is used. "
"This format lists the commits in the range like linkgit:git-submodule[1] "
"`summary` does. When `--submodule=diff` is specified, the 'diff' format is "
"used. This format shows an inline diff of the changes in the submodule "
@@ -11436,8 +11144,8 @@ msgstr "--color"
#. type: Plain text
#: en/diff-options.txt:222
msgid ""
-"Show colored diff. `--color` (i.e. without '=<when>') is the same as `--"
-"color=always`. '<when>' can be one of `always`, `never`, or `auto`."
+"Show colored diff. `--color` (i.e. without '=<when>') is the same as "
+"`--color=always`. '<when>' can be one of `always`, `never`, or `auto`."
msgstr ""
#. type: Plain text
@@ -11514,8 +11222,8 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:254
msgid ""
-"Use a special line-based format intended for script consumption. Added/"
-"removed/unchanged runs are printed in the usual unified diff format, "
+"Use a special line-based format intended for script consumption. "
+"Added/removed/unchanged runs are printed in the usual unified diff format, "
"starting with a `+`/`-`/` ` character at the beginning of the line and "
"extending to the end of the line. Newlines in the input are represented by "
"a tilde `~` on a line of its own."
@@ -11535,8 +11243,8 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:260
msgid ""
-"Note that despite the name of the first mode, color is used to highlight the "
-"changed parts in all modes if enabled."
+"Note that despite the name of the first mode, color is used to highlight the"
+" changed parts in all modes if enabled."
msgstr ""
#. type: Labeled list
@@ -11560,8 +11268,8 @@ msgid ""
"between these matches is considered whitespace and ignored(!) for the "
"purposes of finding differences. You may want to append `|[^[:space:]]` to "
"your regular expression to make sure that it matches all non-whitespace "
-"characters. A match that contains a newline is silently truncated(!) at the "
-"newline."
+"characters. A match that contains a newline is silently truncated(!) at the"
+" newline."
msgstr ""
#. type: Plain text
@@ -11595,18 +11303,16 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:287
-#, fuzzy, no-wrap
-#| msgid "--rename-section"
+#, no-wrap
msgid "--no-renames"
-msgstr "--rename-section"
+msgstr "--no-renames"
-#
#. type: Plain text
#: en/diff-options.txt:290
#, fuzzy
#| msgid ""
-#| "Turn off branch colors, even when the configuration file gives the "
-#| "default to color output."
+#| "Turn off branch colors, even when the configuration file gives the default "
+#| "to color output."
msgid ""
"Turn off rename detection, even when the configuration file gives the "
"default to do so."
@@ -11616,10 +11322,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:292 en/git-apply.txt:58
-#, fuzzy, no-wrap
-#| msgid "--no-checkout"
+#, no-wrap
msgid "--check"
-msgstr "--no-checkout"
+msgstr "--check"
#. type: Plain text
#: en/diff-options.txt:301
@@ -11653,10 +11358,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:315
-#, fuzzy, no-wrap
-#| msgid "--full-diff"
+#, no-wrap
msgid "--full-index"
-msgstr "--full-diff"
+msgstr "--full-index"
#. type: Plain text
#: en/diff-options.txt:319
@@ -11670,13 +11374,13 @@ msgstr ""
#: en/diff-options.txt:320 en/git-apply.txt:150
#, no-wrap
msgid "--binary"
-msgstr ""
+msgstr "--binary"
#. type: Plain text
#: en/diff-options.txt:323
msgid ""
-"In addition to `--full-index`, output a binary diff that can be applied with "
-"`git-apply`."
+"In addition to `--full-index`, output a binary diff that can be applied with"
+" `git-apply`."
msgstr ""
#. type: Labeled list
@@ -11693,8 +11397,8 @@ msgid ""
"Instead of showing the full 40-byte hexadecimal object name in diff-raw "
"format output and diff-tree header lines, show only a partial prefix. This "
"is independent of the `--full-index` option above, which controls the diff-"
-"patch output format. Non default number of digits can be specified with `--"
-"abbrev=<n>`."
+"patch output format. Non default number of digits can be specified with "
+"`--abbrev=<n>`."
msgstr ""
#. type: Labeled list
@@ -11719,23 +11423,24 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:346
msgid ""
-"It affects the way a change that amounts to a total rewrite of a file not as "
-"a series of deletion and insertion mixed together with a very few lines that "
-"happen to match textually as the context, but as a single deletion of "
+"It affects the way a change that amounts to a total rewrite of a file not as"
+" a series of deletion and insertion mixed together with a very few lines "
+"that happen to match textually as the context, but as a single deletion of "
"everything old followed by a single insertion of everything new, and the "
-"number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` "
-"specifies that less than 30% of the original should remain in the result for "
-"Git to consider it a total rewrite (i.e. otherwise the resulting patch will "
-"be a series of deletion and insertion mixed together with context lines)."
+"number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%`"
+" specifies that less than 30% of the original should remain in the result "
+"for Git to consider it a total rewrite (i.e. otherwise the resulting patch "
+"will be a series of deletion and insertion mixed together with context "
+"lines)."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:354
msgid ""
-"When used with -M, a totally-rewritten file is also considered as the source "
-"of a rename (usually -M only considers a file that disappeared as the source "
-"of a rename), and the number `n` controls this aspect of the -B option "
-"(defaults to 50%). `-B20%` specifies that a change with addition and "
+"When used with -M, a totally-rewritten file is also considered as the source"
+" of a rename (usually -M only considers a file that disappeared as the "
+"source of a rename), and the number `n` controls this aspect of the -B "
+"option (defaults to 50%). `-B20%` specifies that a change with addition and "
"deletion compared to 20% or more of the file's size are eligible for being "
"picked up as a possible source of a rename to another file."
msgstr ""
@@ -11805,7 +11510,7 @@ msgstr ""
#: en/diff-options.txt:380 en/git-svn.txt:595
#, no-wrap
msgid "--find-copies-harder"
-msgstr ""
+msgstr "--find-copies-harder"
#. type: Plain text
#: en/diff-options.txt:388
@@ -11813,8 +11518,8 @@ msgid ""
"For performance reasons, by default, `-C` option finds copies only if the "
"original file of the copy was modified in the same changeset. This flag "
"makes the command inspect unmodified files as candidates for the source of "
-"copy. This is a very expensive operation for large projects, so use it with "
-"caution. Giving more than one `-C` option has the same effect."
+"copy. This is a very expensive operation for large projects, so use it with"
+" caution. Giving more than one `-C` option has the same effect."
msgstr ""
#. type: Labeled list
@@ -11827,14 +11532,14 @@ msgstr "-D"
#: en/diff-options.txt:390
#, no-wrap
msgid "--irreversible-delete"
-msgstr ""
+msgstr "--irreversible-delete"
#. type: Plain text
#: en/diff-options.txt:398
msgid ""
"Omit the preimage for deletes, i.e. print only the header but not the diff "
-"between the preimage and `/dev/null`. The resulting patch is not meant to be "
-"applied with `patch` or `git apply`; this is solely for people who want to "
+"between the preimage and `/dev/null`. The resulting patch is not meant to be"
+" applied with `patch` or `git apply`; this is solely for people who want to "
"just concentrate on reviewing the text after the change. In addition, the "
"output obviously lack enough information to apply such a patch in reverse, "
"even manually, hence the name of the option."
@@ -11843,8 +11548,8 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:401
msgid ""
-"When used together with `-B`, omit also the preimage in the deletion part of "
-"a delete/create pair."
+"When used together with `-B`, omit also the preimage in the deletion part of"
+" a delete/create pair."
msgstr ""
#. type: Labeled list
@@ -11875,8 +11580,8 @@ msgid ""
"Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, "
"submodule, ...) changed (`T`), are Unmerged (`U`), are Unknown (`X`), or "
"have had their pairing Broken (`B`). Any combination of the filter "
-"characters (including none) can be used. When `*` (All-or-none) is added to "
-"the combination, all paths are selected if there is any file that matches "
+"characters (including none) can be used. When `*` (All-or-none) is added to"
+" the combination, all paths are selected if there is any file that matches "
"other criteria in the comparison; if there is no file that matches other "
"criteria, nothing is selected."
msgstr ""
@@ -11904,8 +11609,8 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:435
msgid ""
-"It is useful when you're looking for an exact block of code (like a struct), "
-"and want to know the history of that block since it first came into being: "
+"It is useful when you're looking for an exact block of code (like a struct),"
+" and want to know the history of that block since it first came into being: "
"use the feature iteratively to feed the interesting block in the preimage "
"back into `-S`, and keep going until you get the very first version of the "
"block."
@@ -11927,8 +11632,8 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:443
msgid ""
-"To illustrate the difference between `-S<regex> --pickaxe-regex` and `-"
-"G<regex>`, consider a commit with the following diff in the same file:"
+"To illustrate the difference between `-S<regex> --pickaxe-regex` and "
+"`-G<regex>`, consider a commit with the following diff in the same file:"
msgstr ""
#. type: delimited block -
@@ -11943,22 +11648,22 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:453
msgid ""
-"While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S"
-"\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of "
+"While `git log -G\"regexec\\(regexp\"` will show this commit, `git log "
+"-S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of "
"occurrences of that string did not change)."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:456
-msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
+msgid ""
+"See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:457
-#, fuzzy, no-wrap
-#| msgid "--replace-all"
+#, no-wrap
msgid "--pickaxe-all"
-msgstr "--replace-all"
+msgstr "--pickaxe-all"
#. type: Plain text
#: en/diff-options.txt:461
@@ -11969,10 +11674,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:462
-#, fuzzy, no-wrap
-#| msgid "--get-regexp"
+#, no-wrap
msgid "--pickaxe-regex"
-msgstr "--get-regexp"
+msgstr "--pickaxe-regex"
#. type: Plain text
#: en/diff-options.txt:465
@@ -11999,14 +11703,14 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:484
msgid ""
-"The output order is determined by the order of glob patterns in "
-"<orderfile>. All files with pathnames that match the first pattern are "
-"output first, all files with pathnames that match the second pattern (but "
-"not the first) are output next, and so on. All files with pathnames that do "
-"not match any pattern are output last, as if there was an implicit match-all "
-"pattern at the end of the file. If multiple pathnames have the same rank "
-"(they match the same pattern but no earlier patterns), their output order "
-"relative to each other is the normal order."
+"The output order is determined by the order of glob patterns in <orderfile>."
+" All files with pathnames that match the first pattern are output first, "
+"all files with pathnames that match the second pattern (but not the first) "
+"are output next, and so on. All files with pathnames that do not match any "
+"pattern are output last, as if there was an implicit match-all pattern at "
+"the end of the file. If multiple pathnames have the same rank (they match "
+"the same pattern but no earlier patterns), their output order relative to "
+"each other is the normal order."
msgstr ""
#. type: Plain text
@@ -12036,11 +11740,11 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:503
msgid ""
-"Patterns have the same syntax and semantics as patterns used for fnmantch(3) "
-"without the FNM_PATHNAME flag, except a pathname also matches a pattern if "
+"Patterns have the same syntax and semantics as patterns used for fnmantch(3)"
+" without the FNM_PATHNAME flag, except a pathname also matches a pattern if "
"removing any number of the final pathname components matches the pattern. "
-"For example, the pattern \"`foo*bar`\" matches \"`fooasdfbar`\" and \"`foo/"
-"bar/baz/asdf`\" but not \"`foobarx`\"."
+"For example, the pattern \"`foo*bar`\" matches \"`fooasdfbar`\" and "
+"\"`foo/bar/baz/asdf`\" but not \"`foobarx`\"."
msgstr ""
#. type: Labeled list
@@ -12067,8 +11771,8 @@ msgstr ""
msgid ""
"When run from a subdirectory of the project, it can be told to exclude "
"changes outside the directory and show pathnames relative to it with this "
-"option. When you are not in a subdirectory (e.g. in a bare repository), you "
-"can name which subdirectory to make the output relative to by giving a "
+"option. When you are not in a subdirectory (e.g. in a bare repository), you"
+" can name which subdirectory to make the output relative to by giving a "
"<path> as an argument."
msgstr ""
@@ -12087,7 +11791,7 @@ msgstr "-a"
#: en/diff-options.txt:519 en/git-grep.txt:106
#, no-wrap
msgid "--text"
-msgstr ""
+msgstr "--text"
#. type: Plain text
#: en/diff-options.txt:521
@@ -12096,10 +11800,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:522
-#, fuzzy, no-wrap
-#| msgid "--replace-all"
+#, no-wrap
msgid "--ignore-space-at-eol"
-msgstr "--replace-all"
+msgstr "--ignore-space-at-eol"
#. type: Plain text
#: en/diff-options.txt:524
@@ -12108,10 +11811,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:526 en/git-am.txt:102 en/git-apply.txt:172
-#, fuzzy, no-wrap
-#| msgid "--ignore-unmatch"
+#, no-wrap
msgid "--ignore-space-change"
-msgstr "--ignore-unmatch"
+msgstr "--ignore-space-change"
#. type: Plain text
#: en/diff-options.txt:530
@@ -12126,14 +11828,13 @@ msgstr ""
#: en/git-grep.txt:131 en/git-hash-object.txt:31 en/git-help.txt:66
#, no-wrap
msgid "-w"
-msgstr ""
+msgstr "-w"
#. type: Labeled list
#: en/diff-options.txt:532
-#, fuzzy, no-wrap
-#| msgid "--ignore-unmatch"
+#, no-wrap
msgid "--ignore-all-space"
-msgstr "--ignore-unmatch"
+msgstr "--ignore-all-space"
#. type: Plain text
#: en/diff-options.txt:536
@@ -12144,10 +11845,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:537
-#, fuzzy, no-wrap
-#| msgid "--ignore-errors"
+#, no-wrap
msgid "--ignore-blank-lines"
-msgstr "--ignore-errors"
+msgstr "--ignore-blank-lines"
#. type: Plain text
#: en/diff-options.txt:539
@@ -12164,8 +11864,8 @@ msgstr ""
#: en/diff-options.txt:545
msgid ""
"Show the context between diff hunks, up to the specified number of lines, "
-"thereby fusing hunks that are close to each other. Defaults to `diff."
-"interHunkContext` or 0 if the config option is unset."
+"thereby fusing hunks that are close to each other. Defaults to "
+"`diff.interHunkContext` or 0 if the config option is unset."
msgstr ""
#. type: Labeled list
@@ -12178,7 +11878,7 @@ msgstr ""
#: en/diff-options.txt:547 en/git-grep.txt:247
#, no-wrap
msgid "--function-context"
-msgstr ""
+msgstr "--function-context"
#. type: Plain text
#: en/diff-options.txt:549
@@ -12189,13 +11889,13 @@ msgstr ""
#: en/diff-options.txt:552 en/git-ls-remote.txt:46
#, no-wrap
msgid "--exit-code"
-msgstr ""
+msgstr "--exit-code"
#. type: Plain text
#: en/diff-options.txt:556
msgid ""
-"Make the program exit with codes similar to diff(1). That is, it exits with "
-"1 if there were differences and 0 means no differences."
+"Make the program exit with codes similar to diff(1). That is, it exits with"
+" 1 if there were differences and 0 means no differences."
msgstr ""
#. type: Labeled list
@@ -12222,10 +11922,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:562
-#, fuzzy, no-wrap
-#| msgid "--full-diff"
+#, no-wrap
msgid "--ext-diff"
-msgstr "--full-diff"
+msgstr "--ext-diff"
#. type: Plain text
#: en/diff-options.txt:566
@@ -12237,10 +11936,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:567
-#, fuzzy, no-wrap
-#| msgid "--no-verify"
+#, no-wrap
msgid "--no-ext-diff"
-msgstr "--no-verify"
+msgstr "--no-ext-diff"
#. type: Plain text
#: en/diff-options.txt:569
@@ -12251,14 +11949,13 @@ msgstr ""
#: en/diff-options.txt:570 en/git-cat-file.txt:59 en/git-grep.txt:109
#, no-wrap
msgid "--textconv"
-msgstr ""
+msgstr "--textconv"
#. type: Labeled list
#: en/diff-options.txt:571 en/git-grep.txt:112
-#, fuzzy, no-wrap
-#| msgid "--no-checkout"
+#, no-wrap
msgid "--no-textconv"
-msgstr "--no-checkout"
+msgstr "--no-textconv"
#. type: Plain text
#: en/diff-options.txt:580
@@ -12268,8 +11965,8 @@ msgid ""
"textconv filters are typically a one-way conversion, the resulting diff is "
"suitable for human consumption, but cannot be applied. For this reason, "
"textconv filters are enabled by default only for linkgit:git-diff[1] and "
-"linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing "
-"commands."
+"linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing"
+" commands."
msgstr ""
#. type: Labeled list
@@ -12286,12 +11983,12 @@ msgid ""
"\"none\" will consider the submodule modified when it either contains "
"untracked or modified files or its HEAD differs from the commit recorded in "
"the superproject and can be used to override any settings of the 'ignore' "
-"option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" "
-"is used submodules are not considered dirty when they only contain untracked "
-"content (but they are still scanned for modified content). Using \"dirty\" "
-"ignores all changes to the work tree of submodules, only changes to the "
-"commits stored in the superproject are shown (this was the behavior until "
-"1.7.0). Using \"all\" hides all changes to submodules."
+"option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\""
+" is used submodules are not considered dirty when they only contain "
+"untracked content (but they are still scanned for modified content). Using "
+"\"dirty\" ignores all changes to the work tree of submodules, only changes "
+"to the commits stored in the superproject are shown (this was the behavior "
+"until 1.7.0). Using \"all\" hides all changes to submodules."
msgstr ""
#. type: Labeled list
@@ -12320,10 +12017,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:600
-#, fuzzy, no-wrap
-#| msgid "--no-abbrev"
+#, no-wrap
msgid "--no-prefix"
-msgstr "--no-abbrev"
+msgstr "--no-prefix"
#. type: Plain text
#: en/diff-options.txt:602
@@ -12346,7 +12042,7 @@ msgstr ""
#: en/diff-options.txt:606
#, no-wrap
msgid "--ita-invisible-in-index"
-msgstr ""
+msgstr "--ita-invisible-in-index"
#. type: Plain text
#: en/diff-options.txt:613
@@ -12361,8 +12057,8 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:615
msgid ""
-"For more detailed explanation on these common options, see also linkgit:"
-"gitdiffcore[7]."
+"For more detailed explanation on these common options, see also "
+"linkgit:gitdiffcore[7]."
msgstr ""
#. type: Labeled list
@@ -12387,7 +12083,7 @@ msgstr ""
#: en/fetch-options.txt:5
#, no-wrap
msgid "--append"
-msgstr ""
+msgstr "--append"
#. type: Plain text
#: en/fetch-options.txt:9
@@ -12408,8 +12104,8 @@ msgstr "--depth <depth>"
#: en/fetch-options.txt:16
msgid ""
"Limit fetching to the specified number of commits from the tip of each "
-"remote branch history. If fetching to a 'shallow' repository created by `git "
-"clone` with `--depth=<depth>` option (see linkgit:git-clone[1]), deepen or "
+"remote branch history. If fetching to a 'shallow' repository created by `git"
+" clone` with `--depth=<depth>` option (see linkgit:git-clone[1]), deepen or "
"shorten the history to the specified number of commits. Tags for the "
"deepened commits are not fetched."
msgstr ""
@@ -12458,10 +12154,9 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:31
-#, fuzzy, no-wrap
-#| msgid "--unset-all"
+#, no-wrap
msgid "--unshallow"
-msgstr "--unset-all"
+msgstr "--unshallow"
#. type: Plain text
#: en/fetch-options.txt:35
@@ -12479,16 +12174,15 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:39
-#, fuzzy, no-wrap
-#| msgid "--update"
+#, no-wrap
msgid "--update-shallow"
-msgstr "--update"
+msgstr "--update-shallow"
#. type: Plain text
#: en/fetch-options.txt:44
msgid ""
-"By default when fetching from a shallow repository, `git fetch` refuses refs "
-"that require updating .git/shallow. This option updates .git/shallow and "
+"By default when fetching from a shallow repository, `git fetch` refuses refs"
+" that require updating .git/shallow. This option updates .git/shallow and "
"accept such refs."
msgstr ""
@@ -12543,9 +12237,9 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:58 en/git-am.txt:40 en/git-cvsexportcommit.txt:67
-#: en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:108
-#: en/git-ls-files.txt:73 en/git-mailinfo.txt:27 en/git-mv.txt:34
-#: en/git-repack.txt:139
+#: en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53
+#: en/git-format-patch.txt:108 en/git-ls-files.txt:73 en/git-mailinfo.txt:27
+#: en/git-mv.txt:34 en/git-repack.txt:139
#, no-wrap
msgid "-k"
msgstr "-k"
@@ -12555,7 +12249,7 @@ msgstr "-k"
#: en/git-index-pack.txt:54 en/git-reset.txt:82
#, no-wrap
msgid "--keep"
-msgstr ""
+msgstr "--keep"
#. type: Plain text
#: en/fetch-options.txt:61
@@ -12566,7 +12260,7 @@ msgstr ""
#: en/fetch-options.txt:63
#, no-wrap
msgid "--multiple"
-msgstr ""
+msgstr "--multiple"
#. type: Plain text
#: en/fetch-options.txt:66
@@ -12577,10 +12271,9 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:68 en/git-push.txt:98
-#, fuzzy, no-wrap
-#| msgid "'prune'"
+#, no-wrap
msgid "--prune"
-msgstr "'prune'"
+msgstr "--prune"
#. type: Plain text
#: en/fetch-options.txt:77
@@ -12603,17 +12296,17 @@ msgstr ""
#: en/git-read-tree.txt:57 en/git-rebase.txt:318 en/git-reflog.txt:114
#: en/git-repack.txt:77 en/git-revert.txt:69 en/git-rm.txt:43
#: en/git-shortlog.txt:29 en/git-submodule.txt:310 en/git-svn.txt:648
-#: en/git-unpack-objects.txt:30 en/git-worktree.txt:110 en/merge-options.txt:56
+#: en/git-unpack-objects.txt:30 en/git-worktree.txt:110
+#: en/merge-options.txt:56
#, no-wrap
msgid "-n"
msgstr "-n"
#. type: Labeled list
#: en/fetch-options.txt:82
-#, fuzzy, no-wrap
-#| msgid "--no-track"
+#, no-wrap
msgid "--no-tags"
-msgstr "--no-track"
+msgstr "--no-tags"
#. type: Plain text
#: en/fetch-options.txt:88
@@ -12646,15 +12339,15 @@ msgstr ""
#: en/git-show-ref.txt:40
#, no-wrap
msgid "--tags"
-msgstr ""
+msgstr "--tags"
#. type: Plain text
#: en/fetch-options.txt:106
msgid ""
"Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into "
-"local tags with the same name), in addition to whatever else would otherwise "
-"be fetched. Using this option alone does not subject tags to pruning, even "
-"if --prune is used (though tags may be pruned anyway if they are also the "
+"local tags with the same name), in addition to whatever else would otherwise"
+" be fetched. Using this option alone does not subject tags to pruning, even"
+" if --prune is used (though tags may be pruned anyway if they are also the "
"destination of an explicit refspec; see `--prune`)."
msgstr ""
@@ -12681,7 +12374,7 @@ msgstr ""
#: en/fetch-options.txt:118
#, no-wrap
msgid "-j"
-msgstr ""
+msgstr "-j"
#. type: Labeled list
#: en/fetch-options.txt:119
@@ -12701,7 +12394,7 @@ msgstr ""
#: en/fetch-options.txt:125 en/git-push.txt:274
#, no-wrap
msgid "--no-recurse-submodules"
-msgstr ""
+msgstr "--no-recurse-submodules"
#. type: Plain text
#: en/fetch-options.txt:128
@@ -12733,19 +12426,18 @@ msgstr ""
#. type: Plain text
#: en/fetch-options.txt:141
msgid ""
-"This option is used internally to temporarily provide a non-negative default "
-"value for the --recurse-submodules option. All other methods of configuring "
-"fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and "
-"linkgit:git-config[1]) override this option, as does specifying --"
-"[no-]recurse-submodules directly."
+"This option is used internally to temporarily provide a non-negative default"
+" value for the --recurse-submodules option. All other methods of "
+"configuring fetch's submodule recursion (such as settings in "
+"linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as "
+"does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:144
-#, fuzzy, no-wrap
-#| msgid "--update"
+#, no-wrap
msgid "--update-head-ok"
-msgstr "--update"
+msgstr "--update-head-ok"
#. type: Plain text
#: en/fetch-options.txt:151
@@ -12762,7 +12454,6 @@ msgstr ""
msgid "--upload-pack <upload-pack>"
msgstr "--upload-pack <upload-pack>"
-#
#. type: Plain text
#: en/fetch-options.txt:157
#, fuzzy
@@ -12770,9 +12461,9 @@ msgstr "--upload-pack <upload-pack>"
#| "When given, and the repository to clone from is accessed via ssh, this "
#| "specifies a non-default path for the command run on the other end."
msgid ""
-"When given, and the repository to fetch from is handled by 'git fetch-pack', "
-"`--exec=<upload-pack>` is passed to the command to specify non-default path "
-"for the command run on the other end."
+"When given, and the repository to fetch from is handled by 'git fetch-pack',"
+" `--exec=<upload-pack>` is passed to the command to specify non-default path"
+" for the command run on the other end."
msgstr ""
"Wird diese Option angegeben und auf das zu klonende Projektarchiv mittels "
"ssh zugegriffen, dann gibt <upload-pack> das auf der entfernten Seite "
@@ -12836,7 +12527,6 @@ msgstr "-v"
msgid "--verbose"
msgstr "--verbose"
-#
#. type: Plain text
#: en/fetch-options.txt:168 en/git-add.txt:73 en/git-imap-send.txt:35
#: en/merge-options.txt:111
@@ -12848,28 +12538,28 @@ msgstr "Gib ausf체hrliche Informationen aus."
#: en/git-push.txt:268 en/merge-options.txt:112
#, no-wrap
msgid "--progress"
-msgstr ""
+msgstr "--progress"
#. type: Plain text
#: en/fetch-options.txt:175 en/git-clone.txt:133 en/git-pack-objects.txt:141
#: en/git-push.txt:273
msgid ""
"Progress status is reported on the standard error stream by default when it "
-"is attached to a terminal, unless -q is specified. This flag forces progress "
-"status even if the standard error stream is not directed to a terminal."
+"is attached to a terminal, unless -q is specified. This flag forces progress"
+" status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:176 en/git-push.txt:295
#, no-wrap
msgid "-4"
-msgstr ""
+msgstr "-4"
#. type: Labeled list
#: en/fetch-options.txt:177 en/git-push.txt:296
#, no-wrap
msgid "--ipv4"
-msgstr ""
+msgstr "--ipv4"
#. type: Plain text
#: en/fetch-options.txt:179 en/git-push.txt:298
@@ -12880,13 +12570,13 @@ msgstr ""
#: en/fetch-options.txt:180 en/git-push.txt:299
#, no-wrap
msgid "-6"
-msgstr ""
+msgstr "-6"
#. type: Labeled list
#: en/fetch-options.txt:181 en/git-push.txt:300
#, no-wrap
msgid "--ipv6"
-msgstr ""
+msgstr "--ipv6"
#. type: Plain text
#: en/fetch-options.txt:182 en/git-push.txt:302
@@ -12932,47 +12622,49 @@ msgstr "git-add(1)"
#: en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5
#: en/git-blame.txt:5 en/git-branch.txt:5 en/git-bundle.txt:5
#: en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5
-#: en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5
-#: en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5
-#: en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5
-#: en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5
-#: en/git-config.txt:5 en/git-count-objects.txt:5
-#: en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5
-#: en/git-credential-store.txt:5 en/git-credential.txt:5
-#: en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5
-#: en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5
-#: en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5
-#: en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5
-#: en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5
-#: en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5
-#: en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5
-#: en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5
-#: en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5
-#: en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5
-#: en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5
-#: en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5
-#: en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5
-#: en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5
-#: en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5
+#: en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5
+#: en/git-checkout.txt:5 en/git-check-ref-format.txt:5
+#: en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5
+#: en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5
+#: en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5
+#: en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5
+#: en/git-credential-cache.txt:5 en/git-credential-store.txt:5
+#: en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5
+#: en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5
+#: en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5
+#: en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5
+#: en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5
+#: en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5
+#: en/git-for-each-ref.txt:5 en/git-format-patch.txt:5
+#: en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5
+#: en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5
+#: en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5
+#: en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5
+#: en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5
+#: en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5
+#: en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5
+#: en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5
+#: en/git-merge-file.txt:5 en/git-merge-index.txt:5
#: en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5
#: en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5
-#: en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5
-#: en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5
-#: en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5
-#: en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5
-#: en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5
-#: en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5
-#: en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5
-#: en/git-remote-testgit.txt:5 en/git-remote.txt:5 en/git-repack.txt:5
-#: en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5
-#: en/git-reset.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5
-#: en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5
-#: en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5
-#: en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5
-#: en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5
-#: en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5
-#: en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5
-#: en/git-svn.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5
+#: en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5
+#: en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5
+#: en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5
+#: en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5
+#: en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5
+#: en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5
+#: en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5
+#: en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote-testgit.txt:5
+#: en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5
+#: en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5
+#: en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5
+#: en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5
+#: en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5
+#: en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5
+#: en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5
+#: en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5
+#: en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5
+#: en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5
#: en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5
#: en/git-update-index.txt:5 en/git-update-ref.txt:5
#: en/git-update-server-info.txt:5 en/git-upload-archive.txt:5
@@ -12983,7 +12675,6 @@ msgstr "git-add(1)"
msgid "NAME"
msgstr "NAME"
-#
#. type: Plain text
#: en/git-add.txt:7
msgid "git-add - Add file contents to the index"
@@ -12995,16 +12686,17 @@ msgstr "git-add - F체ge Dateiinhalte zum Index hinzu."
#: en/git-blame.txt:9 en/git-branch.txt:9 en/git-bundle.txt:10
#: en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10
#: en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10
-#: en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9
-#: en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9
-#: en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10
-#: en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9
-#: en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9
-#: en/git-credential-store.txt:9 en/git-credential.txt:9
-#: en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9
-#: en/git-daemon.txt:9 en/git-describe.txt:10 en/git-diff-files.txt:10
-#: en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10
-#: en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10
+#: en/git-checkout.txt:9 en/git-check-ref-format.txt:9
+#: en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9
+#: en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9
+#: en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10
+#: en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9
+#: en/git-credential-cache.txt:9 en/git-credential-store.txt:9
+#: en/git-credential.txt:9 en/git-cvsexportcommit.txt:10
+#: en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9
+#: en/git-describe.txt:10 en/git-diff-files.txt:10 en/git-diff-index.txt:10
+#: en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10
+#: en/git-fast-export.txt:10 en/git-fast-import.txt:10
#: en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9
#: en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9
#: en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10
@@ -13108,13 +12800,13 @@ msgstr ""
#: en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15
#: en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:26
#: en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:24
-#: en/git-svn.txt:14 en/git-symbolic-ref.txt:16 en/git-tag.txt:21 en/git.txt:20
-#: en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16
+#: en/git-svn.txt:14 en/git-symbolic-ref.txt:16 en/git-tag.txt:21
+#: en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16
#: en/git-update-index.txt:29 en/git-update-ref.txt:14
#: en/git-update-server-info.txt:15 en/git-upload-archive.txt:15
#: en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16
-#: en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15
-#: en/git-worktree.txt:19 en/git-write-tree.txt:15
+#: en/git-verify-tag.txt:14 en/git-web--browse.txt:14
+#: en/git-whatchanged.txt:15 en/git-worktree.txt:19 en/git-write-tree.txt:15
#, no-wrap
msgid "DESCRIPTION"
msgstr "DESCRIPTION"
@@ -13130,38 +12822,36 @@ msgid ""
"exist in the working tree anymore."
msgstr ""
-#
#. type: Plain text
#: en/git-add.txt:30
#, fuzzy
#| msgid ""
-#| "The \"index\" holds a snapshot of the content of the working tree, and it "
-#| "is this snapshot that is taken as the contents of the next commit. Thus "
-#| "after making any changes to the working directory, and before running the "
-#| "commit command, you must use the 'add' command to add any new or modified "
-#| "files to the index."
-msgid ""
-"The \"index\" holds a snapshot of the content of the working tree, and it is "
-"this snapshot that is taken as the contents of the next commit. Thus after "
-"making any changes to the working tree, and before running the commit "
+#| "The \"index\" holds a snapshot of the content of the working tree, and it is"
+#| " this snapshot that is taken as the contents of the next commit. Thus after"
+#| " making any changes to the working directory, and before running the commit "
+#| "command, you must use the 'add' command to add any new or modified files to "
+#| "the index."
+msgid ""
+"The \"index\" holds a snapshot of the content of the working tree, and it is"
+" this snapshot that is taken as the contents of the next commit. Thus after"
+" making any changes to the working tree, and before running the commit "
"command, you must use the `add` command to add any new or modified files to "
"the index."
msgstr ""
-"Der \"Index\" enth채lt eine Momentaufnahme des Inhalts des Arbeitsbaumes, und "
-"es ist genau diese Momentaufnahme die bei der n채chsten Eintragung (commit) "
+"Der \"Index\" enth채lt eine Momentaufnahme des Inhalts des Arbeitsbaumes, und"
+" es ist genau diese Momentaufnahme die bei der n채chsten Eintragung (commit) "
"genommen wird. Darum mu횩 man nachdem man 횆nderungen im Arbeitsbereich "
"durchgef체hrt hat und bevor man die Eintragung (commit) ausf체hrt, die neuen "
"oder ge채nderten Dateien mit der 'git-add' Anweisung in den Index aufnehmen."
-#
#. type: Plain text
#: en/git-add.txt:35
#, fuzzy
#| msgid ""
-#| "This command can be performed multiple times before a commit. It only "
-#| "adds the content of the specified file(s) at the time the add command is "
-#| "run; if you want subsequent changes included in the next commit, then you "
-#| "must run 'git add' again to add the new content to the index."
+#| "This command can be performed multiple times before a commit. It only adds "
+#| "the content of the specified file(s) at the time the add command is run; if "
+#| "you want subsequent changes included in the next commit, then you must run "
+#| "'git add' again to add the new content to the index."
msgid ""
"This command can be performed multiple times before a commit. It only adds "
"the content of the specified file(s) at the time the add command is run; if "
@@ -13174,31 +12864,29 @@ msgstr ""
"Dateien in die Eintragung (commit) aufgenommen werden, so mu횩 'git-add' "
"neuerlich aufgerufen werden."
-#
#. type: Plain text
#: en/git-add.txt:38
msgid ""
-"The `git status` command can be used to obtain a summary of which files have "
-"changes that are staged for the next commit."
+"The `git status` command can be used to obtain a summary of which files have"
+" changes that are staged for the next commit."
msgstr ""
"Der Befehl 'git status' kann verwendet werden um eine 횥bersicht dar체ber zu "
"erhalten, welche f체r die n채chste Eintragung (commit) vorgesehene Dateien "
"ver채ndert wurden."
-#
#. type: Plain text
#: en/git-add.txt:45
#, fuzzy
#| msgid ""
-#| "The 'git add' command will not add ignored files by default. If any "
-#| "ignored files were explicitly specified on the command line, 'git add' "
-#| "will fail with a list of ignored files. Ignored files reached by "
-#| "directory recursion or filename globbing performed by Git (quote your "
-#| "globs before the shell) will be silently ignored. The 'add' command can "
-#| "be used to add ignored files with the `-f` (force) option."
-msgid ""
-"The `git add` command will not add ignored files by default. If any ignored "
-"files were explicitly specified on the command line, `git add` will fail "
+#| "The 'git add' command will not add ignored files by default. If any ignored"
+#| " files were explicitly specified on the command line, 'git add' will fail "
+#| "with a list of ignored files. Ignored files reached by directory recursion "
+#| "or filename globbing performed by Git (quote your globs before the shell) "
+#| "will be silently ignored. The 'add' command can be used to add ignored "
+#| "files with the `-f` (force) option."
+msgid ""
+"The `git add` command will not add ignored files by default. If any ignored"
+" files were explicitly specified on the command line, `git add` will fail "
"with a list of ignored files. Ignored files reached by directory recursion "
"or filename globbing performed by Git (quote your globs before the shell) "
"will be silently ignored. The 'git add' command can be used to add ignored "
@@ -13213,7 +12901,6 @@ msgstr ""
"stillschweigend ignoriert. Der 'git add' Befehl kann das Hinzuf체gen "
"ignorierter Dateien mit der Option '-f' (force) erzwingen."
-#
#. type: Plain text
#: en/git-add.txt:48
msgid ""
@@ -13266,8 +12953,8 @@ msgstr ""
#: en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29
#: en/git-update-index.txt:41 en/git-update-server-info.txt:24
#: en/git-upload-archive.txt:56 en/git-var.txt:19 en/git-verify-commit.txt:18
-#: en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43
-#: en/git-worktree.txt:83 en/git-write-tree.txt:29
+#: en/git-verify-pack.txt:22 en/git-verify-tag.txt:18
+#: en/git-web--browse.txt:43 en/git-worktree.txt:83 en/git-write-tree.txt:29
#, no-wrap
msgid "OPTIONS"
msgstr "OPTIONS"
@@ -13283,17 +12970,16 @@ msgstr "<paths>..."
#: en/git-add.txt:64
msgid ""
"Files to add content from. Fileglobs (e.g. `*.c`) can be given to add all "
-"matching files. Also a leading directory name (e.g. `dir` to add `dir/"
-"file1` and `dir/file2`) can be given to update the index to match the "
+"matching files. Also a leading directory name (e.g. `dir` to add "
+"`dir/file1` and `dir/file2`) can be given to update the index to match the "
"current state of the directory as a whole (e.g. specifying `dir` will "
-"record not just a file `dir/file1` modified in the working tree, a file `dir/"
-"file2` added to the working tree, but also a file `dir/file3` removed from "
-"the working tree). Note that older versions of Git used to ignore removed "
-"files; use `--no-all` option if you want to add modified or new files but "
-"ignore removed ones."
+"record not just a file `dir/file1` modified in the working tree, a file "
+"`dir/file2` added to the working tree, but also a file `dir/file3` removed "
+"from the working tree). Note that older versions of Git used to ignore "
+"removed files; use `--no-all` option if you want to add modified or new "
+"files but ignore removed ones."
msgstr ""
-#
#. type: Plain text
#: en/git-add.txt:69
#, fuzzy
@@ -13305,7 +12991,6 @@ msgstr ""
"F체ge die Datei(en) nicht tats채chlich hinzu, sondern zeige nur ob sie "
"existieren."
-#
#. type: Plain text
#: en/git-add.txt:77
msgid "Allow adding otherwise ignored files."
@@ -13328,7 +13013,6 @@ msgstr "-i"
msgid "--interactive"
msgstr "--interactive"
-#
#. type: Plain text
#: en/git-add.txt:84
msgid ""
@@ -13345,16 +13029,16 @@ msgstr ""
#: en/git-add.txt:91
msgid ""
"Interactively choose hunks of patch between the index and the work tree and "
-"add them to the index. This gives the user a chance to review the difference "
-"before adding modified contents to the index."
+"add them to the index. This gives the user a chance to review the difference"
+" before adding modified contents to the index."
msgstr ""
#. type: Plain text
#: en/git-add.txt:95
msgid ""
"This effectively runs `add --interactive`, but bypasses the initial command "
-"menu and directly jumps to the `patch` subcommand. See ``Interactive mode'' "
-"for details."
+"menu and directly jumps to the `patch` subcommand. See ``Interactive mode''"
+" for details."
msgstr ""
#. type: Labeled list
@@ -13385,11 +13069,11 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:107
msgid ""
-"The intent of this option is to pick and choose lines of the patch to apply, "
-"or even to modify the contents of lines to be staged. This can be quicker "
+"The intent of this option is to pick and choose lines of the patch to apply,"
+" or even to modify the contents of lines to be staged. This can be quicker "
"and more flexible than using the interactive hunk selector. However, it is "
-"easy to confuse oneself and create a patch that does not apply to the index. "
-"See EDITING PATCHES below."
+"easy to confuse oneself and create a patch that does not apply to the index."
+" See EDITING PATCHES below."
msgstr ""
#. type: Labeled list
@@ -13409,8 +13093,8 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:118
msgid ""
-"If no <pathspec> is given when `-u` option is used, all tracked files in the "
-"entire working tree are updated (old versions of Git used to limit the "
+"If no <pathspec> is given when `-u` option is used, all tracked files in the"
+" entire working tree are updated (old versions of Git used to limit the "
"update to the current directory and its subdirectories)."
msgstr ""
@@ -13457,8 +13141,8 @@ msgstr "--ignore-removal"
#. type: Plain text
#: en/git-add.txt:138
msgid ""
-"Update the index by adding new files that are unknown to the index and files "
-"modified in the working tree, but ignore files that have been removed from "
+"Update the index by adding new files that are unknown to the index and files"
+" modified in the working tree, but ignore files that have been removed from "
"the working tree. This option is a no-op when no <pathspec> is used."
msgstr ""
@@ -13486,8 +13170,8 @@ msgstr "--intent-to-add"
#: en/git-add.txt:150
msgid ""
"Record only the fact that the path will be added later. An entry for the "
-"path is placed in the index with no content. This is useful for, among other "
-"things, showing the unstaged content of such files with `git diff` and "
+"path is placed in the index with no content. This is useful for, among other"
+" things, showing the unstaged content of such files with `git diff` and "
"committing them with `git commit -a`."
msgstr ""
@@ -13497,7 +13181,6 @@ msgstr ""
msgid "--refresh"
msgstr "--refresh"
-#
#. type: Plain text
#: en/git-add.txt:154
msgid ""
@@ -13513,18 +13196,17 @@ msgstr ""
msgid "--ignore-errors"
msgstr "--ignore-errors"
-#
#. type: Plain text
#: en/git-add.txt:161
#, fuzzy
#| msgid ""
#| "If some files could not be added because of errors indexing them, do not "
-#| "abort the operation, but continue adding the others. The command shall "
-#| "still exit with non-zero status."
+#| "abort the operation, but continue adding the others. The command shall still"
+#| " exit with non-zero status."
msgid ""
"If some files could not be added because of errors indexing them, do not "
-"abort the operation, but continue adding the others. The command shall still "
-"exit with non-zero status. The configuration variable `add.ignoreErrors` "
+"abort the operation, but continue adding the others. The command shall still"
+" exit with non-zero status. The configuration variable `add.ignoreErrors` "
"can be set to true to make this the default behaviour."
msgstr ""
"Konnten einige Dateien aufgrund von Fehlern beim Indizieren nicht "
@@ -13569,15 +13251,14 @@ msgstr ""
msgid "\\--"
msgstr "\\--"
-#
#. type: Plain text
#: en/git-add.txt:177 en/git-rm.txt:57
msgid ""
"This option can be used to separate command-line options from the list of "
"files, (useful when filenames might be mistaken for command-line options)."
msgstr ""
-"Diese Option kann dazu verwendet werden, Befehlszeilenoptionen von der Liste "
-"von Dateien zu trennen. Dies ist sinnvoll, wenn Dateinamen mit "
+"Diese Option kann dazu verwendet werden, Befehlszeilenoptionen von der Liste"
+" von Dateien zu trennen. Dies ist sinnvoll, wenn Dateinamen mit "
"Befehlszeilenoptionen verwechselt werden k철nnten."
#. type: Title -
@@ -13587,25 +13268,23 @@ msgstr ""
msgid "Configuration"
msgstr "Configuration"
-#
#. type: Plain text
#: en/git-add.txt:186
#, fuzzy
#| msgid ""
-#| "The optional configuration variable 'core.excludesfile' indicates a path "
-#| "to a file containing patterns of file names to exclude from git-add, "
-#| "similar to $GIT_DIR/info/exclude. Patterns in the exclude file are used "
-#| "in addition to those in info/exclude. See linkgit:gitrepository-"
-#| "layout[5]."
+#| "The optional configuration variable 'core.excludesfile' indicates a path to "
+#| "a file containing patterns of file names to exclude from git-add, similar to"
+#| " $GIT_DIR/info/exclude. Patterns in the exclude file are used in addition "
+#| "to those in info/exclude. See linkgit:gitrepository-layout[5]."
msgid ""
"The optional configuration variable `core.excludesFile` indicates a path to "
-"a file containing patterns of file names to exclude from git-add, similar to "
-"$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to "
-"those in info/exclude. See linkgit:gitignore[5]."
+"a file containing patterns of file names to exclude from git-add, similar to"
+" $GIT_DIR/info/exclude. Patterns in the exclude file are used in addition "
+"to those in info/exclude. See linkgit:gitignore[5]."
msgstr ""
"Mit der optionalen Konfigurationsvariable 'core.excludesfile' kann eine "
-"Datei angegeben werden, welche Dateisuchkriterien (z.B. '*.log') f체r von git-"
-"add zu ignorierende Dateien enth채lt. Dieser Mechanismus ist 채hnlich zu "
+"Datei angegeben werden, welche Dateisuchkriterien (z.B. '*.log') f체r von "
+"git-add zu ignorierende Dateien enth채lt. Dieser Mechanismus ist 채hnlich zu "
"$GIT_DIR/info/exclude. Dateisuchkriterien im excludesfile werden zus채tzlich "
"zu jenen in info/exclude angewandt. Siehe auch linkgit:gitrepository-"
"layout[5]."
@@ -13620,17 +13299,16 @@ msgstr ""
#: en/git-daemon.txt:235 en/git-describe.txt:110 en/git-diff.txt:109
#: en/git-fast-export.txt:125 en/git-fetch.txt:155 en/git-for-each-ref.txt:237
#: en/git-format-patch.txt:591 en/git-http-backend.txt:67 en/git-init.txt:141
-#: en/git-interpret-trailers.txt:205 en/git-log.txt:108 en/git-ls-remote.txt:75
-#: en/git-merge-file.txt:81 en/git-merge.txt:310 en/git-notes.txt:278
-#: en/git-pull.txt:206 en/git-remote-fd.txt:37 en/git-reset.txt:102
-#: en/git-revert.txt:109 en/git-rev-parse.txt:427 en/git-rm.txt:159
-#: en/git-show.txt:58 en/git-stash.txt:201 en/git-stripspace.txt:49
-#: en/git-worktree.txt:224
+#: en/git-interpret-trailers.txt:205 en/git-log.txt:108
+#: en/git-ls-remote.txt:75 en/git-merge-file.txt:81 en/git-merge.txt:310
+#: en/git-notes.txt:278 en/git-pull.txt:206 en/git-remote-fd.txt:37
+#: en/git-reset.txt:102 en/git-revert.txt:109 en/git-rev-parse.txt:427
+#: en/git-rm.txt:159 en/git-show.txt:58 en/git-stash.txt:201
+#: en/git-stripspace.txt:49 en/git-worktree.txt:224
#, no-wrap
msgid "EXAMPLES"
msgstr "EXAMPLES"
-#
#. type: Plain text
#: en/git-add.txt:193
#, fuzzy
@@ -13650,16 +13328,17 @@ msgstr ""
msgid "$ git add Documentation/\\*.txt\n"
msgstr "$ git add Documentation/\\*.txt\n"
-#
#. type: Plain text
#: en/git-add.txt:201
msgid ""
"Note that the asterisk `*` is quoted from the shell in this example; this "
"lets the command include the files from subdirectories of `Documentation/` "
"directory."
-msgstr "Anmerkung: das Sternchen `*` wird in diesem Beispiel vom Befehlsprozessor (shell) nicht automatisch erweitert, wodurch der git add Befehl auch Unterverzeichnisse des `Documentation/` Verzeichnisses erfassen kann."
+msgstr ""
+"Anmerkung: das Sternchen `*` wird in diesem Beispiel vom Befehlsprozessor "
+"(shell) nicht automatisch erweitert, wodurch der git add Befehl auch "
+"Unterverzeichnisse des `Documentation/` Verzeichnisses erfassen kann."
-#
#. type: Plain text
#: en/git-add.txt:203
msgid "Considers adding content from all git-*.sh scripts:"
@@ -13671,7 +13350,6 @@ msgstr "F체ge die Inhalte aller git-*-s Skripte hinzu:"
msgid "$ git add git-*.sh\n"
msgstr "$ git add git-*.sh\n"
-#
#. type: Plain text
#: en/git-add.txt:211
#, fuzzy
@@ -13692,7 +13370,6 @@ msgstr ""
msgid "Interactive mode"
msgstr "Interaktiver Modus"
-#
#. type: Plain text
#: en/git-add.txt:217
msgid ""
@@ -13703,16 +13380,15 @@ msgstr ""
"'status' Unterbefehls, und beginnt dann mit der interaktiven "
"Befehlsverarbeitung."
-#
#. type: Plain text
#: en/git-add.txt:222 en/git-clean.txt:84
msgid ""
-"The command loop shows the list of subcommands available, and gives a prompt "
-"\"What now> \". In general, when the prompt ends with a single '>', you can "
-"pick only one of the choices given and type return, like this:"
+"The command loop shows the list of subcommands available, and gives a prompt"
+" \"What now> \". In general, when the prompt ends with a single '>', you "
+"can pick only one of the choices given and type return, like this:"
msgstr ""
-"Diese zeigt eine Liste der m철glichen Unterbefehle und fr채gt \"What now> \". "
-"Wenn die Frage mit einem einzelnen '>' endet, kann man im Allgemeinen aus "
+"Diese zeigt eine Liste der m철glichen Unterbefehle und fr채gt \"What now> \"."
+" Wenn die Frage mit einem einzelnen '>' endet, kann man im Allgemeinen aus "
"einer der folgenden Optionen w채hlen und diese mit der Eingabetaste "
"best채tigen:"
@@ -13730,7 +13406,6 @@ msgstr ""
" 5: patch\t6: diff\t 7: quit\t 8: help\n"
" What now> 1\n"
-#
#. type: Plain text
#: en/git-add.txt:232
#, fuzzy
@@ -13744,7 +13419,6 @@ msgstr ""
"Man kann weiters \"s\" oder \"sta\" oder \"status\" eingeben, solange die "
"Auswahl eindeutig ist."
-#
#. type: Plain text
#: en/git-add.txt:234
msgid "The main command loop has 6 subcommands (plus help and quit)."
@@ -13758,25 +13432,24 @@ msgstr ""
msgid "status"
msgstr "status"
-#
#. type: Plain text
#: en/git-add.txt:242
#, fuzzy
#| msgid ""
-#| "This shows the change between HEAD and index (i.e. what will be committed "
-#| "if you say \"git commit\"), and between index and working tree files (i."
-#| "e. what you could stage further before \"git commit\" using \"git-add\") "
-#| "for each path. A sample output looks like this:"
+#| "This shows the change between HEAD and index (i.e. what will be committed if"
+#| " you say \"git commit\"), and between index and working tree files (i.e. "
+#| "what you could stage further before \"git commit\" using \"git-add\") for "
+#| "each path. A sample output looks like this:"
msgid ""
-"This shows the change between HEAD and index (i.e. what will be committed if "
-"you say `git commit`), and between index and working tree files (i.e. what "
-"you could stage further before `git commit` using `git add`) for each path. "
-"A sample output looks like this:"
+"This shows the change between HEAD and index (i.e. what will be committed if"
+" you say `git commit`), and between index and working tree files (i.e. what "
+"you could stage further before `git commit` using `git add`) for each path."
+" A sample output looks like this:"
msgstr ""
-"Zeigt den Unterschied zwischen HEAD und dem Index (also was eingetragen wird "
-"wenn man \"git commit\" ausf체hrt), sowie zwischen dem Index und den Dateien "
-"im Arbeitsbereich (also was man vor einem \"git-commit\" mittels \"git-add\" "
-"hinzuf체gen k철nnte) f체r jeden Pfad. Eine Beispielausgabe:"
+"Zeigt den Unterschied zwischen HEAD und dem Index (also was eingetragen wird"
+" wenn man \"git commit\" ausf체hrt), sowie zwischen dem Index und den Dateien"
+" im Arbeitsbereich (also was man vor einem \"git-commit\" mittels \"git-"
+"add\" hinzuf체gen k철nnte) f체r jeden Pfad. Eine Beispielausgabe:"
#. type: delimited block -
#: en/git-add.txt:247
@@ -13790,26 +13463,25 @@ msgstr ""
" 1: binary nothing foo.png\n"
" 2: +403/-35\t+1/-1 git-add--interactive.perl\n"
-#
#. type: Plain text
#: en/git-add.txt:258
#, fuzzy
#| msgid ""
-#| "It shows that foo.png has differences from HEAD (but that is binary so "
-#| "line count cannot be shown) and there is no difference between indexed "
-#| "copy and the working tree version (if the working tree version were also "
-#| "different, 'binary' would have been shown in place of 'nothing'). The "
-#| "other file, git-add--interactive.perl, has 403 lines added and 35 lines "
-#| "deleted if you commit what is in the index, but working tree file has "
-#| "further modifications (one addition and one deletion)."
+#| "It shows that foo.png has differences from HEAD (but that is binary so line "
+#| "count cannot be shown) and there is no difference between indexed copy and "
+#| "the working tree version (if the working tree version were also different, "
+#| "'binary' would have been shown in place of 'nothing'). The other file, git-"
+#| "add--interactive.perl, has 403 lines added and 35 lines deleted if you "
+#| "commit what is in the index, but working tree file has further modifications"
+#| " (one addition and one deletion)."
msgid ""
"It shows that foo.png has differences from HEAD (but that is binary so line "
"count cannot be shown) and there is no difference between indexed copy and "
"the working tree version (if the working tree version were also different, "
"'binary' would have been shown in place of 'nothing'). The other file, git-"
"add{litdd}interactive.perl, has 403 lines added and 35 lines deleted if you "
-"commit what is in the index, but working tree file has further modifications "
-"(one addition and one deletion)."
+"commit what is in the index, but working tree file has further modifications"
+" (one addition and one deletion)."
msgstr ""
"Es zeigt sich, da횩 foo.png im Vergleich mit dem HEAD ge채ndert wurde, (da es "
"sich um eine Bin채rdatei handelt wird keine Zeilenanzahl gezeigt), und da횩 "
@@ -13826,23 +13498,22 @@ msgstr ""
msgid "update"
msgstr "update"
-#
#. type: Plain text
#: en/git-add.txt:268
#, fuzzy
#| msgid ""
-#| "This shows the status information and gives prompt \"Update>>\". When "
-#| "the prompt ends with double '>>', you can make more than one selection, "
-#| "concatenated with whitespace or comma. Also you can say ranges. E.g. "
-#| "\"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in "
-#| "a range is omitted, all remaining patches are taken. E.g. \"7-\" to "
-#| "choose 7,8,9 from the list. You can say '*' to choose everything."
+#| "This shows the status information and gives prompt \"Update>>\". When the "
+#| "prompt ends with double '>>', you can make more than one selection, "
+#| "concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5"
+#| " 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range"
+#| " is omitted, all remaining patches are taken. E.g. \"7-\" to choose 7,8,9 "
+#| "from the list. You can say '*' to choose everything."
msgid ""
"This shows the status information and issues an \"Update>>\" prompt. When "
"the prompt ends with double '>>', you can make more than one selection, "
-"concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 "
-"7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range "
-"is omitted, all remaining patches are taken. E.g. \"7-\" to choose 7,8,9 "
+"concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5"
+" 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range"
+" is omitted, all remaining patches are taken. E.g. \"7-\" to choose 7,8,9 "
"from the list. You can say '*' to choose everything."
msgstr ""
"Zeigt die Status Information und wartet mit der Meldung \"Update>>\" auf "
@@ -13853,7 +13524,6 @@ msgstr ""
"angegeben, reicht dieser bis an das Ende der Liste, zB \"7-\" um 7,8,9 aus "
"der Liste auszuw채hlen. Durch '*' werden alle Listeneintr채ge ausgew채hlt."
-#
#. type: Plain text
#: en/git-add.txt:271
msgid "What you chose are then highlighted with '*', like this:"
@@ -13873,7 +13543,6 @@ msgstr ""
" 1: binary nothing foo.png\n"
"* 2: +403/-35 +1/-1 git-add--interactive.perl\n"
-#
#. type: Plain text
#: en/git-add.txt:280
msgid "To remove selection, prefix the input with `-` like this:"
@@ -13885,7 +13554,6 @@ msgstr "Ein '-' vor der Option macht die Auswahl wieder r체ckg채ngig:"
msgid "Update>> -2\n"
msgstr "Update>> -2\n"
-#
#. type: Plain text
#: en/git-add.txt:287
msgid ""
@@ -13901,7 +13569,6 @@ msgstr ""
msgid "revert"
msgstr "revert"
-#
#. type: Plain text
#: en/git-add.txt:293
msgid ""
@@ -13920,15 +13587,14 @@ msgstr ""
msgid "add untracked"
msgstr "add untracked"
-#
#. type: Plain text
#: en/git-add.txt:298
msgid ""
"This has a very similar UI to 'update' and 'revert', and lets you add "
"untracked paths to the index."
msgstr ""
-"Mit einer zu 'update' und 'revert' sehr 채hnlichen Bedienweise k철nnen mit git "
-"noch nicht verwaltete Dateien zum Index hinzugef체gt werden."
+"Mit einer zu 'update' und 'revert' sehr 채hnlichen Bedienweise k철nnen mit git"
+" noch nicht verwaltete Dateien zum Index hinzugef체gt werden."
#. type: Labeled list
#: en/git-add.txt:299
@@ -13936,15 +13602,14 @@ msgstr ""
msgid "patch"
msgstr "patch"
-#
#. type: Plain text
#: en/git-add.txt:306
#, fuzzy
#| msgid ""
#| "This lets you choose one path out of 'status' like selection. After "
-#| "choosing the path, it presents diff between the index and the working "
-#| "tree file and asks you if you want to stage the change of each hunk. You "
-#| "can say:"
+#| "choosing the path, it presents diff between the index and the working tree "
+#| "file and asks you if you want to stage the change of each hunk. You can "
+#| "say:"
msgid ""
"This lets you choose one path out of a 'status' like selection. After "
"choosing the path, it presents the diff between the index and the working "
@@ -13990,12 +13655,11 @@ msgstr ""
"e - manually edit the current hunk\n"
"? - print help\n"
-#
#. type: Plain text
#: en/git-add.txt:324
msgid ""
-"After deciding the fate for all hunks, if there is any hunk that was chosen, "
-"the index is updated with the selected hunks."
+"After deciding the fate for all hunks, if there is any hunk that was chosen,"
+" the index is updated with the selected hunks."
msgstr ""
"Nachdem zumindest ein Source Brocken ausgew채hlt wurde werden die "
"ausgew채hlten Brocken in den Index aufgenommen."
@@ -14013,7 +13677,6 @@ msgstr ""
msgid "diff"
msgstr "diff"
-#
#. type: Plain text
#: en/git-add.txt:332
msgid ""
@@ -14088,8 +13751,8 @@ msgstr ""
msgid ""
"There are also more complex operations that can be performed. But beware "
"that because the patch is applied only to the index and not the working "
-"tree, the working tree will appear to \"undo\" the change in the index. For "
-"example, introducing a new line into the index that is in neither the HEAD "
+"tree, the working tree will appear to \"undo\" the change in the index. For"
+" example, introducing a new line into the index that is in neither the HEAD "
"nor the working tree will stage the new line for commit, but the line will "
"appear to be reverted in the working tree."
msgstr ""
@@ -14123,8 +13786,8 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:390
msgid ""
-"One can also modify context lines by staging them for removal (by converting "
-"\" \" to \"-\") and adding a \"{plus}\" line with the new content. "
+"One can also modify context lines by staging them for removal (by converting"
+" \" \" to \"-\") and adding a \"{plus}\" line with the new content. "
"Similarly, one can modify \"{plus}\" lines for existing additions or "
"modifications. In all cases, the new modification will appear reverted in "
"the working tree."
@@ -14170,13 +13833,13 @@ msgstr ""
#: en/git-add.txt:406 en/git-am.txt:227 en/git-annotate.txt:29
#: en/git-apply.txt:270 en/git-archive.txt:192 en/git-bisect.txt:494
#: en/git-blame.txt:232 en/git-branch.txt:313 en/git-check-attr.txt:115
-#: en/git-check-ignore.txt:113 en/git-cherry-pick.txt:228 en/git-cherry.txt:140
-#: en/git-clean.txt:136 en/git-commit-tree.txt:113 en/git-commit.txt:480
-#: en/git-difftool.txt:135 en/git-diff.txt:179 en/git-fast-export.txt:213
-#: en/git-fast-import.txt:1470 en/git-fetch-pack.txt:127 en/git-fetch.txt:207
-#: en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:339
-#: en/git-format-patch.txt:636 en/git-gc.txt:178 en/git-gui.txt:103
-#: en/git-imap-send.txt:178 en/git-instaweb.txt:88
+#: en/git-check-ignore.txt:113 en/git-cherry-pick.txt:228
+#: en/git-cherry.txt:140 en/git-clean.txt:136 en/git-commit-tree.txt:113
+#: en/git-commit.txt:480 en/git-difftool.txt:135 en/git-diff.txt:179
+#: en/git-fast-export.txt:213 en/git-fast-import.txt:1470
+#: en/git-fetch-pack.txt:127 en/git-fetch.txt:207 en/git-fmt-merge-msg.txt:73
+#: en/git-for-each-ref.txt:339 en/git-format-patch.txt:636 en/git-gc.txt:178
+#: en/git-gui.txt:103 en/git-imap-send.txt:178 en/git-instaweb.txt:88
#: en/git-interpret-trailers.txt:334 en/git-ls-files.txt:237
#: en/git-merge.txt:353 en/git-pack-objects.txt:235
#: en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:78
@@ -14192,7 +13855,6 @@ msgstr ""
msgid "SEE ALSO"
msgstr "SEE ALSO"
-#
#. type: Plain text
#: en/git-add.txt:413
msgid ""
@@ -14224,43 +13886,45 @@ msgstr ""
#: en/git-format-patch.txt:640 en/git-fsck-objects.txt:21 en/git-fsck.txt:158
#: en/git-gc.txt:185 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:313
#: en/git-gui.txt:126 en/git-hash-object.txt:64 en/git-help.txt:190
-#: en/git-http-backend.txt:276 en/git-http-fetch.txt:51 en/git-http-push.txt:96
-#: en/git-imap-send.txt:182 en/git-index-pack.txt:104 en/git-init-db.txt:22
-#: en/git-init.txt:157 en/git-instaweb.txt:92 en/git-interpret-trailers.txt:338
-#: en/git-log.txt:223 en/git-ls-files.txt:241 en/git-ls-remote.txt:94
-#: en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56
-#: en/git-merge-base.txt:182 en/git-merge-file.txt:94 en/git-merge-index.txt:78
+#: en/git-http-backend.txt:276 en/git-http-fetch.txt:51
+#: en/git-http-push.txt:96 en/git-imap-send.txt:182 en/git-index-pack.txt:104
+#: en/git-init-db.txt:22 en/git-init.txt:157 en/git-instaweb.txt:92
+#: en/git-interpret-trailers.txt:338 en/git-log.txt:223
+#: en/git-ls-files.txt:241 en/git-ls-remote.txt:94 en/git-ls-tree.txt:103
+#: en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:182
+#: en/git-merge-file.txt:94 en/git-merge-index.txt:78
#: en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:46
#: en/git-mergetool.txt:100 en/git-merge-tree.txt:28 en/git-merge.txt:362
#: en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68
#: en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:241
#: en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72
-#: en/git-parse-remote.txt:22 en/git-patch-id.txt:63 en/git-prune-packed.txt:46
-#: en/git-prune.txt:85 en/git-pull.txt:256 en/git-push.txt:566
-#: en/git-quiltimport.txt:60 en/git-read-tree.txt:430 en/git-rebase.txt:801
-#: en/git-receive-pack.txt:222 en/git-reflog.txt:132 en/git-remote-ext.txt:124
-#: en/git-remote-fd.txt:58 en/git-remote-testgit.txt:29 en/git-remote.txt:251
-#: en/git-repack.txt:165 en/git-replace.txt:155 en/git-request-pull.txt:78
-#: en/git-rerere.txt:215 en/git-reset.txt:453 en/git-revert.txt:128
-#: en/git-rev-list.txt:120 en/git-rev-parse.txt:452 en/git-rm.txt:187
-#: en/git-send-email.txt:481 en/git-send-pack.txt:149 en/git-shell.txt:89
-#: en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89
-#: en/git-show-branch.txt:203 en/git-show-index.txt:26 en/git-show-ref.txt:185
-#: en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22
-#: en/git-stash.txt:294 en/git-status.txt:358 en/git-stripspace.txt:93
-#: en/git-submodule.txt:437 en/git-svn.txt:1135 en/git-symbolic-ref.txt:68
-#: en/git-tag.txt:350 en/git.txt:1295 en/git-unpack-file.txt:27
-#: en/git-unpack-objects.txt:51 en/git-update-index.txt:485
-#: en/git-update-ref.txt:151 en/git-update-server-info.txt:43
-#: en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69
-#: en/git-verify-commit.txt:31 en/git-verify-pack.txt:52
-#: en/git-verify-tag.txt:31 en/git-web--browse.txt:123
-#: en/git-whatchanged.txt:42 en/git-worktree.txt:258 en/git-write-tree.txt:41
+#: en/git-parse-remote.txt:22 en/git-patch-id.txt:63
+#: en/git-prune-packed.txt:46 en/git-prune.txt:85 en/git-pull.txt:256
+#: en/git-push.txt:566 en/git-quiltimport.txt:60 en/git-read-tree.txt:430
+#: en/git-rebase.txt:801 en/git-receive-pack.txt:222 en/git-reflog.txt:132
+#: en/git-remote-ext.txt:124 en/git-remote-fd.txt:58
+#: en/git-remote-testgit.txt:29 en/git-remote.txt:251 en/git-repack.txt:165
+#: en/git-replace.txt:155 en/git-request-pull.txt:78 en/git-rerere.txt:215
+#: en/git-reset.txt:453 en/git-revert.txt:128 en/git-rev-list.txt:120
+#: en/git-rev-parse.txt:452 en/git-rm.txt:187 en/git-send-email.txt:481
+#: en/git-send-pack.txt:149 en/git-shell.txt:89
+#: en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42
+#: en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:26
+#: en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94
+#: en/git-stage.txt:22 en/git-stash.txt:294 en/git-status.txt:358
+#: en/git-stripspace.txt:93 en/git-submodule.txt:437 en/git-svn.txt:1135
+#: en/git-symbolic-ref.txt:68 en/git-tag.txt:350 en/git.txt:1295
+#: en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51
+#: en/git-update-index.txt:485 en/git-update-ref.txt:151
+#: en/git-update-server-info.txt:43 en/git-upload-archive.txt:61
+#: en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31
+#: en/git-verify-pack.txt:52 en/git-verify-tag.txt:31
+#: en/git-web--browse.txt:123 en/git-whatchanged.txt:42
+#: en/git-worktree.txt:258 en/git-write-tree.txt:41
#, no-wrap
msgid "GIT"
msgstr "GIT"
-#
#. type: Plain text
#: en/git-add.txt:416 en/git-am.txt:232 en/git-annotate.txt:34
#: en/git-apply.txt:275 en/git-archimport.txt:112 en/git-archive.txt:197
@@ -14283,47 +13947,49 @@ msgstr "GIT"
#: en/git-format-patch.txt:641 en/git-fsck-objects.txt:22 en/git-fsck.txt:159
#: en/git-gc.txt:186 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:314
#: en/git-gui.txt:127 en/git-hash-object.txt:65 en/git-help.txt:191
-#: en/git-http-backend.txt:277 en/git-http-fetch.txt:52 en/git-http-push.txt:97
-#: en/git-imap-send.txt:183 en/git-index-pack.txt:105 en/git-init-db.txt:23
-#: en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:339
-#: en/git-log.txt:224 en/git-ls-files.txt:242 en/git-ls-remote.txt:95
-#: en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57
-#: en/git-merge-base.txt:183 en/git-merge-file.txt:95 en/git-merge-index.txt:79
+#: en/git-http-backend.txt:277 en/git-http-fetch.txt:52
+#: en/git-http-push.txt:97 en/git-imap-send.txt:183 en/git-index-pack.txt:105
+#: en/git-init-db.txt:23 en/git-init.txt:158 en/git-instaweb.txt:93
+#: en/git-interpret-trailers.txt:339 en/git-log.txt:224
+#: en/git-ls-files.txt:242 en/git-ls-remote.txt:95 en/git-ls-tree.txt:104
+#: en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:183
+#: en/git-merge-file.txt:95 en/git-merge-index.txt:79
#: en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:47
#: en/git-mergetool.txt:101 en/git-merge-tree.txt:29 en/git-merge.txt:363
#: en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69
#: en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:242
#: en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73
-#: en/git-parse-remote.txt:23 en/git-patch-id.txt:64 en/git-prune-packed.txt:47
-#: en/git-prune.txt:86 en/git-pull.txt:257 en/git-push.txt:567
-#: en/git-quiltimport.txt:61 en/git-read-tree.txt:431 en/git-rebase.txt:802
-#: en/git-receive-pack.txt:223 en/git-reflog.txt:133 en/git-remote-ext.txt:125
-#: en/git-remote-fd.txt:59 en/git-remote-testgit.txt:30 en/git-remote.txt:252
-#: en/git-repack.txt:166 en/git-replace.txt:156 en/git-request-pull.txt:79
-#: en/git-rerere.txt:216 en/git-reset.txt:454 en/git-revert.txt:129
-#: en/git-rev-list.txt:121 en/git-rev-parse.txt:453 en/git-rm.txt:188
-#: en/git-send-email.txt:482 en/git-send-pack.txt:150 en/git-shell.txt:90
-#: en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90
-#: en/git-show-branch.txt:204 en/git-show-index.txt:27 en/git-show-ref.txt:186
-#: en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23
-#: en/git-stash.txt:295 en/git-status.txt:359 en/git-stripspace.txt:94
-#: en/git-submodule.txt:438 en/git-svn.txt:1136 en/git-symbolic-ref.txt:69
-#: en/git-tag.txt:351 en/git.txt:1296 en/git-unpack-file.txt:28
-#: en/git-unpack-objects.txt:52 en/git-update-index.txt:486
-#: en/git-update-ref.txt:152 en/git-update-server-info.txt:44
-#: en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70
-#: en/git-verify-commit.txt:32 en/git-verify-pack.txt:53
-#: en/git-verify-tag.txt:32 en/git-web--browse.txt:124
-#: en/git-whatchanged.txt:43 en/git-worktree.txt:259 en/git-write-tree.txt:42
+#: en/git-parse-remote.txt:23 en/git-patch-id.txt:64
+#: en/git-prune-packed.txt:47 en/git-prune.txt:86 en/git-pull.txt:257
+#: en/git-push.txt:567 en/git-quiltimport.txt:61 en/git-read-tree.txt:431
+#: en/git-rebase.txt:802 en/git-receive-pack.txt:223 en/git-reflog.txt:133
+#: en/git-remote-ext.txt:125 en/git-remote-fd.txt:59
+#: en/git-remote-testgit.txt:30 en/git-remote.txt:252 en/git-repack.txt:166
+#: en/git-replace.txt:156 en/git-request-pull.txt:79 en/git-rerere.txt:216
+#: en/git-reset.txt:454 en/git-revert.txt:129 en/git-rev-list.txt:121
+#: en/git-rev-parse.txt:453 en/git-rm.txt:188 en/git-send-email.txt:482
+#: en/git-send-pack.txt:150 en/git-shell.txt:90
+#: en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43
+#: en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:27
+#: en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95
+#: en/git-stage.txt:23 en/git-stash.txt:295 en/git-status.txt:359
+#: en/git-stripspace.txt:94 en/git-submodule.txt:438 en/git-svn.txt:1136
+#: en/git-symbolic-ref.txt:69 en/git-tag.txt:351 en/git.txt:1296
+#: en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52
+#: en/git-update-index.txt:486 en/git-update-ref.txt:152
+#: en/git-update-server-info.txt:44 en/git-upload-archive.txt:62
+#: en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32
+#: en/git-verify-pack.txt:53 en/git-verify-tag.txt:32
+#: en/git-web--browse.txt:124 en/git-whatchanged.txt:43
+#: en/git-worktree.txt:259 en/git-write-tree.txt:42
msgid "Part of the linkgit:git[1] suite"
msgstr "Teil der linkgit:git[1] Suite"
#. type: Title =
#: en/git-am.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-rm(1)"
+#, no-wrap
msgid "git-am(1)"
-msgstr "git-rm(1)"
+msgstr "git-am(1)"
#. type: Plain text
#: en/git-am.txt:7
@@ -14387,10 +14053,9 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:44
-#, fuzzy, no-wrap
-#| msgid "--patch"
+#, no-wrap
msgid "--keep-non-patch"
-msgstr "--patch"
+msgstr "--keep-non-patch"
#. type: Plain text
#: en/git-am.txt:46
@@ -14401,14 +14066,14 @@ msgstr ""
#: en/git-am.txt:47
#, no-wrap
msgid "--[no-]keep-cr"
-msgstr ""
+msgstr "--[no-]keep-cr"
#. type: Plain text
#: en/git-am.txt:52
msgid ""
"With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) with "
-"the same option, to prevent it from stripping CR at the end of lines. `am."
-"keepcr` configuration variable can be used to specify the default "
+"the same option, to prevent it from stripping CR at the end of lines. "
+"`am.keepcr` configuration variable can be used to specify the default "
"behaviour. `--no-keep-cr` is useful to override `am.keepcr`."
msgstr ""
@@ -14419,13 +14084,13 @@ msgstr ""
#: en/git-stripspace.txt:42 en/rev-list-options.txt:866
#, no-wrap
msgid "-c"
-msgstr ""
+msgstr "-c"
#. type: Labeled list
#: en/git-am.txt:54 en/git-mailinfo.txt:74
#, no-wrap
msgid "--scissors"
-msgstr ""
+msgstr "--scissors"
#. type: Plain text
#: en/git-am.txt:58
@@ -14437,10 +14102,9 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:59 en/git-mailinfo.txt:90
-#, fuzzy, no-wrap
-#| msgid "--no-color"
+#, no-wrap
msgid "--no-scissors"
-msgstr "--no-color"
+msgstr "--no-scissors"
#. type: Plain text
#: en/git-am.txt:61
@@ -14460,10 +14124,9 @@ msgstr "-m"
#. type: Labeled list
#: en/git-am.txt:63 en/git-mailinfo.txt:70
-#, fuzzy, no-wrap
-#| msgid "--merged"
+#, no-wrap
msgid "--message-id"
-msgstr "--merged"
+msgstr "--message-id"
#. type: Plain text
#: en/git-am.txt:68
@@ -14475,10 +14138,9 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:69
-#, fuzzy, no-wrap
-#| msgid "--no-merged"
+#, no-wrap
msgid "--no-message-id"
-msgstr "--no-merged"
+msgstr "--no-message-id"
#. type: Plain text
#: en/git-am.txt:72
@@ -14496,7 +14158,7 @@ msgstr ""
#: en/git-am.txt:78
#, no-wrap
msgid "--utf8"
-msgstr ""
+msgstr "--utf8"
#. type: Plain text
#: en/git-am.txt:84
@@ -14517,10 +14179,9 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:88
-#, fuzzy, no-wrap
-#| msgid "--no-checkout"
+#, no-wrap
msgid "--no-utf8"
-msgstr "--no-checkout"
+msgstr "--no-utf8"
#. type: Plain text
#: en/git-am.txt:91
@@ -14531,37 +14192,35 @@ msgstr ""
#: en/git-am.txt:92 en/git-apply.txt:77
#, no-wrap
msgid "-3"
-msgstr ""
+msgstr "-3"
#. type: Labeled list
#: en/git-am.txt:93 en/git-apply.txt:78
#, no-wrap
msgid "--3way"
-msgstr ""
+msgstr "--3way"
#. type: Labeled list
#: en/git-am.txt:94
-#, fuzzy, no-wrap
-#| msgid "--no-track"
+#, no-wrap
msgid "--no-3way"
-msgstr "--no-track"
+msgstr "--no-3way"
#. type: Plain text
#: en/git-am.txt:101
msgid ""
-"When the patch does not apply cleanly, fall back on 3-way merge if the patch "
-"records the identity of blobs it is supposed to apply to and we have those "
+"When the patch does not apply cleanly, fall back on 3-way merge if the patch"
+" records the identity of blobs it is supposed to apply to and we have those "
"blobs available locally. `--no-3way` can be used to override am.threeWay "
-"configuration variable. For more information, see am.threeWay in linkgit:git-"
-"config[1]."
+"configuration variable. For more information, see am.threeWay in "
+"linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
#: en/git-am.txt:103 en/git-apply.txt:173 en/git-rebase.txt:361
-#, fuzzy, no-wrap
-#| msgid "--ignore-errors"
+#, no-wrap
msgid "--ignore-whitespace"
-msgstr "--ignore-errors"
+msgstr "--ignore-whitespace"
#. type: Labeled list
#: en/git-am.txt:104 en/git-rebase.txt:362
@@ -14605,7 +14264,7 @@ msgstr "--include"
#: en/git-am.txt:110 en/git-apply.txt:100
#, no-wrap
msgid "--reject"
-msgstr ""
+msgstr "--reject"
#. type: Plain text
#: en/git-am.txt:114
@@ -14616,10 +14275,9 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:115
-#, fuzzy, no-wrap
-#| msgid "--patch"
+#, no-wrap
msgid "--patch-format"
-msgstr "--patch"
+msgstr "--patch-format"
#. type: Plain text
#: en/git-am.txt:121
@@ -14641,23 +14299,22 @@ msgstr "--interactive"
#: en/git-am.txt:126 en/git-rebase.txt:367
#, no-wrap
msgid "--committer-date-is-author-date"
-msgstr ""
+msgstr "--committer-date-is-author-date"
#. type: Plain text
#: en/git-am.txt:132
msgid ""
"By default the command records the date from the e-mail message as the "
"commit author date, and uses the time of commit creation as the committer "
-"date. This allows the user to lie about the committer date by using the same "
-"value as the author date."
+"date. This allows the user to lie about the committer date by using the same"
+" value as the author date."
msgstr ""
#. type: Labeled list
#: en/git-am.txt:133 en/git-rebase.txt:368
-#, fuzzy, no-wrap
-#| msgid "--ignore-unmatch"
+#, no-wrap
msgid "--ignore-date"
-msgstr "--ignore-unmatch"
+msgstr "--ignore-date"
#. type: Plain text
#: en/git-am.txt:139
@@ -14672,7 +14329,7 @@ msgstr ""
#: en/git-am.txt:140 en/git-rebase.txt:264
#, no-wrap
msgid "--skip"
-msgstr ""
+msgstr "--skip"
#. type: Plain text
#: en/git-am.txt:143
@@ -14711,7 +14368,7 @@ msgstr ""
#: en/sequencer.txt:1
#, no-wrap
msgid "--continue"
-msgstr ""
+msgstr "--continue"
#. type: Labeled list
#: en/git-am.txt:151 en/git-branch.txt:136 en/git-cherry-pick.txt:74
@@ -14726,13 +14383,13 @@ msgstr "-r"
#: en/git-am.txt:152
#, no-wrap
msgid "--resolved"
-msgstr ""
+msgstr "--resolved"
#. type: Plain text
#: en/git-am.txt:159
msgid ""
-"After a patch failure (e.g. attempting to apply conflicting patch), the user "
-"has applied it by hand and the index file stores the result of the "
+"After a patch failure (e.g. attempting to apply conflicting patch), the user"
+" has applied it by hand and the index file stores the result of the "
"application. Make a commit using the authorship and commit log extracted "
"from the e-mail message and the current index file, and continue."
msgstr ""
@@ -14748,9 +14405,9 @@ msgstr "--message=<msg>"
#: en/git-am.txt:166
msgid ""
"When a patch failure occurs, <msg> will be printed to the screen before "
-"exiting. This overrides the standard message informing you to use `--"
-"continue` or `--skip` to handle the failure. This is solely for internal "
-"use between 'git rebase' and 'git am'."
+"exiting. This overrides the standard message informing you to use "
+"`--continue` or `--skip` to handle the failure. This is solely for internal"
+" use between 'git rebase' and 'git am'."
msgstr ""
#. type: Labeled list
@@ -14758,7 +14415,7 @@ msgstr ""
#: en/git-rebase.txt:248 en/sequencer.txt:11
#, no-wrap
msgid "--abort"
-msgstr ""
+msgstr "--abort"
#. type: Plain text
#: en/git-am.txt:169
@@ -14784,26 +14441,26 @@ msgstr ""
#. type: Plain text
#: en/git-am.txt:179
msgid ""
-"The commit author name is taken from the \"From: \" line of the message, and "
-"commit author date is taken from the \"Date: \" line of the message. The "
+"The commit author name is taken from the \"From: \" line of the message, and"
+" commit author date is taken from the \"Date: \" line of the message. The "
"\"Subject: \" line is used as the title of the commit, after stripping "
-"common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to "
-"concisely describe what the commit is about in one line of text."
+"common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to"
+" concisely describe what the commit is about in one line of text."
msgstr ""
#. type: Plain text
#: en/git-am.txt:182
msgid ""
-"\"From: \" and \"Subject: \" lines starting the body override the respective "
-"commit author name and title values taken from the headers."
+"\"From: \" and \"Subject: \" lines starting the body override the respective"
+" commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
#: en/git-am.txt:187
msgid ""
"The commit message is formed by the title taken from the \"Subject: \", a "
-"blank line and the body of the message up to where the patch begins. Excess "
-"whitespace at the end of each line is automatically stripped."
+"blank line and the body of the message up to where the patch begins. Excess"
+" whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
@@ -14853,8 +14510,8 @@ msgstr ""
#: en/git-am.txt:208
msgid ""
"hand resolve the conflict in the working directory, and update the index "
-"file to bring it into a state that the patch should have produced. Then run "
-"the command with the `--continue` option."
+"file to bring it into a state that the patch should have produced. Then run"
+" the command with the `--continue` option."
msgstr ""
#. type: Plain text
@@ -14870,8 +14527,8 @@ msgstr ""
msgid ""
"Before any patches are applied, ORIG_HEAD is set to the tip of the current "
"branch. This is useful if you have problems with multiple commits, like "
-"running 'git am' on the wrong branch or an error in the commits that is more "
-"easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
+"running 'git am' on the wrong branch or an error in the commits that is more"
+" easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
@@ -14880,22 +14537,20 @@ msgstr ""
msgid "HOOKS"
msgstr "HOOKS"
-#
#. type: Plain text
#: en/git-am.txt:225
#, fuzzy
#| msgid ""
-#| "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, "
-#| "and `post-commit` hooks. See linkgit:githooks[5] for more information."
+#| "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, and "
+#| "`post-commit` hooks. See linkgit:githooks[5] for more information."
msgid ""
"This command can run `applypatch-msg`, `pre-applypatch`, and `post-"
"applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr ""
"Dieser Befehl kann die folgenden Einsprungspunkte (hooks) aufrufen: `commit-"
-"msg`, `prepare-commit-msg`, `pre-commit` und `post-commit`. Siehe linkgit:"
-"githooks[5] f체r weitere Information."
+"msg`, `prepare-commit-msg`, `pre-commit` und `post-commit`. Siehe "
+"linkgit:githooks[5] f체r weitere Information."
-#
#. type: Plain text
#: en/git-am.txt:229
#, fuzzy
@@ -14903,13 +14558,11 @@ msgstr ""
msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-add[1]"
-#
#. type: Title =
#: en/git-annotate.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-remote(1)"
+#, no-wrap
msgid "git-annotate(1)"
-msgstr "git-remote(1)"
+msgstr "git-annotate(1)"
#. type: Plain text
#: en/git-annotate.txt:7
@@ -14925,27 +14578,25 @@ msgstr ""
#. type: Plain text
#: en/git-annotate.txt:17
msgid ""
-"Annotates each line in the given file with information from the commit which "
-"introduced the line. Optionally annotates from a given revision."
+"Annotates each line in the given file with information from the commit which"
+" introduced the line. Optionally annotates from a given revision."
msgstr ""
#. type: Plain text
#: en/git-annotate.txt:22
msgid ""
"The only difference between this command and linkgit:git-blame[1] is that "
-"they use slightly different output formats, and this command exists only for "
-"backward compatibility to support existing scripts, and provide a more "
+"they use slightly different output formats, and this command exists only for"
+" backward compatibility to support existing scripts, and provide a more "
"familiar command name for people coming from other SCM systems."
msgstr ""
#. type: Title =
#: en/git-apply.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-apply(1)"
-msgstr "git-add(1)"
+msgstr "git-apply(1)"
-#
#. type: Plain text
#: en/git-apply.txt:7
#, fuzzy
@@ -14981,9 +14632,9 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:34
msgid ""
-"This command applies the patch but does not create a commit. Use linkgit:"
-"git-am[1] to create commits from patches generated by linkgit:git-format-"
-"patch[1] and/or received by email."
+"This command applies the patch but does not create a commit. Use "
+"linkgit:git-am[1] to create commits from patches generated by linkgit:git-"
+"format-patch[1] and/or received by email."
msgstr ""
#. type: Labeled list
@@ -14993,7 +14644,6 @@ msgstr ""
msgid "<patch>..."
msgstr "<path>..."
-#
#. type: Plain text
#: en/git-apply.txt:40
#, fuzzy
@@ -15001,18 +14651,17 @@ msgstr "<path>..."
#| "Take the commit message from the given file. Use '-' to read the message "
#| "from the standard input."
msgid ""
-"The files to read the patch from. '-' can be used to read from the standard "
-"input."
+"The files to read the patch from. '-' can be used to read from the standard"
+" input."
msgstr ""
-"Nimm die Eintragungsbemerkung (commit message) der spezifizierten Datei. Mit "
-"'-' wird die Bemerkung von der Standard Eingabe gelesen."
+"Nimm die Eintragungsbemerkung (commit message) der spezifizierten Datei. Mit"
+" '-' wird die Bemerkung von der Standard Eingabe gelesen."
#. type: Labeled list
#: en/git-apply.txt:41 en/git-rebase.txt:314 en/merge-options.txt:55
-#, fuzzy, no-wrap
-#| msgid "status"
+#, no-wrap
msgid "--stat"
-msgstr "status"
+msgstr "--stat"
#. type: Plain text
#: en/git-apply.txt:44
@@ -15034,31 +14683,31 @@ msgstr ""
#: en/git-apply.txt:57
msgid ""
"Instead of applying the patch, output a condensed summary of information "
-"obtained from git diff extended headers, such as creations, renames and mode "
-"changes. Turns off \"apply\"."
+"obtained from git diff extended headers, such as creations, renames and mode"
+" changes. Turns off \"apply\"."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:62
msgid ""
-"Instead of applying the patch, see if the patch is applicable to the current "
-"working tree and/or the index file and detects errors. Turns off \"apply\"."
+"Instead of applying the patch, see if the patch is applicable to the current"
+" working tree and/or the index file and detects errors. Turns off "
+"\"apply\"."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, fuzzy, no-wrap
-#| msgid "--include"
+#, no-wrap
msgid "--index"
-msgstr "--include"
+msgstr "--index"
#. type: Plain text
#: en/git-apply.txt:71
msgid ""
"When `--check` is in effect, or when applying the patch (which is the "
"default when none of the options that disables it is in effect), make sure "
-"the patch is applicable to what the current index file records. If the file "
-"to be patched in the working tree is not up-to-date, it is flagged as an "
+"the patch is applicable to what the current index file records. If the file"
+" to be patched in the working tree is not up-to-date, it is flagged as an "
"error. This flag also causes the index file to be updated."
msgstr ""
@@ -15081,12 +14730,12 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:85
msgid ""
-"When the patch does not apply cleanly, fall back on 3-way merge if the patch "
-"records the identity of blobs it is supposed to apply to, and we have those "
-"blobs available locally, possibly leaving the conflict markers in the files "
-"in the working tree for the user to resolve. This option implies the `--"
-"index` option, and is incompatible with the `--reject` and the `--cached` "
-"options."
+"When the patch does not apply cleanly, fall back on 3-way merge if the patch"
+" records the identity of blobs it is supposed to apply to, and we have those"
+" blobs available locally, possibly leaving the conflict markers in the files"
+" in the working tree for the user to resolve. This option implies the "
+"`--index` option, and is incompatible with the `--reject` and the `--cached`"
+" options."
msgstr ""
#. type: Labeled list
@@ -15107,18 +14756,16 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:95
msgid ""
-"When a pure mode change is encountered (which has no index information), the "
-"information is read from the current index instead."
+"When a pure mode change is encountered (which has no index information), the"
+" information is read from the current index instead."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:97 en/rev-list-options.txt:659
-#, fuzzy, no-wrap
-#| msgid "revert"
+#, no-wrap
msgid "--reverse"
-msgstr "revert"
+msgstr "--reverse"
-#
#. type: Plain text
#: en/git-apply.txt:99
#, fuzzy
@@ -15151,24 +14798,24 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:124 en/git-rebase.txt:334
msgid ""
-"Ensure at least <n> lines of surrounding context match before and after each "
-"change. When fewer lines of surrounding context exist they all must match. "
-"By default no context is ever ignored."
+"Ensure at least <n> lines of surrounding context match before and after each"
+" change. When fewer lines of surrounding context exist they all must match."
+" By default no context is ever ignored."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:125
#, no-wrap
msgid "--unidiff-zero"
-msgstr ""
+msgstr "--unidiff-zero"
#. type: Plain text
#: en/git-apply.txt:131
msgid ""
"By default, 'git apply' expects that the patch being applied is a unified "
-"diff with at least one line of context. This provides good safety measures, "
-"but breaks down when applying a diff generated with `--unified=0`. To bypass "
-"these checks use `--unidiff-zero`."
+"diff with at least one line of context. This provides good safety measures,"
+" but breaks down when applying a diff generated with `--unified=0`. To "
+"bypass these checks use `--unidiff-zero`."
msgstr ""
#. type: Plain text
@@ -15182,37 +14829,36 @@ msgstr ""
#: en/git-apply.txt:135
#, no-wrap
msgid "--apply"
-msgstr ""
+msgstr "--apply"
#. type: Plain text
#: en/git-apply.txt:141
msgid ""
"If you use any of the options marked \"Turns off 'apply'\" above, 'git "
-"apply' reads and outputs the requested information without actually applying "
-"the patch. Give this flag after those flags to also apply the patch."
+"apply' reads and outputs the requested information without actually applying"
+" the patch. Give this flag after those flags to also apply the patch."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:142
-#, fuzzy, no-wrap
-#| msgid "--add"
+#, no-wrap
msgid "--no-add"
-msgstr "--add"
+msgstr "--no-add"
#. type: Plain text
#: en/git-apply.txt:148
msgid ""
-"When applying a patch, ignore additions made by the patch. This can be used "
-"to extract the common part between two files by first running 'diff' on them "
-"and applying the result with this option, which would apply the deletion "
-"part but not the addition part."
+"When applying a patch, ignore additions made by the patch. This can be used"
+" to extract the common part between two files by first running 'diff' on "
+"them and applying the result with this option, which would apply the "
+"deletion part but not the addition part."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:149
#, no-wrap
msgid "--allow-binary-replacement"
-msgstr ""
+msgstr "--allow-binary-replacement"
#. type: Plain text
#: en/git-apply.txt:155
@@ -15253,11 +14899,11 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:171
msgid ""
-"When `--exclude` and `--include` patterns are used, they are examined in the "
-"order they appear on the command line, and the first match determines if a "
+"When `--exclude` and `--include` patterns are used, they are examined in the"
+" order they appear on the command line, and the first match determines if a "
"patch to each path is used. A patch to a path that does not match any "
-"include/exclude pattern is used by default if there is no include pattern on "
-"the command line, and ignored if there is any include pattern."
+"include/exclude pattern is used by default if there is no include pattern on"
+" the command line, and ignored if there is any include pattern."
msgstr ""
#. type: Plain text
@@ -15279,11 +14925,11 @@ msgstr ""
#: en/git-apply.txt:188
msgid ""
"When applying a patch, detect a new or modified line that has whitespace "
-"errors. What are considered whitespace errors is controlled by `core."
-"whitespace` configuration. By default, trailing whitespaces (including "
-"lines that solely consist of whitespaces) and a space character that is "
-"immediately followed by a tab character inside the initial indent of the "
-"line are considered whitespace errors."
+"errors. What are considered whitespace errors is controlled by "
+"`core.whitespace` configuration. By default, trailing whitespaces "
+"(including lines that solely consist of whitespaces) and a space character "
+"that is immediately followed by a tab character inside the initial indent of"
+" the line are considered whitespace errors."
msgstr ""
#. type: Plain text
@@ -15336,13 +14982,13 @@ msgstr ""
#: en/git-apply.txt:207
#, no-wrap
msgid "--inaccurate-eof"
-msgstr ""
+msgstr "--inaccurate-eof"
#. type: Plain text
#: en/git-apply.txt:213
msgid ""
-"Under certain circumstances, some versions of 'diff' do not correctly detect "
-"a missing new-line at the end of the file. As a result, patches created by "
+"Under certain circumstances, some versions of 'diff' do not correctly detect"
+" a missing new-line at the end of the file. As a result, patches created by "
"such 'diff' programs do not record incomplete lines correctly. This option "
"adds support for applying such patches by working around this bug."
msgstr ""
@@ -15359,7 +15005,7 @@ msgstr ""
#: en/git-apply.txt:220
#, no-wrap
msgid "--recount"
-msgstr ""
+msgstr "--recount"
#. type: Plain text
#: en/git-apply.txt:224
@@ -15386,41 +15032,40 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:232
msgid ""
-"For example, a patch that talks about updating `a/git-gui.sh` to `b/git-gui."
-"sh` can be applied to the file in the working tree `modules/git-gui/git-gui."
-"sh` by running `git apply --directory=modules/git-gui`."
+"For example, a patch that talks about updating `a/git-gui.sh` to `b/git-"
+"gui.sh` can be applied to the file in the working tree `modules/git-gui/git-"
+"gui.sh` by running `git apply --directory=modules/git-gui`."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:233
-#, fuzzy, no-wrap
-#| msgid "--unset"
+#, no-wrap
msgid "--unsafe-paths"
-msgstr "--unset"
+msgstr "--unsafe-paths"
#. type: Plain text
#: en/git-apply.txt:238
msgid ""
"By default, a patch that affects outside the working area (either a Git "
-"controlled working tree, or the current working directory when \"git apply\" "
-"is used as a replacement of GNU patch) is rejected as a mistake (or a "
+"controlled working tree, or the current working directory when \"git apply\""
+" is used as a replacement of GNU patch) is rejected as a mistake (or a "
"mischief)."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:242
msgid ""
-"When `git apply` is used as a \"better GNU patch\", the user can pass the `--"
-"unsafe-paths` option to override this safety check. This option has no "
+"When `git apply` is used as a \"better GNU patch\", the user can pass the "
+"`--unsafe-paths` option to override this safety check. This option has no "
"effect when `--index` or `--cached` is in use."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:250
msgid ""
-"Set to 'change' if you want changes in whitespace to be ignored by default. "
-"Set to one of: no, none, never, false if you want changes in whitespace to "
-"be significant."
+"Set to 'change' if you want changes in whitespace to be ignored by default."
+" Set to one of: no, none, never, false if you want changes in whitespace to"
+" be significant."
msgstr ""
#. type: Plain text
@@ -15448,8 +15093,9 @@ msgstr ""
msgid ""
"If `--index` is specified (explicitly or implicitly), then the submodule "
"commits must match the index exactly for the patch to apply. If any of the "
-"submodules are checked-out, then these check-outs are completely ignored, i."
-"e., they are not required to be up-to-date or clean and they are not updated."
+"submodules are checked-out, then these check-outs are completely ignored, "
+"i.e., they are not required to be up-to-date or clean and they are not "
+"updated."
msgstr ""
#. type: Plain text
@@ -15460,7 +15106,6 @@ msgid ""
"is checked and (if possible) updated."
msgstr ""
-#
#. type: Plain text
#: en/git-apply.txt:272
#, fuzzy
@@ -15468,15 +15113,12 @@ msgstr ""
msgid "linkgit:git-am[1]."
msgstr "linkgit:git-add[1]"
-#
#. type: Title =
#: en/git-archimport.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-remote(1)"
+#, no-wrap
msgid "git-archimport(1)"
-msgstr "git-remote(1)"
+msgstr "git-archimport(1)"
-#
#. type: Plain text
#: en/git-archimport.txt:7
#, fuzzy
@@ -15497,18 +15139,18 @@ msgstr ""
#: en/git-archimport.txt:22
msgid ""
"Imports a project from one or more Arch repositories. It will follow "
-"branches and repositories within the namespaces defined by the <archive/"
-"branch> parameters supplied. If it cannot find the remote branch a merge "
-"comes from it will just import it as a regular commit. If it can find it, it "
-"will mark it as a merge whenever possible (see discussion below)."
+"branches and repositories within the namespaces defined by the "
+"<archive/branch> parameters supplied. If it cannot find the remote branch a "
+"merge comes from it will just import it as a regular commit. If it can find "
+"it, it will mark it as a merge whenever possible (see discussion below)."
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:26
msgid ""
"The script expects you to provide the key roots where it can start the "
-"import from an 'initial import' or 'tag' type of Arch commit. It will follow "
-"and import new branches within the provided roots."
+"import from an 'initial import' or 'tag' type of Arch commit. It will follow"
+" and import new branches within the provided roots."
msgstr ""
#. type: Plain text
@@ -15522,8 +15164,8 @@ msgstr ""
#. type: Plain text
#: en/git-archimport.txt:36
msgid ""
-"'git archimport' uses `tla` extensively in the background to access the Arch "
-"repository. Make sure you have a recent version of `tla` available in the "
+"'git archimport' uses `tla` extensively in the background to access the Arch"
+" repository. Make sure you have a recent version of `tla` available in the "
"path. `tla` must know about the repositories you pass to 'git archimport'."
msgstr ""
@@ -15531,8 +15173,8 @@ msgstr ""
#: en/git-archimport.txt:41
msgid ""
"For the initial import, 'git archimport' expects to find itself in an empty "
-"directory. To follow the development of a project that uses Arch, rerun 'git "
-"archimport' with the same parameters as the initial import to perform "
+"directory. To follow the development of a project that uses Arch, rerun 'git"
+" archimport' with the same parameters as the initial import to perform "
"incremental imports."
msgstr ""
@@ -15550,8 +15192,8 @@ msgstr ""
#. type: Plain text
#: en/git-archimport.txt:53
msgid ""
-"Associating multiple Arch branches to one Git branch is possible; the result "
-"will make the most sense only if no commits are made to the first branch, "
+"Associating multiple Arch branches to one Git branch is possible; the result"
+" will make the most sense only if no commits are made to the first branch, "
"after the second branch is created. Still, this is useful to convert Arch "
"repositories that had been rotated periodically."
msgstr ""
@@ -15576,8 +15218,8 @@ msgstr ""
#: en/git-archimport.txt:66
msgid ""
"Fortunately, when you try and merge branches imported from Arch, Git will "
-"find a good merge base, and it has a good chance of identifying patches that "
-"have been traded out-of-sequence between the branches."
+"find a good merge base, and it has a good chance of identifying patches that"
+" have been traded out-of-sequence between the branches."
msgstr ""
#. type: Plain text
@@ -15599,15 +15241,15 @@ msgstr ""
#. type: Plain text
#: en/git-archimport.txt:79
msgid ""
-"Many tags. Will create a tag for every commit, reflecting the commit name in "
-"the Arch repository."
+"Many tags. Will create a tag for every commit, reflecting the commit name in"
+" the Arch repository."
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:84
msgid ""
-"Use the fast patchset import strategy. This can be significantly faster for "
-"large trees, but cannot handle directory renames or permissions changes. "
+"Use the fast patchset import strategy. This can be significantly faster for"
+" large trees, but cannot handle directory renames or permissions changes. "
"The default strategy is slow and safe."
msgstr ""
@@ -15622,10 +15264,10 @@ msgstr "-o"
#: en/git-archimport.txt:92
msgid ""
"Use this for compatibility with old-style branch names used by earlier "
-"versions of 'git archimport'. Old-style branch names were category{litdd}"
-"branch, whereas new-style branch names are archive,category{litdd}"
-"branch{litdd}version. In both cases, names given on the command-line will "
-"override the automatically-generated ones."
+"versions of 'git archimport'. Old-style branch names were "
+"category{litdd}branch, whereas new-style branch names are "
+"archive,category{litdd}branch{litdd}version. In both cases, names given on "
+"the command-line will override the automatically-generated ones."
msgstr ""
#. type: Labeled list
@@ -15656,7 +15298,6 @@ msgstr ""
msgid "-t <tmpdir>"
msgstr "-t <file>"
-#
#. type: Plain text
#: en/git-archimport.txt:104
#, fuzzy
@@ -15678,10 +15319,9 @@ msgstr ""
#. type: Title =
#: en/git-archive.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-branch(1)"
+#, no-wrap
msgid "git-archive(1)"
-msgstr "git-branch(1)"
+msgstr "git-archive(1)"
#. type: Plain text
#: en/git-archive.txt:7
@@ -15701,8 +15341,8 @@ msgstr ""
#. type: Plain text
#: en/git-archive.txt:23
msgid ""
-"Creates an archive of the specified format containing the tree structure for "
-"the named tree, and writes it out to the standard output. If <prefix> is "
+"Creates an archive of the specified format containing the tree structure for"
+" the named tree, and writes it out to the standard output. If <prefix> is "
"specified it is prepended to the filenames in the archive."
msgstr ""
@@ -15784,13 +15424,13 @@ msgstr ""
#: en/git-archive.txt:58
#, no-wrap
msgid "--worktree-attributes"
-msgstr ""
+msgstr "--worktree-attributes"
#. type: Plain text
#: en/git-archive.txt:61
msgid ""
-"Look for attributes in .gitattributes files in the working tree as well (see "
-"<<ATTRIBUTES>>)."
+"Look for attributes in .gitattributes files in the working tree as well (see"
+" <<ATTRIBUTES>>)."
msgstr ""
#. type: Labeled list
@@ -15858,8 +15498,8 @@ msgstr "<path>..."
#: en/git-archive.txt:84
msgid ""
"Without an optional path parameter, all files and subdirectories of the "
-"current working directory are included in the archive. If one or more paths "
-"are specified, only these are included."
+"current working directory are included in the archive. If one or more paths"
+" are specified, only these are included."
msgstr ""
#. type: Title -
@@ -15878,7 +15518,7 @@ msgstr ""
#: en/git-archive.txt:90 en/git-diff-files.txt:28
#, no-wrap
msgid "-0"
-msgstr ""
+msgstr "-0"
#. type: Plain text
#: en/git-archive.txt:92
@@ -15889,13 +15529,13 @@ msgstr ""
#: en/git-archive.txt:92
#, no-wrap
msgid "-9"
-msgstr ""
+msgstr "-9"
#. type: Plain text
#: en/git-archive.txt:95
msgid ""
-"Highest and slowest compression level. You can specify any number from 1 to "
-"9 to adjust compression speed and ratio."
+"Highest and slowest compression level. You can specify any number from 1 to"
+" 9 to adjust compression speed and ratio."
msgstr ""
#. type: Title -
@@ -15986,19 +15626,19 @@ msgstr ""
#. type: Plain text
#: en/git-archive.txt:139
msgid ""
-"If the attribute export-subst is set for a file then Git will expand several "
-"placeholders when adding this file to an archive. See linkgit:"
-"gitattributes[5] for details."
+"If the attribute export-subst is set for a file then Git will expand several"
+" placeholders when adding this file to an archive. See "
+"linkgit:gitattributes[5] for details."
msgstr ""
#. type: Plain text
#: en/git-archive.txt:147
msgid ""
-"Note that attributes are by default taken from the `.gitattributes` files in "
-"the tree that is being archived. If you want to tweak the way the output is "
-"generated after the fact (e.g. you committed without adding an appropriate "
-"export-ignore in its `.gitattributes`), adjust the checked out `."
-"gitattributes` file as necessary and use `--worktree-attributes` option. "
+"Note that attributes are by default taken from the `.gitattributes` files in"
+" the tree that is being archived. If you want to tweak the way the output "
+"is generated after the fact (e.g. you committed without adding an "
+"appropriate export-ignore in its `.gitattributes`), adjust the checked out "
+"`.gitattributes` file as necessary and use `--worktree-attributes` option. "
"Alternatively you can keep necessary attributes that should apply while "
"archiving any tree in your `$GIT_DIR/info/attributes` file."
msgstr ""
@@ -16006,7 +15646,8 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:150
#, no-wrap
-msgid "`git archive --format=tar --prefix=junk/ HEAD | (cd /var/tmp/ && tar xf -)`"
+msgid ""
+"`git archive --format=tar --prefix=junk/ HEAD | (cd /var/tmp/ && tar xf -)`"
msgstr ""
#. type: Plain text
@@ -16019,7 +15660,9 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:156
#, no-wrap
-msgid "`git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip >git-1.4.0.tar.gz`"
+msgid ""
+"`git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip "
+">git-1.4.0.tar.gz`"
msgstr ""
#. type: Plain text
@@ -16030,7 +15673,8 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:160
#, no-wrap
-msgid "`git archive --format=tar.gz --prefix=git-1.4.0/ v1.4.0 >git-1.4.0.tar.gz`"
+msgid ""
+"`git archive --format=tar.gz --prefix=git-1.4.0/ v1.4.0 >git-1.4.0.tar.gz`"
msgstr ""
#. type: Plain text
@@ -16052,7 +15696,9 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:168
#, no-wrap
-msgid "`git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip >git-1.4.0.tar.gz`"
+msgid ""
+"`git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip "
+">git-1.4.0.tar.gz`"
msgstr ""
#. type: Plain text
@@ -16065,7 +15711,9 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:173
#, no-wrap
-msgid "`git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > git-1.4.0-docs.zip`"
+msgid ""
+"`git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > "
+"git-1.4.0-docs.zip`"
msgstr ""
#. type: Plain text
@@ -16103,7 +15751,6 @@ msgid ""
"foo.tar.xz`."
msgstr ""
-#
#. type: Plain text
#: en/git-archive.txt:194
#, fuzzy
@@ -16113,14 +15760,14 @@ msgstr "linkgit:git-add[1]"
#. type: Title =
#: en/git-bisect.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-checkout(1)"
+#, no-wrap
msgid "git-bisect(1)"
-msgstr "git-checkout(1)"
+msgstr "git-bisect(1)"
#. type: Plain text
#: en/git-bisect.txt:7
-msgid "git-bisect - Use binary search to find the commit that introduced a bug"
+msgid ""
+"git-bisect - Use binary search to find the commit that introduced a bug"
msgstr ""
#. type: Plain text
@@ -16158,9 +15805,9 @@ msgstr ""
#: en/git-bisect.txt:40
msgid ""
"This command uses a binary search algorithm to find which commit in your "
-"project's history introduced a bug. You use it by first telling it a \"bad\" "
-"commit that is known to contain the bug, and a \"good\" commit that is known "
-"to be before the bug was introduced. Then `git bisect` picks a commit "
+"project's history introduced a bug. You use it by first telling it a \"bad\""
+" commit that is known to contain the bug, and a \"good\" commit that is "
+"known to be before the bug was introduced. Then `git bisect` picks a commit "
"between those two endpoints and asks you whether the selected commit is "
"\"good\" or \"bad\". It continues narrowing down the range until it finds "
"the exact commit that introduced the change."
@@ -16172,9 +15819,9 @@ msgid ""
"In fact, `git bisect` can be used to find the commit that changed *any* "
"property of your project; e.g., the commit that fixed a bug, or the commit "
"that caused a benchmark's performance to improve. To support this more "
-"general usage, the terms \"old\" and \"new\" can be used in place of \"good"
-"\" and \"bad\", or you can choose your own terms. See section \"Alternate "
-"terms\" below for more information."
+"general usage, the terms \"old\" and \"new\" can be used in place of "
+"\"good\" and \"bad\", or you can choose your own terms. See section "
+"\"Alternate terms\" below for more information."
msgstr ""
#. type: Title ~
@@ -16187,8 +15834,8 @@ msgstr ""
#: en/git-bisect.txt:54
msgid ""
"As an example, suppose you are trying to find the commit that broke a "
-"feature that was known to work in version `v2.6.13-rc2` of your project. You "
-"start a bisect session as follows:"
+"feature that was known to work in version `v2.6.13-rc2` of your project. You"
+" start a bisect session as follows:"
msgstr ""
#. type: delimited block -
@@ -16262,8 +15909,8 @@ msgstr ""
#: en/git-bisect.txt:95
msgid ""
"Eventually there will be no more revisions left to inspect, and the command "
-"will print out a description of the first bad commit. The reference `refs/"
-"bisect/bad` will be left pointing at that commit."
+"will print out a description of the first bad commit. The reference "
+"`refs/bisect/bad` will be left pointing at that commit."
msgstr ""
#. type: Title ~
@@ -16323,22 +15970,22 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:132
msgid ""
-"Sometimes you are not looking for the commit that introduced a breakage, but "
-"rather for a commit that caused a change between some other \"old\" state "
+"Sometimes you are not looking for the commit that introduced a breakage, but"
+" rather for a commit that caused a change between some other \"old\" state "
"and \"new\" state. For example, you might be looking for the commit that "
-"introduced a particular fix. Or you might be looking for the first commit in "
-"which the source-code filenames were finally all converted to your company's "
-"naming standard. Or whatever."
+"introduced a particular fix. Or you might be looking for the first commit in"
+" which the source-code filenames were finally all converted to your "
+"company's naming standard. Or whatever."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:138
msgid ""
-"In such cases it can be very confusing to use the terms \"good\" and \"bad\" "
-"to refer to \"the state before the change\" and \"the state after the change"
-"\". So instead, you can use the terms \"old\" and \"new\", respectively, in "
-"place of \"good\" and \"bad\". (But note that you cannot mix \"good\" and "
-"\"bad\" with \"old\" and \"new\" in a single session.)"
+"In such cases it can be very confusing to use the terms \"good\" and \"bad\""
+" to refer to \"the state before the change\" and \"the state after the "
+"change\". So instead, you can use the terms \"old\" and \"new\", "
+"respectively, in place of \"good\" and \"bad\". (But note that you cannot "
+"mix \"good\" and \"bad\" with \"old\" and \"new\" in a single session.)"
msgstr ""
#. type: Plain text
@@ -16347,8 +15994,8 @@ msgid ""
"In this more general usage, you provide `git bisect` with a \"new\" commit "
"has some property and an \"old\" commit that doesn't have that property. "
"Each time `git bisect` checks out a commit, you test if that commit has the "
-"property. If it does, mark the commit as \"new\"; otherwise, mark it as \"old"
-"\". When the bisection is done, `git bisect` will report which commit "
+"property. If it does, mark the commit as \"new\"; otherwise, mark it as "
+"\"old\". When the bisection is done, `git bisect` will report which commit "
"introduced the property."
msgstr ""
@@ -16396,15 +16043,15 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:170
msgid ""
-"You can get just the old (respectively new) term with `git bisect term --"
-"term-old` or `git bisect term --term-good`."
+"You can get just the old (respectively new) term with `git bisect term "
+"--term-old` or `git bisect term --term-good`."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:175
msgid ""
-"If you would like to use your own terms instead of \"bad\"/\"good\" or \"new"
-"\"/\"old\", you can choose any names you like (except existing bisect "
+"If you would like to use your own terms instead of \"bad\"/\"good\" or "
+"\"new\"/\"old\", you can choose any names you like (except existing bisect "
"subcommands like `reset`, `start`, ...) by starting the bisection using"
msgstr ""
@@ -16472,8 +16119,8 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:211
msgid ""
-"If the `DISPLAY` environment variable is not set, 'git log' is used "
-"instead. You can also give command-line options such as `-p` and `--stat`."
+"If the `DISPLAY` environment variable is not set, 'git log' is used instead."
+" You can also give command-line options such as `-p` and `--stat`."
msgstr ""
#. type: delimited block -
@@ -16491,8 +16138,8 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:221
msgid ""
-"After having marked revisions as good or bad, issue the following command to "
-"show what has been done so far:"
+"After having marked revisions as good or bad, issue the following command to"
+" show what has been done so far:"
msgstr ""
#. type: delimited block -
@@ -16699,21 +16346,21 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:332
msgid ""
-"Any other exit code will abort the bisect process. It should be noted that a "
-"program that terminates via `exit(-1)` leaves $? = 255, (see the exit(3) "
+"Any other exit code will abort the bisect process. It should be noted that a"
+" program that terminates via `exit(-1)` leaves $? = 255, (see the exit(3) "
"manual page), as the value is chopped with `& 0377`."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:341
msgid ""
-"The special exit code 125 should be used when the current source code cannot "
-"be tested. If the script exits with this code, the current revision will be "
-"skipped (see `git bisect skip` above). 125 was chosen as the highest "
+"The special exit code 125 should be used when the current source code cannot"
+" be tested. If the script exits with this code, the current revision will be"
+" skipped (see `git bisect skip` above). 125 was chosen as the highest "
"sensible value to use for this purpose, because 126 and 127 are used by "
"POSIX shells to signal specific error status (127 is for command not found, "
-"126 is for command found but not executable--these details do not matter, as "
-"they are normal errors in the script, as far as `bisect run` is concerned)."
+"126 is for command found but not executable--these details do not matter, as"
+" they are normal errors in the script, as far as `bisect run` is concerned)."
msgstr ""
#. type: Plain text
@@ -16722,8 +16369,8 @@ msgid ""
"You may often find that during a bisect session you want to have temporary "
"modifications (e.g. s/#define DEBUG 0/#define DEBUG 1/ in a header file, or "
"\"revision that does not have this commit needs this patch applied to work "
-"around another problem this bisection is not interested in\") applied to the "
-"revision being tested."
+"around another problem this bisection is not interested in\") applied to the"
+" revision being tested."
msgstr ""
#. type: Plain text
@@ -16748,8 +16395,8 @@ msgstr "--no-checkout"
#: en/git-bisect.txt:363
msgid ""
"Do not checkout the new working tree at each iteration of the bisection "
-"process. Instead just update a special reference named `BISECT_HEAD` to make "
-"it point to the commit that should be tested."
+"process. Instead just update a special reference named `BISECT_HEAD` to make"
+" it point to the commit that should be tested."
msgstr ""
#. type: Plain text
@@ -16947,7 +16594,6 @@ msgid ""
"$ git bisect old HEAD~10 # the tenth commit from now is marked as old\n"
msgstr ""
-#
#. type: Plain text
#: en/git-bisect.txt:481
#, fuzzy
@@ -16980,16 +16626,15 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:497
msgid ""
-"link:git-bisect-lk2009.html[Fighting regressions with git bisect], linkgit:"
-"git-blame[1]."
+"link:git-bisect-lk2009.html[Fighting regressions with git bisect], "
+"linkgit:git-blame[1]."
msgstr ""
#. type: Title =
#: en/git-blame.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-mv(1)"
+#, no-wrap
msgid "git-blame(1)"
-msgstr "git-mv(1)"
+msgstr "git-blame(1)"
#. type: Plain text
#: en/git-blame.txt:7
@@ -17018,8 +16663,8 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:24
msgid ""
-"When specified one or more times, `-L` restricts annotation to the requested "
-"lines."
+"When specified one or more times, `-L` restricts annotation to the requested"
+" lines."
msgstr ""
#. type: Plain text
@@ -17034,8 +16679,8 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:34
msgid ""
-"The report does not tell you anything about lines which have been deleted or "
-"replaced; you need to use a tool such as 'git diff' or the \"pickaxe\" "
+"The report does not tell you anything about lines which have been deleted or"
+" replaced; you need to use a tool such as 'git diff' or the \"pickaxe\" "
"interface briefly mentioned in the following paragraph."
msgstr ""
@@ -17043,8 +16688,8 @@ msgstr ""
#: en/git-blame.txt:41
msgid ""
"Apart from supporting file annotation, Git also supports searching the "
-"development history for when a code snippet occurred in a change. This makes "
-"it possible to track when a code snippet was added to a file, moved or "
+"development history for when a code snippet occurred in a change. This makes"
+" it possible to track when a code snippet was added to a file, moved or "
"copied between files, and eventually deleted or replaced. It works by "
"searching for a text string in the diff. A small example of the pickaxe "
"interface that searches for `blame_usage`:"
@@ -17068,24 +16713,24 @@ msgstr ""
#: en/git-blame.txt:55
#, no-wrap
msgid "--score-debug"
-msgstr ""
+msgstr "--score-debug"
#. type: Plain text
#: en/git-blame.txt:63
msgid ""
-"Include debugging information related to the movement of lines between files "
-"(see `-C`) and lines moved within a file (see `-M`). The first number "
-"listed is the score. This is the number of alphanumeric characters detected "
-"as having been moved between or within files. This must be above a certain "
-"threshold for 'git blame' to consider those lines of code to have been moved."
+"Include debugging information related to the movement of lines between files"
+" (see `-C`) and lines moved within a file (see `-M`). The first number "
+"listed is the score. This is the number of alphanumeric characters detected"
+" as having been moved between or within files. This must be above a certain"
+" threshold for 'git blame' to consider those lines of code to have been "
+"moved."
msgstr ""
#. type: Labeled list
#: en/git-blame.txt:65
-#, fuzzy, no-wrap
-#| msgid "--shared"
+#, no-wrap
msgid "--show-name"
-msgstr "--shared"
+msgstr "--show-name"
#. type: Plain text
#: en/git-blame.txt:69
@@ -17099,7 +16744,7 @@ msgstr ""
#: en/git-blame.txt:71
#, no-wrap
msgid "--show-number"
-msgstr ""
+msgstr "--show-number"
#. type: Plain text
#: en/git-blame.txt:73
@@ -17115,7 +16760,7 @@ msgstr ""
#: en/git-blame.txt:78
#, no-wrap
msgid "--show-email"
-msgstr ""
+msgstr "--show-email"
#. type: Plain text
#: en/git-blame.txt:82
@@ -17192,8 +16837,8 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:114
msgid ""
-"the author name (\"author\"), email (\"author-mail\"), time (\"author-time"
-"\"), and time zone (\"author-tz\"); similarly for committer."
+"the author name (\"author\"), email (\"author-mail\"), time (\"author-"
+"time\"), and time zone (\"author-tz\"); similarly for committer."
msgstr ""
#. type: Plain text
@@ -17217,11 +16862,12 @@ msgstr ""
#: en/git-blame.txt:128
msgid ""
"The porcelain format generally suppresses commit information that has "
-"already been seen. For example, two lines that are blamed to the same commit "
-"will both be shown, but the details for that commit will be shown only once. "
-"This is more efficient, but may require more state be kept by the reader. "
-"The `--line-porcelain` option can be used to output full commit information "
-"for each line, allowing simpler (but less efficient) usage like:"
+"already been seen. For example, two lines that are blamed to the same commit"
+" will both be shown, but the details for that commit will be shown only "
+"once. This is more efficient, but may require more state be kept by the "
+"reader. The `--line-porcelain` option can be used to output full commit "
+"information for each line, allowing simpler (but less efficient) usage "
+"like:"
msgstr ""
#. type: Plain text
@@ -17253,8 +16899,8 @@ msgstr ""
#: en/git-blame.txt:147
msgid ""
"When you are interested in finding the origin for lines 40-60 for file "
-"`foo`, you can use the `-L` option like so (they mean the same thing -- both "
-"ask for 21 lines starting at line 40):"
+"`foo`, you can use the `-L` option like so (they mean the same thing -- both"
+" ask for 21 lines starting at line 40):"
msgstr ""
#. type: Plain text
@@ -17285,8 +16931,8 @@ msgstr ""
#: en/git-blame.txt:160
msgid ""
"When you are not interested in changes older than version v2.6.18, or "
-"changes older than 3 weeks, you can use revision range specifiers similar to "
-"'git rev-list':"
+"changes older than 3 weeks, you can use revision range specifiers similar to"
+" 'git rev-list':"
msgstr ""
#. type: Plain text
@@ -17377,8 +17023,8 @@ msgstr ""
msgid ""
"The first time that a commit shows up in the stream, it has various other "
"information about it printed out with a one-word tag at the beginning of "
-"each line describing the extra commit information (author, email, committer, "
-"dates, summary, etc.)."
+"each line describing the extra commit information (author, email, committer,"
+" dates, summary, etc.)."
msgstr ""
#. type: Plain text
@@ -17424,7 +17070,6 @@ msgstr ""
msgid "git-branch(1)"
msgstr "git-branch(1)"
-#
#. type: Plain text
#: en/git-branch.txt:7
msgid "git-branch - List, create, or delete branches"
@@ -17467,29 +17112,28 @@ msgstr ""
msgid ""
"If `--list` is given, or if there are no non-option arguments, existing "
"branches are listed; the current branch will be highlighted with an "
-"asterisk. Option `-r` causes the remote-tracking branches to be listed, and "
-"option `-a` shows both local and remote branches. If a `<pattern>` is given, "
-"it is used as a shell wildcard to restrict the output to matching branches. "
-"If multiple patterns are given, a branch is shown if it matches any of the "
-"patterns. Note that when providing a `<pattern>`, you must use `--list`; "
-"otherwise the command is interpreted as branch creation."
+"asterisk. Option `-r` causes the remote-tracking branches to be listed, and"
+" option `-a` shows both local and remote branches. If a `<pattern>` is "
+"given, it is used as a shell wildcard to restrict the output to matching "
+"branches. If multiple patterns are given, a branch is shown if it matches "
+"any of the patterns. Note that when providing a `<pattern>`, you must use "
+"`--list`; otherwise the command is interpreted as branch creation."
msgstr ""
-#
#. type: Plain text
#: en/git-branch.txt:43
#, fuzzy
#| msgid ""
#| "With `--contains`, shows only the branches that contains the named commit "
-#| "(in other words, the branches whose tip commits are descendant of the "
-#| "named commit). With `--merged`, only branches merged into the named "
-#| "commit (i.e. the branches whose tip commits are reachable from the named "
-#| "commit) will be listed. With `--no-merged` only branches not merged into "
-#| "the named commit will be listed. Missing <commit> argument defaults to "
-#| "'HEAD' (i.e. the tip of the current branch)."
-msgid ""
-"With `--contains`, shows only the branches that contain the named commit (in "
-"other words, the branches whose tip commits are descendants of the named "
+#| "(in other words, the branches whose tip commits are descendant of the named "
+#| "commit). With `--merged`, only branches merged into the named commit (i.e. "
+#| "the branches whose tip commits are reachable from the named commit) will be "
+#| "listed. With `--no-merged` only branches not merged into the named commit "
+#| "will be listed. Missing <commit> argument defaults to 'HEAD' (i.e. the tip "
+#| "of the current branch)."
+msgid ""
+"With `--contains`, shows only the branches that contain the named commit (in"
+" other words, the branches whose tip commits are descendants of the named "
"commit). With `--merged`, only branches merged into the named commit (i.e. "
"the branches whose tip commits are reachable from the named commit) will be "
"listed. With `--no-merged` only branches not merged into the named commit "
@@ -17498,8 +17142,8 @@ msgid ""
msgstr ""
"Mittels '--contains' werden nur jene Entwicklungszweige (branches) "
"angezeigt, welche die benannte Eintragung (commit) beinhalten (mit anderen "
-"Worten: jene Entwicklungszweige deren letzte Eintragung direkt oder indirekt "
-"darauf beruht). Mit '--merged' werden alle Entwicklungszweige (branches) "
+"Worten: jene Entwicklungszweige deren letzte Eintragung direkt oder indirekt"
+" darauf beruht). Mit '--merged' werden alle Entwicklungszweige (branches) "
"angezeigt, welche in die benannte Eintragung (commit) zusammengef체hrt "
"(merged) wurden (mit anderen Worten jene Entwicklungszweige die von der "
"benannten Eintragung aus erreichbar sind). Mit '--no-merged' werden nur "
@@ -17511,11 +17155,10 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:46
msgid ""
-"The command's second form creates a new branch head named <branchname> which "
-"points to the current `HEAD`, or <start-point> if given."
+"The command's second form creates a new branch head named <branchname> which"
+" points to the current `HEAD`, or <start-point> if given."
msgstr ""
-#
#. type: Plain text
#: en/git-branch.txt:50
msgid ""
@@ -17527,42 +17170,39 @@ msgstr ""
"Arbeitsbaum nicht auf diesen umgeschalten wird. Dies kann mit 'git checkout "
"<newbranch>' erreicht werden."
-#
#. type: Plain text
#: en/git-branch.txt:58
#, fuzzy
#| msgid ""
-#| "When a local branch is started off a remote branch, git sets up the "
-#| "branch so that 'git-pull' will appropriately merge from the remote "
-#| "branch. This behavior may be changed via the global `branch."
-#| "autosetupmerge` configuration flag. That setting can be overridden by "
-#| "using the `--track` and `--no-track` options."
-msgid ""
-"When a local branch is started off a remote-tracking branch, Git sets up the "
-"branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` "
+#| "When a local branch is started off a remote branch, git sets up the branch "
+#| "so that 'git-pull' will appropriately merge from the remote branch. This "
+#| "behavior may be changed via the global `branch.autosetupmerge` configuration"
+#| " flag. That setting can be overridden by using the `--track` and `--no-"
+#| "track` options."
+msgid ""
+"When a local branch is started off a remote-tracking branch, Git sets up the"
+" branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` "
"configuration entries) so that 'git pull' will appropriately merge from the "
-"remote-tracking branch. This behavior may be changed via the global `branch."
-"autoSetupMerge` configuration flag. That setting can be overridden by using "
-"the `--track` and `--no-track` options, and changed later using `git branch "
-"--set-upstream-to`."
-msgstr ""
-"Wird ein lokaler Entwicklungszweig (branch) von einem fernen (remote "
-"branch) abgeleitet setzt git diesen so auf, da횩 'git pull' eine "
-"ordnungsgem채횩e Zusammenf체hrung (merge) durchf체hren kann. Dieses Verhalten "
-"kann global durch das 'branch.autosetupmerge' Konfigurationsflag ge채ndert "
-"werden. Diese Option kann durch Verwendung der '--track' und '--no-track' "
-"체berschrieben werden."
+"remote-tracking branch. This behavior may be changed via the global "
+"`branch.autoSetupMerge` configuration flag. That setting can be overridden "
+"by using the `--track` and `--no-track` options, and changed later using "
+"`git branch --set-upstream-to`."
+msgstr ""
+"Wird ein lokaler Entwicklungszweig (branch) von einem fernen (remote branch)"
+" abgeleitet setzt git diesen so auf, da횩 'git pull' eine ordnungsgem채횩e "
+"Zusammenf체hrung (merge) durchf체hren kann. Dieses Verhalten kann global durch"
+" das 'branch.autosetupmerge' Konfigurationsflag ge채ndert werden. Diese "
+"Option kann durch Verwendung der '--track' und '--no-track' 체berschrieben "
+"werden."
-#
#. type: Plain text
#: en/git-branch.txt:64
#, fuzzy
#| msgid ""
-#| "With a '-m' or '-M' option, <oldbranch> will be renamed to <newbranch>. "
-#| "If <oldbranch> had a corresponding reflog, it is renamed to match "
-#| "<newbranch>, and a reflog entry is created to remember the branch "
-#| "renaming. If <newbranch> exists, -M must be used to force the rename to "
-#| "happen."
+#| "With a '-m' or '-M' option, <oldbranch> will be renamed to <newbranch>. If "
+#| "<oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, "
+#| "and a reflog entry is created to remember the branch renaming. If "
+#| "<newbranch> exists, -M must be used to force the rename to happen."
msgid ""
"With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If "
"<oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, "
@@ -17575,33 +17215,31 @@ msgstr ""
"Umbenennung erzeugt. Existiert <newbranch> bereits, mu횩 '-M' verwendet "
"werden um die Umbenennung zu erzwingen."
-#
#. type: Plain text
#: en/git-branch.txt:68
msgid ""
-"With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify "
-"more than one branch for deletion. If the branch currently has a reflog "
+"With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify"
+" more than one branch for deletion. If the branch currently has a reflog "
"then the reflog will also be deleted."
msgstr ""
-"Durch die '-d' oder '-D' Option wird '<branchname>' gel철scht. Man kann auch "
-"mehr als einen zu l철schenden Entwicklungszweig angeben. Hat der "
+"Durch die '-d' oder '-D' Option wird '<branchname>' gel철scht. Man kann auch"
+" mehr als einen zu l철schenden Entwicklungszweig angeben. Hat der "
"Entwicklungszweig einen reflog, dann wird dieser ebenfalls gel철scht."
-#
#. type: Plain text
#: en/git-branch.txt:74
#, fuzzy
#| msgid ""
#| "Use -r together with -d to delete remote-tracking branches. Note, that it "
-#| "only makes sense to delete remote-tracking branches if they no longer "
-#| "exist in remote repository or if 'git-fetch' was configured not to fetch "
-#| "them again. See also 'prune' subcommand of linkgit:git-remote[1] for way "
-#| "to clean up all obsolete remote-tracking branches."
+#| "only makes sense to delete remote-tracking branches if they no longer exist "
+#| "in remote repository or if 'git-fetch' was configured not to fetch them "
+#| "again. See also 'prune' subcommand of linkgit:git-remote[1] for way to clean"
+#| " up all obsolete remote-tracking branches."
msgid ""
"Use `-r` together with `-d` to delete remote-tracking branches. Note, that "
"it only makes sense to delete remote-tracking branches if they no longer "
-"exist in the remote repository or if 'git fetch' was configured not to fetch "
-"them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a "
+"exist in the remote repository or if 'git fetch' was configured not to fetch"
+" them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a "
"way to clean up all obsolete remote-tracking branches."
msgstr ""
"Wird '-r' gemeinsam mit der '-d' Option verwendet wird die Referenz auf den "
@@ -17625,10 +17263,9 @@ msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:79 en/git-push.txt:126 en/git-replace.txt:65
#: en/git-symbolic-ref.txt:36 en/git-tag.txt:76
-#, fuzzy, no-wrap
-#| msgid "--decorate"
+#, no-wrap
msgid "--delete"
-msgstr "--decorate"
+msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:83
@@ -17646,26 +17283,26 @@ msgstr ""
#: en/git-branch.txt:88 en/git-tag.txt:152
#, no-wrap
msgid "--create-reflog"
-msgstr ""
+msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:97
msgid ""
-"Create the branch's reflog. This activates recording of all changes made to "
-"the branch ref, enabling use of date based sha1 expressions such as "
-"\"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs "
-"are usually enabled by default by the `core.logallrefupdates` config "
-"option. The negated form `--no-create-reflog` only overrides an earlier `--"
-"create-reflog`, but currently does not negate the setting of `core."
-"logallrefupdates`."
+"Create the branch's reflog. This activates recording of all changes made to"
+" the branch ref, enabling use of date based sha1 expressions such as "
+"\"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs"
+" are usually enabled by default by the `core.logallrefupdates` config "
+"option. The negated form `--no-create-reflog` only overrides an earlier "
+"`--create-reflog`, but currently does not negate the setting of "
+"`core.logallrefupdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:106
msgid ""
-"Reset <branchname> to <startpoint> if <branchname> exists already. Without `-"
-"f` 'git branch' refuses to change an existing branch. In combination with `-"
-"d` (or `--delete`), allow deleting the branch irrespective of its merged "
+"Reset <branchname> to <startpoint> if <branchname> exists already. Without "
+"`-f` 'git branch' refuses to change an existing branch. In combination with"
+" `-d` (or `--delete`), allow deleting the branch irrespective of its merged "
"status. In combination with `-m` (or `--move`), allow renaming the branch "
"even if the new branch name already exists."
msgstr ""
@@ -17674,9 +17311,8 @@ msgstr ""
#: en/git-branch.txt:108
#, no-wrap
msgid "--move"
-msgstr ""
+msgstr "--move"
-#
#. type: Plain text
#: en/git-branch.txt:110
msgid "Move/rename a branch and the corresponding reflog."
@@ -17694,11 +17330,11 @@ msgstr "-M"
msgid "Shortcut for `--move --force`."
msgstr ""
-#
#. type: Plain text
#: en/git-branch.txt:118
#, fuzzy
-#| msgid "Color branches to highlight current, local, and remote branches."
+#| msgid ""
+#| "Color branches to highlight current, local, and remote branches."
msgid ""
"Color branches to highlight current, local, and remote-tracking branches. "
"The value must be always (the default), never, or auto."
@@ -17706,13 +17342,12 @@ msgstr ""
"Zeige den aktuellen, lokale und ferne Entwicklungszweige in "
"unterschiedlichen Farben an."
-#
#. type: Plain text
#: en/git-branch.txt:123
#, fuzzy
#| msgid ""
-#| "Turn off branch colors, even when the configuration file gives the "
-#| "default to color output."
+#| "Turn off branch colors, even when the configuration file gives the default "
+#| "to color output."
msgid ""
"Turn off branch colors, even when the configuration file gives the default "
"to color output. Same as `--color=never`."
@@ -17723,10 +17358,9 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:125 en/git-for-each-ref.txt:82 en/git-grep.txt:117
#: en/git-tag.txt:112
-#, fuzzy, no-wrap
-#| msgid "--ignore-errors"
+#, no-wrap
msgid "--ignore-case"
-msgstr "--ignore-errors"
+msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:127
@@ -17741,10 +17375,9 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-status.txt:105 en/git-tag.txt:116
-#, fuzzy, no-wrap
-#| msgid "--no-color"
+#, no-wrap
msgid "--no-column"
-msgstr "--no-color"
+msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:133
@@ -17761,12 +17394,10 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:137 en/git-show-branch.txt:44
-#, fuzzy, no-wrap
-#| msgid "--refresh"
+#, no-wrap
msgid "--remotes"
-msgstr "--refresh"
+msgstr "--remotes"
-#
#. type: Plain text
#: en/git-branch.txt:139
msgid "List or delete (if used with -d) the remote-tracking branches."
@@ -17774,7 +17405,6 @@ msgstr ""
"Auflisten oder L철schen (wenn die '-d' Option gleichzeitig verwendet wird) "
"der Referenzen auf fernen Entwicklungszweige (remote-tracking branches)."
-#
#. type: Plain text
#: en/git-branch.txt:143
msgid "List both remote-tracking branches and local branches."
@@ -17783,16 +17413,15 @@ msgstr "Zeige sowohl lokale wie auch remote-tracking Entwicklungszweige an."
#. type: Plain text
#: en/git-branch.txt:147
msgid ""
-"Activate the list mode. `git branch <pattern>` would try to create a branch, "
-"use `git branch --list <pattern>` to list matching branches."
+"Activate the list mode. `git branch <pattern>` would try to create a branch,"
+" use `git branch --list <pattern>` to list matching branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:149
-#, fuzzy, no-wrap
-#| msgid "-v"
+#, no-wrap
msgid "-vv"
-msgstr "-v"
+msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:156
@@ -17815,13 +17444,11 @@ msgstr ""
msgid "--abbrev=<length>"
msgstr "--abbrev=<length>"
-#
#. type: Plain text
#: en/git-branch.txt:166
#, fuzzy
#| msgid ""
-#| "Alter minimum display length for sha1 in output listing, default value is "
-#| "7."
+#| "Alter minimum display length for sha1 in output listing, default value is 7."
msgid ""
"Alter the sha1's minimum display length in the output listing. The default "
"value is 7 and can be overridden by the `core.abbrev` config option."
@@ -17835,7 +17462,6 @@ msgstr ""
msgid "--no-abbrev"
msgstr "--no-abbrev"
-#
#. type: Plain text
#: en/git-branch.txt:169
#, fuzzy
@@ -17854,46 +17480,28 @@ msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:179
msgid ""
-"When creating a new branch, set up `branch.<name>.remote` and `branch.<name>."
-"merge` configuration entries to mark the start-point branch as \"upstream\" "
-"from the new branch. This configuration will tell git to show the "
-"relationship between the two branches in `git status` and `git branch -v`. "
-"Furthermore, it directs `git pull` without arguments to pull from the "
-"upstream when the new branch is checked out."
+"When creating a new branch, set up `branch.<name>.remote` and "
+"`branch.<name>.merge` configuration entries to mark the start-point branch "
+"as \"upstream\" from the new branch. This configuration will tell git to "
+"show the relationship between the two branches in `git status` and `git "
+"branch -v`. Furthermore, it directs `git pull` without arguments to pull "
+"from the upstream when the new branch is checked out."
msgstr ""
-#
#. type: Plain text
#: en/git-branch.txt:185
#, fuzzy
msgid ""
"This behavior is the default when the start point is a remote-tracking "
"branch. Set the branch.autoSetupMerge configuration variable to `false` if "
-"you want `git checkout` and `git branch` to always behave as if `--no-track` "
-"were given. Set it to `always` if you want this behavior when the start-"
+"you want `git checkout` and `git branch` to always behave as if `--no-track`"
+" were given. Set it to `always` if you want this behavior when the start-"
"point is either a local or remote-tracking branch."
msgstr ""
"#-#-#-#-# git-branch-de.po (PACKAGE VERSION) #-#-#-#-#\n"
-"Beim Erzeugen eines neuen Entwicklungszweiges (branch) wird die "
-"Konfiguration so eingestellt, da횩 'git pull' automatisch die Daten des "
-"Entwicklungszweiges vom fernen Projektarchiv holt. Dies ist sinnvoll, wenn "
-"횆nderungen immer vom gleichen fernen Entwicklungszweig geholt werden, ohne "
-"ein explizites 'git pull <repository> <refspec>' ausf체hren zu m체ssen. Dies "
-"ist der Standard falls von einem fernen Entwicklungszweig aus gestartet "
-"wird. Setzt man die 'branch.autosetupmerge' Konfigurationsvariable auf "
-"'false', verhalten sich die Befehle 'git checkout' und 'git branch' so als "
-"ob '--no-track' angegeben wurde. Setzt man sie auf 'always' um dieses "
-"Verhalten auch f체r locale Entwicklungszweige zum Standard zu machen.\n"
+"Beim Erzeugen eines neuen Entwicklungszweiges (branch) wird die Konfiguration so eingestellt, da횩 'git pull' automatisch die Daten des Entwicklungszweiges vom fernen Projektarchiv holt. Dies ist sinnvoll, wenn 횆nderungen immer vom gleichen fernen Entwicklungszweig geholt werden, ohne ein explizites 'git pull <repository> <refspec>' ausf체hren zu m체ssen. Dies ist der Standard falls von einem fernen Entwicklungszweig aus gestartet wird. Setzt man die 'branch.autosetupmerge' Konfigurationsvariable auf 'false', verhalten sich die Befehle 'git checkout' und 'git branch' so als ob '--no-track' angegeben wurde. Setzt man sie auf 'always' um dieses Verhalten auch f체r locale Entwicklungszweige zum Standard zu machen.\n"
"#-#-#-#-# git-checkout-de.po (PACKAGE VERSION) #-#-#-#-#\n"
-"When creating a new branch, set up configuration so that 'git-pull' will "
-"automatically retrieve data from the start point, which must be a branch. "
-"Use this if you always pull from the same upstream branch into the new "
-"branch, and if you don't want to use \"git pull <repository> <refspec>\" "
-"explicitly. This behavior is the default when the start point is a remote "
-"branch. Set the branch.autosetupmerge configuration variable to `false` if "
-"you want 'git-checkout' and 'git-branch' to always behave as if '--no-track' "
-"were given. Set it to `always` if you want this behavior when the start-"
-"point is either a local or remote branch."
+"When creating a new branch, set up configuration so that 'git-pull' will automatically retrieve data from the start point, which must be a branch. Use this if you always pull from the same upstream branch into the new branch, and if you don't want to use \"git pull <repository> <refspec>\" explicitly. This behavior is the default when the start point is a remote branch. Set the branch.autosetupmerge configuration variable to `false` if you want 'git-checkout' and 'git-branch' to always behave as if '--no-track' were given. Set it to `always` if you want this behavior when the start-point is either a local or remote branch."
#. type: Labeled list
#: en/git-branch.txt:186 en/git-checkout.txt:170
@@ -17901,7 +17509,6 @@ msgstr ""
msgid "--no-track"
msgstr "--no-track"
-#
#. type: Plain text
#: en/git-branch.txt:189 en/git-checkout.txt:173
#, fuzzy
@@ -17910,8 +17517,7 @@ msgid ""
"configuration variable is true."
msgstr ""
"#-#-#-#-# git-branch-de.po (PACKAGE VERSION) #-#-#-#-#\n"
-"Dies ist das Gegenteil der '--track' Option, wodurch 'git pull' nicht mehr "
-"automatisch auf den fernen Entwicklungszweig (remote branch) zugreift.\n"
+"Dies ist das Gegenteil der '--track' Option, wodurch 'git pull' nicht mehr automatisch auf den fernen Entwicklungszweig (remote branch) zugreift.\n"
"#-#-#-#-# git-checkout-de.po (PACKAGE VERSION) #-#-#-#-#\n"
"Ignore the branch.autosetupmerge configuration variable."
@@ -17919,14 +17525,15 @@ msgstr ""
#: en/git-branch.txt:190 en/git-push.txt:246
#, no-wrap
msgid "--set-upstream"
-msgstr ""
+msgstr "--set-upstream"
#. type: Plain text
#: en/git-branch.txt:195
msgid ""
"If specified branch does not exist yet or if `--force` has been given, acts "
-"exactly like `--track`. Otherwise sets up configuration like `--track` would "
-"when creating the branch, except that where branch points to is not changed."
+"exactly like `--track`. Otherwise sets up configuration like `--track` would"
+" when creating the branch, except that where branch points to is not "
+"changed."
msgstr ""
#. type: Labeled list
@@ -17951,10 +17558,9 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:202
-#, fuzzy, no-wrap
-#| msgid "--unset-all"
+#, no-wrap
msgid "--unset-upstream"
-msgstr "--unset-all"
+msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:205
@@ -17967,7 +17573,7 @@ msgstr ""
#: en/git-branch.txt:206
#, no-wrap
msgid "--edit-description"
-msgstr ""
+msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:211
@@ -17984,7 +17590,6 @@ msgstr ""
msgid "--contains [<commit>]"
msgstr "--contains <commit>"
-#
#. type: Plain text
#: en/git-branch.txt:215
#, fuzzy
@@ -18030,13 +17635,12 @@ msgstr ""
msgid "<branchname>"
msgstr "<branchname>"
-#
#. type: Plain text
#: en/git-branch.txt:229
msgid ""
"The name of the branch to create or delete. The new branch name must pass "
-"all checks defined by linkgit:git-check-ref-format[1]. Some of these checks "
-"may restrict the characters allowed in a branch name."
+"all checks defined by linkgit:git-check-ref-format[1]. Some of these checks"
+" may restrict the characters allowed in a branch name."
msgstr ""
"Der Name des Entwicklungszweiges (branch) der erzeugt oder gel철scht werden "
"soll. Der Name mu횩 alle Pr체fungen die in linkgit:git-check-ref-format[1] "
@@ -18049,14 +17653,13 @@ msgstr ""
msgid "<start-point>"
msgstr "<start-point>"
-#
#. type: Plain text
#: en/git-branch.txt:234
#, fuzzy
#| msgid ""
-#| "The new branch will be created with a HEAD equal to this. It may be "
-#| "given as a branch name, a commit-id, or a tag. If this option is "
-#| "omitted, the current branch is assumed."
+#| "The new branch will be created with a HEAD equal to this. It may be given "
+#| "as a branch name, a commit-id, or a tag. If this option is omitted, the "
+#| "current branch is assumed."
msgid ""
"The new branch head will point to this commit. It may be given as a branch "
"name, a commit-id, or a tag. If this option is omitted, the current HEAD "
@@ -18074,7 +17677,6 @@ msgstr ""
msgid "<oldbranch>"
msgstr "<oldbranch>"
-#
#. type: Plain text
#: en/git-branch.txt:237
msgid "The name of an existing branch to rename."
@@ -18088,7 +17690,6 @@ msgstr ""
msgid "<newbranch>"
msgstr "<newbranch>"
-#
#. type: Plain text
#: en/git-branch.txt:241
#, fuzzy
@@ -18099,8 +17700,8 @@ msgid ""
"The new name for an existing branch. The same restrictions as for "
"<branchname> apply."
msgstr ""
-"Der neue Name f체r einen existierenden Entwicklungszweig (branch). Es gelten "
-"die gleichen Einschr채nkungen wie f체r <branchname>."
+"Der neue Name f체r einen existierenden Entwicklungszweig (branch). Es gelten"
+" die gleichen Einschr채nkungen wie f체r <branchname>."
#. type: Labeled list
#: en/git-branch.txt:242 en/git-tag.txt:98
@@ -18112,11 +17713,11 @@ msgstr ""
#: en/git-branch.txt:251
msgid ""
"Sort based on the key given. Prefix `-` to sort in descending order of the "
-"value. You may use the --sort=<key> option multiple times, in which case the "
-"last key becomes the primary key. The keys supported are the same as those "
+"value. You may use the --sort=<key> option multiple times, in which case the"
+" last key becomes the primary key. The keys supported are the same as those "
"in `git for-each-ref`. Sort order defaults to sorting based on the full "
-"refname (including `refs/...` prefix). This lists detached HEAD (if present) "
-"first, then local branches and finally remote-tracking branches."
+"refname (including `refs/...` prefix). This lists detached HEAD (if present)"
+" first, then local branches and finally remote-tracking branches."
msgstr ""
#. type: Labeled list
@@ -18125,7 +17726,6 @@ msgstr ""
msgid "--points-at <object>"
msgstr ""
-#
#. type: Plain text
#: en/git-branch.txt:255
#, fuzzy
@@ -18187,7 +17787,6 @@ msgstr ""
"$ git branch my2.6.14 v2.6.14 <1>\n"
"$ git checkout my2.6.14\n"
-#
#. type: Plain text
#: en/git-branch.txt:275
msgid ""
@@ -18218,37 +17817,35 @@ msgstr ""
"$ git branch -d -r origin/todo origin/html origin/man <1>\n"
"$ git branch -D test <2>\n"
-#
#. type: Plain text
#: en/git-branch.txt:288
#, fuzzy
#| msgid ""
-#| "Delete remote-tracking branches \"todo\", \"html\", \"man\". Next 'fetch' "
-#| "or 'pull' will create them again unless you configure them not to. See "
+#| "Delete remote-tracking branches \"todo\", \"html\", \"man\". Next 'fetch' or"
+#| " 'pull' will create them again unless you configure them not to. See "
#| "linkgit:git-fetch[1]."
msgid ""
-"Delete the remote-tracking branches \"todo\", \"html\" and \"man\". The next "
-"'fetch' or 'pull' will create them again unless you configure them not to. "
-"See linkgit:git-fetch[1]."
+"Delete the remote-tracking branches \"todo\", \"html\" and \"man\". The next"
+" 'fetch' or 'pull' will create them again unless you configure them not to."
+" See linkgit:git-fetch[1]."
msgstr ""
"L철sche die remote-tracking Entwicklungszweige \"todo\", \"html\", \"man\". "
-"Das n채chste 'git fetch' oder 'git pull' wird diese wieder anlegen, au횩er man "
-"konfiguriert git entsprechend. Siehe auch linkgit:git-fetch[1]."
+"Das n채chste 'git fetch' oder 'git pull' wird diese wieder anlegen, au횩er man"
+" konfiguriert git entsprechend. Siehe auch linkgit:git-fetch[1]."
-#
#. type: Plain text
#: en/git-branch.txt:290
#, fuzzy
#| msgid ""
-#| "Delete \"test\" branch even if the \"master\" branch (or whichever branch "
-#| "is currently checked out) does not have all commits from test branch."
+#| "Delete \"test\" branch even if the \"master\" branch (or whichever branch is"
+#| " currently checked out) does not have all commits from test branch."
msgid ""
"Delete the \"test\" branch even if the \"master\" branch (or whichever "
"branch is currently checked out) does not have all commits from the test "
"branch."
msgstr ""
-"L철sche den Entwicklungszweig \"test\", selbst dann wenn der \"master\" (oder "
-"der gerade aktiven Entwicklungszweig) nicht alle Eintragungen (commits) "
+"L철sche den Entwicklungszweig \"test\", selbst dann wenn der \"master\" (oder"
+" der gerade aktiven Entwicklungszweig) nicht alle Eintragungen (commits) "
"dieses Entwicklungszweigs enth채lt."
#. type: Title -
@@ -18258,7 +17855,6 @@ msgstr ""
msgid "Notes"
msgstr "Notes"
-#
#. type: Plain text
#: en/git-branch.txt:298
#, fuzzy
@@ -18271,17 +17867,16 @@ msgid ""
"easier to use the git checkout command with its `-b` option to create a "
"branch and check it out with a single command."
msgstr ""
-"Will man einen Entwicklungszweig (branch) erzeugen und diesen sofort abrufen "
-"(checkout), ist es einfacher dies in einem Schritt, durch Ausf체hren des "
+"Will man einen Entwicklungszweig (branch) erzeugen und diesen sofort abrufen"
+" (checkout), ist es einfacher dies in einem Schritt, durch Ausf체hren des "
"Befehls 'git checkout' mit der '-b' Option, zu machen."
-#
#. type: Plain text
#: en/git-branch.txt:301
#, fuzzy
#| msgid ""
-#| "The options `--contains`, `--merged` and `--no-merged` serves three "
-#| "related but different purposes:"
+#| "The options `--contains`, `--merged` and `--no-merged` serves three related "
+#| "but different purposes:"
msgid ""
"The options `--contains`, `--merged` and `--no-merged` serve three related "
"but different purposes:"
@@ -18289,7 +17884,6 @@ msgstr ""
"Die Optionen `--contains`, `--merged` und `--no-merged` erf체llen drei "
"verwandte aber doch unterschiedliche Aufgaben:"
-#
#. type: Plain text
#: en/git-branch.txt:305
msgid ""
@@ -18301,7 +17895,6 @@ msgstr ""
"zu finden in denen <commit> vorkommt, bevor dieser mit 'git commit --amend' "
"oder 'git rebase' ver채ndert wird."
-#
#. type: Plain text
#: en/git-branch.txt:308
msgid ""
@@ -18312,12 +17905,11 @@ msgstr ""
"(branches) ohne Informationen zu verlieren gel철scht werden k철nnen, da diese "
"sowieso vollst채ndig in HEAD enthalten sind."
-#
#. type: Plain text
#: en/git-branch.txt:311
msgid ""
-"`--no-merged` is used to find branches which are candidates for merging into "
-"HEAD, since those branches are not fully contained by HEAD."
+"`--no-merged` is used to find branches which are candidates for merging into"
+" HEAD, since those branches are not fully contained by HEAD."
msgstr ""
"`--no-merged` wird verwendet um Entwicklungszweige (branches) zu finden die "
"Kandidaten f체r eine Zusammenf체hrung (merge) in den HEAD sind, da diese noch "
@@ -18333,10 +17925,9 @@ msgstr ""
#. type: Title =
#: en/git-bundle.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-clone(1)"
+#, no-wrap
msgid "git-bundle(1)"
-msgstr "git-clone(1)"
+msgstr "git-bundle(1)"
#. type: Plain text
#: en/git-bundle.txt:7
@@ -18379,8 +17970,8 @@ msgstr "-t <file>"
#. type: Plain text
#: en/git-bundle.txt:39
msgid ""
-"Used to create a bundle named 'file'. This requires the 'git-rev-list-args' "
-"arguments to define the bundle contents."
+"Used to create a bundle named 'file'. This requires the 'git-rev-list-args'"
+" arguments to define the bundle contents."
msgstr ""
#. type: Labeled list
@@ -18395,8 +17986,8 @@ msgstr "-F <file>"
msgid ""
"Used to check that a bundle file is valid and will apply cleanly to the "
"current repository. This includes checks on the bundle format itself as "
-"well as checking that the prerequisite commits exist and are fully linked in "
-"the current repository. 'git bundle' prints a list of missing commits, if "
+"well as checking that the prerequisite commits exist and are fully linked in"
+" the current repository. 'git bundle' prints a list of missing commits, if "
"any, and exits with a non-zero status."
msgstr ""
@@ -18425,8 +18016,8 @@ msgstr ""
msgid ""
"Passes the objects in the bundle to 'git index-pack' for storage in the "
"repository, then prints the names of all defined references. If a list of "
-"references is given, only references matching those in the list are printed. "
-"This command is really plumbing, intended to be called only by 'git fetch'."
+"references is given, only references matching those in the list are printed."
+" This command is really plumbing, intended to be called only by 'git fetch'."
msgstr ""
#. type: Labeled list
@@ -18439,11 +18030,11 @@ msgstr ""
#: en/git-bundle.txt:69
msgid ""
"A list of arguments, acceptable to 'git rev-parse' and 'git rev-list' (and "
-"containing a named ref, see SPECIFYING REFERENCES below), that specifies the "
-"specific objects and references to transport. For example, `master~10.."
-"master` causes the current master reference to be packaged along with all "
-"objects added since its 10th ancestor commit. There is no explicit limit to "
-"the number of references and objects that may be packaged."
+"containing a named ref, see SPECIFYING REFERENCES below), that specifies the"
+" specific objects and references to transport. For example, "
+"`master~10..master` causes the current master reference to be packaged along"
+" with all objects added since its 10th ancestor commit. There is no "
+"explicit limit to the number of references and objects that may be packaged."
msgstr ""
#. type: Labeled list
@@ -18476,11 +18067,11 @@ msgstr ""
msgid ""
"'git bundle' will only package references that are shown by 'git show-ref': "
"this includes heads, tags, and remote heads. References such as `master~1` "
-"cannot be packaged, but are perfectly suitable for defining the basis. More "
-"than one reference may be packaged, and more than one basis can be "
-"specified. The objects packaged are those not contained in the union of the "
-"given bases. Each basis can be specified explicitly (e.g. `^master~10`), or "
-"implicitly (e.g. `master~10..master`, `--since=10.days.ago master`)."
+"cannot be packaged, but are perfectly suitable for defining the basis. More"
+" than one reference may be packaged, and more than one basis can be "
+"specified. The objects packaged are those not contained in the union of the"
+" given bases. Each basis can be specified explicitly (e.g. `^master~10`), "
+"or implicitly (e.g. `master~10..master`, `--since=10.days.ago master`)."
msgstr ""
#. type: Plain text
@@ -18505,9 +18096,9 @@ msgstr "EXAMPLES"
#. type: Plain text
#: en/git-bundle.txt:103
msgid ""
-"Assume you want to transfer the history from a repository R1 on machine A to "
-"another repository R2 on machine B. For whatever reason, direct connection "
-"between A and B is not allowed, but we can move data from A to B via some "
+"Assume you want to transfer the history from a repository R1 on machine A to"
+" another repository R2 on machine B. For whatever reason, direct connection"
+" between A and B is not allowed, but we can move data from A to B via some "
"mechanism (CD, email, etc.). We want to update R2 with development made on "
"the branch master in R1."
msgstr ""
@@ -18547,9 +18138,9 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:126
msgid ""
-"This will define a remote called \"origin\" in the resulting repository that "
-"lets you fetch and pull from the bundle. The $GIT_DIR/config file in R2 will "
-"have an entry like this:"
+"This will define a remote called \"origin\" in the resulting repository that"
+" lets you fetch and pull from the bundle. The $GIT_DIR/config file in R2 "
+"will have an entry like this:"
msgstr ""
#. type: delimited block -
@@ -18588,8 +18179,8 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:148
msgid ""
-"You then transfer the bundle to the other machine to replace /home/me/tmp/"
-"file.bundle, and pull from it."
+"You then transfer the bundle to the other machine to replace "
+"/home/me/tmp/file.bundle, and pull from it."
msgstr ""
#. type: delimited block -
@@ -18633,7 +18224,6 @@ msgstr ""
msgid "$ git bundle create mybundle --since=10.days master\n"
msgstr ""
-#
#. type: Plain text
#: en/git-bundle.txt:174
#, fuzzy
@@ -18650,8 +18240,8 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:181
msgid ""
-"You can run `git-bundle verify` to see if you can extract from a bundle that "
-"was created with a basis:"
+"You can run `git-bundle verify` to see if you can extract from a bundle that"
+" was created with a basis:"
msgstr ""
#. type: delimited block -
@@ -18694,10 +18284,9 @@ msgstr ""
#. type: Title =
#: en/git-cat-file.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-clone(1)"
+#, no-wrap
msgid "git-cat-file(1)"
-msgstr "git-clone(1)"
+msgstr "git-cat-file(1)"
#. type: Plain text
#: en/git-cat-file.txt:7
@@ -18717,19 +18306,19 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:21
msgid ""
-"In its first form, the command provides the content or the type of an object "
-"in the repository. The type is required unless `-t` or `-p` is used to find "
-"the object type, or `-s` is used to find the object size, or `--textconv` or "
-"`--filters` is used (which imply type \"blob\")."
+"In its first form, the command provides the content or the type of an object"
+" in the repository. The type is required unless `-t` or `-p` is used to find"
+" the object type, or `-s` is used to find the object size, or `--textconv` "
+"or `--filters` is used (which imply type \"blob\")."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:28
msgid ""
"In the second form, a list of objects (separated by linefeeds) is provided "
-"on stdin, and the SHA-1, type, and size of each object is printed on stdout. "
-"The output format can be overridden using the optional `<format>` argument. "
-"If either `--textconv` or `--filters` was specified, the input is expected "
+"on stdin, and the SHA-1, type, and size of each object is printed on stdout."
+" The output format can be overridden using the optional `<format>` argument."
+" If either `--textconv` or `--filters` was specified, the input is expected "
"to list the object names followed by the path name, separated by a single "
"white space, so that the appropriate drivers can be determined."
msgstr ""
@@ -18744,8 +18333,8 @@ msgstr ""
#: en/git-cat-file.txt:35
msgid ""
"The name of the object to show. For a more complete list of ways to spell "
-"object names, see the \"SPECIFYING REVISIONS\" section in linkgit:"
-"gitrevisions[7]."
+"object names, see the \"SPECIFYING REVISIONS\" section in "
+"linkgit:gitrevisions[7]."
msgstr ""
#. type: Plain text
@@ -18761,8 +18350,8 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:47
msgid ""
-"Suppress all output; instead exit with zero status if <object> exists and is "
-"a valid object."
+"Suppress all output; instead exit with zero status if <object> exists and is"
+" a valid object."
msgstr ""
#. type: Plain text
@@ -18780,8 +18369,8 @@ msgstr ""
#: en/git-cat-file.txt:58
msgid ""
"Typically this matches the real type of <object> but asking for a type that "
-"can trivially be dereferenced from the given <object> is also permitted. An "
-"example is to ask for a \"tree\" with <object> being a commit object that "
+"can trivially be dereferenced from the given <object> is also permitted. An"
+" example is to ask for a \"tree\" with <object> being a commit object that "
"contains it, or to ask for a \"blob\" with <object> being a tag object that "
"points at it."
msgstr ""
@@ -18789,8 +18378,8 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:64
msgid ""
-"Show the content as transformed by a textconv filter. In this case, <object> "
-"has to be of the form <tree-ish>:<path>, or :<path> in order to apply the "
+"Show the content as transformed by a textconv filter. In this case, <object>"
+" has to be of the form <tree-ish>:<path>, or :<path> in order to apply the "
"filter to the content recorded in the index at <path>."
msgstr ""
@@ -18798,15 +18387,15 @@ msgstr ""
#: en/git-cat-file.txt:65
#, no-wrap
msgid "--filters"
-msgstr ""
+msgstr "--filters"
#. type: Plain text
#: en/git-cat-file.txt:70
msgid ""
"Show the content as converted by the filters configured in the current "
"working tree for the given <path> (i.e. smudge filters, end-of-line "
-"conversion, etc). In this case, <object> has to be of the form <tree-ish>:"
-"<path>, or :<path>."
+"conversion, etc). In this case, <object> has to be of the form <tree-"
+"ish>:<path>, or :<path>."
msgstr ""
#. type: Labeled list
@@ -18819,17 +18408,16 @@ msgstr "--patch"
#. type: Plain text
#: en/git-cat-file.txt:75
msgid ""
-"For use with --textconv or --filters, to allow specifying an object name and "
-"a path separately, e.g. when it is difficult to figure out the revision from "
-"which the blob came."
+"For use with --textconv or --filters, to allow specifying an object name and"
+" a path separately, e.g. when it is difficult to figure out the revision "
+"from which the blob came."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:76 en/git-mktree.txt:32
-#, fuzzy, no-wrap
-#| msgid "--patch"
+#, no-wrap
msgid "--batch"
-msgstr "--patch"
+msgstr "--batch"
#. type: Labeled list
#: en/git-cat-file.txt:77
@@ -18842,16 +18430,16 @@ msgstr ""
msgid ""
"Print object information and contents for each object provided on stdin. "
"May not be combined with any other options or arguments except `--textconv` "
-"or `--filters`, in which case the input lines also need to specify the path, "
-"separated by white space. See the section `BATCH OUTPUT` below for details."
+"or `--filters`, in which case the input lines also need to specify the path,"
+" separated by white space. See the section `BATCH OUTPUT` below for "
+"details."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:84
-#, fuzzy, no-wrap
-#| msgid "--no-checkout"
+#, no-wrap
msgid "--batch-check"
-msgstr "--no-checkout"
+msgstr "--batch-check"
#. type: Labeled list
#: en/git-cat-file.txt:85
@@ -18863,8 +18451,8 @@ msgstr ""
#: en/git-cat-file.txt:91
msgid ""
"Print object information for each object provided on stdin. May not be "
-"combined with any other options or arguments except `--textconv` or `--"
-"filters`, in which case the input lines also need to specify the path, "
+"combined with any other options or arguments except `--textconv` or "
+"`--filters`, in which case the input lines also need to specify the path, "
"separated by white space. See the section `BATCH OUTPUT` below for details."
msgstr ""
@@ -18872,7 +18460,7 @@ msgstr ""
#: en/git-cat-file.txt:92
#, no-wrap
msgid "--batch-all-objects"
-msgstr ""
+msgstr "--batch-all-objects"
#. type: Plain text
#: en/git-cat-file.txt:98
@@ -18880,14 +18468,15 @@ msgid ""
"Instead of reading a list of objects on stdin, perform the requested batch "
"operation on all objects in the repository and any alternate object stores "
"(not just reachable objects). Requires `--batch` or `--batch-check` be "
-"specified. Note that the objects are visited in order sorted by their hashes."
+"specified. Note that the objects are visited in order sorted by their "
+"hashes."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:99
#, no-wrap
msgid "--buffer"
-msgstr ""
+msgstr "--buffer"
#. type: Plain text
#: en/git-cat-file.txt:105
@@ -18900,10 +18489,9 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:106
-#, fuzzy, no-wrap
-#| msgid "--allow-empty"
+#, no-wrap
msgid "--allow-unknown-type"
-msgstr "--allow-empty"
+msgstr "--allow-unknown-type"
#. type: Plain text
#: en/git-cat-file.txt:108
@@ -18912,20 +18500,19 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:109
-#, fuzzy, no-wrap
-#| msgid "--follow"
+#, no-wrap
msgid "--follow-symlinks"
-msgstr "--follow"
+msgstr "--follow-symlinks"
#. type: Plain text
#: en/git-cat-file.txt:118
msgid ""
"With --batch or --batch-check, follow symlinks inside the repository when "
-"requesting objects with extended SHA-1 expressions of the form tree-ish:path-"
-"in-tree. Instead of providing output about the link itself, provide output "
-"about the linked-to object. If a symlink points outside the tree-ish (e.g. "
-"a link to /foo or a root-level link to ../foo), the portion of the link "
-"which is outside the tree will be printed."
+"requesting objects with extended SHA-1 expressions of the form tree-"
+"ish:path-in-tree. Instead of providing output about the link itself, "
+"provide output about the linked-to object. If a symlink points outside the "
+"tree-ish (e.g. a link to /foo or a root-level link to ../foo), the portion "
+"of the link which is outside the tree will be printed."
msgstr ""
#. type: Plain text
@@ -19060,8 +18647,8 @@ msgstr ""
#: en/git-cat-file.txt:185
msgid ""
"If `--batch` or `--batch-check` is given, `cat-file` will read objects from "
-"stdin, one per line, and print information about them. By default, the whole "
-"line is considered as an object, as if it were fed to linkgit:git-rev-"
+"stdin, one per line, and print information about them. By default, the whole"
+" line is considered as an object, as if it were fed to linkgit:git-rev-"
"parse[1]."
msgstr ""
@@ -19070,8 +18657,8 @@ msgstr ""
msgid ""
"You can specify the information shown for each object by using a custom "
"`<format>`. The `<format>` is copied literally to stdout for each object, "
-"with placeholders of the form `%(atom)` expanded, followed by a newline. The "
-"available atoms are:"
+"with placeholders of the form `%(atom)` expanded, followed by a newline. The"
+" available atoms are:"
msgstr ""
#. type: Labeled list
@@ -19146,8 +18733,8 @@ msgid ""
"If this atom is used in the output string, input lines are split at the "
"first whitespace boundary. All characters before that whitespace are "
"considered to be the object name; characters after that first run of "
-"whitespace (i.e., the \"rest\" of the line) are output in place of the `"
-"%(rest)` atom."
+"whitespace (i.e., the \"rest\" of the line) are output in place of the "
+"`%(rest)` atom."
msgstr ""
#. type: Plain text
@@ -19204,8 +18791,8 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:247
msgid ""
-"If --follow-symlinks is used, and a symlink in the repository points outside "
-"the repository, then `cat-file` will ignore any custom format and print:"
+"If --follow-symlinks is used, and a symlink in the repository points outside"
+" the repository, then `cat-file` will ignore any custom format and print:"
msgstr ""
#. type: delimited block -
@@ -19219,15 +18806,16 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:256
msgid ""
-"The symlink will either be absolute (beginning with a /), or relative to the "
-"tree root. For instance, if dir/link points to ../../foo, then <symlink> "
+"The symlink will either be absolute (beginning with a /), or relative to the"
+" tree root. For instance, if dir/link points to ../../foo, then <symlink> "
"will be ../foo. <size> is the size of the symlink in bytes."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:259
msgid ""
-"If --follow-symlinks is used, the following error messages will be displayed:"
+"If --follow-symlinks is used, the following error messages will be "
+"displayed:"
msgstr ""
#. type: Plain text
@@ -19261,8 +18849,8 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:278
msgid ""
-"is printed for symlink loops (or any symlinks that require more than 40 link "
-"resolutions to resolve)."
+"is printed for symlink loops (or any symlinks that require more than 40 link"
+" resolutions to resolve)."
msgstr ""
#. type: delimited block -
@@ -19301,16 +18889,15 @@ msgstr ""
#: en/git-cat-file.txt:299
msgid ""
"Note also that multiple copies of an object may be present in the object "
-"database; in this case, it is undefined which copy's size or delta base will "
-"be reported."
+"database; in this case, it is undefined which copy's size or delta base will"
+" be reported."
msgstr ""
#. type: Title =
#: en/git-check-attr.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-checkout(1)"
+#, no-wrap
msgid "git-check-attr(1)"
-msgstr "git-checkout(1)"
+msgstr "git-check-attr(1)"
#. type: Plain text
#: en/git-check-attr.txt:7
@@ -19349,7 +18936,8 @@ msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:29
-msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
+msgid ""
+"Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
@@ -19361,7 +18949,7 @@ msgstr ""
#: en/git-update-index.txt:140 en/rev-list-options.txt:194
#, no-wrap
msgid "--stdin"
-msgstr ""
+msgstr "--stdin"
#. type: Plain text
#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
@@ -19373,9 +18961,9 @@ msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:38
msgid ""
-"The output format is modified to be machine-parseable. If `--stdin` is also "
-"given, input paths are separated with a NUL character instead of a linefeed "
-"character."
+"The output format is modified to be machine-parseable. If `--stdin` is also"
+" given, input paths are separated with a NUL character instead of a linefeed"
+" character."
msgstr ""
#. type: Plain text
@@ -19401,8 +18989,8 @@ msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:55
msgid ""
-"unless `-z` is in effect, in which case NUL is used as delimiter: <path> NUL "
-"<attribute> NUL <info> NUL"
+"unless `-z` is in effect, in which case NUL is used as delimiter: <path> NUL"
+" <attribute> NUL <info> NUL"
msgstr ""
#. type: Plain text
@@ -19460,8 +19048,8 @@ msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
msgid ""
-"Buffering happens as documented under the `GIT_FLUSH` option in linkgit:"
-"git[1]. The caller is responsible for avoiding deadlocks caused by "
+"Buffering happens as documented under the `GIT_FLUSH` option in "
+"linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by "
"overfilling an input buffer or reading from an empty output buffer."
msgstr ""
@@ -19507,7 +19095,6 @@ msgid ""
"org/example/MyClass.java: myAttr: set\n"
msgstr ""
-#
#. type: Plain text
#: en/git-check-attr.txt:95
#, fuzzy
@@ -19551,7 +19138,6 @@ msgid ""
"README: caveat: unspecified\n"
msgstr ""
-#
#. type: Plain text
#: en/git-check-attr.txt:117
#, fuzzy
@@ -19561,10 +19147,9 @@ msgstr "linkgit:git-add[1]"
#. type: Title =
#: en/git-check-ignore.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-checkout(1)"
+#, no-wrap
msgid "git-check-ignore(1)"
-msgstr "git-checkout(1)"
+msgstr "git-check-ignore(1)"
#. type: Plain text
#: en/git-check-ignore.txt:7
@@ -19590,8 +19175,8 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:25
msgid ""
-"By default, tracked files are not shown at all since they are not subject to "
-"exclude rules; but see `--no-index'."
+"By default, tracked files are not shown at all since they are not subject to"
+" exclude rules; but see `--no-index'."
msgstr ""
#. type: Labeled list
@@ -19626,9 +19211,9 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:45
msgid ""
-"The output format is modified to be machine-parseable (see below). If `--"
-"stdin` is also given, input paths are separated with a NUL character instead "
-"of a linefeed character."
+"The output format is modified to be machine-parseable (see below). If "
+"`--stdin` is also given, input paths are separated with a NUL character "
+"instead of a linefeed character."
msgstr ""
#. type: Labeled list
@@ -19640,8 +19225,8 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:51
msgid ""
-"Show given paths which don't match any pattern.\t This only makes sense when "
-"`--verbose` is enabled, otherwise it would not be possible to distinguish "
+"Show given paths which don't match any pattern.\t This only makes sense when"
+" `--verbose` is enabled, otherwise it would not be possible to distinguish "
"between paths which match a pattern and those which don't."
msgstr ""
@@ -19649,7 +19234,7 @@ msgstr ""
#: en/git-check-ignore.txt:52 en/git-grep.txt:76
#, no-wrap
msgid "--no-index"
-msgstr ""
+msgstr "--no-index"
#. type: Plain text
#: en/git-check-ignore.txt:58
@@ -19663,8 +19248,8 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:66
msgid ""
-"By default, any of the given pathnames which match an ignore pattern will be "
-"output, one per line. If no pattern matches a given path, nothing will be "
+"By default, any of the given pathnames which match an ignore pattern will be"
+" output, one per line. If no pattern matches a given path, nothing will be "
"output for that path; this means that path will not be ignored."
msgstr ""
@@ -19686,9 +19271,9 @@ msgid ""
"pattern, <source> is the pattern's source file, and <linenum> is the line "
"number of the pattern within that source. If the pattern contained a `!` "
"prefix or `/` suffix, it will be preserved in the output. <source> will be "
-"an absolute path when referring to the file configured by `core."
-"excludesFile`, or relative to the repository root when referring to `.git/"
-"info/exclude` or a per-directory exclude file."
+"an absolute path when referring to the file configured by "
+"`core.excludesFile`, or relative to the repository root when referring to "
+"`.git/info/exclude` or a per-directory exclude file."
msgstr ""
#. type: Plain text
@@ -19757,20 +19342,19 @@ msgstr ""
msgid "A fatal error was encountered."
msgstr ""
-#
#. type: Plain text
#: en/git-check-ignore.txt:117
#, fuzzy
-#| msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
+#| msgid ""
+#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-check-mailmap.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-checkout(1)"
+#, no-wrap
msgid "git-check-mailmap(1)"
-msgstr "git-checkout(1)"
+msgstr "git-check-mailmap(1)"
#. type: Plain text
#: en/git-check-mailmap.txt:7
@@ -19811,12 +19395,10 @@ msgstr ""
#. type: Title =
#: en/git-checkout-index.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-checkout(1)"
+#, no-wrap
msgid "git-checkout-index(1)"
-msgstr "git-checkout(1)"
+msgstr "git-checkout-index(1)"
-#
#. type: Plain text
#: en/git-checkout-index.txt:7
#, fuzzy
@@ -19868,10 +19450,9 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:44
-#, fuzzy, no-wrap
-#| msgid "--no-color"
+#, no-wrap
msgid "--no-create"
-msgstr "--no-color"
+msgstr "--no-create"
#. type: Plain text
#: en/git-checkout-index.txt:47
@@ -19910,7 +19491,7 @@ msgstr ""
#: en/git-checkout-index.txt:57
#, no-wrap
msgid "--temp"
-msgstr ""
+msgstr "--temp"
#. type: Plain text
#: en/git-checkout-index.txt:61
@@ -19923,8 +19504,8 @@ msgstr ""
#: en/git-checkout-index.txt:66 en/git-update-index.txt:144
msgid ""
"Instead of taking list of paths from the command line, read list of paths "
-"from the standard input. Paths are separated by LF (i.e. one path per line) "
-"by default."
+"from the standard input. Paths are separated by LF (i.e. one path per line)"
+" by default."
msgstr ""
#. type: Plain text
@@ -19934,15 +19515,14 @@ msgid ""
"instead of LF."
msgstr ""
-#
#. type: Plain text
#: en/git-checkout-index.txt:73 en/git-commit.txt:338 en/git-ls-files.txt:176
#: en/git-merge-index.txt:25 en/git-prune.txt:47 en/git-update-index.txt:206
#: en/git-verify-pack.txt:38
msgid "Do not interpret any more arguments as options."
msgstr ""
-"Diese Option kann dazu verwendet werden, Befehlszeilenoptionen von der Liste "
-"von Dateien zu trennen. Dies ist sinnvoll, wenn Dateinamen mit "
+"Diese Option kann dazu verwendet werden, Befehlszeilenoptionen von der Liste"
+" von Dateien zu trennen. Dies ist sinnvoll, wenn Dateinamen mit "
"Befehlszeilenoptionen verwechselt werden k철nnten."
#. type: Plain text
@@ -20026,10 +19606,10 @@ msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:121
msgid ""
-"The first format is what gets used when `--stage` is omitted or is not `--"
-"stage=all`. The field tempname is the temporary file name holding the file "
-"content and path is the tracked path name in the index. Only the requested "
-"entries are output."
+"The first format is what gets used when `--stage` is omitted or is not "
+"`--stage=all`. The field tempname is the temporary file name holding the "
+"file content and path is the tracked path name in the index. Only the "
+"requested entries are output."
msgstr ""
#. type: Plain text
@@ -20075,7 +19655,9 @@ msgstr ""
#. type: delimited block -
#: en/git-checkout-index.txt:148 en/git-update-index.txt:342
#, no-wrap
-msgid "$ git checkout-index -n -f -a && git update-index --ignore-missing --refresh\n"
+msgid ""
+"$ git checkout-index -n -f -a && git update-index --ignore-missing "
+"--refresh\n"
msgstr ""
#. type: Labeled list
@@ -20087,9 +19669,9 @@ msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:154
msgid ""
-"The prefix ability basically makes it trivial to use 'git checkout-index' as "
-"an \"export as tree\" function. Just read the desired tree into the index, "
-"and do:"
+"The prefix ability basically makes it trivial to use 'git checkout-index' as"
+" an \"export as tree\" function. Just read the desired tree into the index,"
+" and do:"
msgstr ""
#. type: delimited block -
@@ -20127,8 +19709,8 @@ msgstr "$ git checkout experimentell\n"
#. type: Plain text
#: en/git-checkout-index.txt:174
msgid ""
-"This will check out the currently cached copy of `Makefile` into the file `."
-"merged-Makefile`."
+"This will check out the currently cached copy of `Makefile` into the file "
+"`.merged-Makefile`."
msgstr ""
#. type: Title =
@@ -20137,7 +19719,6 @@ msgstr ""
msgid "git-checkout(1)"
msgstr "git-checkout(1)"
-#
#. type: Plain text
#: en/git-checkout.txt:7
#, fuzzy
@@ -20167,7 +19748,6 @@ msgid ""
"`HEAD` to set the specified branch as the current branch."
msgstr ""
-#
#. type: Labeled list
#: en/git-checkout.txt:25
#, fuzzy, no-wrap
@@ -20180,8 +19760,8 @@ msgstr "switch branch"
msgid ""
"To prepare for working on <branch>, switch to it by updating the index and "
"the files in the working tree, and by pointing HEAD at the branch. Local "
-"modifications to the files in the working tree are kept, so that they can be "
-"committed to the <branch>."
+"modifications to the files in the working tree are kept, so that they can be"
+" committed to the <branch>."
msgstr ""
#. type: Plain text
@@ -20201,8 +19781,8 @@ msgstr ""
#: en/git-checkout.txt:44
msgid ""
"You could omit <branch>, in which case the command degenerates to \"check "
-"out the current branch\", which is a glorified no-op with a rather expensive "
-"side-effects to show only the tracking information, if exists, for the "
+"out the current branch\", which is a glorified no-op with a rather expensive"
+" side-effects to show only the tracking information, if exists, for the "
"current branch."
msgstr ""
@@ -20216,17 +19796,17 @@ msgstr ""
#: en/git-checkout.txt:53
msgid ""
"Specifying `-b` causes a new branch to be created as if linkgit:git-"
-"branch[1] were called and then checked out. In this case you can use the `--"
-"track` or `--no-track` options, which will be passed to 'git branch'. As a "
-"convenience, `--track` without `-b` implies branch creation; see the "
+"branch[1] were called and then checked out. In this case you can use the "
+"`--track` or `--no-track` options, which will be passed to 'git branch'. As"
+" a convenience, `--track` without `-b` implies branch creation; see the "
"description of `--track` below."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:56
msgid ""
-"If `-B` is given, <new_branch> is created if it doesn't exist; otherwise, it "
-"is reset. This is the transactional equivalent of"
+"If `-B` is given, <new_branch> is created if it doesn't exist; otherwise, it"
+" is reset. This is the transactional equivalent of"
msgstr ""
#. type: delimited block -
@@ -20286,33 +19866,32 @@ msgstr ""
msgid "'git checkout' [-p|--patch] [<tree-ish>] [--] <pathspec>..."
msgstr "'git diff' [--options] [--] [<path>...]"
-#
#. type: Plain text
#: en/git-checkout.txt:91
#, fuzzy
#| msgid ""
-#| "When <paths> are given, this command does *not* switch branches. It "
-#| "updates the named paths in the working tree from the index file (i.e. it "
-#| "runs `git checkout-index -f -u`), or from a named commit. In this case, "
-#| "the `-f` and `-b` options are meaningless and giving either of them "
-#| "results in an error. <tree-ish> argument can be used to specify a "
-#| "specific tree-ish (i.e. commit, tag or tree) to update the index for the "
-#| "given paths before updating the working tree."
+#| "When <paths> are given, this command does *not* switch branches. It updates"
+#| " the named paths in the working tree from the index file (i.e. it runs `git "
+#| "checkout-index -f -u`), or from a named commit. In this case, the `-f` and "
+#| "`-b` options are meaningless and giving either of them results in an error."
+#| " <tree-ish> argument can be used to specify a specific tree-ish (i.e. "
+#| "commit, tag or tree) to update the index for the given paths before "
+#| "updating the working tree."
msgid ""
"When <paths> or `--patch` are given, 'git checkout' does *not* switch "
"branches. It updates the named paths in the working tree from the index "
-"file or from a named <tree-ish> (most often a commit). In this case, the `-"
-"b` and `--track` options are meaningless and giving either of them results "
-"in an error. The <tree-ish> argument can be used to specify a specific tree-"
-"ish (i.e. commit, tag or tree) to update the index for the given paths "
-"before updating the working tree."
+"file or from a named <tree-ish> (most often a commit). In this case, the "
+"`-b` and `--track` options are meaningless and giving either of them results"
+" in an error. The <tree-ish> argument can be used to specify a specific "
+"tree-ish (i.e. commit, tag or tree) to update the index for the given paths"
+" before updating the working tree."
msgstr ""
"Werden <paths> angegeben, dann wird der aktive Entwicklungszweig (branch) "
"*nicht* gewechselt, sondern die benannten Dateipfade im Arbeitsbereich "
"werden aus dem Index (durch Ausf체hren von `git checkout-index -f -u`), oder "
"aus einer benannten Eintragung (commit) aktualisiert. In diesem Fall sind "
-"die Optionen '-f' und '-b' unzul채ssig und f체hren bei der Verwendung zu einer "
-"Fehlermeldung. <tree-ish> argument can be used to specify a specific tree-"
+"die Optionen '-f' und '-b' unzul채ssig und f체hren bei der Verwendung zu einer"
+" Fehlermeldung. <tree-ish> argument can be used to specify a specific tree-"
"ish (i.e. commit, tag or tree) to update the index for the given paths "
"before updating the working tree."
@@ -20336,7 +19915,6 @@ msgid ""
"create the original conflicted merge result."
msgstr ""
-#
#. type: Plain text
#: en/git-checkout.txt:109
msgid "Quiet, suppress feedback messages."
@@ -20347,11 +19925,10 @@ msgstr "Leise, unterdr체cke Hinweisnachrichten."
msgid ""
"Progress status is reported on the standard error stream by default when it "
"is attached to a terminal, unless `--quiet` is specified. This flag enables "
-"progress reporting even if not attached to a terminal, regardless of `--"
-"quiet`."
+"progress reporting even if not attached to a terminal, regardless of "
+"`--quiet`."
msgstr ""
-#
#. type: Plain text
#: en/git-checkout.txt:121
#, fuzzy
@@ -20377,13 +19954,13 @@ msgstr ""
#: en/git-checkout.txt:125 en/git-merge-file.txt:73
#, no-wrap
msgid "--ours"
-msgstr ""
+msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:126 en/git-merge-file.txt:74
#, no-wrap
msgid "--theirs"
-msgstr ""
+msgstr "--theirs"
#. type: Plain text
#: en/git-checkout.txt:129
@@ -20408,9 +19985,9 @@ msgid ""
"the remote as the shared canonical one, and treats the work done on the "
"branch you are rebasing as the third-party work to be integrated, and you "
"are temporarily assuming the role of the keeper of the canonical history "
-"during the rebase. As the keeper of the canonical history, you need to view "
-"the history from the remote as `ours` (i.e. \"our shared canonical history"
-"\"), while what you did on your side branch as `theirs` (i.e. \"one "
+"during the rebase. As the keeper of the canonical history, you need to view"
+" the history from the remote as `ours` (i.e. \"our shared canonical "
+"history\"), while what you did on your side branch as `theirs` (i.e. \"one "
"contributor's work on top of it\")."
msgstr ""
@@ -20438,16 +20015,16 @@ msgstr "<new_branch>"
#. type: Plain text
#: en/git-checkout.txt:154
msgid ""
-"Creates the branch <new_branch> and start it at <start_point>; if it already "
-"exists, then reset it to <start_point>. This is equivalent to running \"git "
-"branch\" with \"-f\"; see linkgit:git-branch[1] for details."
+"Creates the branch <new_branch> and start it at <start_point>; if it already"
+" exists, then reset it to <start_point>. This is equivalent to running \"git"
+" branch\" with \"-f\"; see linkgit:git-branch[1] for details."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:159
msgid ""
-"When creating a new branch, set up \"upstream\" configuration. See \"--track"
-"\" in linkgit:git-branch[1] for details."
+"When creating a new branch, set up \"upstream\" configuration. See \"--"
+"track\" in linkgit:git-branch[1] for details."
msgstr ""
#. type: Plain text
@@ -20455,11 +20032,11 @@ msgstr ""
msgid ""
"If no `-b` option is given, the name of the new branch will be derived from "
"the remote-tracking branch, by looking at the local part of the refspec "
-"configured for the corresponding remote, and then stripping the initial part "
-"up to the \"*\". This would tell us to use \"hack\" as the local branch "
+"configured for the corresponding remote, and then stripping the initial part"
+" up to the \"*\". This would tell us to use \"hack\" as the local branch "
"when branching off of \"origin/hack\" (or \"remotes/origin/hack\", or even "
-"\"refs/remotes/origin/hack\"). If the given name has no slash, or the above "
-"guessing results in an empty name, the guessing is aborted. You can "
+"\"refs/remotes/origin/hack\"). If the given name has no slash, or the above"
+" guessing results in an empty name, the guessing is aborted. You can "
"explicitly give a name with `-b` in such a case."
msgstr ""
@@ -20472,7 +20049,7 @@ msgstr ""
#: en/git-checkout.txt:178 en/git-daemon.txt:134 en/git-worktree.txt:100
#, no-wrap
msgid "--detach"
-msgstr ""
+msgstr "--detach"
#. type: Plain text
#: en/git-checkout.txt:184
@@ -20493,8 +20070,8 @@ msgstr "<new_branch>"
#. type: Plain text
#: en/git-checkout.txt:191
msgid ""
-"Create a new 'orphan' branch, named <new_branch>, started from <start_point> "
-"and switch to it. The first commit made on this new branch will have no "
+"Create a new 'orphan' branch, named <new_branch>, started from <start_point>"
+" and switch to it. The first commit made on this new branch will have no "
"parents and it will be the root of a new history totally disconnected from "
"all the other branches and commits."
msgstr ""
@@ -20503,8 +20080,8 @@ msgstr ""
#: en/git-checkout.txt:196
msgid ""
"The index and the working tree are adjusted as if you had previously run "
-"\"git checkout <start_point>\". This allows you to start a new history that "
-"records a set of paths similar to <start_point> by easily running \"git "
+"\"git checkout <start_point>\". This allows you to start a new history that"
+" records a set of paths similar to <start_point> by easily running \"git "
"commit -a\" to make the root commit."
msgstr ""
@@ -20520,47 +20097,45 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:209
msgid ""
-"If you want to start a disconnected history that records a set of paths that "
-"is totally different from the one of <start_point>, then you should clear "
+"If you want to start a disconnected history that records a set of paths that"
+" is totally different from the one of <start_point>, then you should clear "
"the index and the working tree right after creating the orphan branch by "
-"running \"git rm -rf .\" from the top level of the working tree. Afterwards "
-"you will be ready to prepare your new files, repopulating the working tree, "
-"by copying them from elsewhere, extracting a tarball, etc."
+"running \"git rm -rf .\" from the top level of the working tree. Afterwards"
+" you will be ready to prepare your new files, repopulating the working tree,"
+" by copying them from elsewhere, extracting a tarball, etc."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:210
#, no-wrap
msgid "--ignore-skip-worktree-bits"
-msgstr ""
+msgstr "--ignore-skip-worktree-bits"
#. type: Plain text
#: en/git-checkout.txt:215
msgid ""
-"In sparse checkout mode, `git checkout -- <paths>` would update only entries "
-"matched by <paths> and sparse patterns in $GIT_DIR/info/sparse-checkout. "
+"In sparse checkout mode, `git checkout -- <paths>` would update only entries"
+" matched by <paths> and sparse patterns in $GIT_DIR/info/sparse-checkout. "
"This option ignores the sparse patterns and adds back any files in <paths>."
msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:217 en/git-rebase.txt:271 en/git-reset.txt:71
#: en/git-submodule.txt:363 en/git-svn.txt:638 en/rev-list-options.txt:278
-#, fuzzy, no-wrap
-#| msgid "--merged"
+#, no-wrap
msgid "--merge"
-msgstr "--merged"
+msgstr "--merge"
-#
#. type: Plain text
#: en/git-checkout.txt:226
#, fuzzy
#| msgid ""
#| "If you have local modifications to one or more files that are different "
#| "between the current branch and the branch to which you are switching, the "
-#| "command refuses to switch branches in order to preserve your "
-#| "modifications in context. However, with this option, a three-way merge "
-#| "between the current branch, your working tree contents, and the new "
-#| "branch is done, and you will be on the new branch."
+#| "command refuses to switch branches in order to preserve your modifications "
+#| "in context. However, with this option, a three-way merge between the "
+#| "current branch, your working tree contents, and the new branch is done, and "
+#| "you will be on the new branch."
msgid ""
"When switching branches, if you have local modifications to one or more "
"files that are different between the current branch and the branch to which "
@@ -20576,7 +20151,6 @@ msgstr ""
"current branch, your working tree contents, and the new branch is done, and "
"you will be on the new branch."
-#
#. type: Plain text
#: en/git-checkout.txt:231
msgid ""
@@ -20631,17 +20205,16 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:253
-#, fuzzy, no-wrap
-#| msgid "--ignore-errors"
+#, no-wrap
msgid "--ignore-other-worktrees"
-msgstr "--ignore-errors"
+msgstr "--ignore-other-worktrees"
#. type: Plain text
#: en/git-checkout.txt:258
msgid ""
-"`git checkout` refuses when the wanted ref is already checked out by another "
-"worktree. This option makes it check the ref out anyway. In other words, the "
-"ref can be held by more than one worktree."
+"`git checkout` refuses when the wanted ref is already checked out by another"
+" worktree. This option makes it check the ref out anyway. In other words, "
+"the ref can be held by more than one worktree."
msgstr ""
#. type: Labeled list
@@ -20654,9 +20227,9 @@ msgstr "<branch>"
#: en/git-checkout.txt:265
msgid ""
"Branch to checkout; if it refers to a branch (i.e., a name that, when "
-"prepended with \"refs/heads/\", is a valid ref), then that branch is checked "
-"out. Otherwise, if it refers to a valid commit, your HEAD becomes \"detached"
-"\" and you are no longer on any branch (see below for details)."
+"prepended with \"refs/heads/\", is a valid ref), then that branch is checked"
+" out. Otherwise, if it refers to a valid commit, your HEAD becomes "
+"\"detached\" and you are no longer on any branch (see below for details)."
msgstr ""
#. type: Plain text
@@ -20681,7 +20254,6 @@ msgstr ""
msgid "<new_branch>"
msgstr "<new_branch>"
-#
#. type: Plain text
#: en/git-checkout.txt:276
msgid "Name for the new branch."
@@ -20718,8 +20290,8 @@ msgstr ""
#: en/git-checkout.txt:292
msgid ""
"HEAD normally refers to a named branch (e.g. 'master'). Meanwhile, each "
-"branch refers to a specific commit. Let's look at a repo with three commits, "
-"one of them tagged, and with branch 'master' checked out:"
+"branch refers to a specific commit. Let's look at a repo with three commits,"
+" one of them tagged, and with branch 'master' checked out:"
msgstr ""
#. type: delimited block -
@@ -20916,8 +20488,8 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:408
msgid ""
-"similarly creates a new branch 'foo', which refers to commit 'f', but leaves "
-"HEAD detached."
+"similarly creates a new branch 'foo', which refers to commit 'f', but leaves"
+" HEAD detached."
msgstr ""
#. type: Plain text
@@ -20929,10 +20501,10 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:416
msgid ""
-"If we have moved away from commit 'f', then we must first recover its object "
-"name (typically by using git reflog), and then we can create a reference to "
-"it. For example, to see the last two commits to which HEAD referred, we can "
-"use either of these commands:"
+"If we have moved away from commit 'f', then we must first recover its object"
+" name (typically by using git reflog), and then we can create a reference to"
+" it. For example, to see the last two commits to which HEAD referred, we can"
+" use either of these commands:"
msgstr ""
#. type: delimited block -
@@ -20963,7 +20535,6 @@ msgid ""
"index."
msgstr ""
-#
#. type: Plain text
#: en/git-checkout.txt:440
msgid ""
@@ -20989,13 +20560,11 @@ msgstr ""
"$ rm -f hello.c\n"
"$ git checkout hello.c <3>\n"
-#
#. type: Plain text
#: en/git-checkout.txt:449
msgid "switch branch"
msgstr "switch branch"
-#
#. type: Plain text
#: en/git-checkout.txt:450
#, fuzzy
@@ -21003,7 +20572,6 @@ msgstr "switch branch"
msgid "take a file out of another commit"
msgstr "take out a file out of other commit"
-#
#. type: Plain text
#: en/git-checkout.txt:451
#, fuzzy
@@ -21029,10 +20597,10 @@ msgstr "$ git checkout -- hello.c\n"
msgid ""
"Note the quotes around `*.c`. The file `hello.c` will also be checked out, "
"even though it is no longer in the working tree, because the file globbing "
-"is used to match entries in the index (not in the working tree by the shell)."
+"is used to match entries in the index (not in the working tree by the "
+"shell)."
msgstr ""
-#
#. type: Plain text
#: en/git-checkout.txt:467
msgid ""
@@ -21050,7 +20618,6 @@ msgstr ""
msgid "$ git checkout -- hello.c\n"
msgstr "$ git checkout -- hello.c\n"
-#
#. type: Plain text
#: en/git-checkout.txt:474
#, fuzzy
@@ -21070,18 +20637,17 @@ msgstr ""
msgid "$ git checkout mytopic\n"
msgstr "$ git checkout mytopic\n"
-#
#. type: Plain text
#: en/git-checkout.txt:482
#, fuzzy
#| msgid ""
-#| "However, your \"wrong\" branch and correct \"mytopic\" branch may differ "
-#| "in files that you have locally modified, in which case, the above "
-#| "checkout would fail like this:"
+#| "However, your \"wrong\" branch and correct \"mytopic\" branch may differ in "
+#| "files that you have locally modified, in which case, the above checkout "
+#| "would fail like this:"
msgid ""
"However, your \"wrong\" branch and correct \"mytopic\" branch may differ in "
-"files that you have modified locally, in which case the above checkout would "
-"fail like this:"
+"files that you have modified locally, in which case the above checkout would"
+" fail like this:"
msgstr ""
"However, your \"wrong\" branch and correct \"mytopic\" branch may differ in "
"files that you have locally modified, in which case, the above checkout "
@@ -21100,13 +20666,14 @@ msgstr ""
"$ git checkout mytopic\n"
"fatal: Entry 'frotz' not uptodate. Cannot merge.\n"
-#
#. type: Plain text
#: en/git-checkout.txt:490
msgid ""
-"You can give the `-m` flag to the command, which would try a three-way merge:"
+"You can give the `-m` flag to the command, which would try a three-way "
+"merge:"
msgstr ""
-"You can give the `-m` flag to the command, which would try a three-way merge:"
+"You can give the `-m` flag to the command, which would try a three-way "
+"merge:"
#. type: delimited block -
#: en/git-checkout.txt:494
@@ -21118,7 +20685,6 @@ msgstr ""
"$ git checkout -m mytopic\n"
"Auto-merging frotz\n"
-#
#. type: Plain text
#: en/git-checkout.txt:499
msgid ""
@@ -21130,7 +20696,6 @@ msgstr ""
"your index file, so `git diff` would show you what changes you made since "
"the tip of the new branch."
-#
#. type: Plain text
#: en/git-checkout.txt:502
msgid ""
@@ -21161,7 +20726,6 @@ msgstr ""
"ERROR: Merge conflict in frotz\n"
"fatal: merge program failed\n"
-#
#. type: Plain text
#: en/git-checkout.txt:514
msgid ""
@@ -21185,10 +20749,9 @@ msgstr ""
#. type: Title =
#: en/git-check-ref-format.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-checkout(1)"
+#, no-wrap
msgid "git-check-ref-format(1)"
-msgstr "git-checkout(1)"
+msgstr "git-check-ref-format(1)"
#. type: Plain text
#: en/git-check-ref-format.txt:7
@@ -21216,10 +20779,10 @@ msgstr ""
#: en/git-check-ref-format.txt:27
msgid ""
"A reference is used in Git to specify branches and tags. A branch head is "
-"stored in the `refs/heads` hierarchy, while a tag is stored in the `refs/"
-"tags` hierarchy of the ref namespace (typically in `$GIT_DIR/refs/heads` and "
-"`$GIT_DIR/refs/tags` directories or, as entries in file `$GIT_DIR/packed-"
-"refs` if refs are packed by `git gc`)."
+"stored in the `refs/heads` hierarchy, while a tag is stored in the "
+"`refs/tags` hierarchy of the ref namespace (typically in "
+"`$GIT_DIR/refs/heads` and `$GIT_DIR/refs/tags` directories or, as entries in"
+" file `$GIT_DIR/packed-refs` if refs are packed by `git gc`)."
msgstr ""
#. type: Plain text
@@ -21238,9 +20801,9 @@ msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:38
msgid ""
-"They must contain at least one `/`. This enforces the presence of a category "
-"like `heads/`, `tags/` etc. but the actual names are not restricted. If the "
-"`--allow-onelevel` option is used, this rule is waived."
+"They must contain at least one `/`. This enforces the presence of a category"
+" like `heads/`, `tags/` etc. but the actual names are not restricted. If "
+"the `--allow-onelevel` option is used, this rule is waived."
msgstr ""
#. type: Plain text
@@ -21251,8 +20814,8 @@ msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:44
msgid ""
-"They cannot have ASCII control characters (i.e. bytes whose values are lower "
-"than \\040, or \\177 `DEL`), space, tilde `~`, caret `^`, or colon `:` "
+"They cannot have ASCII control characters (i.e. bytes whose values are lower"
+" than \\040, or \\177 `DEL`), space, tilde `~`, caret `^`, or colon `:` "
"anywhere."
msgstr ""
@@ -21260,8 +20823,8 @@ msgstr ""
#: en/git-check-ref-format.txt:48
msgid ""
"They cannot have question-mark `?`, asterisk `*`, or open bracket `[` "
-"anywhere. See the `--refspec-pattern` option below for an exception to this "
-"rule."
+"anywhere. See the `--refspec-pattern` option below for an exception to this"
+" rule."
msgstr ""
#. type: Plain text
@@ -21310,15 +20873,15 @@ msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:72
msgid ""
-"A tilde `~` and caret `^` are used to introduce the postfix 'nth parent' and "
-"'peel onion' operation."
+"A tilde `~` and caret `^` are used to introduce the postfix 'nth parent' and"
+" 'peel onion' operation."
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:77
msgid ""
-"A colon `:` is used as in `srcref:dstref` to mean \"use srcref\\'s value and "
-"store it in dstref\" in fetch and push operations. It may also be used to "
+"A colon `:` is used as in `srcref:dstref` to mean \"use srcref\\'s value and"
+" store it in dstref\" in fetch and push operations. It may also be used to "
"select a specific object such as with 'git cat-file': \"git cat-file blob "
"v1.3.3:refs.c\"."
msgstr ""
@@ -21331,23 +20894,23 @@ msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:85
msgid ""
-"With the `--branch` option, it expands the ``previous branch syntax'' `@{-n}"
-"`. For example, `@{-1}` is a way to refer the last branch you were on. "
-"This option should be used by porcelains to accept this syntax anywhere a "
-"branch name is expected, so they can act as if you typed the branch name."
+"With the `--branch` option, it expands the ``previous branch syntax'' "
+"`@{-n}`. For example, `@{-1}` is a way to refer the last branch you were "
+"on. This option should be used by porcelains to accept this syntax anywhere"
+" a branch name is expected, so they can act as if you typed the branch name."
msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:88
#, no-wrap
msgid "--[no-]allow-onelevel"
-msgstr ""
+msgstr "--[no-]allow-onelevel"
#. type: Plain text
#: en/git-check-ref-format.txt:92
msgid ""
-"Controls whether one-level refnames are accepted (i.e., refnames that do not "
-"contain multiple `/`-separated components). The default is `--no-allow-"
+"Controls whether one-level refnames are accepted (i.e., refnames that do not"
+" contain multiple `/`-separated components). The default is `--no-allow-"
"onelevel`."
msgstr ""
@@ -21355,7 +20918,7 @@ msgstr ""
#: en/git-check-ref-format.txt:93
#, no-wrap
msgid "--refspec-pattern"
-msgstr ""
+msgstr "--refspec-pattern"
#. type: Plain text
#: en/git-check-ref-format.txt:99
@@ -21370,7 +20933,7 @@ msgstr ""
#: en/git-check-ref-format.txt:100
#, no-wrap
msgid "--normalize"
-msgstr ""
+msgstr "--normalize"
#. type: Plain text
#: en/git-check-ref-format.txt:107
@@ -21378,8 +20941,8 @@ msgid ""
"Normalize 'refname' by removing any leading slash (`/`) characters and "
"collapsing runs of adjacent slashes between name components into a single "
"slash. If the normalized refname is valid then print it to standard output "
-"and exit with a status of 0, otherwise exit with a non-zero status. (`--"
-"print` is a deprecated way to spell `--normalize`.)"
+"and exit with a status of 0, otherwise exit with a non-zero status. "
+"(`--print` is a deprecated way to spell `--normalize`.)"
msgstr ""
#. type: Plain text
@@ -21408,14 +20971,14 @@ msgstr ""
#. type: Title =
#: en/git-cherry-pick.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-checkout(1)"
+#, no-wrap
msgid "git-cherry-pick(1)"
-msgstr "git-checkout(1)"
+msgstr "git-cherry-pick(1)"
#. type: Plain text
#: en/git-cherry-pick.txt:7
-msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
+msgid ""
+"git-cherry-pick - Apply the changes introduced by some existing commits"
msgstr ""
#. type: Plain text
@@ -21452,15 +21015,15 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:31
msgid ""
-"The `CHERRY_PICK_HEAD` ref is set to point at the commit that introduced the "
-"change that is difficult to apply."
+"The `CHERRY_PICK_HEAD` ref is set to point at the commit that introduced the"
+" change that is difficult to apply."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:33
msgid ""
-"Paths in which the change applied cleanly are updated both in the index file "
-"and in your working tree."
+"Paths in which the change applied cleanly are updated both in the index file"
+" and in your working tree."
msgstr ""
#. type: Plain text
@@ -21494,11 +21057,11 @@ msgstr "-C <commit>"
#: en/git-cherry-pick.txt:54
msgid ""
"Commits to cherry-pick. For a more complete list of ways to spell commits, "
-"see linkgit:gitrevisions[7]. Sets of commits can be passed but no traversal "
-"is done by default, as if the `--no-walk` option was specified, see linkgit:"
-"git-rev-list[1]. Note that specifying a range will feed all <commit>... "
-"arguments to a single revision walk (see a later example that uses 'maint "
-"master..next')."
+"see linkgit:gitrevisions[7]. Sets of commits can be passed but no traversal"
+" is done by default, as if the `--no-walk` option was specified, see "
+"linkgit:git-rev-list[1]. Note that specifying a range will feed all "
+"<commit>... arguments to a single revision walk (see a later example that "
+"uses 'maint master..next')."
msgstr ""
#. type: Plain text
@@ -21512,7 +21075,7 @@ msgstr ""
#: en/git-cherry-pick.txt:60 en/git-clean.txt:62
#, no-wrap
msgid "-x"
-msgstr ""
+msgstr "-x"
#. type: Plain text
#: en/git-cherry-pick.txt:73
@@ -21522,8 +21085,8 @@ msgid ""
"commit this change was cherry-picked from. This is done only for cherry "
"picks without conflicts. Do not use this option if you are cherry-picking "
"from your private branch because the information is useless to the "
-"recipient. If on the other hand you are cherry-picking between two publicly "
-"visible branches (e.g. backporting a fix to a maintenance branch for an "
+"recipient. If on the other hand you are cherry-picking between two publicly"
+" visible branches (e.g. backporting a fix to a maintenance branch for an "
"older release from a development branch), adding this information can be "
"useful."
msgstr ""
@@ -21531,9 +21094,9 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:78
msgid ""
-"It used to be that the command defaulted to do `-x` described above, and `-"
-"r` was to disable it. Now the default is not to do `-x` so this option is a "
-"no-op."
+"It used to be that the command defaulted to do `-x` described above, and "
+"`-r` was to disable it. Now the default is not to do `-x` so this option is"
+" a no-op."
msgstr ""
#. type: Labeled list
@@ -21551,18 +21114,17 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:86
msgid ""
-"Usually you cannot cherry-pick a merge because you do not know which side of "
-"the merge should be considered the mainline. This option specifies the "
+"Usually you cannot cherry-pick a merge because you do not know which side of"
+" the merge should be considered the mainline. This option specifies the "
"parent number (starting from 1) of the mainline and allows cherry-pick to "
"replay the change relative to the specified parent."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:88 en/git-revert.txt:70 en/merge-options.txt:2
-#, fuzzy, no-wrap
-#| msgid "--no-color"
+#, no-wrap
msgid "--no-commit"
-msgstr "--no-color"
+msgstr "--no-commit"
#. type: Plain text
#: en/git-cherry-pick.txt:96
@@ -21570,8 +21132,8 @@ msgid ""
"Usually the command automatically creates a sequence of commits. This flag "
"applies the changes necessary to cherry-pick each named commit to your "
"working tree and the index, without making any commit. In addition, when "
-"this option is used, your index does not have to match the HEAD commit. The "
-"cherry-pick is done against the beginning state of your index."
+"this option is used, your index does not have to match the HEAD commit. The"
+" cherry-pick is done against the beginning state of your index."
msgstr ""
#. type: Plain text
@@ -21581,7 +21143,6 @@ msgid ""
"index in a row."
msgstr ""
-#
#. type: Plain text
#: en/git-cherry-pick.txt:104 en/git-revert.txt:93
#, fuzzy
@@ -21597,7 +21158,7 @@ msgstr ""
#: en/git-cherry-pick.txt:111 en/merge-options.txt:30
#, no-wrap
msgid "--ff"
-msgstr ""
+msgstr "--ff"
#. type: Plain text
#: en/git-cherry-pick.txt:115
@@ -21619,20 +21180,18 @@ msgid ""
"explicit invocation of `git commit --allow-empty` is required. This option "
"overrides that behavior, allowing empty commits to be preserved "
"automatically in a cherry-pick. Note that when \"--ff\" is in effect, empty "
-"commits that meet the \"fast-forward\" requirement will be kept even without "
-"this option. Note also, that use of this option only keeps commits that "
-"were initially empty (i.e. the commit recorded the same tree as its "
-"parent). Commits which are made empty due to a previous commit are "
-"dropped. To force the inclusion of those commits use `--keep-redundant-"
-"commits`."
+"commits that meet the \"fast-forward\" requirement will be kept even without"
+" this option. Note also, that use of this option only keeps commits that "
+"were initially empty (i.e. the commit recorded the same tree as its parent)."
+" Commits which are made empty due to a previous commit are dropped. To "
+"force the inclusion of those commits use `--keep-redundant-commits`."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:129 en/git-commit.txt:179
-#, fuzzy, no-wrap
-#| msgid "--allow-empty"
+#, no-wrap
msgid "--allow-empty-message"
-msgstr "--allow-empty"
+msgstr "--allow-empty-message"
#. type: Plain text
#: en/git-cherry-pick.txt:133
@@ -21646,7 +21205,7 @@ msgstr ""
#: en/git-cherry-pick.txt:134
#, no-wrap
msgid "--keep-redundant-commits"
-msgstr ""
+msgstr "--keep-redundant-commits"
#. type: Plain text
#: en/git-cherry-pick.txt:140
@@ -21654,8 +21213,8 @@ msgid ""
"If a commit being cherry picked duplicates a commit already in the current "
"history, it will become empty. By default these redundant commits cause "
"`cherry-pick` to stop so the user can examine the commit. This option "
-"overrides that behavior and creates an empty commit object. Implies `--"
-"allow-empty`."
+"overrides that behavior and creates an empty commit object. Implies "
+"`--allow-empty`."
msgstr ""
#. type: Labeled list
@@ -21725,8 +21284,8 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:167
msgid ""
-"Apply the changes introduced by all commits that are ancestors of master but "
-"not of HEAD to produce new commits."
+"Apply the changes introduced by all commits that are ancestors of master but"
+" not of HEAD to produce new commits."
msgstr ""
#. type: Labeled list
@@ -21745,8 +21304,8 @@ msgstr ""
#: en/git-cherry-pick.txt:176
msgid ""
"Apply the changes introduced by all commits that are ancestors of maint or "
-"next, but not master or any of its ancestors. Note that the latter does not "
-"mean `maint` and everything between `master` and `next`; specifically, "
+"next, but not master or any of its ancestors. Note that the latter does not"
+" mean `maint` and everything between `master` and `next`; specifically, "
"`maint` will not be used if it is included in `master`."
msgstr ""
@@ -21772,9 +21331,9 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:189
msgid ""
-"Apply to the working tree and the index the changes introduced by the second "
-"last commit pointed to by master and by the last commit pointed to by next, "
-"but do not create any commit with these changes."
+"Apply to the working tree and the index the changes introduced by the second"
+" last commit pointed to by master and by the last commit pointed to by next,"
+" but do not create any commit with these changes."
msgstr ""
#. type: Labeled list
@@ -21802,8 +21361,8 @@ msgstr ""
#: en/git-cherry-pick.txt:204
msgid ""
"Apply the changes introduced by all commits on the master branch that "
-"touched README to the working tree and index, so the result can be inspected "
-"and made into a single new commit if suitable."
+"touched README to the working tree and index, so the result can be inspected"
+" and made into a single new commit if suitable."
msgstr ""
#. type: Plain text
@@ -21827,8 +21386,8 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:219
msgid ""
-"apply the change that would be shown by `git show topic^`. In this example, "
-"the patch does not apply cleanly, so information about the conflict is "
+"apply the change that would be shown by `git show topic^`. In this example,"
+" the patch does not apply cleanly, so information about the conflict is "
"written to the index and working tree and no new commit results."
msgstr ""
@@ -21847,16 +21406,15 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:226
msgid ""
-"try to apply the change introduced by `topic^` again, spending extra time to "
-"avoid mistakes based on incorrectly matching context lines."
+"try to apply the change introduced by `topic^` again, spending extra time to"
+" avoid mistakes based on incorrectly matching context lines."
msgstr ""
#. type: Title =
#: en/git-cherry.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-rm(1)"
+#, no-wrap
msgid "git-cherry(1)"
-msgstr "git-rm(1)"
+msgstr "git-cherry(1)"
#. type: Plain text
#: en/git-cherry.txt:7
@@ -21880,20 +21438,19 @@ msgstr ""
#: en/git-cherry.txt:22
msgid ""
"The equivalence test is based on the diff, after removing whitespace and "
-"line numbers. git-cherry therefore detects when commits have been \"copied"
-"\" by means of linkgit:git-cherry-pick[1], linkgit:git-am[1] or linkgit:git-"
-"rebase[1]."
+"line numbers. git-cherry therefore detects when commits have been "
+"\"copied\" by means of linkgit:git-cherry-pick[1], linkgit:git-am[1] or "
+"linkgit:git-rebase[1]."
msgstr ""
#. type: Plain text
#: en/git-cherry.txt:26
msgid ""
-"Outputs the SHA1 of every commit in `<limit>..<head>`, prefixed with `-` for "
-"commits that have an equivalent in <upstream>, and `+` for commits that do "
+"Outputs the SHA1 of every commit in `<limit>..<head>`, prefixed with `-` for"
+" commits that have an equivalent in <upstream>, and `+` for commits that do "
"not."
msgstr ""
-#
#. type: Plain text
#: en/git-cherry.txt:31
#, fuzzy
@@ -21941,10 +21498,10 @@ msgstr ""
#. type: Plain text
#: en/git-cherry.txt:52
msgid ""
-"git-cherry is frequently used in patch-based workflows (see linkgit:"
-"gitworkflows[7]) to determine if a series of patches has been applied by the "
-"upstream maintainer. In such a workflow you might create and send a topic "
-"branch like this:"
+"git-cherry is frequently used in patch-based workflows (see "
+"linkgit:gitworkflows[7]) to determine if a series of patches has been "
+"applied by the upstream maintainer. In such a workflow you might create and"
+" send a topic branch like this:"
msgstr ""
#. type: delimited block -
@@ -22024,8 +21581,8 @@ msgstr ""
msgid ""
"Here, we see that the commits A and C (marked with `-`) can be dropped from "
"your `topic` branch when you rebase it on top of `origin/master`, while the "
-"commit B (marked with `+`) still needs to be kept so that it will be sent to "
-"be applied to `origin/master`."
+"commit B (marked with `+`) still needs to be kept so that it will be sent to"
+" be applied to `origin/master`."
msgstr ""
#. type: Title ~
@@ -22038,8 +21595,8 @@ msgstr ""
#: en/git-cherry.txt:110
msgid ""
"The optional <limit> is useful in cases where your topic is based on other "
-"work that is not in upstream. Expanding on the previous example, this might "
-"look like:"
+"work that is not in upstream. Expanding on the previous example, this might"
+" look like:"
msgstr ""
#. type: delimited block -
@@ -22085,13 +21642,11 @@ msgstr ""
msgid "git-citool(1)"
msgstr "git-citool(1)"
-#
#. type: Plain text
#: en/git-citool.txt:7
msgid "git-citool - Graphical alternative to git-commit"
msgstr "git-gitool - Graphische Alternative zu git-commit"
-#
#. type: Plain text
#: en/git-citool.txt:12
#, fuzzy, no-wrap
@@ -22099,27 +21654,25 @@ msgstr "git-gitool - Graphische Alternative zu git-commit"
msgid "'git citool'\n"
msgstr "'git citool'"
-#
#. type: Plain text
#: en/git-citool.txt:19
#, fuzzy
#| msgid ""
-#| "A Tcl/Tk based graphical interface to review modified files, stage them "
-#| "into the index, enter a commit message and record the new commit onto the "
+#| "A Tcl/Tk based graphical interface to review modified files, stage them into"
+#| " the index, enter a commit message and record the new commit onto the "
#| "current branch. This interface is an alternative to the less interactive "
#| "'git-commit' program."
msgid ""
-"A Tcl/Tk based graphical interface to review modified files, stage them into "
-"the index, enter a commit message and record the new commit onto the current "
-"branch. This interface is an alternative to the less interactive 'git "
-"commit' program."
+"A Tcl/Tk based graphical interface to review modified files, stage them into"
+" the index, enter a commit message and record the new commit onto the "
+"current branch. This interface is an alternative to the less interactive "
+"'git commit' program."
msgstr ""
-"Eine graphische, Tcl/Tk-basierte Oberfl채che, um ver채nderte Dateien anzushen, "
-"sie in den Index aufzunehmen, eine 횆nderungsnachricht einzugeben und neue "
+"Eine graphische, Tcl/Tk-basierte Oberfl채che, um ver채nderte Dateien anzushen,"
+" sie in den Index aufzunehmen, eine 횆nderungsnachricht einzugeben und neue "
"횆nderungen in den aktuellen Zweig einzupflegen. Diese Oberfl채che ist eine "
"alternative zum weniger interaktiven Programm 'git-commit'."
-#
#. type: Plain text
#: en/git-citool.txt:22
#, fuzzy
@@ -22127,31 +21680,32 @@ msgstr ""
#| "'git-citool' is actually a standard alias for `git gui citool`. See "
#| "linkgit:git-gui[1] for more details."
msgid ""
-"'git citool' is actually a standard alias for `git gui citool`. See linkgit:"
-"git-gui[1] for more details."
+"'git citool' is actually a standard alias for `git gui citool`. See "
+"linkgit:git-gui[1] for more details."
msgstr ""
"'git-citool' ist eigentlich ein Standardalias f체r `git gui citool`. Siehe "
"linkgit:git-gui[1] f체r weitere Informationen."
#. type: Title =
#: en/git-clean.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-clone(1)"
+#, no-wrap
msgid "git-clean(1)"
-msgstr "git-clone(1)"
+msgstr "git-clean(1)"
-#
#. type: Plain text
#: en/git-clean.txt:7
#, fuzzy
-#| msgid "git-rm - Remove files from the working tree and from the index"
+#| msgid ""
+#| "git-rm - Remove files from the working tree and from the index"
msgid "git-clean - Remove untracked files from the working tree"
msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
#. type: Plain text
#: en/git-clean.txt:12
#, no-wrap
-msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>...\n"
+msgid ""
+"'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "
+"<path>...\n"
msgstr ""
#. type: Plain text
@@ -22181,8 +21735,8 @@ msgstr ""
msgid ""
"Remove untracked directories in addition to untracked files. If an "
"untracked directory is managed by a different Git repository, it is not "
-"removed by default. Use -f option twice if you really want to remove such a "
-"directory."
+"removed by default. Use -f option twice if you really want to remove such a"
+" directory."
msgstr ""
#. type: Plain text
@@ -22190,8 +21744,8 @@ msgstr ""
msgid ""
"If the Git configuration variable clean.requireForce is not set to false, "
"'git clean' will refuse to delete files or directories unless given -f, -n "
-"or -i. Git will refuse to delete directories with .git sub directory or file "
-"unless a second -f is given."
+"or -i. Git will refuse to delete directories with .git sub directory or file"
+" unless a second -f is given."
msgstr ""
#. type: Plain text
@@ -22201,7 +21755,6 @@ msgid ""
"mode'' for details."
msgstr ""
-#
#. type: Plain text
#: en/git-clean.txt:50
#, fuzzy
@@ -22234,16 +21787,16 @@ msgstr ""
#. type: Plain text
#: en/git-clean.txt:61
msgid ""
-"In addition to those found in .gitignore (per directory) and $GIT_DIR/info/"
-"exclude, also consider these patterns to be in the set of the ignore rules "
-"in effect."
+"In addition to those found in .gitignore (per directory) and "
+"$GIT_DIR/info/exclude, also consider these patterns to be in the set of the "
+"ignore rules in effect."
msgstr ""
#. type: Plain text
#: en/git-clean.txt:69
msgid ""
-"Don't use the standard ignore rules read from .gitignore (per directory) and "
-"$GIT_DIR/info/exclude, but do still use the ignore rules given with `-e` "
+"Don't use the standard ignore rules read from .gitignore (per directory) and"
+" $GIT_DIR/info/exclude, but do still use the ignore rules given with `-e` "
"options. This allows removing all untracked files, including build "
"products. This can be used (possibly in conjunction with 'git reset') to "
"create a pristine working directory to test a clean build."
@@ -22262,7 +21815,6 @@ msgid ""
"from scratch, but keep manually created files."
msgstr ""
-#
#. type: Plain text
#: en/git-clean.txt:79
#, fuzzy
@@ -22296,7 +21848,6 @@ msgstr ""
" 5: patch\t6: diff\t 7: quit\t 8: help\n"
" What now> 1\n"
-#
#. type: Plain text
#: en/git-clean.txt:93
#, fuzzy
@@ -22309,7 +21860,6 @@ msgstr ""
"Man kann weiters \"s\" oder \"sta\" oder \"status\" eingeben, solange die "
"Auswahl eindeutig ist."
-#
#. type: Plain text
#: en/git-clean.txt:95
#, fuzzy
@@ -22342,9 +21892,9 @@ msgstr "<filepattern>..."
msgid ""
"This shows the files and directories to be deleted and issues an \"Input "
"ignore patterns>>\" prompt. You can input space-separated patterns to "
-"exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes "
-"files end with \".c\" and \".h\" from deletion. When you are satisfied with "
-"the filtered result, press ENTER (empty) back to the main menu."
+"exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes"
+" files end with \".c\" and \".h\" from deletion. When you are satisfied with"
+" the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
@@ -22353,25 +21903,24 @@ msgstr ""
msgid "select by numbers"
msgstr ""
-#
#. type: Plain text
#: en/git-clean.txt:120
#, fuzzy
#| msgid ""
-#| "This shows the status information and gives prompt \"Update>>\". When "
-#| "the prompt ends with double '>>', you can make more than one selection, "
-#| "concatenated with whitespace or comma. Also you can say ranges. E.g. "
-#| "\"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in "
-#| "a range is omitted, all remaining patches are taken. E.g. \"7-\" to "
-#| "choose 7,8,9 from the list. You can say '*' to choose everything."
+#| "This shows the status information and gives prompt \"Update>>\". When the "
+#| "prompt ends with double '>>', you can make more than one selection, "
+#| "concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5"
+#| " 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range"
+#| " is omitted, all remaining patches are taken. E.g. \"7-\" to choose 7,8,9 "
+#| "from the list. You can say '*' to choose everything."
msgid ""
"This shows the files and directories to be deleted and issues an \"Select "
-"items to delete>>\" prompt. When the prompt ends with double '>>' like this, "
-"you can make more than one selection, concatenated with whitespace or "
+"items to delete>>\" prompt. When the prompt ends with double '>>' like this,"
+" you can make more than one selection, concatenated with whitespace or "
"comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 "
"from the list. If the second number in a range is omitted, all remaining "
-"items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say "
-"'*' to choose everything. Also when you are satisfied with the filtered "
+"items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say"
+" '*' to choose everything. Also when you are satisfied with the filtered "
"result, press ENTER (empty) back to the main menu."
msgstr ""
"Zeigt die Status Information und wartet mit der Meldung \"Update>>\" auf "
@@ -22391,8 +21940,8 @@ msgstr ""
#. type: Plain text
#: en/git-clean.txt:126
msgid ""
-"This will start to clean, and you must confirm one by one in order to delete "
-"items. Please note that this action is not as efficient as the above two "
+"This will start to clean, and you must confirm one by one in order to delete"
+" items. Please note that this action is not as efficient as the above two "
"actions."
msgstr ""
@@ -22418,7 +21967,6 @@ msgstr ""
msgid "Show brief usage of interactive git-clean."
msgstr ""
-#
#. type: Plain text
#: en/git-clean.txt:138 en/git-status.txt:356
#, fuzzy
@@ -22432,7 +21980,6 @@ msgstr "linkgit:git-add[1]"
msgid "git-clone(1)"
msgstr "git-clone(1)"
-#
#. type: Plain text
#: en/git-clone.txt:7
msgid "git-clone - Clone a repository into a new directory"
@@ -22461,19 +22008,18 @@ msgstr ""
"\t [-o <name>] [-u <upload-pack>] [--reference <repository>]\n"
"\t [--depth <depth>] [--] <repository> [<directory>]\n"
-#
#. type: Plain text
#: en/git-clone.txt:28
#, fuzzy
#| msgid ""
-#| "Clones a repository into a newly created directory, creates remote-"
-#| "tracking branches for each branch in the cloned repository (visible using "
-#| "`git branch -r`), and creates and checks out an initial branch equal to "
-#| "the cloned repository's currently active branch."
+#| "Clones a repository into a newly created directory, creates remote-tracking "
+#| "branches for each branch in the cloned repository (visible using `git branch"
+#| " -r`), and creates and checks out an initial branch equal to the cloned "
+#| "repository's currently active branch."
msgid ""
"Clones a repository into a newly created directory, creates remote-tracking "
-"branches for each branch in the cloned repository (visible using `git branch "
-"-r`), and creates and checks out an initial branch that is forked from the "
+"branches for each branch in the cloned repository (visible using `git branch"
+" -r`), and creates and checks out an initial branch that is forked from the "
"cloned repository's currently active branch."
msgstr ""
"Klont ein Projektarchiv (repository) in ein neu erzeugtes Verzeichnis, "
@@ -22482,15 +22028,14 @@ msgstr ""
"Zus채tzlich wird der gerade aktive Entwicklungszweig (branch) des fernen "
"Projektarchivs lokal angelegt und dessen Inhalte geholt."
-#
#. type: Plain text
#: en/git-clone.txt:34
#, fuzzy
#| msgid ""
-#| "After the clone, a plain `git fetch` without arguments will update all "
-#| "the remote-tracking branches, and a `git pull` without arguments will in "
-#| "addition merge the remote master branch into the current master branch, "
-#| "if any."
+#| "After the clone, a plain `git fetch` without arguments will update all the "
+#| "remote-tracking branches, and a `git pull` without arguments will in "
+#| "addition merge the remote master branch into the current master branch, if "
+#| "any."
msgid ""
"After the clone, a plain `git fetch` without arguments will update all the "
"remote-tracking branches, and a `git pull` without arguments will in "
@@ -22498,29 +22043,27 @@ msgid ""
"any (this is untrue when \"--single-branch\" is given; see below)."
msgstr ""
"Nach dem Klonen werden durch ein einfaches 'git fetch' (ohne weitere "
-"Argumente) lokal alle 'remote-tracking' Entwicklungszweige aktualisiert, ein "
-"Aufruf von 'git pull' wird zus채tzlich die 횆nderungen des fernen "
+"Argumente) lokal alle 'remote-tracking' Entwicklungszweige aktualisiert, ein"
+" Aufruf von 'git pull' wird zus채tzlich die 횆nderungen des fernen "
"Entwicklungszweigs 'master' (falls es einen gibt) in den gleichnamigen "
"lokalen Entwicklungszweig zusammenf체hren."
-#
#. type: Plain text
#: en/git-clone.txt:39
#, fuzzy
#| msgid ""
-#| "This default configuration is achieved by creating references to the "
-#| "remote branch heads under `$GIT_DIR/refs/remotes/origin` and by "
-#| "initializing `remote.origin.url` and `remote.origin.fetch` configuration "
-#| "variables."
+#| "This default configuration is achieved by creating references to the remote "
+#| "branch heads under `$GIT_DIR/refs/remotes/origin` and by initializing "
+#| "`remote.origin.url` and `remote.origin.fetch` configuration variables."
msgid ""
"This default configuration is achieved by creating references to the remote "
-"branch heads under `refs/remotes/origin` and by initializing `remote.origin."
-"url` and `remote.origin.fetch` configuration variables."
+"branch heads under `refs/remotes/origin` and by initializing "
+"`remote.origin.url` and `remote.origin.fetch` configuration variables."
msgstr ""
-"Diese Standardkonfiguration wird durch Anlegen einer Referenz auf den 'HEAD' "
-"des fernen Entwicklungszweigs unter `$GIT_DIR/refs/remotes/origin` und der "
-"Einrichtung der Konfigurationsvariablen `remote.origin.url` und `remote."
-"origin.fetch` erreicht."
+"Diese Standardkonfiguration wird durch Anlegen einer Referenz auf den 'HEAD'"
+" des fernen Entwicklungszweigs unter `$GIT_DIR/refs/remotes/origin` und der "
+"Einrichtung der Konfigurationsvariablen `remote.origin.url` und "
+"`remote.origin.fetch` erreicht."
#. type: Labeled list
#: en/git-clone.txt:43 en/git-config.txt:127 en/git-instaweb.txt:24
@@ -22529,21 +22072,19 @@ msgstr ""
msgid "--local"
msgstr "--local"
-#
#. type: Plain text
#: en/git-clone.txt:51
#, fuzzy
#| msgid ""
-#| "When the repository to clone from is on a local machine, this flag "
-#| "bypasses normal \"git aware\" transport mechanism and clones the "
-#| "repository by making a copy of HEAD and everything under objects and refs "
-#| "directories. The files under `.git/objects/` directory are hardlinked to "
-#| "save space when possible. This is now the default when the source "
-#| "repository is specified with `/path/to/repo` syntax, so it essentially is "
-#| "a no-op option. To force copying instead of hardlinking (which may be "
-#| "desirable if you are trying to make a back-up of your repository), but "
-#| "still avoid the usual \"git aware\" transport mechanism, `--no-hardlinks` "
-#| "can be used."
+#| "When the repository to clone from is on a local machine, this flag bypasses "
+#| "normal \"git aware\" transport mechanism and clones the repository by making"
+#| " a copy of HEAD and everything under objects and refs directories. The "
+#| "files under `.git/objects/` directory are hardlinked to save space when "
+#| "possible. This is now the default when the source repository is specified "
+#| "with `/path/to/repo` syntax, so it essentially is a no-op option. To force "
+#| "copying instead of hardlinking (which may be desirable if you are trying to "
+#| "make a back-up of your repository), but still avoid the usual \"git aware\" "
+#| "transport mechanism, `--no-hardlinks` can be used."
msgid ""
"When the repository to clone from is on a local machine, this flag bypasses "
"the normal \"Git aware\" transport mechanism and clones the repository by "
@@ -22554,23 +22095,23 @@ msgstr ""
"Ist das zu klonende Projektarchiv lokal auf der Maschine, kann durch dieses "
"Flag der normale git Transport Mechanismus umgangen werden und es wird ein "
"einfacher Kopiervorgang von 'HEAD' und allen unter den 'objects' und 'refs' "
-"Verzeichnissen gelegenen Daten durchgef체hrt. Die Dateien unter '.git/"
-"objects/' werden zum Platzsparen mittels hard link referenziert anstatt sie "
-"physikalisch zu kopieren. Dieses Verhalten ist nun der Standard wenn das "
-"Quellarchiv mit '/pfad/zum/archiv' beginnt, und mu횩 somit meist nicht "
-"explizit angegeben werden. Soll der git Transportmechanismus vermieden, aber "
-"echtes kopieren (statt hard linking) erzwungen werden (z.B. wenn man eine "
-"Sicherungskopie des Projektarchivs anlegen will) kann die Option '--no-"
-"hardlinks' verwendet werden."
+"Verzeichnissen gelegenen Daten durchgef체hrt. Die Dateien unter "
+"'.git/objects/' werden zum Platzsparen mittels hard link referenziert "
+"anstatt sie physikalisch zu kopieren. Dieses Verhalten ist nun der Standard "
+"wenn das Quellarchiv mit '/pfad/zum/archiv' beginnt, und mu횩 somit meist "
+"nicht explizit angegeben werden. Soll der git Transportmechanismus "
+"vermieden, aber echtes kopieren (statt hard linking) erzwungen werden (z.B. "
+"wenn man eine Sicherungskopie des Projektarchivs anlegen will) kann die "
+"Option '--no-hardlinks' verwendet werden."
#. type: Plain text
#: en/git-clone.txt:58
msgid ""
-"If the repository is specified as a local path (e.g., `/path/to/repo`), this "
-"is the default, and --local is essentially a no-op. If the repository is "
+"If the repository is specified as a local path (e.g., `/path/to/repo`), this"
+" is the default, and --local is essentially a no-op. If the repository is "
"specified as a URL, then this flag is ignored (and we never use the local "
-"optimizations). Specifying `--no-local` will override the default when `/"
-"path/to/repo` is given, using the regular Git transport instead."
+"optimizations). Specifying `--no-local` will override the default when "
+"`/path/to/repo` is given, using the regular Git transport instead."
msgstr ""
#. type: Labeled list
@@ -22579,7 +22120,6 @@ msgstr ""
msgid "--no-hardlinks"
msgstr "--no-hardlinks"
-#
#. type: Plain text
#: en/git-clone.txt:64
#, fuzzy
@@ -22589,10 +22129,11 @@ msgstr "--no-hardlinks"
msgid ""
"Force the cloning process from a repository on a local filesystem to copy "
"the files under the `.git/objects` directory instead of using hardlinks. "
-"This may be desirable if you are trying to make a back-up of your repository."
+"This may be desirable if you are trying to make a back-up of your "
+"repository."
msgstr ""
-"Erzwinge ein physikalisches Kopieren aller Dateien unter dem '.git/objects/' "
-"Verzeichnis."
+"Erzwinge ein physikalisches Kopieren aller Dateien unter dem '.git/objects/'"
+" Verzeichnis."
#. type: Labeled list
#: en/git-clone.txt:65
@@ -22600,15 +22141,14 @@ msgstr ""
msgid "--shared"
msgstr "--shared"
-#
#. type: Plain text
#: en/git-clone.txt:72
#, fuzzy
#| msgid ""
-#| "When the repository to clone is on the local machine, instead of using "
-#| "hard links, automatically setup .git/objects/info/alternates to share the "
-#| "objects with the source repository. The resulting repository starts out "
-#| "without any object of its own."
+#| "When the repository to clone is on the local machine, instead of using hard "
+#| "links, automatically setup .git/objects/info/alternates to share the objects"
+#| " with the source repository. The resulting repository starts out without "
+#| "any object of its own."
msgid ""
"When the repository to clone is on the local machine, instead of using hard "
"links, automatically setup `.git/objects/info/alternates` to share the "
@@ -22616,9 +22156,9 @@ msgid ""
"without any object of its own."
msgstr ""
"Befindet sich das zu klonende Projektarchiv (repository) lokal auf der "
-"Maschine, dann werden automatisch alle Objkte mittels '.git/objects/info/"
-"alternates' gemeinsam verwendet. Das erzeugte Projektarchiv enth채lt initial "
-"keine eigenen Objekte."
+"Maschine, dann werden automatisch alle Objkte mittels "
+"'.git/objects/info/alternates' gemeinsam verwendet. Das erzeugte "
+"Projektarchiv enth채lt initial keine eigenen Objekte."
#. type: Plain text
#: en/git-clone.txt:82
@@ -22658,9 +22198,9 @@ msgstr ""
#: en/git-clone.txt:88
msgid ""
"Note that running `git repack` without the `-l` option in a repository "
-"cloned with `-s` will copy objects from the source repository into a pack in "
-"the cloned repository, removing the disk space savings of `clone -s`. It is "
-"safe, however, to run `git gc`, which uses the `-l` option by default."
+"cloned with `-s` will copy objects from the source repository into a pack in"
+" the cloned repository, removing the disk space savings of `clone -s`. It "
+"is safe, however, to run `git gc`, which uses the `-l` option by default."
msgstr ""
#. type: Plain text
@@ -22678,19 +22218,18 @@ msgstr ""
msgid "--reference[-if-able] <repository>"
msgstr "--reference <repository>"
-#
#. type: Plain text
#: en/git-clone.txt:103
#, fuzzy
#| msgid ""
-#| "If the reference repository is on the local machine automatically setup ."
-#| "git/objects/info/alternates to obtain objects from the reference "
+#| "If the reference repository is on the local machine automatically setup "
+#| ".git/objects/info/alternates to obtain objects from the reference "
#| "repository. Using an already existing repository as an alternate will "
#| "require fewer objects to be copied from the repository being cloned, "
#| "reducing network and local storage costs."
msgid ""
-"If the reference repository is on the local machine, automatically setup `."
-"git/objects/info/alternates` to obtain objects from the reference "
+"If the reference repository is on the local machine, automatically setup "
+"`.git/objects/info/alternates` to obtain objects from the reference "
"repository. Using an already existing repository as an alternate will "
"require fewer objects to be copied from the repository being cloned, "
"reducing network and local storage costs. When using the `--reference-if-"
@@ -22700,8 +22239,8 @@ msgstr ""
"Befindet sich das zu klonende Projektarchiv (repository) lokal auf der "
"Maschine, dann setze .git/objects/info/alternates so auf, da횩 Objekte "
"automatisch vom original Projektarchiv genommen werden. Wird ein bereits "
-"bestehendes Projektarchiv als 'alternativ' angegeben, m체ssen weniger Objekte "
-"von diesem kopiert werden, wodurch weniger Plattenplatz und Bandbreite auf "
+"bestehendes Projektarchiv als 'alternativ' angegeben, m체ssen weniger Objekte"
+" von diesem kopiert werden, wodurch weniger Plattenplatz und Bandbreite auf "
"dem Netzwerk verbraucht werden."
#. type: Plain text
@@ -22716,21 +22255,20 @@ msgstr ""
#: en/git-clone.txt:107
#, no-wrap
msgid "--dissociate"
-msgstr ""
+msgstr "--dissociate"
#. type: Plain text
#: en/git-clone.txt:117
msgid ""
-"Borrow the objects from reference repositories specified with the `--"
-"reference` options only to reduce network transfer, and stop borrowing from "
-"them after a clone is made by making necessary local copies of borrowed "
-"objects. This option can also be used when cloning locally from a "
+"Borrow the objects from reference repositories specified with the "
+"`--reference` options only to reduce network transfer, and stop borrowing "
+"from them after a clone is made by making necessary local copies of borrowed"
+" objects. This option can also be used when cloning locally from a "
"repository that already borrows objects from another repository--the new "
-"repository will borrow objects from the same repository, and this option can "
-"be used to stop the borrowing."
+"repository will borrow objects from the same repository, and this option can"
+" be used to stop the borrowing."
msgstr ""
-#
#. type: Plain text
#: en/git-clone.txt:122
#, fuzzy
@@ -22750,7 +22288,6 @@ msgid ""
"standard error stream."
msgstr ""
-#
#. type: Plain text
#: en/git-clone.txt:137
msgid "No checkout of HEAD is performed after the clone is complete."
@@ -22763,48 +22300,47 @@ msgstr ""
msgid "--bare"
msgstr "--bare"
-#
#. type: Plain text
#: en/git-clone.txt:149
#, fuzzy
#| msgid ""
#| "Make a 'bare' GIT repository. That is, instead of creating `<directory>` "
#| "and placing the administrative files in `<directory>/.git`, make the "
-#| "`<directory>` itself the `$GIT_DIR`. This obviously implies the `-n` "
-#| "because there is nowhere to check out the working tree. Also the branch "
-#| "heads at the remote are copied directly to corresponding local branch "
-#| "heads, without mapping them to `refs/remotes/origin/`. When this option "
-#| "is used, neither remote-tracking branches nor the related configuration "
-#| "variables are created."
+#| "`<directory>` itself the `$GIT_DIR`. This obviously implies the `-n` because"
+#| " there is nowhere to check out the working tree. Also the branch heads at "
+#| "the remote are copied directly to corresponding local branch heads, without "
+#| "mapping them to `refs/remotes/origin/`. When this option is used, neither "
+#| "remote-tracking branches nor the related configuration variables are "
+#| "created."
msgid ""
"Make a 'bare' Git repository. That is, instead of creating `<directory>` "
"and placing the administrative files in `<directory>/.git`, make the "
-"`<directory>` itself the `$GIT_DIR`. This obviously implies the `-n` because "
-"there is nowhere to check out the working tree. Also the branch heads at "
+"`<directory>` itself the `$GIT_DIR`. This obviously implies the `-n` because"
+" there is nowhere to check out the working tree. Also the branch heads at "
"the remote are copied directly to corresponding local branch heads, without "
"mapping them to `refs/remotes/origin/`. When this option is used, neither "
-"remote-tracking branches nor the related configuration variables are created."
+"remote-tracking branches nor the related configuration variables are "
+"created."
msgstr ""
"Erzeuge ein 'reines' GIT repository, d.h. anstatt ein '<verzeichnis>' zu "
"erzeugen und die administrativen Dateien unter '<verzeichnis>/.git' "
-"abzulegen werden diese direkt unter '<verzeichnis>' als '$GIT_DIR' "
-"abgelegt. Dies impliziert die '-n' Option, da ein Abrufen (checkout) des "
+"abzulegen werden diese direkt unter '<verzeichnis>' als '$GIT_DIR' abgelegt."
+" Dies impliziert die '-n' Option, da ein Abrufen (checkout) des "
"Arbeitsbereichs offensichtlich nicht m철glich ist. Zus채tzlcih werden die "
"Entwicklungszweige des fernen Projektarchivs direkt zu den entsprechenden "
-"lokalen Entwicklungszweigen kopiert, ohne Zuordnungen 체ber 'refs/remotes/"
-"origin/' anzulegen. Wird diese Option angegeben, so werden weder remote-"
-"tracking Entwicklungszweige noch die dazugeh철rigen Konfigurationsvariablen "
-"angelegt. Also the branch heads at the remote are copied directly to "
-"corresponding local branch heads, without mapping them to `refs/remotes/"
-"origin/`. When this option is used, neither remote-tracking branches nor "
-"the related configuration variables are created."
+"lokalen Entwicklungszweigen kopiert, ohne Zuordnungen 체ber "
+"'refs/remotes/origin/' anzulegen. Wird diese Option angegeben, so werden "
+"weder remote-tracking Entwicklungszweige noch die dazugeh철rigen "
+"Konfigurationsvariablen angelegt. Also the branch heads at the remote are "
+"copied directly to corresponding local branch heads, without mapping them to"
+" `refs/remotes/origin/`. When this option is used, neither remote-tracking "
+"branches nor the related configuration variables are created."
#. type: Labeled list
#: en/git-clone.txt:150 en/git-push.txt:106
-#, fuzzy, no-wrap
-#| msgid "--ignore-errors"
+#, no-wrap
msgid "--mirror"
-msgstr "--ignore-errors"
+msgstr "--mirror"
#. type: Plain text
#: en/git-clone.txt:157
@@ -22813,7 +22349,8 @@ msgid ""
"to `--bare`, `--mirror` not only maps local branches of the source to local "
"branches of the target, it maps all refs (including remote-tracking "
"branches, notes etc.) and sets up a refspec configuration such that all "
-"these refs are overwritten by a `git remote update` in the target repository."
+"these refs are overwritten by a `git remote update` in the target "
+"repository."
msgstr ""
#. type: Labeled list
@@ -22828,7 +22365,6 @@ msgstr "--origin <name>"
msgid "-o <name>"
msgstr "-o <name>"
-#
#. type: Plain text
#: en/git-clone.txt:162
#, fuzzy
@@ -22872,7 +22408,6 @@ msgstr ""
msgid "-u <upload-pack>"
msgstr "-u <upload-pack>"
-#
#. type: Plain text
#: en/git-clone.txt:177
msgid ""
@@ -22892,8 +22427,8 @@ msgstr "--template=<template_directory>"
#. type: Plain text
#: en/git-clone.txt:181
msgid ""
-"Specify the directory from which templates will be used; (See the \"TEMPLATE "
-"DIRECTORY\" section of linkgit:git-init[1].)"
+"Specify the directory from which templates will be used; (See the \"TEMPLATE"
+" DIRECTORY\" section of linkgit:git-init[1].)"
msgstr ""
#. type: Labeled list
@@ -22929,8 +22464,8 @@ msgstr "--depth <depth>"
#. type: Plain text
#: en/git-clone.txt:199
msgid ""
-"Create a 'shallow' clone with a history truncated to the specified number of "
-"commits. Implies `--single-branch` unless `--no-single-branch` is given to "
+"Create a 'shallow' clone with a history truncated to the specified number of"
+" commits. Implies `--single-branch` unless `--no-single-branch` is given to "
"fetch the histories near the tips of all branches. If you want to clone "
"submodules shallowly, also pass `--shallow-submodules`."
msgstr ""
@@ -22944,14 +22479,15 @@ msgstr ""
#: en/git-clone.txt:207
msgid ""
"Create a shallow clone with a history, excluding commits reachable from a "
-"specified remote branch or tag. This option can be specified multiple times."
+"specified remote branch or tag. This option can be specified multiple "
+"times."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:208
#, no-wrap
msgid "--[no-]single-branch"
-msgstr ""
+msgstr "--[no-]single-branch"
#. type: Plain text
#: en/git-clone.txt:217
@@ -22960,38 +22496,37 @@ msgid ""
"specified by the `--branch` option or the primary branch remote's `HEAD` "
"points at. Further fetches into the resulting repository will only update "
"the remote-tracking branch for the branch this option was used for the "
-"initial cloning. If the HEAD at the remote did not point at any branch when "
-"`--single-branch` clone was made, no remote-tracking branch is created."
+"initial cloning. If the HEAD at the remote did not point at any branch when"
+" `--single-branch` clone was made, no remote-tracking branch is created."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:218 en/git-submodule.txt:400
-#, fuzzy, no-wrap
-#| msgid "--refresh"
+#, no-wrap
msgid "--recursive"
-msgstr "--refresh"
+msgstr "--recursive"
#. type: Labeled list
#: en/git-clone.txt:219 en/git-grep.txt:92 en/git-ls-files.txt:142
#, no-wrap
msgid "--recurse-submodules"
-msgstr ""
+msgstr "--recurse-submodules"
#. type: Plain text
#: en/git-clone.txt:226
msgid ""
"After the clone is created, initialize all submodules within, using their "
-"default settings. This is equivalent to running `git submodule update --init "
-"--recursive` immediately after the clone is finished. This option is ignored "
-"if the cloned repository does not have a worktree/checkout (i.e. if any of "
-"`--no-checkout`/`-n`, `--bare`, or `--mirror` is given)"
+"default settings. This is equivalent to running `git submodule update --init"
+" --recursive` immediately after the clone is finished. This option is "
+"ignored if the cloned repository does not have a worktree/checkout (i.e. if "
+"any of `--no-checkout`/`-n`, `--bare`, or `--mirror` is given)"
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:227
#, no-wrap
msgid "--[no-]shallow-submodules"
-msgstr ""
+msgstr "--[no-]shallow-submodules"
#. type: Plain text
#: en/git-clone.txt:229
@@ -23039,15 +22574,14 @@ msgstr ""
msgid "<repository>"
msgstr "<repository>"
-#
#. type: Plain text
#: en/git-clone.txt:246
msgid ""
"The (possibly remote) repository to clone from. See the <<URLS,URLS>> "
"section below for more information on specifying repositories."
msgstr ""
-"Das (m철glicherweise ferne) Projektarchiv das geklont werden soll. Siehe die "
-"<<URLS,URLS>> Sektion f체r weitere Information wie Projektarchive angegeben "
+"Das (m철glicherweise ferne) Projektarchiv das geklont werden soll. Siehe die"
+" <<URLS,URLS>> Sektion f체r weitere Information wie Projektarchive angegeben "
"werden k철nnen."
#. type: Labeled list
@@ -23058,19 +22592,18 @@ msgstr ""
msgid "<directory>"
msgstr "<directory>"
-#
#. type: Plain text
#: en/git-clone.txt:253
#, fuzzy
#| msgid ""
#| "The name of a new directory to clone into. The \"humanish\" part of the "
-#| "source repository is used if no directory is explicitly given (\"repo\" "
-#| "for \"/path/to/repo.git\" and \"foo\" for \"host.xz:foo/.git\"). Cloning "
-#| "into an existing directory is not allowed."
+#| "source repository is used if no directory is explicitly given (\"repo\" for "
+#| "\"/path/to/repo.git\" and \"foo\" for \"host.xz:foo/.git\"). Cloning into "
+#| "an existing directory is not allowed."
msgid ""
"The name of a new directory to clone into. The \"humanish\" part of the "
-"source repository is used if no directory is explicitly given (`repo` for `/"
-"path/to/repo.git` and `foo` for `host.xz:foo/.git`). Cloning into an "
+"source repository is used if no directory is explicitly given (`repo` for "
+"`/path/to/repo.git` and `foo` for `host.xz:foo/.git`). Cloning into an "
"existing directory is only allowed if the directory is empty."
msgstr ""
"Der Name eines neuen Verzeichnisses in das gekloned wird. Falls kein "
@@ -23106,11 +22639,11 @@ msgstr ""
#: en/git-clone.txt:270
#, fuzzy
#| msgid ""
-#| "Make a local clone that borrows from the current directory, without "
-#| "checking things out"
+#| "Make a local clone that borrows from the current directory, without checking"
+#| " things out"
msgid ""
-"Make a local clone that borrows from the current directory, without checking "
-"things out:"
+"Make a local clone that borrows from the current directory, without checking"
+" things out:"
msgstr ""
"Erzeuge einen lokalen Klon der vom aktuellen Verzeichnis borgt, ohne 'git "
"checkout' durchzuf체hren"
@@ -23130,7 +22663,8 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:279
#, fuzzy
-#| msgid "Clone from upstream while borrowing from an existing local directory"
+#| msgid ""
+#| "Clone from upstream while borrowing from an existing local directory"
msgid "Clone from upstream while borrowing from an existing local directory:"
msgstr ""
"Klone ein 'fernes' Projektarchiv w채hrend Objekte von einem lokalen "
@@ -23158,7 +22692,8 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:289
#, fuzzy
-#| msgid "Create a bare repository to publish your changes to the public"
+#| msgid ""
+#| "Create a bare repository to publish your changes to the public"
msgid "Create a bare repository to publish your changes to the public:"
msgstr "Erzeuge ein 'reines' Projektarchiv um 횆nderungen publik zu machen"
@@ -23170,10 +22705,9 @@ msgstr "$ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n"
#. type: Title =
#: en/git-column.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-clone(1)"
+#, no-wrap
msgid "git-column(1)"
-msgstr "git-clone(1)"
+msgstr "git-column(1)"
#. type: Plain text
#: en/git-column.txt:7
@@ -23203,7 +22737,8 @@ msgstr "--origin <name>"
#. type: Plain text
#: en/git-column.txt:23
msgid ""
-"Look up layout mode using configuration variable column.<name> and column.ui."
+"Look up layout mode using configuration variable column.<name> and "
+"column.ui."
msgstr ""
#. type: Labeled list
@@ -23241,8 +22776,8 @@ msgstr ""
#. type: Plain text
#: en/git-column.txt:35
msgid ""
-"Specify the terminal width. By default 'git column' will detect the terminal "
-"width, or fall back to 80 if it is unable to do so."
+"Specify the terminal width. By default 'git column' will detect the terminal"
+" width, or fall back to 80 if it is unable to do so."
msgstr ""
#. type: Labeled list
@@ -23281,12 +22816,10 @@ msgstr ""
#. type: Title =
#: en/git-commit-tree.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-commit-tree(1)"
-msgstr "git-commit(1)"
+msgstr "git-commit-tree(1)"
-#
#. type: Plain text
#: en/git-commit-tree.txt:7
#, fuzzy
@@ -23306,8 +22839,8 @@ msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:21
msgid ""
-"This is usually not what an end user wants to run directly. See linkgit:git-"
-"commit[1] instead."
+"This is usually not what an end user wants to run directly. See "
+"linkgit:git-commit[1] instead."
msgstr ""
#. type: Plain text
@@ -23329,15 +22862,15 @@ msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:34
msgid ""
-"While a tree represents a particular directory state of a working directory, "
-"a commit represents that state in \"time\", and explains how to get there."
+"While a tree represents a particular directory state of a working directory,"
+" a commit represents that state in \"time\", and explains how to get there."
msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:40
msgid ""
-"Normally a commit would identify a new \"HEAD\" state, and while Git doesn't "
-"care where you save the note about that state, in practice we tend to just "
+"Normally a commit would identify a new \"HEAD\" state, and while Git doesn't"
+" care where you save the note about that state, in practice we tend to just "
"write the result to the file that is pointed at by `.git/HEAD`, so that we "
"can always see what the last committed state was."
msgstr ""
@@ -23385,7 +22918,6 @@ msgstr ""
msgid "-F <file>"
msgstr "-F <file>"
-#
#. type: Plain text
#: en/git-commit-tree.txt:56
#, fuzzy
@@ -23396,15 +22928,14 @@ msgid ""
"Read the commit log message from the given file. Use `-` to read from the "
"standard input."
msgstr ""
-"Nimm die Eintragungsbemerkung (commit message) der spezifizierten Datei. Mit "
-"'-' wird die Bemerkung von der Standard Eingabe gelesen."
+"Nimm die Eintragungsbemerkung (commit message) der spezifizierten Datei. Mit"
+" '-' wird die Bemerkung von der Standard Eingabe gelesen."
#. type: Labeled list
#: en/git-commit-tree.txt:63 en/git-commit.txt:332
-#, fuzzy, no-wrap
-#| msgid "--log-size"
+#, no-wrap
msgid "--no-gpg-sign"
-msgstr "--log-size"
+msgstr "--no-gpg-sign"
#. type: Plain text
#: en/git-commit-tree.txt:66
@@ -23470,9 +23001,10 @@ msgstr ""
msgid ""
"In case (some of) these environment variables are not set, the information "
"is taken from the configuration items user.name and user.email, or, if not "
-"present, the environment variable EMAIL, or, if that is not set, system user "
-"name and the hostname used for outgoing mail (taken from `/etc/mailname` and "
-"falling back to the fully qualified hostname when that file does not exist)."
+"present, the environment variable EMAIL, or, if that is not set, system user"
+" name and the hostname used for outgoing mail (taken from `/etc/mailname` "
+"and falling back to the fully qualified hostname when that file does not "
+"exist)."
msgstr ""
#. type: Plain text
@@ -23508,7 +23040,6 @@ msgstr ""
msgid "git-commit(1)"
msgstr "git-commit(1)"
-#
#. type: Plain text
#: en/git-commit.txt:7
msgid "git-commit - Record changes to the repository"
@@ -23535,7 +23066,6 @@ msgstr ""
"\t [--allow-empty] [--no-verify] [-e] [--author=<author>]\n"
"\t [--cleanup=<mode>] [--] [[-i | -o ]<file>...]\n"
-#
#. type: Plain text
#: en/git-commit.txt:22
msgid ""
@@ -23546,13 +23076,11 @@ msgstr ""
"des Benutzers beschreibenden Log Nachricht als neue Eintragung (commit) im "
"Projektarchiv."
-#
#. type: Plain text
#: en/git-commit.txt:24
msgid "The content to be added can be specified in several ways:"
msgstr "Der neue Inhalt kann auf verschiedene Arten angegeben werden:"
-#
#. type: Plain text
#: en/git-commit.txt:28
#, fuzzy
@@ -23567,21 +23095,19 @@ msgstr ""
"Befehls, schrittweise zum Index hinzuzuf체gen (Anmerkung: auch lediglich "
"modifizierte Dateien m체ssen \"hinzugef체gt\" werden);"
-#
#. type: Plain text
#: en/git-commit.txt:31
#, fuzzy
#| msgid ""
-#| "by using 'git-rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git-rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid ""
-"by using 'git rm' to remove files from the working tree and the index, again "
-"before using the 'commit' command;"
+"by using 'git rm' to remove files from the working tree and the index, again"
+" before using the 'commit' command;"
msgstr ""
"Durch Verwendung von 'git-rm' um Dateien, vor Aufruf des 'git commit' "
"Befehls, aus dem Arbeitsbereich, und dem Index zu entfernen,"
-#
#. type: Plain text
#: en/git-commit.txt:37
#, fuzzy
@@ -23590,24 +23116,23 @@ msgstr ""
#| "commit will ignore changes staged in the index, and instead record the "
#| "current content of the listed files;"
msgid ""
-"by listing files as arguments to the 'commit' command (without --interactive "
-"or --patch switch), in which case the commit will ignore changes staged in "
-"the index, and instead record the current content of the listed files (which "
-"must already be known to Git);"
+"by listing files as arguments to the 'commit' command (without --interactive"
+" or --patch switch), in which case the commit will ignore changes staged in "
+"the index, and instead record the current content of the listed files (which"
+" must already be known to Git);"
msgstr ""
-"Durch die Angabe von Dateien als Argumente des 'git commit' Befehls, wodurch "
-"die Eintragung (commit) aller im Index vorgemerkten 횆nderungen ignoriert "
+"Durch die Angabe von Dateien als Argumente des 'git commit' Befehls, wodurch"
+" die Eintragung (commit) aller im Index vorgemerkten 횆nderungen ignoriert "
"wird, und statt dessen der aktuelle Inhalt der aufgez채hlten Dateien im "
"Projektarchiv (repository) eingetragen wird."
-#
#. type: Plain text
#: en/git-commit.txt:43
msgid ""
"by using the -a switch with the 'commit' command to automatically \"add\" "
"changes from all known files (i.e. all files that are already listed in the "
-"index) and to automatically \"rm\" files in the index that have been removed "
-"from the working tree, and then perform the actual commit;"
+"index) and to automatically \"rm\" files in the index that have been removed"
+" from the working tree, and then perform the actual commit;"
msgstr ""
"Durch Verwendung des -a Schalters des 'git commit' Befehls, um zuvor "
"automatisch die 횆nderungen aller bekannten Dateien (also aller Dateien die "
@@ -23615,13 +23140,12 @@ msgstr ""
"alle Dateien die aus dem Arbeitsbereich gel철scht wurden zu entfernen ('git "
"rm')."
-#
#. type: Plain text
#: en/git-commit.txt:49
#, fuzzy
#| msgid ""
-#| "by using the --interactive switch with the 'commit' command to decide one "
-#| "by one which files should be part of the commit, before finalizing the "
+#| "by using the --interactive switch with the 'commit' command to decide one by"
+#| " one which files should be part of the commit, before finalizing the "
#| "operation. Currently, this is done by invoking 'git-add --interactive'."
msgid ""
"by using the --interactive or --patch switches with the 'commit' command to "
@@ -23635,39 +23159,36 @@ msgstr ""
"(commit) sein soll. Dies wird derzeit durch 'git-add --interactive' "
"bewerkstelligt."
-#
#. type: Plain text
#: en/git-commit.txt:53
#, fuzzy
#| msgid ""
-#| "The 'git-status' command can be used to obtain a summary of what is "
-#| "included by any of the above for the next commit by giving the same set "
-#| "of parameters you would give to this command."
+#| "The 'git-status' command can be used to obtain a summary of what is included"
+#| " by any of the above for the next commit by giving the same set of "
+#| "parameters you would give to this command."
msgid ""
"The `--dry-run` option can be used to obtain a summary of what is included "
-"by any of the above for the next commit by giving the same set of parameters "
-"(options and paths)."
+"by any of the above for the next commit by giving the same set of parameters"
+" (options and paths)."
msgstr ""
"Der 'git-status' Befehl kann, durch Angabe der selben Parameter die man f체r "
"'git commit' benutzen w체rde, dazu verwendet werden, um einen 횥berblick "
"dar체ber zu erhalten, welche Dateien bei jeder der obigen Optionen in der "
"n채chsten Eintragung (commit) beinhaltet sein w체rden."
-#
#. type: Plain text
#: en/git-commit.txt:56
#, fuzzy
#| msgid ""
-#| "If you make a commit and then find a mistake immediately after that, you "
-#| "can recover from it with 'git-reset'."
+#| "If you make a commit and then find a mistake immediately after that, you can"
+#| " recover from it with 'git-reset'."
msgid ""
-"If you make a commit and then find a mistake immediately after that, you can "
-"recover from it with 'git reset'."
+"If you make a commit and then find a mistake immediately after that, you can"
+" recover from it with 'git reset'."
msgstr ""
"Wurde eine Eintragung (commit) durchgef체hrt und unmittelbar danach ein "
"Fehler erkannt, so kann diese mit 'git-reset' r체ckg채ngig gemacht werden."
-#
#. type: Plain text
#: en/git-commit.txt:65
#, fuzzy
@@ -23680,8 +23201,8 @@ msgid ""
msgstr ""
"F체hre die Bereitstellung (staging) und Eintragung (commit) aller "
"modifizierten und gel철schten Dateien durch. Es werden ausschlie횩lich "
-"Dateien behandelt die in git bekannt sind, alle f체r git neuen Dateien werden "
-"somit nicht eingetragen."
+"Dateien behandelt die in git bekannt sind, alle f체r git neuen Dateien werden"
+" somit nicht eingetragen."
#. type: Plain text
#: en/git-commit.txt:71
@@ -23702,12 +23223,11 @@ msgstr "-C <commit>"
msgid "--reuse-message=<commit>"
msgstr "--reuse-message=<commit>"
-#
#. type: Plain text
#: en/git-commit.txt:77
msgid ""
-"Take an existing commit object, and reuse the log message and the authorship "
-"information (including the timestamp) when creating the commit."
+"Take an existing commit object, and reuse the log message and the authorship"
+" information (including the timestamp) when creating the commit."
msgstr ""
"Nimm eine existierende Eintragung (commit) und verwende die "
"Eintragungsbemerkung (commit message) und die Autoreninformation (inklusive "
@@ -23725,19 +23245,18 @@ msgstr "-c <commit>"
msgid "--reedit-message=<commit>"
msgstr "--reedit-message=<commit>"
-#
#. type: Plain text
#: en/git-commit.txt:82
#, fuzzy
#| msgid ""
-#| "Like '-C', but with '-c' the editor is invoked, so that the user can "
-#| "further edit the commit message."
+#| "Like '-C', but with '-c' the editor is invoked, so that the user can further"
+#| " edit the commit message."
msgid ""
-"Like '-C', but with `-c` the editor is invoked, so that the user can further "
-"edit the commit message."
+"Like '-C', but with `-c` the editor is invoked, so that the user can further"
+" edit the commit message."
msgstr ""
-"횆hnlich wie '-C' allerdings wird mit '-c' der Editor aufgerufen, wodurch der "
-"Benutzer die Eintragungsbemerkung vor der Eintragung 체berarbeiten kann."
+"횆hnlich wie '-C' allerdings wird mit '-c' der Editor aufgerufen, wodurch der"
+" Benutzer die Eintragungsbemerkung vor der Eintragung 체berarbeiten kann."
#. type: Labeled list
#: en/git-commit.txt:83
@@ -23766,31 +23285,30 @@ msgstr "--contains <commit>"
msgid ""
"Construct a commit message for use with `rebase --autosquash`. The commit "
"message subject line is taken from the specified commit with a prefix of "
-"\"squash! \". Can be used with additional commit message options (`-m`/`-c`/"
-"`-C`/`-F`). See linkgit:git-rebase[1] for details."
+"\"squash! \". Can be used with additional commit message options "
+"(`-m`/`-c`/`-C`/`-F`). See linkgit:git-rebase[1] for details."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:96
#, no-wrap
msgid "--reset-author"
-msgstr ""
+msgstr "--reset-author"
#. type: Plain text
#: en/git-commit.txt:101
msgid ""
"When used with -C/-c/--amend options, or when committing after a a "
-"conflicting cherry-pick, declare that the authorship of the resulting commit "
-"now belongs to the committer. This also renews the author timestamp."
+"conflicting cherry-pick, declare that the authorship of the resulting commit"
+" now belongs to the committer. This also renews the author timestamp."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:102 en/git-rev-parse.txt:139 en/git-status.txt:28
#: en/git-symbolic-ref.txt:45
-#, fuzzy, no-wrap
-#| msgid "--shared"
+#, no-wrap
msgid "--short"
-msgstr "--shared"
+msgstr "--short"
#. type: Plain text
#: en/git-commit.txt:105
@@ -23801,10 +23319,9 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:106 en/git-status.txt:32 en/git-submodule.txt:280
-#, fuzzy, no-wrap
-#| msgid "<branch>"
+#, no-wrap
msgid "--branch"
-msgstr "<branch>"
+msgstr "--branch"
#. type: Plain text
#: en/git-commit.txt:108 en/git-status.txt:34
@@ -23821,10 +23338,9 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:114 en/git-describe.txt:74 en/git-ls-tree.txt:52
#: en/git-status.txt:44
-#, fuzzy, no-wrap
-#| msgid "--log-size"
+#, no-wrap
msgid "--long"
-msgstr "--log-size"
+msgstr "--long"
#. type: Plain text
#: en/git-commit.txt:117
@@ -23843,8 +23359,8 @@ msgstr "--null"
#: en/git-commit.txt:126
msgid ""
"When showing `short` or `porcelain` status output, print the filename "
-"verbatim and terminate the entries with NUL, instead of LF. If no format is "
-"given, implies the `--porcelain` output format. Without the `-z` option, "
+"verbatim and terminate the entries with NUL, instead of LF. If no format is"
+" given, implies the `--porcelain` output format. Without the `-z` option, "
"filenames with \"unusual\" characters are quoted as explained for the "
"configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr ""
@@ -23855,15 +23371,14 @@ msgstr ""
msgid "--file=<file>"
msgstr "--file=<file>"
-#
#. type: Plain text
#: en/git-commit.txt:131
msgid ""
"Take the commit message from the given file. Use '-' to read the message "
"from the standard input."
msgstr ""
-"Nimm die Eintragungsbemerkung (commit message) der spezifizierten Datei. Mit "
-"'-' wird die Bemerkung von der Standard Eingabe gelesen."
+"Nimm die Eintragungsbemerkung (commit message) der spezifizierten Datei. Mit"
+" '-' wird die Bemerkung von der Standard Eingabe gelesen."
#. type: Labeled list
#: en/git-commit.txt:132
@@ -23874,8 +23389,8 @@ msgstr "--author=<author>"
#. type: Plain text
#: en/git-commit.txt:138
msgid ""
-"Override the commit author. Specify an explicit author using the standard `A "
-"U Thor <author@example.com>` format. Otherwise <author> is assumed to be a "
+"Override the commit author. Specify an explicit author using the standard `A"
+" U Thor <author@example.com>` format. Otherwise <author> is assumed to be a "
"pattern and is used to search for an existing commit by that author (i.e. "
"rev-list --all -i --author=<author>); the commit author is then copied from "
"the first such commit found."
@@ -23888,7 +23403,6 @@ msgstr ""
msgid "--date=<date>"
msgstr "--template=<file>"
-#
#. type: Plain text
#: en/git-commit.txt:141
#, fuzzy
@@ -23934,10 +23448,10 @@ msgid ""
"When editing the commit message, start the editor with the contents in the "
"given file. The `commit.template` configuration variable is often used to "
"give this option implicitly to the command. This mechanism can be used by "
-"projects that want to guide participants with some hints on what to write in "
-"the message in what order. If the user exits the editor without editing the "
-"message, the commit is aborted. This has no effect when a message is given "
-"by other means, e.g. with the `-m` or `-F` options."
+"projects that want to guide participants with some hints on what to write in"
+" the message in what order. If the user exits the editor without editing "
+"the message, the commit is aborted. This has no effect when a message is "
+"given by other means, e.g. with the `-m` or `-F` options."
msgstr ""
#. type: Plain text
@@ -23946,8 +23460,8 @@ msgid ""
"Add Signed-off-by line by the committer at the end of the commit log "
"message. The meaning of a signoff depends on the project, but it typically "
"certifies that committer has the rights to submit this work under the same "
-"license and agrees to a Developer Certificate of Origin (see http://"
-"developercertificate.org/ for more information)."
+"license and agrees to a Developer Certificate of Origin (see "
+"http://developercertificate.org/ for more information)."
msgstr ""
#. type: Labeled list
@@ -23956,33 +23470,31 @@ msgstr ""
msgid "--no-verify"
msgstr "--no-verify"
-#
#. type: Plain text
#: en/git-commit.txt:172
msgid ""
-"This option bypasses the pre-commit and commit-msg hooks. See also linkgit:"
-"githooks[5]."
+"This option bypasses the pre-commit and commit-msg hooks. See also "
+"linkgit:githooks[5]."
msgstr ""
-"Diese Option schaltet die pre-commit und commit-msg Einsprungspunkte (hooks) "
-"aus. Siehe auch linkgit:githooks[5]."
+"Diese Option schaltet die pre-commit und commit-msg Einsprungspunkte (hooks)"
+" aus. Siehe auch linkgit:githooks[5]."
-#
#. type: Plain text
#: en/git-commit.txt:178
#, fuzzy
#| msgid ""
-#| "Usually recording a commit that has the exact same tree as its sole "
-#| "parent commit is a mistake, and the command prevents you from making such "
-#| "a commit. This option bypasses the safety, and is primarily for use by "
-#| "foreign scm interface scripts."
+#| "Usually recording a commit that has the exact same tree as its sole parent "
+#| "commit is a mistake, and the command prevents you from making such a commit."
+#| " This option bypasses the safety, and is primarily for use by foreign scm "
+#| "interface scripts."
msgid ""
"Usually recording a commit that has the exact same tree as its sole parent "
-"commit is a mistake, and the command prevents you from making such a "
-"commit. This option bypasses the safety, and is primarily for use by "
-"foreign SCM interface scripts."
+"commit is a mistake, and the command prevents you from making such a commit."
+" This option bypasses the safety, and is primarily for use by foreign SCM "
+"interface scripts."
msgstr ""
-"Normalerweise ist das Aufzeichnen einer Eintragung welche exakt den gleichen "
-"Inhalt wie sein Vorg채nger hat ein Fehler, und 'git commit' verhindert eine "
+"Normalerweise ist das Aufzeichnen einer Eintragung welche exakt den gleichen"
+" Inhalt wie sein Vorg채nger hat ein Fehler, und 'git commit' verhindert eine "
"derartige Eintragung. Mit dieser Option kann diese Sicherheitsvorkehrung "
"ausgeschalten werden, was haupts채chlich f체r fremde SCM Schnittstellen-"
"Skripte verwendet wird."
@@ -24054,8 +23566,9 @@ msgstr ""
#: en/git-commit.txt:204
msgid ""
"Same as `whitespace`, except that everything from (and including) the line "
-"\"`# ------------------------ >8 ------------------------`\" is truncated if "
-"the message is to be edited. \"`#`\" can be customized with core.commentChar."
+"\"`# ------------------------ >8 ------------------------`\" is truncated if"
+" the message is to be edited. \"`#`\" can be customized with "
+"core.commentChar."
msgstr ""
#. type: Labeled list
@@ -24070,32 +23583,29 @@ msgid ""
"Same as `strip` if the message is to be edited. Otherwise `whitespace`."
msgstr ""
-#
#. type: Plain text
#: en/git-commit.txt:211
#, fuzzy
#| msgid ""
#| "The remote configuration is achieved using the `remote.origin.url` and "
-#| "`remote.origin.fetch` configuration variables. (See linkgit:git-"
-#| "config[1])."
+#| "`remote.origin.fetch` configuration variables. (See linkgit:git-config[1])."
msgid ""
"The default can be changed by the `commit.cleanup` configuration variable "
"(see linkgit:git-config[1])."
msgstr ""
"The remote configuration is achieved using the `remote.origin.url` and "
-"`remote.origin.fetch` configuration variables. (See linkgit:git-"
-"config[1]). Die Konfiguration entfernter Repositories wird durch die "
+"`remote.origin.fetch` configuration variables. (See linkgit:git-config[1])."
+" Die Konfiguration entfernter Repositories wird durch die "
"Konfigurationsvariablen `remote.origin.url` und `remote.origin.fetch` "
"erreicht. (Siehe linkgit:git-config[1])."
-#
#. type: Plain text
#: en/git-commit.txt:218
#, fuzzy
#| msgid ""
-#| "The message taken from file with `-F`, command line with `-m`, and from "
-#| "file with `-C` are usually used as the commit log message unmodified. "
-#| "This option lets you further edit the message taken from these sources."
+#| "The message taken from file with `-F`, command line with `-m`, and from file"
+#| " with `-C` are usually used as the commit log message unmodified. This "
+#| "option lets you further edit the message taken from these sources."
msgid ""
"The message taken from file with `-F`, command line with `-m`, and from "
"commit object with `-C` are usually used as the commit log message "
@@ -24109,10 +23619,9 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:219 en/git-revert.txt:65 en/merge-options.txt:12
-#, fuzzy, no-wrap
-#| msgid "--edit"
+#, no-wrap
msgid "--no-edit"
-msgstr "--edit"
+msgstr "--no-edit"
#. type: Plain text
#: en/git-commit.txt:223
@@ -24131,16 +23640,15 @@ msgstr "--amend"
#. type: Plain text
#: en/git-commit.txt:234
msgid ""
-"Replace the tip of the current branch by creating a new commit. The recorded "
-"tree is prepared as usual (including the effect of the `-i` and `-o` options "
-"and explicit pathspec), and the message from the original commit is used as "
-"the starting point, instead of an empty message, when no other message is "
-"specified from the command line via options such as `-m`, `-F`, `-c`, etc. "
-"The new commit has the same parents and author as the current one (the `--"
-"reset-author` option can countermand this)."
+"Replace the tip of the current branch by creating a new commit. The recorded"
+" tree is prepared as usual (including the effect of the `-i` and `-o` "
+"options and explicit pathspec), and the message from the original commit is "
+"used as the starting point, instead of an empty message, when no other "
+"message is specified from the command line via options such as `-m`, `-F`, "
+"`-c`, etc. The new commit has the same parents and author as the current "
+"one (the `--reset-author` option can countermand this)."
msgstr ""
-#
#. type: Plain text
#: en/git-commit.txt:237
msgid "It is a rough equivalent for:"
@@ -24158,7 +23666,6 @@ msgstr ""
"\t$ ... f체hre die notwendigen 횆nderungen im Index durch ...\n"
"\t$ git commit -c ORIG_HEAD\n"
-#
#. type: Plain text
#: en/git-commit.txt:244
msgid "but can be used to amend a merge commit."
@@ -24170,15 +23677,15 @@ msgstr ""
#: en/git-commit.txt:249
msgid ""
"You should understand the implications of rewriting history if you amend a "
-"commit that has already been published. (See the \"RECOVERING FROM UPSTREAM "
-"REBASE\" section in linkgit:git-rebase[1].)"
+"commit that has already been published. (See the \"RECOVERING FROM UPSTREAM"
+" REBASE\" section in linkgit:git-rebase[1].)"
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:250
#, no-wrap
msgid "--no-post-rewrite"
-msgstr ""
+msgstr "--no-post-rewrite"
#. type: Plain text
#: en/git-commit.txt:252
@@ -24191,7 +23698,6 @@ msgstr ""
msgid "--include"
msgstr "--include"
-#
#. type: Plain text
#: en/git-commit.txt:259
msgid ""
@@ -24210,25 +23716,24 @@ msgstr ""
msgid "--only"
msgstr "--only"
-#
#. type: Plain text
#: en/git-commit.txt:273
#, fuzzy
#| msgid ""
#| "Make a commit only from the paths specified on the command line, "
-#| "disregarding any contents that have been staged so far. This is the "
-#| "default mode of operation of 'git-commit' if any paths are given on the "
-#| "command line, in which case this option can be omitted. If this option "
-#| "is specified together with '--amend', then no paths need be specified, "
-#| "which can be used to amend the last commit without committing changes "
-#| "that have already been staged."
+#| "disregarding any contents that have been staged so far. This is the default "
+#| "mode of operation of 'git-commit' if any paths are given on the command "
+#| "line, in which case this option can be omitted. If this option is specified"
+#| " together with '--amend', then no paths need be specified, which can be used"
+#| " to amend the last commit without committing changes that have already been "
+#| "staged."
msgid ""
"Make a commit by taking the updated working tree contents of the paths "
"specified on the command line, disregarding any contents that have been "
"staged for other paths. This is the default mode of operation of 'git "
"commit' if any paths are given on the command line, in which case this "
-"option can be omitted. If this option is specified together with `--amend`, "
-"then no paths need to be specified, which can be used to amend the last "
+"option can be omitted. If this option is specified together with `--amend`,"
+" then no paths need to be specified, which can be used to amend the last "
"commit without committing changes that have already been staged. If used "
"together with `--allow-empty` paths are also not required, and an empty "
"commit will be created."
@@ -24236,11 +23741,11 @@ msgstr ""
"F체hre die Eintragung (commit) ausschlie횩lich mit den in der Befehlszeile "
"angegebenen Dateipfaden durch, und ignoriere s채mtliche im Index "
"vorbereiteten 횆nderungen. Dies ist der\tStandardmodus von 'git commit' wenn "
-"Dateipfade in der Befehlszeile angegeben wurden. Wird diese Option gemeinsam "
-"mit '--amend' angegeben, dann m체ssen keine Dateiangaben get채tigt werden. "
+"Dateipfade in der Befehlszeile angegeben wurden. Wird diese Option gemeinsam"
+" mit '--amend' angegeben, dann m체ssen keine Dateiangaben get채tigt werden. "
"Dies kann verwendet werdenum die letzte Eintragung abzu채ndern (zB "
-"Eintragungsbemerkung korrigieren) ohne die zwischenzeitlich bereits im Index "
-"vorbereiteten 횆nderungen zu 체bernehmen."
+"Eintragungsbemerkung korrigieren) ohne die zwischenzeitlich bereits im Index"
+" vorbereiteten 횆nderungen zu 체bernehmen."
#. type: Labeled list
#: en/git-commit.txt:274 en/git-status.txt:55
@@ -24261,7 +23766,6 @@ msgstr "--untracked-files[=<mode>]"
msgid "Show untracked files."
msgstr "'no' - zeige keine von git nicht verwalteten Dateien an\n"
-#
#. type: Plain text
#: en/git-commit.txt:281
#, fuzzy
@@ -24297,37 +23801,36 @@ msgstr "'normal' - zeige unverwaltete Dateien und Verzeichnisse\n"
#: en/git-commit.txt:287 en/git-status.txt:68
#, no-wrap
msgid "'all' - Also shows individual files in untracked directories.\n"
-msgstr "'all' - zeige zus채tzlich die einzelnen Dateien in den unverwalteten Verzeichnissen\n"
+msgstr ""
+"'all' - zeige zus채tzlich die einzelnen Dateien in den unverwalteten "
+"Verzeichnissen\n"
-#
#. type: Plain text
#: en/git-commit.txt:290 en/git-status.txt:81
#, fuzzy
#| msgid ""
#| "The remote configuration is achieved using the `remote.origin.url` and "
-#| "`remote.origin.fetch` configuration variables. (See linkgit:git-"
-#| "config[1])."
+#| "`remote.origin.fetch` configuration variables. (See linkgit:git-config[1])."
msgid ""
-"The default can be changed using the status.showUntrackedFiles configuration "
-"variable documented in linkgit:git-config[1]."
+"The default can be changed using the status.showUntrackedFiles configuration"
+" variable documented in linkgit:git-config[1]."
msgstr ""
"The remote configuration is achieved using the `remote.origin.url` and "
-"`remote.origin.fetch` configuration variables. (See linkgit:git-"
-"config[1]). Die Konfiguration entfernter Repositories wird durch die "
+"`remote.origin.fetch` configuration variables. (See linkgit:git-config[1])."
+" Die Konfiguration entfernter Repositories wird durch die "
"Konfigurationsvariablen `remote.origin.url` und `remote.origin.fetch` "
"erreicht. (Siehe linkgit:git-config[1])."
-#
#. type: Plain text
#: en/git-commit.txt:301
#, fuzzy
#| msgid ""
-#| "Show unified diff between the HEAD commit and what would be committed at "
-#| "the bottom of the commit message template. Note that this diff output "
-#| "doesn't have its lines prefixed with '#'."
+#| "Show unified diff between the HEAD commit and what would be committed at the"
+#| " bottom of the commit message template. Note that this diff output doesn't "
+#| "have its lines prefixed with '#'."
msgid ""
-"Show unified diff between the HEAD commit and what would be committed at the "
-"bottom of the commit message template to help the user describe the commit "
+"Show unified diff between the HEAD commit and what would be committed at the"
+" bottom of the commit message template to help the user describe the commit "
"by reminding what changes the commit has. Note that this diff output "
"doesn't have its lines prefixed with '#'. This diff will not be a part of "
"the commit message. See the `commit.verbose` configuration variable in "
@@ -24341,10 +23844,10 @@ msgstr ""
#: en/git-commit.txt:305
msgid ""
"If specified twice, show in addition the unified diff between what would be "
-"committed and the worktree files, i.e. the unstaged changes to tracked files."
+"committed and the worktree files, i.e. the unstaged changes to tracked "
+"files."
msgstr ""
-#
#. type: Plain text
#: en/git-commit.txt:309
msgid "Suppress commit summary message."
@@ -24360,25 +23863,23 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:315
-#, fuzzy, no-wrap
-#| msgid "status"
+#, no-wrap
msgid "--status"
-msgstr "status"
+msgstr "--status"
#. type: Plain text
#: en/git-commit.txt:320
msgid ""
"Include the output of linkgit:git-status[1] in the commit message template "
-"when using an editor to prepare the commit message. Defaults to on, but can "
-"be used to override configuration variable commit.status."
+"when using an editor to prepare the commit message. Defaults to on, but can"
+" be used to override configuration variable commit.status."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:321
-#, fuzzy, no-wrap
-#| msgid "status"
+#, no-wrap
msgid "--no-status"
-msgstr "status"
+msgstr "--no-status"
#. type: Plain text
#: en/git-commit.txt:325
@@ -24404,7 +23905,6 @@ msgstr ""
"#-#-#-#-# git-rm-de.po (PACKAGE VERSION) #-#-#-#-#\n"
"<Datei>..."
-#
#. type: Plain text
#: en/git-commit.txt:345
msgid ""
@@ -24419,38 +23919,37 @@ msgstr ""
"im Index bereitgestellt (zus채tzlich zu den dort bereits vorbereiteten "
"횆nderungen)."
-#
#. type: Plain text
#: en/git-commit.txt:362
#, fuzzy
#| msgid ""
-#| "When recording your own work, the contents of modified files in your "
-#| "working tree are temporarily stored to a staging area called the \"index"
-#| "\" with 'git-add'. A file can be reverted back, only in the index but "
-#| "not in the working tree, to that of the last commit with `git reset HEAD "
-#| "-- <file>`, which effectively reverts 'git-add' and prevents the changes "
-#| "to this file from participating in the next commit. After building the "
-#| "state to be committed incrementally with these commands, `git commit` "
-#| "(without any pathname parameter) is used to record what has been staged "
-#| "so far. This is the most basic form of the command. An example:"
-msgid ""
-"When recording your own work, the contents of modified files in your working "
-"tree are temporarily stored to a staging area called the \"index\" with 'git "
-"add'. A file can be reverted back, only in the index but not in the working "
-"tree, to that of the last commit with `git reset HEAD -- <file>`, which "
-"effectively reverts 'git add' and prevents the changes to this file from "
-"participating in the next commit. After building the state to be committed "
-"incrementally with these commands, `git commit` (without any pathname "
-"parameter) is used to record what has been staged so far. This is the most "
-"basic form of the command. An example:"
-msgstr ""
-"Beim Aufzeichnen der eigenen Arbeit, wird der Inhalt der ver채nderten Dateien "
-"im Arbeitsbereich mit 'git add' tempor채r in einem Zwischenbereich (\"Index\" "
-"genannt) abgelegt. Die mit 'git add' vorbereiteten 횆nderungen einer Datei "
-"k철nnen mit `git reset HEAD -- <file>` wieder aus dem Index entfernt werden, "
-"ohne dadurch die Datei selbst zu ver채ndern. Nachdem die gew체nschten "
-"횆nderungen im Index vorbereitet wurden kann dieser mit dem 'git commit' "
-"Befehl im Projektarchiv eingetragen (commited) werden. Ein Beispiel:"
+#| "When recording your own work, the contents of modified files in your working"
+#| " tree are temporarily stored to a staging area called the \"index\" with "
+#| "'git-add'. A file can be reverted back, only in the index but not in the "
+#| "working tree, to that of the last commit with `git reset HEAD -- <file>`, "
+#| "which effectively reverts 'git-add' and prevents the changes to this file "
+#| "from participating in the next commit. After building the state to be "
+#| "committed incrementally with these commands, `git commit` (without any "
+#| "pathname parameter) is used to record what has been staged so far. This is "
+#| "the most basic form of the command. An example:"
+msgid ""
+"When recording your own work, the contents of modified files in your working"
+" tree are temporarily stored to a staging area called the \"index\" with "
+"'git add'. A file can be reverted back, only in the index but not in the "
+"working tree, to that of the last commit with `git reset HEAD -- <file>`, "
+"which effectively reverts 'git add' and prevents the changes to this file "
+"from participating in the next commit. After building the state to be "
+"committed incrementally with these commands, `git commit` (without any "
+"pathname parameter) is used to record what has been staged so far. This is "
+"the most basic form of the command. An example:"
+msgstr ""
+"Beim Aufzeichnen der eigenen Arbeit, wird der Inhalt der ver채nderten Dateien"
+" im Arbeitsbereich mit 'git add' tempor채r in einem Zwischenbereich "
+"(\"Index\" genannt) abgelegt. Die mit 'git add' vorbereiteten 횆nderungen "
+"einer Datei k철nnen mit `git reset HEAD -- <file>` wieder aus dem Index "
+"entfernt werden, ohne dadurch die Datei selbst zu ver채ndern. Nachdem die "
+"gew체nschten 횆nderungen im Index vorbereitet wurden kann dieser mit dem 'git "
+"commit' Befehl im Projektarchiv eingetragen (commited) werden. Ein Beispiel:"
#. type: delimited block -
#: en/git-commit.txt:368
@@ -24466,14 +23965,13 @@ msgstr ""
"$ git add hello.c\n"
"$ git commit\n"
-#
#. type: Plain text
#: en/git-commit.txt:376
msgid ""
"Instead of staging files after each individual change, you can tell `git "
"commit` to notice the changes to the files whose contents are tracked in "
-"your working tree and do corresponding `git add` and `git rm` for you. That "
-"is, this example does the same as the earlier example if there is no other "
+"your working tree and do corresponding `git add` and `git rm` for you. That"
+" is, this example does the same as the earlier example if there is no other "
"change in your working tree:"
msgstr ""
"Anstatt die Dateien nach jeder 횆nderung einzeln im Index vorzubereiten kann "
@@ -24494,26 +23992,24 @@ msgstr ""
"$ rm goodbye.c\n"
"$ git commit -a\n"
-#
#. type: Plain text
#: en/git-commit.txt:386
msgid ""
"The command `git commit -a` first looks at your working tree, notices that "
-"you have modified hello.c and removed goodbye.c, and performs necessary `git "
-"add` and `git rm` for you."
+"you have modified hello.c and removed goodbye.c, and performs necessary `git"
+" add` and `git rm` for you."
msgstr ""
-"Der Befehl 'git commit -a' betrachtet zuerst den Arbeitsbereich, erkennt das "
-"hello.c ge채ndert und goodbye.c entfernt wurden, und f체hrt intern die "
+"Der Befehl 'git commit -a' betrachtet zuerst den Arbeitsbereich, erkennt das"
+" hello.c ge채ndert und goodbye.c entfernt wurden, und f체hrt intern die "
"notwendigen 'git add' und 'git rm' funktionen aus."
-#
#. type: Plain text
#: en/git-commit.txt:391
msgid ""
-"After staging changes to many files, you can alter the order the changes are "
-"recorded in, by giving pathnames to `git commit`. When pathnames are given, "
-"the command makes a commit that only records the changes made to the named "
-"paths:"
+"After staging changes to many files, you can alter the order the changes are"
+" recorded in, by giving pathnames to `git commit`. When pathnames are "
+"given, the command makes a commit that only records the changes made to the "
+"named paths:"
msgstr ""
"Wurden im Index 횆nderungen an mehreren Dateien vorbereitet, kann die "
"Reihenfolge in der diese 횆nderungen eingetragen (commited) werden, durch "
@@ -24535,18 +24031,17 @@ msgstr ""
"$ edit Makefile\n"
"$ git commit Makefile\n"
-#
#. type: Plain text
#: en/git-commit.txt:404
msgid ""
"This makes a commit that records the modification to `Makefile`. The "
-"changes staged for `hello.c` and `hello.h` are not included in the resulting "
-"commit. However, their changes are not lost -- they are still staged and "
+"changes staged for `hello.c` and `hello.h` are not included in the resulting"
+" commit. However, their changes are not lost -- they are still staged and "
"merely held back. After the above sequence, if you do:"
msgstr ""
"Die hier erzeugte Eintragung (commit) enth채lt ausschlie횩lich die 횆nderungen "
-"der Datei 'Makefile'. Die vorbereiteten 횆nderungen an 'hello.c' und 'hello."
-"h' sind in dieser Eintragung nicht enthalten, sie bleiben allerdings "
+"der Datei 'Makefile'. Die vorbereiteten 횆nderungen an 'hello.c' und "
+"'hello.h' sind in dieser Eintragung nicht enthalten, sie bleiben allerdings "
"weiterhin im Index vorbereitet und gehen nicht verloren. Wird anschlie횩end "
"der folgende Befehl aufgerufen:"
@@ -24556,7 +24051,6 @@ msgstr ""
msgid "$ git commit\n"
msgstr "$ git commit\n"
-#
#. type: Plain text
#: en/git-commit.txt:411
msgid ""
@@ -24566,24 +24060,23 @@ msgstr ""
"werden in einer zweiten Eintragung (commit) die 횆nderungen an 'hello.c' und "
"'hello.h' im Projektarchiv eingetragen."
-#
#. type: Plain text
#: en/git-commit.txt:419
#, fuzzy
#| msgid ""
#| "After a merge (initiated by 'git-merge' or 'git-pull') stops because of "
-#| "conflicts, cleanly merged paths are already staged to be committed for "
-#| "you, and paths that conflicted are left in unmerged state. You would "
-#| "have to first check which paths are conflicting with 'git-status' and "
-#| "after fixing them manually in your working tree, you would stage the "
-#| "result as usual with 'git-add':"
+#| "conflicts, cleanly merged paths are already staged to be committed for you, "
+#| "and paths that conflicted are left in unmerged state. You would have to "
+#| "first check which paths are conflicting with 'git-status' and after fixing "
+#| "them manually in your working tree, you would stage the result as usual with"
+#| " 'git-add':"
msgid ""
"After a merge (initiated by 'git merge' or 'git pull') stops because of "
"conflicts, cleanly merged paths are already staged to be committed for you, "
"and paths that conflicted are left in unmerged state. You would have to "
"first check which paths are conflicting with 'git status' and after fixing "
-"them manually in your working tree, you would stage the result as usual with "
-"'git add':"
+"them manually in your working tree, you would stage the result as usual with"
+" 'git add':"
msgstr ""
"Nach einer Zusammenf체hrung (merge, durchgef체hrt mit 'git-merge' oder 'git-"
"pull') die Aufgrund von Konflikten abgebrochen wird, sind sauber "
@@ -24608,54 +24101,51 @@ msgstr ""
"$ edit hello.c\n"
"$ git add hello.c\n"
-#
#. type: Plain text
#: en/git-commit.txt:430
msgid ""
"After resolving conflicts and staging the result, `git ls-files -u` would "
-"stop mentioning the conflicted path. When you are done, run `git commit` to "
-"finally record the merge:"
+"stop mentioning the conflicted path. When you are done, run `git commit` to"
+" finally record the merge:"
msgstr ""
"Nachdem die Konflikte aufgel철st und im Index vorbereitet wurden zeigt 'git "
"ls-files -u' die betreffenden Dateipfade nicht mehr an. Durch 'git commit' "
"k철nnen die 횆nderungen abschlie횩end im Projektarchiv eingetragen (commited) "
"werden:"
-#
#. type: Plain text
#: en/git-commit.txt:441
msgid ""
-"As with the case to record your own changes, you can use `-a` option to save "
-"typing. One difference is that during a merge resolution, you cannot use "
+"As with the case to record your own changes, you can use `-a` option to save"
+" typing. One difference is that during a merge resolution, you cannot use "
"`git commit` with pathnames to alter the order the changes are committed, "
"because the merge should be recorded as a single commit. In fact, the "
"command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
"Mann kann die '-a' Option allerdings auch einfach dazu verwenden um weniger "
"tippen zu m체ssen. Eine Einschr채nkung besteht allerdings dahingehend, da횩 "
-"dies bei einer Zusammenf체hrung (merge) nicht verwendet werden kann, da diese "
-"mit einer einzelnen Eintragung (commit) erfolgen mu횩. Bei Verwendung der '-"
-"a' Option sind keine weiteren Pfadangaben erlaubt (Ausnahme bei "
+"dies bei einer Zusammenf체hrung (merge) nicht verwendet werden kann, da diese"
+" mit einer einzelnen Eintragung (commit) erfolgen mu횩. Bei Verwendung der "
+"'-a' Option sind keine weiteren Pfadangaben erlaubt (Ausnahme bei "
"gleichzeitiger Verwendung der '-i' Option)."
-#
#. type: Plain text
#: en/git-commit.txt:453
#, fuzzy
#| msgid ""
#| "Though not required, it's a good idea to begin the commit message with a "
-#| "single short (less than 50 character) line summarizing the change, "
-#| "followed by a blank line and then a more thorough description. Tools "
-#| "that turn commits into email, for example, use the first line on the "
-#| "Subject: line and the rest of the commit in the body."
+#| "single short (less than 50 character) line summarizing the change, followed "
+#| "by a blank line and then a more thorough description. Tools that turn "
+#| "commits into email, for example, use the first line on the Subject: line and"
+#| " the rest of the commit in the body."
msgid ""
"Though not required, it's a good idea to begin the commit message with a "
"single short (less than 50 character) line summarizing the change, followed "
"by a blank line and then a more thorough description. The text up to the "
"first blank line in a commit message is treated as the commit title, and "
-"that title is used throughout Git. For example, linkgit:git-format-patch[1] "
-"turns a commit into email, and it uses the title on the Subject line and the "
-"rest of the commit in the body."
+"that title is used throughout Git. For example, linkgit:git-format-patch[1]"
+" turns a commit into email, and it uses the title on the Subject line and "
+"the rest of the commit in the body."
msgstr ""
"Obwohl es technisch nicht erforderlich ist, ist es eine gebr채uchlich die "
"Eintragungsbemerkung (commit message) mit einer einzelnen kurzen "
@@ -24670,41 +24160,39 @@ msgstr ""
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr "ENVIRONMENT AND CONFIGURATION VARIABLES"
-#
#. type: Plain text
#: en/git-commit.txt:462
#, fuzzy
#| msgid ""
#| "The editor used to edit the commit log message will be chosen from the "
-#| "GIT_EDITOR environment variable, the core.editor configuration variable, "
-#| "the VISUAL environment variable, or the EDITOR environment variable (in "
-#| "that order)."
+#| "GIT_EDITOR environment variable, the core.editor configuration variable, the"
+#| " VISUAL environment variable, or the EDITOR environment variable (in that "
+#| "order)."
msgid ""
"The editor used to edit the commit log message will be chosen from the "
"`GIT_EDITOR` environment variable, the core.editor configuration variable, "
"the `VISUAL` environment variable, or the `EDITOR` environment variable (in "
"that order). See linkgit:git-var[1] for details."
msgstr ""
-"Der Editor zum Bearbeiten der Eintragungsbemerkung wird durch die GIT_EDITOR "
-"Umgebungsvariable, die core.editor Konfigurationsvariable die VISUAL "
+"Der Editor zum Bearbeiten der Eintragungsbemerkung wird durch die GIT_EDITOR"
+" Umgebungsvariable, die core.editor Konfigurationsvariable die VISUAL "
"Umgebungsvariable oder die EDITOR Umgebungsvariable festgelegt (in dieser "
"Reihenfolge)."
-#
#. type: Plain text
#: en/git-commit.txt:468
#, fuzzy
#| msgid ""
-#| "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, "
-#| "and `post-commit` hooks. See linkgit:githooks[5] for more information."
+#| "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, and "
+#| "`post-commit` hooks. See linkgit:githooks[5] for more information."
msgid ""
-"This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-"
-"commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more "
+"This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, "
+"`post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more "
"information."
msgstr ""
"Dieser Befehl kann die folgenden Einsprungspunkte (hooks) aufrufen: `commit-"
-"msg`, `prepare-commit-msg`, `pre-commit` und `post-commit`. Siehe linkgit:"
-"githooks[5] f체r weitere Information."
+"msg`, `prepare-commit-msg`, `pre-commit` und `post-commit`. Siehe "
+"linkgit:githooks[5] f체r weitere Information."
#. type: Labeled list
#: en/git-commit.txt:472
@@ -24722,7 +24210,6 @@ msgid ""
"`git commit`."
msgstr ""
-#
#. type: Plain text
#: en/git-commit.txt:486
msgid ""
@@ -24738,7 +24225,6 @@ msgstr ""
msgid "git-config(1)"
msgstr "git-config(1)"
-#
#. type: Plain text
#: en/git-config.txt:7
msgid "git-config - Get and set repository or global options"
@@ -24793,7 +24279,6 @@ msgstr ""
"'git config' [<Datei-Option>] --get-color Name [Standard]\n"
"'git config' [<Datei-Option>] --get-colorbool Name [Standardausgabe-ist-tty]\n"
-#
#. type: Plain text
#: en/git-config.txt:33
msgid ""
@@ -24802,27 +24287,26 @@ msgid ""
"escaped."
msgstr ""
"Sie k철nnen mit diesem Befehl Optionen abfragen/setzen/ersetzen/leeren. Der "
-"Name ist eigentlich das Abteil und der Schl체ssel, durch einen Punkt getrennt "
-"und der Wert wird escapet."
+"Name ist eigentlich das Abteil und der Schl체ssel, durch einen Punkt getrennt"
+" und der Wert wird escapet."
-#
#. type: Plain text
#: en/git-config.txt:40
#, fuzzy
#| msgid ""
#| "Multiple lines can be added to an option by using the '--add' option. If "
-#| "you want to update or unset an option which can occur on multiple lines, "
-#| "a POSIX regexp `value_regex` needs to be given. Only the existing values "
-#| "that match the regexp are updated or unset. If you want to handle the "
-#| "lines that do *not* match the regex, just prepend a single exclamation "
-#| "mark in front (see also <<EXAMPLES>>)."
+#| "you want to update or unset an option which can occur on multiple lines, a "
+#| "POSIX regexp `value_regex` needs to be given. Only the existing values that"
+#| " match the regexp are updated or unset. If you want to handle the lines "
+#| "that do *not* match the regex, just prepend a single exclamation mark in "
+#| "front (see also <<EXAMPLES>>)."
msgid ""
"Multiple lines can be added to an option by using the `--add` option. If "
"you want to update or unset an option which can occur on multiple lines, a "
-"POSIX regexp `value_regex` needs to be given. Only the existing values that "
-"match the regexp are updated or unset. If you want to handle the lines that "
-"do *not* match the regex, just prepend a single exclamation mark in front "
-"(see also <<EXAMPLES>>)."
+"POSIX regexp `value_regex` needs to be given. Only the existing values that"
+" match the regexp are updated or unset. If you want to handle the lines "
+"that do *not* match the regex, just prepend a single exclamation mark in "
+"front (see also <<EXAMPLES>>)."
msgstr ""
"Mehrere Linien k철nnen zu einer Option mit der Option '--add' hinzugef체gt "
"werden. Falls Sie eine Option 채ndern oder leeren m철chten, was bei mehreren "
@@ -24832,16 +24316,15 @@ msgstr ""
"die Regex passen, stellen Sie einfach ein einzelnes Ausrufezeichen vor den "
"Ausdruck (Siehe auch <<EXAMPLES>>)."
-#
#. type: Plain text
#: en/git-config.txt:47
#, fuzzy
#| msgid ""
-#| "The type specifier can be either '--int' or '--bool', which will make "
-#| "'git-config' ensure that the variable(s) are of the given type and "
-#| "convert the value to the canonical form (simple decimal number for int, a "
-#| "\"true\" or \"false\" string for bool). If no type specifier is passed, "
-#| "no checks or transformations are performed on the value."
+#| "The type specifier can be either '--int' or '--bool', which will make 'git-"
+#| "config' ensure that the variable(s) are of the given type and convert the "
+#| "value to the canonical form (simple decimal number for int, a \"true\" or "
+#| "\"false\" string for bool). If no type specifier is passed, no checks or "
+#| "transformations are performed on the value."
msgid ""
"The type specifier can be either `--int` or `--bool`, to make 'git config' "
"ensure that the variable(s) are of the given type and convert the value to "
@@ -24860,27 +24343,27 @@ msgstr ""
#: en/git-config.txt:52
msgid ""
"When reading, the values are read from the system, global and repository "
-"local configuration files by default, and options `--system`, `--global`, `--"
-"local` and `--file <filename>` can be used to tell the command to read from "
-"only that location (see <<FILES>>)."
+"local configuration files by default, and options `--system`, `--global`, "
+"`--local` and `--file <filename>` can be used to tell the command to read "
+"from only that location (see <<FILES>>)."
msgstr ""
#. type: Plain text
#: en/git-config.txt:57
msgid ""
-"When writing, the new value is written to the repository local configuration "
-"file by default, and options `--system`, `--global`, `--file <filename>` can "
-"be used to tell the command to write to that location (you can say `--local` "
-"but that is the default)."
+"When writing, the new value is written to the repository local configuration"
+" file by default, and options `--system`, `--global`, `--file <filename>` "
+"can be used to tell the command to write to that location (you can say "
+"`--local` but that is the default)."
msgstr ""
#. type: Plain text
#: en/git-config.txt:60
msgid ""
-"This command will fail with non-zero status upon error. Some exit codes are:"
+"This command will fail with non-zero status upon error. Some exit codes "
+"are:"
msgstr ""
-#
#. type: Plain text
#: en/git-config.txt:62
#, fuzzy
@@ -24888,7 +24371,6 @@ msgstr ""
msgid "The section or key is invalid (ret=1),"
msgstr "Das Abteil oder der Schl체ssel falsch ist,"
-#
#. type: Plain text
#: en/git-config.txt:63
#, fuzzy
@@ -24896,7 +24378,6 @@ msgstr "Das Abteil oder der Schl체ssel falsch ist,"
msgid "no section or name was provided (ret=2),"
msgstr "Kein Abteil angegeben wurde,"
-#
#. type: Plain text
#: en/git-config.txt:64
#, fuzzy
@@ -24909,7 +24390,6 @@ msgstr "Die Konfigurationsdatei falsch ist,"
msgid "the config file cannot be written (ret=4),"
msgstr ""
-#
#. type: Plain text
#: en/git-config.txt:66
#, fuzzy
@@ -24917,11 +24397,11 @@ msgstr ""
msgid "you try to unset an option which does not exist (ret=5),"
msgstr "Sie versuchen, eine Option, die nicht existiert, zu leeren."
-#
#. type: Plain text
#: en/git-config.txt:67
#, fuzzy
-#| msgid "you try to unset/set an option for which multiple lines match, or"
+#| msgid ""
+#| "you try to unset/set an option for which multiple lines match, or"
msgid ""
"you try to unset/set an option for which multiple lines match (ret=5), or"
msgstr ""
@@ -24944,7 +24424,6 @@ msgstr ""
msgid "--replace-all"
msgstr "--replace-all"
-#
#. type: Plain text
#: en/git-config.txt:77
msgid ""
@@ -24960,16 +24439,15 @@ msgstr ""
msgid "--add"
msgstr "--add"
-#
#. type: Plain text
#: en/git-config.txt:82
#, fuzzy
#| msgid ""
-#| "Adds a new line to the option without altering any existing values. This "
-#| "is the same as providing '^$' as the value_regex."
+#| "Adds a new line to the option without altering any existing values. This is"
+#| " the same as providing '^$' as the value_regex."
msgid ""
-"Adds a new line to the option without altering any existing values. This is "
-"the same as providing '^$' as the value_regex in `--replace-all`."
+"Adds a new line to the option without altering any existing values. This is"
+" the same as providing '^$' as the value_regex in `--replace-all`."
msgstr ""
"F체gt eine neue Zeile zu der Option hinzu, ohne andere, ebenfalls vorhandene "
"Werte zu ver채ndern. Dies ist das Selbe, wie '^$' als Wert_Regex anzugeben."
@@ -24980,14 +24458,13 @@ msgstr ""
msgid "--get"
msgstr "--get"
-#
#. type: Plain text
#: en/git-config.txt:87
#, fuzzy
#| msgid ""
-#| "Get the value for a given key (optionally filtered by a regex matching "
-#| "the value). Returns error code 1 if the key was not found and error code "
-#| "2 if multiple key values were found."
+#| "Get the value for a given key (optionally filtered by a regex matching the "
+#| "value). Returns error code 1 if the key was not found and error code 2 if "
+#| "multiple key values were found."
msgid ""
"Get the value for a given key (optionally filtered by a regex matching the "
"value). Returns error code 1 if the key was not found and the last value if "
@@ -25046,7 +24523,6 @@ msgstr ""
msgid "--global"
msgstr "--global"
-#
#. type: Plain text
#: en/git-config.txt:111
#, fuzzy
@@ -25061,21 +24537,19 @@ msgstr ""
"Um Optionen zu schreiben: Es wird in die Globale Datei ~/.gitconfig "
"geschrieben, anstatt in die Repositoryeigene .git/config"
-#
#. type: Plain text
#: en/git-config.txt:114
#, fuzzy
#| msgid ""
-#| "For reading options: read only from global ~/.gitconfig rather than from "
-#| "all available files."
+#| "For reading options: read only from global ~/.gitconfig rather than from all"
+#| " available files."
msgid ""
-"For reading options: read only from global `~/.gitconfig` and from `"
-"$XDG_CONFIG_HOME/git/config` rather than from all available files."
+"For reading options: read only from global `~/.gitconfig` and from "
+"`$XDG_CONFIG_HOME/git/config` rather than from all available files."
msgstr ""
"Um Optionen zu lesen: Es wird nur aus der globalen Datei ~/.gitconfig "
"gelesen, anstelle aller verf체gbaren Dateien."
-#
#. type: Plain text
#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135
#: en/git-config.txt:292
@@ -25088,7 +24562,6 @@ msgstr "Siehe auch <<FILES>>."
msgid "--system"
msgstr "--system"
-#
#. type: Plain text
#: en/git-config.txt:121
#, fuzzy
@@ -25099,10 +24572,9 @@ msgid ""
"For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather "
"than the repository `.git/config`."
msgstr ""
-"Um Optionen zu schreiben: Es wird in die systemweite Datei ${prefix}/etc/"
-"gitconfig anstatt in die Repositoryeigene .git/config"
+"Um Optionen zu schreiben: Es wird in die systemweite Datei "
+"${prefix}/etc/gitconfig anstatt in die Repositoryeigene .git/config"
-#
#. type: Plain text
#: en/git-config.txt:124
#, fuzzy
@@ -25113,10 +24585,9 @@ msgid ""
"For reading options: read only from system-wide `$(prefix)/etc/gitconfig` "
"rather than from all available files."
msgstr ""
-"Um Optionen zu lesen: Es wird nur aus der systemweiten Datei ${prefix}/etc/"
-"gitconfig gelesen, anstelle aller verf체gbaren Dateien."
+"Um Optionen zu lesen: Es wird nur aus der systemweiten Datei "
+"${prefix}/etc/gitconfig gelesen, anstelle aller verf체gbaren Dateien."
-#
#. type: Plain text
#: en/git-config.txt:130
#, fuzzy
@@ -25124,22 +24595,21 @@ msgstr ""
#| "For writing options: write to global ~/.gitconfig file rather than the "
#| "repository .git/config."
msgid ""
-"For writing options: write to the repository `.git/config` file. This is"
-"\tthe default behavior."
+"For writing options: write to the repository `.git/config` file. This "
+"is\tthe default behavior."
msgstr ""
"Um Optionen zu schreiben: Es wird in die Globale Datei ~/.gitconfig "
"geschrieben, anstatt in die Repositoryeigene .git/config"
-#
#. type: Plain text
#: en/git-config.txt:133
#, fuzzy
#| msgid ""
-#| "For reading options: read only from global ~/.gitconfig rather than from "
-#| "all available files."
+#| "For reading options: read only from global ~/.gitconfig rather than from all"
+#| " available files."
msgid ""
-"For reading options: read only from the repository `.git/config` rather than "
-"from all available files."
+"For reading options: read only from the repository `.git/config` rather than"
+" from all available files."
msgstr ""
"Um Optionen zu lesen: Es wird nur aus der globalen Datei ~/.gitconfig "
"gelesen, anstelle aller verf체gbaren Dateien."
@@ -25156,7 +24626,6 @@ msgstr "-f config-file"
msgid "--file config-file"
msgstr "--file config-file"
-#
#. type: Plain text
#: en/git-config.txt:139
msgid "Use the given config file instead of the one specified by GIT_CONFIG."
@@ -25175,8 +24644,9 @@ msgstr ""
msgid ""
"Similar to `--file` but use the given blob instead of a file. E.g. you can "
"use 'master:.gitmodules' to read values from the file '.gitmodules' in the "
-"master branch. See \"SPECIFYING REVISIONS\" section in linkgit:"
-"gitrevisions[7] for a more complete list of ways to spell blob names."
+"master branch. See \"SPECIFYING REVISIONS\" section in "
+"linkgit:gitrevisions[7] for a more complete list of ways to spell blob "
+"names."
msgstr ""
#. type: Labeled list
@@ -25185,7 +24655,6 @@ msgstr ""
msgid "--remove-section"
msgstr "--remove-section"
-#
#. type: Plain text
#: en/git-config.txt:149
msgid "Remove the given section from the configuration file."
@@ -25197,7 +24666,6 @@ msgstr "L철sche das gegebene Abteil aus der Konfigurationsdatei."
msgid "--rename-section"
msgstr "--rename-section"
-#
#. type: Plain text
#: en/git-config.txt:152
msgid "Rename the given section to a new name."
@@ -25209,7 +24677,6 @@ msgstr "Gib dem gegebenen Abteil einen neuen Namen."
msgid "--unset"
msgstr "--unset"
-#
#. type: Plain text
#: en/git-config.txt:155
msgid "Remove the line matching the key from config file."
@@ -25222,14 +24689,13 @@ msgstr ""
msgid "--unset-all"
msgstr "--unset-all"
-#
#. type: Plain text
#: en/git-config.txt:158
msgid "Remove all lines matching the key from config file."
msgstr ""
-"L철sche alle Zeilen, auf die der Schl체ssel passt, aus der Konfigurationsdatei."
+"L철sche alle Zeilen, auf die der Schl체ssel passt, aus der "
+"Konfigurationsdatei."
-#
#. type: Plain text
#: en/git-config.txt:162
#, fuzzy
@@ -25243,7 +24709,6 @@ msgstr "Zeige alle in der Konfigurationsdatei gesetzten Variablen an."
msgid "--bool"
msgstr "--bool"
-#
#. type: Plain text
#: en/git-config.txt:165
#, fuzzy
@@ -25259,15 +24724,13 @@ msgstr ""
msgid "--int"
msgstr "--int"
-#
#. type: Plain text
#: en/git-config.txt:171
#, fuzzy
#| msgid ""
#| "'git-config' will ensure that the output is a simple decimal number. An "
-#| "optional value suffix of 'k', 'm', or 'g' in the config file will cause "
-#| "the value to be multiplied by 1024, 1048576, or 1073741824 prior to "
-#| "output."
+#| "optional value suffix of 'k', 'm', or 'g' in the config file will cause the "
+#| "value to be multiplied by 1024, 1048576, or 1073741824 prior to output."
msgid ""
"'git config' will ensure that the output is a simple decimal number. An "
"optional value suffix of 'k', 'm', or 'g' in the config file will cause the "
@@ -25280,40 +24743,36 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:172
-#, fuzzy, no-wrap
-#| msgid "--bool"
+#, no-wrap
msgid "--bool-or-int"
-msgstr "--bool"
+msgstr "--bool-or-int"
-#
#. type: Plain text
#: en/git-config.txt:175
#, fuzzy
#| msgid "'git-config' will ensure that the output is \"true\" or \"false\""
msgid ""
-"'git config' will ensure that the output matches the format of either --bool "
-"or --int, as described above."
+"'git config' will ensure that the output matches the format of either --bool"
+" or --int, as described above."
msgstr ""
"'git-config' wird sich versichern, dass die Ausgabe entweder \"true\" oder "
"\"false\" ist."
#. type: Labeled list
#: en/git-config.txt:176 en/git-hash-object.txt:41
-#, fuzzy, no-wrap
-#| msgid "--patch"
+#, no-wrap
msgid "--path"
-msgstr "--patch"
+msgstr "--path"
#. type: Plain text
#: en/git-config.txt:182
msgid ""
"'git-config' will expand leading '{tilde}' to the value of '$HOME', and "
-"'{tilde}user' to the home directory for the specified user. This option has "
-"no effect when setting the value (but you can use 'git config bla {tilde}/' "
-"from the command line to let your shell do the expansion)."
+"'{tilde}user' to the home directory for the specified user. This option has"
+" no effect when setting the value (but you can use 'git config bla {tilde}/'"
+" from the command line to let your shell do the expansion)."
msgstr ""
-#
#. type: Plain text
#: en/git-config.txt:191
msgid ""
@@ -25324,8 +24783,8 @@ msgid ""
msgstr ""
"F체r alle Optionen, die Werte und/oder Schl체ssel ausgeben, immer die Werte "
"mit einem Null-Zeichen beenden (Anstatt eines Newline-Zeichens). Benutze "
-"Newline daf체r als Trenner zwischen Schl체ssel und Wert. Dies erlaubt sicheres "
-"Parsen der Ausgabe, ohne verwirrt zu werden, beispielsweise bei Werten, "
+"Newline daf체r als Trenner zwischen Schl체ssel und Wert. Dies erlaubt sicheres"
+" Parsen der Ausgabe, ohne verwirrt zu werden, beispielsweise bei Werten, "
"welche Zeilenumbr체che enthalten."
#. type: Plain text
@@ -25338,14 +24797,14 @@ msgstr ""
#: en/git-config.txt:196
#, no-wrap
msgid "--show-origin"
-msgstr ""
+msgstr "--show-origin"
#. type: Plain text
#: en/git-config.txt:201
msgid ""
-"Augment the output of all queried config options with the origin type (file, "
-"standard input, blob, command line) and the actual origin (config file path, "
-"ref, or blob id if applicable)."
+"Augment the output of all queried config options with the origin type (file,"
+" standard input, blob, command line) and the actual origin (config file "
+"path, ref, or blob id if applicable)."
msgstr ""
#. type: Labeled list
@@ -25354,12 +24813,11 @@ msgstr ""
msgid "--get-colorbool name [stdout-is-tty]"
msgstr "--get-colorbool Name [Standardausgabe-ist-tty]"
-#
#. type: Plain text
#: en/git-config.txt:212
msgid ""
-"Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or "
-"\"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is "
+"Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or"
+" \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is "
"taken into account when configuration says \"auto\". If `stdout-is-tty` is "
"missing, then checks the standard output of the command itself, and exits "
"with status 0 if color is to be used, or exits with status 1 otherwise. "
@@ -25367,8 +24825,8 @@ msgid ""
"as fallback."
msgstr ""
"Finde die Farbeinstellung f체r `Name` (Beispielsweise `color.diff`) und gib "
-"\"true\" oder \"false\" aus. `Standardausgabe-ist-tty` sollte entweder \"true"
-"\" oder \"false\" sein und wird in Betracht gezogen, wenn in der "
+"\"true\" oder \"false\" aus. `Standardausgabe-ist-tty` sollte entweder "
+"\"true\" oder \"false\" sein und wird in Betracht gezogen, wenn in der "
"Konfigurationsdatei \"auto\" steht. Falls `Standardausgabe-ist-tty` fehlt, "
"dann wird die Standardausgabe des Programmes selbst 체berpr체ft und gibt "
"Status 0 zur체ck, falls Farbe verwendet wird, andernfalls wird Status 1 "
@@ -25382,7 +24840,6 @@ msgstr ""
msgid "--get-color name [default]"
msgstr "--get-color Name Standard"
-#
#. type: Plain text
#: en/git-config.txt:219
msgid ""
@@ -25391,34 +24848,32 @@ msgid ""
"`default` parameter is used instead, if there is no color configured for "
"`name`."
msgstr ""
-"Find die Farbe die f체r `Name` konfiguriert wurde (Beispielsweise `color.diff."
-"new`) und gib sie als ANSI Farb-Escapesequenz auf der Standardausgabe aus. "
-"Der optionale Parameter `Standard` wird verwendet, wenn keine Farbe f체r "
-"`Name` konfiguriert wurde."
+"Find die Farbe die f체r `Name` konfiguriert wurde (Beispielsweise "
+"`color.diff.new`) und gib sie als ANSI Farb-Escapesequenz auf der "
+"Standardausgabe aus. Der optionale Parameter `Standard` wird verwendet, wenn"
+" keine Farbe f체r `Name` konfiguriert wurde."
#. type: Plain text
#: en/git-config.txt:224
msgid ""
-"Opens an editor to modify the specified config file; either `--system`, `--"
-"global`, or repository (default)."
+"Opens an editor to modify the specified config file; either `--system`, "
+"`--global`, or repository (default)."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
-#, fuzzy, no-wrap
-#| msgid "--include"
+#, no-wrap
msgid "--[no-]includes"
-msgstr "--include"
+msgstr "--[no-]includes"
#. type: Plain text
#: en/git-config.txt:230
msgid ""
"Respect `include.*` directives in config files when looking up values. "
-"Defaults to `off` when a specific file is given (e.g., using `--file`, `--"
-"global`, etc) and `on` when searching all config files."
+"Defaults to `off` when a specific file is given (e.g., using `--file`, "
+"`--global`, etc) and `on` when searching all config files."
msgstr ""
-#
#. type: Plain text
#: en/git-config.txt:237
#, fuzzy
@@ -25426,11 +24881,11 @@ msgstr ""
#| "If not set explicitly with '--file', there are three files where 'git-"
#| "config' will search for configuration options:"
msgid ""
-"If not set explicitly with `--file`, there are four files where 'git config' "
-"will search for configuration options:"
+"If not set explicitly with `--file`, there are four files where 'git config'"
+" will search for configuration options:"
msgstr ""
-"Wenn nicht explizit mit '--file' ver채ndert, gibt es drei Dateien, in welchen "
-"'git-config' nach Optionen sucht:"
+"Wenn nicht explizit mit '--file' ver채ndert, gibt es drei Dateien, in welchen"
+" 'git-config' nach Optionen sucht:"
#. type: Labeled list
#: en/git-config.txt:238
@@ -25438,7 +24893,6 @@ msgstr ""
msgid "$(prefix)/etc/gitconfig"
msgstr "${prefix}/etc/gitconfig"
-#
#. type: Plain text
#: en/git-config.txt:240
msgid "System-wide configuration file."
@@ -25466,7 +24920,6 @@ msgstr ""
msgid "~/.gitconfig"
msgstr "~/.gitconfig"
-#
#. type: Plain text
#: en/git-config.txt:252
msgid ""
@@ -25481,7 +24934,6 @@ msgstr ""
msgid "$GIT_DIR/config"
msgstr "$GIT_DIR/config"
-#
#. type: Plain text
#: en/git-config.txt:255
#, fuzzy
@@ -25489,22 +24941,20 @@ msgstr "$GIT_DIR/config"
msgid "Repository specific configuration file."
msgstr "Systemweite Konfigurationsdatei."
-#
#. type: Plain text
#: en/git-config.txt:261
#, fuzzy
#| msgid ""
-#| "If no further options are given, all reading options will read all of "
-#| "these files that are available. If the global or the system-wide "
-#| "configuration file are not available they will be ignored. If the "
-#| "repository configuration file is not available or readable, 'git-config' "
-#| "will exit with a non-zero error code. However, in neither case will an "
-#| "error message be issued."
+#| "If no further options are given, all reading options will read all of these "
+#| "files that are available. If the global or the system-wide configuration "
+#| "file are not available they will be ignored. If the repository configuration"
+#| " file is not available or readable, 'git-config' will exit with a non-zero "
+#| "error code. However, in neither case will an error message be issued."
msgid ""
"If no further options are given, all reading options will read all of these "
"files that are available. If the global or the system-wide configuration "
-"file are not available they will be ignored. If the repository configuration "
-"file is not available or readable, 'git config' will exit with a non-zero "
+"file are not available they will be ignored. If the repository configuration"
+" file is not available or readable, 'git config' will exit with a non-zero "
"error code. However, in neither case will an error message be issued."
msgstr ""
"Falls keine weiteren Optionen gegeben werden, werden alle Leseoperationen "
@@ -25529,35 +24979,32 @@ msgid ""
"command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
-#
#. type: Plain text
#: en/git-config.txt:272
#, fuzzy
#| msgid ""
#| "All writing options will per default write to the repository specific "
-#| "configuration file. Note that this also affects options like '--replace-"
-#| "all' and '--unset'. *'git-config' will only ever change one file at a "
-#| "time*."
+#| "configuration file. Note that this also affects options like '--replace-all'"
+#| " and '--unset'. *'git-config' will only ever change one file at a time*."
msgid ""
"All writing options will per default write to the repository specific "
-"configuration file. Note that this also affects options like `--replace-all` "
-"and `--unset`. *'git config' will only ever change one file at a time*."
+"configuration file. Note that this also affects options like `--replace-all`"
+" and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
"Alle Schreiboperationen werden standardm채ssig auf die repositoryspezifische "
-"Konfigurationsdatei ausgef체hrt. Beachten Sie, dass dies auch Optionen wie '--"
-"replace-all' und '--unset' betrifft. *'git-config' ver채ndert nur eine Datei "
-"in einem Aufruf*."
+"Konfigurationsdatei ausgef체hrt. Beachten Sie, dass dies auch Optionen wie '"
+"--replace-all' und '--unset' betrifft. *'git-config' ver채ndert nur eine "
+"Datei in einem Aufruf*."
-#
#. type: Plain text
#: en/git-config.txt:277
#, fuzzy
#| msgid ""
#| "You can override these rules either by command line options or by "
-#| "environment variables. The '--global' and the '--system' options will "
-#| "limit the file used to the global or system-wide file respectively. The "
-#| "GIT_CONFIG environment variable has a similar effect, but you can specify "
-#| "any filename you want."
+#| "environment variables. The '--global' and the '--system' options will limit "
+#| "the file used to the global or system-wide file respectively. The GIT_CONFIG"
+#| " environment variable has a similar effect, but you can specify any filename"
+#| " you want."
msgid ""
"You can override these rules either by command-line options or by "
"environment variables. The `--global` and the `--system` options will limit "
@@ -25584,7 +25031,6 @@ msgstr "ENVIRONMENT"
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
-#
#. type: Plain text
#: en/git-config.txt:286
msgid ""
@@ -25603,7 +25049,6 @@ msgstr ""
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG"
-#
#. type: Plain text
#: en/git-config.txt:290
#, fuzzy
@@ -25611,13 +25056,12 @@ msgstr "GIT_CONFIG"
#| "For reading options: read only from system-wide $(prefix)/etc/gitconfig "
#| "rather than from all available files."
msgid ""
-"Whether to skip reading settings from the system-wide $(prefix)/etc/"
-"gitconfig file. See linkgit:git[1] for details."
+"Whether to skip reading settings from the system-wide "
+"$(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
-"Um Optionen zu lesen: Es wird nur aus der systemweiten Datei ${prefix}/etc/"
-"gitconfig gelesen, anstelle aller verf체gbaren Dateien."
+"Um Optionen zu lesen: Es wird nur aus der systemweiten Datei "
+"${prefix}/etc/gitconfig gelesen, anstelle aller verf체gbaren Dateien."
-#
#. type: Plain text
#: en/git-config.txt:299
msgid "Given a .git/config like this:"
@@ -25698,7 +25142,6 @@ msgid ""
"\t\tcookieFile = /tmp/cookie.txt\n"
msgstr ""
-#
#. type: Plain text
#: en/git-config.txt:329
msgid "you can set the filemode to true with"
@@ -25710,7 +25153,6 @@ msgstr "Sie k철nnen den Dateimodus auf \"true\" setzen mit"
msgid "% git config core.filemode true\n"
msgstr "% git config core.filemode true\n"
-#
#. type: Plain text
#: en/git-config.txt:337
msgid ""
@@ -25718,9 +25160,9 @@ msgid ""
"what URL they apply to. Here is how to change the entry for kernel.org to "
"\"ssh\"."
msgstr ""
-"Die hypothetischen Proxybefehlseintr채ge haben ein Anh채ngel, um unterscheiden "
-"zu k철nnen, auf welche URL sie sich beziehen. Hier folgt, wie Sie den Eintrag "
-"f체r kernel.org zu \"ssh\" 채ndern."
+"Die hypothetischen Proxybefehlseintr채ge haben ein Anh채ngel, um unterscheiden"
+" zu k철nnen, auf welche URL sie sich beziehen. Hier folgt, wie Sie den "
+"Eintrag f체r kernel.org zu \"ssh\" 채ndern."
#. type: delimited block -
#: en/git-config.txt:340
@@ -25728,7 +25170,6 @@ msgstr ""
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
-#
#. type: Plain text
#: en/git-config.txt:343
msgid ""
@@ -25737,7 +25178,6 @@ msgstr ""
"Dies stellt sicher, dass nur das Schl체ssel/Wertpaar f체r kernel.org ersetzt "
"wird."
-#
#. type: Plain text
#: en/git-config.txt:345
msgid "To delete the entry for renames, do"
@@ -25749,7 +25189,6 @@ msgstr "Um den Eintrag f체r Umbenennungen zu l철schen, verwenden Sie"
msgid "% git config --unset diff.renames\n"
msgstr "% git config --unset diff.renames\n"
-#
#. type: Plain text
#: en/git-config.txt:352
msgid ""
@@ -25760,7 +25199,6 @@ msgstr ""
"Eintr채gen), l철schen m철chten, m체ssen Sie eine Regex f체r den Wert exakt einer "
"Zeile angeben."
-#
#. type: Plain text
#: en/git-config.txt:354
msgid "To query the value for a given key, do"
@@ -25772,7 +25210,6 @@ msgstr "Um den Wert f체r einen gegebenen Schl체ssel abzufragen, benutzen Sie"
msgid "% git config --get core.filemode\n"
msgstr "% git config --get core.filemode\n"
-#
#. type: Plain text
#: en/git-config.txt:360 en/git-gui.txt:120 en/git-merge-index.txt:64
msgid "or"
@@ -25784,7 +25221,6 @@ msgstr "oder"
msgid "% git config core.filemode\n"
msgstr "% git config core.filemode\n"
-#
#. type: Plain text
#: en/git-config.txt:366
msgid "or, to query a multivar:"
@@ -25796,7 +25232,6 @@ msgstr "oder, um eine Multivar abzufragen:"
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr "% git config --get core.gitproxy \"for kernel.org$\"\n"
-#
#. type: Plain text
#: en/git-config.txt:372
msgid "If you want to know all the values for a multivar, do:"
@@ -25808,13 +25243,12 @@ msgstr "Falls Sie alle Werte einer Multivar wissen m철chten, verwenden Sie:"
msgid "% git config --get-all core.gitproxy\n"
msgstr "% git config --get-all core.gitproxy\n"
-#
#. type: Plain text
#: en/git-config.txt:379
#, fuzzy
#| msgid ""
-#| "If you like to live dangerous, you can replace *all* core.gitproxy by a "
-#| "new one with"
+#| "If you like to live dangerous, you can replace *all* core.gitproxy by a new "
+#| "one with"
msgid ""
"If you like to live dangerously, you can replace *all* core.gitproxy by a "
"new one with"
@@ -25828,7 +25262,6 @@ msgstr ""
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr "% git config --replace-all core.gitproxy ssh\n"
-#
#. type: Plain text
#: en/git-config.txt:386
msgid ""
@@ -25836,8 +25269,8 @@ msgid ""
"i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
"Wenn Sie jedoch wirklich nur eine Zeile f체r den Standardproxy ver채ndern "
-"m철chten, beispielsweise diejenige ohne ein Anh채ngsel \"for ...\", k철nnen Sie "
-"dies so tun:"
+"m철chten, beispielsweise diejenige ohne ein Anh채ngsel \"for ...\", k철nnen Sie"
+" dies so tun:"
#. type: delimited block -
#: en/git-config.txt:389
@@ -25845,7 +25278,6 @@ msgstr ""
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr "% git config core.gitproxy ssh '! for '\n"
-#
#. type: Plain text
#: en/git-config.txt:392
msgid "To actually match only values with an exclamation mark, you have to"
@@ -25859,7 +25291,6 @@ msgstr ""
msgid "% git config section.key value '[!]'\n"
msgstr "% git config section.key value '[!]'\n"
-#
#. type: Plain text
#: en/git-config.txt:398
msgid "To add a new proxy, without altering any of the existing ones, use"
@@ -25874,14 +25305,13 @@ msgstr ""
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr "% git config core.gitproxy '\"proxy-command\" for example.com'\n"
-#
#. type: Plain text
#: en/git-config.txt:405
msgid ""
"An example to use customized color from the configuration in your script:"
msgstr ""
-"Ein Beispiel, um angepasste Farbe der Konfigurationsdatei in Ihrem Script zu "
-"verwenden:"
+"Ein Beispiel, um angepasste Farbe der Konfigurationsdatei in Ihrem Script zu"
+" verwenden:"
#. type: delimited block -
#: en/git-config.txt:411
@@ -25919,10 +25349,9 @@ msgstr ""
#. type: Title =
#: en/git-count-objects.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-fsck-objects(1)"
+#, no-wrap
msgid "git-count-objects(1)"
-msgstr "git-fsck-objects(1)"
+msgstr "git-count-objects(1)"
#. type: Plain text
#: en/git-count-objects.txt:7
@@ -25981,8 +25410,8 @@ msgstr ""
#. type: Plain text
#: en/git-count-objects.txt:38
msgid ""
-"garbage: the number of files in object database that are neither valid loose "
-"objects nor valid packs"
+"garbage: the number of files in object database that are neither valid loose"
+" objects nor valid packs"
msgstr ""
#. type: Plain text
@@ -26011,7 +25440,7 @@ msgstr ""
#: en/git-count-objects.txt:48
#, no-wrap
msgid "--human-readable"
-msgstr ""
+msgstr "--human-readable"
#. type: Plain text
#: en/git-count-objects.txt:51
@@ -26022,7 +25451,7 @@ msgstr ""
#: en/git-credential-cache--daemon.txt:2
#, no-wrap
msgid "git-credential-cache--daemon(1)"
-msgstr ""
+msgstr "git-credential-cache--daemon(1)"
#. type: Plain text
#: en/git-credential-cache--daemon.txt:7
@@ -26060,13 +25489,11 @@ msgid ""
"listening for clients."
msgstr ""
-#
#. type: Title =
#: en/git-credential-cache.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-remote(1)"
+#, no-wrap
msgid "git-credential-cache(1)"
-msgstr "git-remote(1)"
+msgstr "git-credential-cache(1)"
#. type: Plain text
#: en/git-credential-cache.txt:7
@@ -26092,8 +25519,8 @@ msgstr ""
#: en/git-credential-cache.txt:25
msgid ""
"You probably don't want to invoke this command directly; it is meant to be "
-"used as a credential helper by other parts of Git. See linkgit:"
-"gitcredentials[7] or `EXAMPLES` below."
+"used as a credential helper by other parts of Git. See "
+"linkgit:gitcredentials[7] or `EXAMPLES` below."
msgstr ""
#. type: Labeled list
@@ -26144,8 +25571,8 @@ msgstr ""
#. type: Plain text
#: en/git-credential-cache.txt:56 en/git-credential-store.txt:75
msgid ""
-"The point of this helper is to reduce the number of times you must type your "
-"username or password. For example:"
+"The point of this helper is to reduce the number of times you must type your"
+" username or password. For example:"
msgstr ""
#. type: delimited block -
@@ -26182,10 +25609,9 @@ msgstr ""
#. type: Title =
#: en/git-credential-store.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-write-tree(1)"
+#, no-wrap
msgid "git-credential-store(1)"
-msgstr "git-write-tree(1)"
+msgstr "git-credential-store(1)"
#. type: Plain text
#: en/git-credential-store.txt:7
@@ -26218,8 +25644,8 @@ msgstr ""
#: en/git-credential-store.txt:28
msgid ""
"You probably don't want to invoke this command directly; it is meant to be "
-"used as a credential helper by other parts of git. See linkgit:"
-"gitcredentials[7] or `EXAMPLES` below."
+"used as a credential helper by other parts of git. See "
+"linkgit:gitcredentials[7] or `EXAMPLES` below."
msgstr ""
#. type: Labeled list
@@ -26233,15 +25659,14 @@ msgstr "--file=<file>"
#: en/git-credential-store.txt:42
msgid ""
"Use `<path>` to lookup and store credentials. The file will have its "
-"filesystem permissions set to prevent other users on the system from reading "
-"it, but will not be encrypted or otherwise protected. If not specified, "
-"credentials will be searched for from `~/.git-credentials` and `"
-"$XDG_CONFIG_HOME/git/credentials`, and credentials will be written to `~/."
-"git-credentials` if it exists, or `$XDG_CONFIG_HOME/git/credentials` if it "
-"exists and the former does not. See also <<FILES>>."
+"filesystem permissions set to prevent other users on the system from reading"
+" it, but will not be encrypted or otherwise protected. If not specified, "
+"credentials will be searched for from `~/.git-credentials` and "
+"`$XDG_CONFIG_HOME/git/credentials`, and credentials will be written to "
+"`~/.git-credentials` if it exists, or `$XDG_CONFIG_HOME/git/credentials` if "
+"it exists and the former does not. See also <<FILES>>."
msgstr ""
-#
#. type: Plain text
#: en/git-credential-store.txt:49
#, fuzzy
@@ -26252,8 +25677,8 @@ msgid ""
"If not set explicitly with `--file`, there are two files where git-"
"credential-store will search for credentials in order of precedence:"
msgstr ""
-"Wenn nicht explizit mit '--file' ver채ndert, gibt es drei Dateien, in welchen "
-"'git-config' nach Optionen sucht:"
+"Wenn nicht explizit mit '--file' ver채ndert, gibt es drei Dateien, in welchen"
+" 'git-config' nach Optionen sucht:"
#. type: Labeled list
#: en/git-credential-store.txt:50
@@ -26287,22 +25712,23 @@ msgstr ""
#: en/git-credential-store.txt:63
msgid ""
"For credential lookups, the files are read in the order given above, with "
-"the first matching credential found taking precedence over credentials found "
-"in files further down the list."
+"the first matching credential found taking precedence over credentials found"
+" in files further down the list."
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:67
msgid ""
"Credential storage will by default write to the first existing file in the "
-"list. If none of these files exist, `~/.git-credentials` will be created and "
-"written to."
+"list. If none of these files exist, `~/.git-credentials` will be created and"
+" written to."
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:69
msgid ""
-"When erasing credentials, matching credentials will be erased from all files."
+"When erasing credentials, matching credentials will be erased from all "
+"files."
msgstr ""
#. type: delimited block -
@@ -26346,19 +25772,18 @@ msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:103
msgid ""
-"When Git needs authentication for a particular URL context, credential-store "
-"will consider that context a pattern to match against each entry in the "
+"When Git needs authentication for a particular URL context, credential-store"
+" will consider that context a pattern to match against each entry in the "
"credentials file. If the protocol, hostname, and username (if we already "
-"have one) match, then the password is returned to Git. See the discussion of "
-"configuration in linkgit:gitcredentials[7] for more information."
+"have one) match, then the password is returned to Git. See the discussion of"
+" configuration in linkgit:gitcredentials[7] for more information."
msgstr ""
#. type: Title =
#: en/git-credential.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-citool(1)"
+#, no-wrap
msgid "git-credential(1)"
-msgstr "git-citool(1)"
+msgstr "git-credential(1)"
#. type: Plain text
#: en/git-credential.txt:7
@@ -26378,8 +25803,8 @@ msgid ""
"system-specific helpers, as well as prompting the user for usernames and "
"passwords. The git-credential command exposes this interface to scripts "
"which may want to retrieve, store, or prompt for credentials in the same "
-"manner as Git. The design of this scriptable interface models the internal C "
-"API; see link:technical/api-credentials.html[the Git credential API] for "
+"manner as Git. The design of this scriptable interface models the internal C"
+" API; see link:technical/api-credentials.html[the Git credential API] for "
"more background on the concepts."
msgstr ""
@@ -26394,8 +25819,8 @@ msgstr ""
#. type: Plain text
#: en/git-credential.txt:36
msgid ""
-"If the action is `fill`, git-credential will attempt to add \"username\" and "
-"\"password\" attributes to the description by reading config files, by "
+"If the action is `fill`, git-credential will attempt to add \"username\" and"
+" \"password\" attributes to the description by reading config files, by "
"contacting any configured credential helpers, or by prompting the user. The "
"username and password attributes of the credential description are then "
"printed to stdout together with the attributes already provided."
@@ -26480,8 +25905,8 @@ msgstr ""
#. type: Plain text
#: en/git-credential.txt:80
msgid ""
-"In most cases, this means the attributes given in the input will be repeated "
-"in the output, but Git may also modify the credential description, for "
+"In most cases, this means the attributes given in the input will be repeated"
+" in the output, but Git may also modify the credential description, for "
"example by removing the `path` attribute when the protocol is HTTP(s) and "
"`credential.useHttpPath` is false."
msgstr ""
@@ -26498,8 +25923,8 @@ msgstr ""
#. type: Plain text
#: en/git-credential.txt:89
msgid ""
-"Use the credential (e.g., access the URL with the username and password from "
-"step (2)), and see if it's accepted."
+"Use the credential (e.g., access the URL with the username and password from"
+" step (2)), and see if it's accepted."
msgstr ""
#. type: Plain text
@@ -26510,8 +25935,8 @@ msgid ""
"\"approve\" action to tell `git credential` to reuse it in its next "
"invocation. If the credential was rejected during the operation, use the "
"\"reject\" action so that `git credential` will ask for a new password in "
-"its next invocation. In either case, `git credential` should be fed with the "
-"credential description obtained from step (2) (which also contain the ones "
+"its next invocation. In either case, `git credential` should be fed with the"
+" credential description obtained from step (2) (which also contain the ones "
"provided in step (1))."
msgstr ""
@@ -26526,8 +25951,8 @@ msgstr ""
msgid ""
"`git credential` reads and/or writes (depending on the action used) "
"credential information in its standard input/output. This information can "
-"correspond either to keys for which `git credential` will obtain the login/"
-"password information (e.g. host, protocol, path), or to the actual "
+"correspond either to keys for which `git credential` will obtain the "
+"login/password information (e.g. host, protocol, path), or to the actual "
"credential data to be obtained (login/password)."
msgstr ""
@@ -26612,22 +26037,21 @@ msgstr ""
#. type: Plain text
#: en/git-credential.txt:154
msgid ""
-"When this special attribute is read by `git credential`, the value is parsed "
-"as a URL and treated as if its constituent parts were read (e.g., "
+"When this special attribute is read by `git credential`, the value is parsed"
+" as a URL and treated as if its constituent parts were read (e.g., "
"`url=https://example.com` would behave as if `protocol=https` and "
"`host=example.com` had been provided). This can help callers avoid parsing "
-"URLs themselves. Note that any components which are missing from the URL (e."
-"g., there is no username in the example above) will be set to empty; if you "
-"want to provide a URL and override some attributes, provide the URL "
+"URLs themselves. Note that any components which are missing from the URL "
+"(e.g., there is no username in the example above) will be set to empty; if "
+"you want to provide a URL and override some attributes, provide the URL "
"attribute first, followed by any overrides."
msgstr ""
#. type: Title =
#: en/git-cvsexportcommit.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-cvsexportcommit(1)"
-msgstr "git-commit(1)"
+msgstr "git-cvsexportcommit(1)"
#. type: Plain text
#: en/git-cvsexportcommit.txt:7
@@ -26681,8 +26105,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:40
msgid ""
-"Commit automatically if the patch applied cleanly. It will not commit if any "
-"hunks fail to apply or there were other problems."
+"Commit automatically if the patch applied cleanly. It will not commit if any"
+" hunks fail to apply or there were other problems."
msgstr ""
#. type: Plain text
@@ -26745,9 +26169,9 @@ msgstr ""
#: en/git-cvsexportcommit.txt:76
msgid ""
"Specify the location of the CVS checkout to use for the export. This option "
-"does not require GIT_DIR to be set before execution if the current directory "
-"is within a Git repository. The default is the value of 'cvsexportcommit."
-"cvsdir'."
+"does not require GIT_DIR to be set before execution if the current directory"
+" is within a Git repository. The default is the value of "
+"'cvsexportcommit.cvsdir'."
msgstr ""
#. type: Plain text
@@ -26758,7 +26182,6 @@ msgid ""
"directory to the parent commit before proceeding."
msgstr ""
-#
#. type: Plain text
#: en/git-cvsexportcommit.txt:84
#, fuzzy
@@ -26796,7 +26219,9 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsexportcommit.txt:102
#, no-wrap
-msgid "Merge one patch into CVS (-c and -w options). The working directory is within the Git Repo"
+msgid ""
+"Merge one patch into CVS (-c and -w options). The working directory is "
+"within the Git Repo"
msgstr ""
#. type: delimited block -
@@ -26808,7 +26233,9 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsexportcommit.txt:108
#, no-wrap
-msgid "Merge pending patches into CVS automatically -- only if you really know what you are doing"
+msgid ""
+"Merge pending patches into CVS automatically -- only if you really know what"
+" you are doing"
msgstr ""
#. type: delimited block -
@@ -26822,10 +26249,9 @@ msgstr ""
#. type: Title =
#: en/git-cvsimport.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-cvsimport(1)"
-msgstr "git-commit(1)"
+msgstr "git-cvsimport(1)"
#. type: Plain text
#: en/git-cvsimport.txt:7
@@ -26882,10 +26308,10 @@ msgstr ""
msgid ""
"You should *never* do any work of your own on the branches that are created "
"by 'git cvsimport'. By default initial import will create and populate a "
-"\"master\" branch from the CVS repository's main branch which you're free to "
-"work with; after that, you need to 'git merge' incremental imports, or any "
-"CVS branches, yourself. It is advisable to specify a named remote via -r to "
-"separate and protect the incoming branches."
+"\"master\" branch from the CVS repository's main branch which you're free to"
+" work with; after that, you need to 'git merge' incremental imports, or any "
+"CVS branches, yourself. It is advisable to specify a named remote via -r to"
+" separate and protect the incoming branches."
msgstr ""
#. type: Plain text
@@ -26913,8 +26339,8 @@ msgstr ""
msgid ""
"The root of the CVS archive. May be local (a simple path) or remote; "
"currently, only the :local:, :ext: and :pserver: access methods are "
-"supported. If not given, 'git cvsimport' will try to read it from `CVS/"
-"Root`. If no such file exists, it checks for the `CVSROOT` environment "
+"supported. If not given, 'git cvsimport' will try to read it from "
+"`CVS/Root`. If no such file exists, it checks for the `CVSROOT` environment "
"variable."
msgstr ""
@@ -26989,8 +26415,8 @@ msgstr ""
#: en/git-cvsimport.txt:92
msgid ""
"Import-only: don't perform a checkout after importing. This option ensures "
-"the working directory and index remain untouched and will not create them if "
-"they do not exist."
+"the working directory and index remain untouched and will not create them if"
+" they do not exist."
msgstr ""
#. type: Plain text
@@ -27078,9 +26504,9 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:127
msgid ""
-"Attempt to detect merges based on the commit message with a custom regex. It "
-"can be used with `-m` to enable the default regexes as well. You must escape "
-"forward slashes."
+"Attempt to detect merges based on the commit message with a custom regex. It"
+" can be used with `-m` to enable the default regexes as well. You must "
+"escape forward slashes."
msgstr ""
#. type: Plain text
@@ -27152,8 +26578,8 @@ msgstr ""
#: en/git-cvsimport.txt:159
msgid ""
"'git cvsimport' will make it appear as those authors had their "
-"GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly all along. If a time zone "
-"is specified, GIT_AUTHOR_DATE will have the corresponding offset applied."
+"GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly all along. If a time zone"
+" is specified, GIT_AUTHOR_DATE will have the corresponding offset applied."
msgstr ""
#. type: Plain text
@@ -27176,8 +26602,8 @@ msgstr ""
msgid ""
"Generate a `$GIT_DIR/cvs-revisions` file containing a mapping from CVS "
"revision numbers to newly-created Git commit IDs. The generated file will "
-"contain one line for each (filename, revision) pair imported; each line will "
-"look like"
+"contain one line for each (filename, revision) pair imported; each line will"
+" look like"
msgstr ""
#. type: delimited block -
@@ -27189,8 +26615,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:180
msgid ""
-"The revision data is appended to the file if it already exists, for use when "
-"doing incremental imports."
+"The revision data is appended to the file if it already exists, for use when"
+" doing incremental imports."
msgstr ""
#. type: Plain text
@@ -27238,8 +26664,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:204
msgid ""
-"If any files were ever \"cvs import\"ed more than once (e.g., import of more "
-"than one vendor release) the HEAD contains the wrong content."
+"If any files were ever \"cvs import\"ed more than once (e.g., import of more"
+" than one vendor release) the HEAD contains the wrong content."
msgstr ""
#. type: Plain text
@@ -27262,8 +26688,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:213
msgid ""
-"All files from the branching point are added to a branch even if never added "
-"in CVS."
+"All files from the branching point are added to a branch even if never added"
+" in CVS."
msgstr ""
#. type: Plain text
@@ -27287,8 +26713,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:223
msgid ""
-"If you suspect that any of these issues may apply to the repository you want "
-"to import, consider using cvs2git:"
+"If you suspect that any of these issues may apply to the repository you want"
+" to import, consider using cvs2git:"
msgstr ""
#. type: Plain text
@@ -27298,10 +26724,9 @@ msgstr ""
#. type: Title =
#: en/git-cvsserver.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-clone(1)"
+#, no-wrap
msgid "git-cvsserver(1)"
-msgstr "git-clone(1)"
+msgstr "git-cvsserver(1)"
#. type: Plain text
#: en/git-cvsserver.txt:7
@@ -27329,7 +26754,9 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:21
#, no-wrap
-msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
+msgid ""
+"cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver "
+"pserver\n"
msgstr ""
#. type: Plain text
@@ -27346,9 +26773,9 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:33
msgid ""
-"All these options obviously only make sense if enforced by the server side. "
-"They have been implemented to resemble the linkgit:git-daemon[1] options as "
-"closely as possible."
+"All these options obviously only make sense if enforced by the server side."
+" They have been implemented to resemble the linkgit:git-daemon[1] options "
+"as closely as possible."
msgstr ""
#. type: Labeled list
@@ -27367,7 +26794,7 @@ msgstr ""
#: en/git-cvsserver.txt:37 en/git-daemon.txt:48
#, no-wrap
msgid "--strict-paths"
-msgstr ""
+msgstr "--strict-paths"
#. type: Plain text
#: en/git-cvsserver.txt:39
@@ -27376,10 +26803,9 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:40 en/git-daemon.txt:77
-#, fuzzy, no-wrap
-#| msgid "--get-all"
+#, no-wrap
msgid "--export-all"
-msgstr "--get-all"
+msgstr "--export-all"
#. type: Plain text
#: en/git-cvsserver.txt:43
@@ -27396,10 +26822,9 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:45 en/git.txt:534
-#, fuzzy, no-wrap
-#| msgid "--verbose"
+#, no-wrap
msgid "--version"
-msgstr "--verbose"
+msgstr "--version"
#. type: Plain text
#: en/git-cvsserver.txt:47
@@ -27410,7 +26835,7 @@ msgstr ""
#: en/git-cvsserver.txt:50 en/git.txt:537
#, no-wrap
msgid "--help"
-msgstr ""
+msgstr "--help"
#. type: Plain text
#: en/git-cvsserver.txt:52
@@ -27460,8 +26885,8 @@ msgstr ""
#: en/git-cvsserver.txt:80
msgid ""
"'git-cvsserver' maps Git branches to CVS modules. This is very different "
-"from what most CVS users would expect since in CVS modules usually represent "
-"one or more directories."
+"from what most CVS users would expect since in CVS modules usually represent"
+" one or more directories."
msgstr ""
#. type: Title -
@@ -27473,8 +26898,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:86
msgid ""
-"If you are going to offer CVS access via pserver, add a line in /etc/inetd."
-"conf like"
+"If you are going to offer CVS access via pserver, add a line in "
+"/etc/inetd.conf like"
msgstr ""
#. type: delimited block -
@@ -27495,7 +26920,9 @@ msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:99
#, no-wrap
-msgid " cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
+msgid ""
+" cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver "
+"pserver\n"
msgstr ""
#. type: Plain text
@@ -27547,7 +26974,9 @@ msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:127
#, no-wrap
-msgid " perl -e 'my ($user, $pass) = @ARGV; printf \"%s:%s\\n\", $user, crypt($user, $pass)' $USER password\n"
+msgid ""
+" perl -e 'my ($user, $pass) = @ARGV; printf \"%s:%s\\n\", $user, "
+"crypt($user, $pass)' $USER password\n"
msgstr ""
#. type: Plain text
@@ -27558,7 +26987,9 @@ msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:132
#, no-wrap
-msgid " cvs -d:pserver:someuser:somepassword <at> server/path/repo.git co <HEAD_name>\n"
+msgid ""
+" cvs -d:pserver:someuser:somepassword <at> server/path/repo.git co "
+"<HEAD_name>\n"
msgstr ""
#. type: Plain text
@@ -27579,7 +27010,9 @@ msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:142
#, no-wrap
-msgid "cvs -d \":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git\" co <HEAD_name>\n"
+msgid ""
+"cvs -d \":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git\" co "
+"<HEAD_name>\n"
msgstr ""
#. type: Plain text
@@ -27614,9 +27047,9 @@ msgstr ""
#: en/git-cvsserver.txt:164
msgid ""
"Note: you need to ensure each user that is going to invoke 'git-cvsserver' "
-"has write access to the log file and to the database (see <<dbbackend,"
-"Database Backend>>. If you want to offer write access over SSH, the users of "
-"course also need write access to the Git repository itself."
+"has write access to the log file and to the database (see "
+"<<dbbackend,Database Backend>>. If you want to offer write access over SSH, "
+"the users of course also need write access to the Git repository itself."
msgstr ""
#. type: Plain text
@@ -27630,8 +27063,8 @@ msgstr ""
#: en/git-cvsserver.txt:173
msgid ""
"All configuration variables can also be overridden for a specific method of "
-"access. Valid method names are \"ext\" (for SSH access) and \"pserver\". The "
-"following example configuration would disable pserver access while still "
+"access. Valid method names are \"ext\" (for SSH access) and \"pserver\". The"
+" following example configuration would disable pserver access while still "
"allowing access over SSH."
msgstr ""
@@ -27658,8 +27091,8 @@ msgid ""
"command, automatically saving it in your 'CVS/Root' files, then you need to "
"set them explicitly in your environment. CVSROOT should be set as per "
"normal, but the directory should point at the appropriate Git repo. As "
-"above, for SSH clients _not_ restricted to 'git-shell', CVS_SERVER should be "
-"set to 'git-cvsserver'."
+"above, for SSH clients _not_ restricted to 'git-shell', CVS_SERVER should be"
+" set to 'git-cvsserver'."
msgstr ""
#. type: delimited block -
@@ -27673,9 +27106,9 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:198
msgid ""
-"For SSH clients that will make commits, make sure their server-side .ssh/"
-"environment files (or .bashrc, etc., according to their specific shell) "
-"export appropriate values for GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, "
+"For SSH clients that will make commits, make sure their server-side "
+".ssh/environment files (or .bashrc, etc., according to their specific shell)"
+" export appropriate values for GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, "
"GIT_COMMITTER_NAME, and GIT_COMMITTER_EMAIL. For SSH clients whose login "
"shell is bash, .bashrc may be a reasonable alternative."
msgstr ""
@@ -27723,19 +27156,19 @@ msgstr ""
#: en/git-cvsserver.txt:227
msgid ""
"That means that even if you offer only read access (e.g. by using the "
-"pserver method), 'git-cvsserver' should have write access to the database to "
-"work reliably (otherwise you need to make sure that the database is up-to-"
+"pserver method), 'git-cvsserver' should have write access to the database to"
+" work reliably (otherwise you need to make sure that the database is up-to-"
"date any time 'git-cvsserver' is executed)."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:234
msgid ""
-"By default it uses SQLite databases in the Git directory, named `gitcvs."
-"<module_name>.sqlite`. Note that the SQLite backend creates temporary files "
-"in the same directory as the database file on write so it might not be "
-"enough to grant the users using 'git-cvsserver' write access to the database "
-"file without granting them write access to the directory, too."
+"By default it uses SQLite databases in the Git directory, named "
+"`gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates "
+"temporary files in the same directory as the database file on write so it "
+"might not be enough to grant the users using 'git-cvsserver' write access to"
+" the database file without granting them write access to the directory, too."
msgstr ""
#. type: Plain text
@@ -27743,12 +27176,12 @@ msgstr ""
msgid ""
"The database can not be reliably regenerated in a consistent form after the "
"branch it is tracking has changed. Example: For merged branches, 'git-"
-"cvsserver' only tracks one branch of development, and after a 'git merge' an "
-"incrementally updated database may track a different branch than a database "
-"regenerated from scratch, causing inconsistent CVS revision numbers. `git-"
-"cvsserver` has no way of knowing which branch it would have picked if it had "
-"been run incrementally pre-merge. So if you have to fully or partially (from "
-"old backup) regenerate the database, you should be suspicious of pre-"
+"cvsserver' only tracks one branch of development, and after a 'git merge' an"
+" incrementally updated database may track a different branch than a database"
+" regenerated from scratch, causing inconsistent CVS revision numbers. `git-"
+"cvsserver` has no way of knowing which branch it would have picked if it had"
+" been run incrementally pre-merge. So if you have to fully or partially "
+"(from old backup) regenerate the database, you should be suspicious of pre-"
"existing CVS sandboxes."
msgstr ""
@@ -27768,8 +27201,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:256
msgid ""
-"'git-cvsserver' uses the Perl DBI module. Please also read its documentation "
-"if changing these variables, especially about `DBI->connect()`."
+"'git-cvsserver' uses the Perl DBI module. Please also read its documentation"
+" if changing these variables, especially about `DBI->connect()`."
msgstr ""
#. type: Plain text
@@ -27785,8 +27218,8 @@ msgstr ""
msgid ""
"Used DBI driver. You can specify any available driver for this here, but it "
"might not work. cvsserver is tested with 'DBD::SQLite', reported to work "
-"with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Please regard "
-"this as an experimental feature. May not contain colons (`:`). Default: "
+"with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Please regard"
+" this as an experimental feature. May not contain colons (`:`). Default: "
"'SQLite'"
msgstr ""
@@ -27826,8 +27259,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:288
msgid ""
-"All variables can also be set per access method, see <<configaccessmethod,"
-"above>>."
+"All variables can also be set per access method, see "
+"<<configaccessmethod,above>>."
msgstr ""
#. type: Title ^
@@ -27863,8 +27296,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:300
msgid ""
-"Git directory name, where all characters except for alpha-numeric ones, `.`, "
-"and `-` are replaced with `_` (this should make it easier to use the "
+"Git directory name, where all characters except for alpha-numeric ones, `.`,"
+" and `-` are replaced with `_` (this should make it easier to use the "
"directory name in a filename if wanted)"
msgstr ""
@@ -27899,8 +27332,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:308
msgid ""
-"Name of the user running 'git-cvsserver'. If no name can be determined, the "
-"numeric uid is used."
+"Name of the user running 'git-cvsserver'. If no name can be determined, the"
+" numeric uid is used."
msgstr ""
#. type: Plain text
@@ -27912,15 +27345,16 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:316
-msgid "GIT_CVSSERVER_BASE_PATH takes the place of the argument to --base-path."
+msgid ""
+"GIT_CVSSERVER_BASE_PATH takes the place of the argument to --base-path."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:320
msgid ""
"GIT_CVSSERVER_ROOT specifies a single-directory whitelist. The repository "
-"must still be configured to allow access through git-cvsserver, as described "
-"above."
+"must still be configured to allow access through git-cvsserver, as described"
+" above."
msgstr ""
#. type: Plain text
@@ -28029,12 +27463,12 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:371
msgid ""
-"Most CVS command arguments that read CVS tags or revision numbers (typically "
-"-r) work, and also support any git refspec (tag, branch, commit ID, etc). "
+"Most CVS command arguments that read CVS tags or revision numbers (typically"
+" -r) work, and also support any git refspec (tag, branch, commit ID, etc). "
"However, CVS revision numbers for non-default branches are not well "
"emulated, and cvs log does not show tags or branches at all. (Non-main-"
-"branch CVS revision numbers superficially resemble CVS revision numbers, but "
-"they actually encode a git commit ID directly, rather than represent the "
+"branch CVS revision numbers superficially resemble CVS revision numbers, but"
+" they actually encode a git commit ID directly, rather than represent the "
"number of revisions since the branch point.)"
msgstr ""
@@ -28058,8 +27492,8 @@ msgstr ""
#: en/git-cvsserver.txt:398
msgid ""
"If you want to refer to a git refspec that has characters that are not "
-"allowed by CVS, you have two options. First, it may just work to supply the "
-"git refspec directly to the appropriate CVS -r argument; some CVS clients "
+"allowed by CVS, you have two options. First, it may just work to supply the"
+" git refspec directly to the appropriate CVS -r argument; some CVS clients "
"don't seem to do much sanity checking of the argument. Second, if that "
"fails, you can use a special character escape mechanism that only uses "
"characters that are valid in CVS tags. A sequence of 4 or 5 characters of "
@@ -28087,16 +27521,16 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:408
msgid ""
-"By default the server leaves the `-k` mode blank for all files, which causes "
-"the CVS client to treat them as a text files, subject to end-of-line "
+"By default the server leaves the `-k` mode blank for all files, which causes"
+" the CVS client to treat them as a text files, subject to end-of-line "
"conversion on some platforms."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:413
msgid ""
-"You can make the server use the end-of-line conversion attributes to set the "
-"`-k` modes for files by setting the `gitcvs.usecrlfattr` config variable. "
+"You can make the server use the end-of-line conversion attributes to set the"
+" `-k` modes for files by setting the `gitcvs.usecrlfattr` config variable. "
"See linkgit:gitattributes[5] for more information about end-of-line "
"conversion."
msgstr ""
@@ -28106,11 +27540,11 @@ msgstr ""
msgid ""
"Alternatively, if `gitcvs.usecrlfattr` config is not enabled or the "
"attributes do not allow automatic detection for a filename, then the server "
-"uses the `gitcvs.allBinary` config for the default setting. If `gitcvs."
-"allBinary` is set, then file not otherwise specified will default to '-kb' "
-"mode. Otherwise the `-k` mode is left blank. But if `gitcvs.allBinary` is "
-"set to \"guess\", then the correct `-k` mode will be guessed based on the "
-"contents of the file."
+"uses the `gitcvs.allBinary` config for the default setting. If "
+"`gitcvs.allBinary` is set, then file not otherwise specified will default to"
+" '-kb' mode. Otherwise the `-k` mode is left blank. But if "
+"`gitcvs.allBinary` is set to \"guess\", then the correct `-k` mode will be "
+"guessed based on the contents of the file."
msgstr ""
#. type: Plain text
@@ -28132,15 +27566,12 @@ msgstr ""
msgid "'git-cvsserver' depends on DBD::SQLite."
msgstr ""
-#
#. type: Title =
#: en/git-daemon.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-remote(1)"
+#, no-wrap
msgid "git-daemon(1)"
-msgstr "git-remote(1)"
+msgstr "git-daemon(1)"
-#
#. type: Plain text
#: en/git-daemon.txt:7
#, fuzzy
@@ -28208,8 +27639,8 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:53
msgid ""
-"Match paths exactly (i.e. don't allow \"/foo/repo\" when the real path is \"/"
-"foo/repo.git\" or \"/foo/repo/.git\") and don't do user-relative paths. "
+"Match paths exactly (i.e. don't allow \"/foo/repo\" when the real path is "
+"\"/foo/repo.git\" or \"/foo/repo/.git\") and don't do user-relative paths. "
"'git daemon' will refuse to start when this option is enabled and no "
"whitelist is specified."
msgstr ""
@@ -28233,7 +27664,7 @@ msgstr ""
#: en/git-daemon.txt:61
#, no-wrap
msgid "--base-path-relaxed"
-msgstr ""
+msgstr "--base-path-relaxed"
#. type: Plain text
#: en/git-daemon.txt:66
@@ -28265,17 +27696,16 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:81
msgid ""
-"Allow pulling from all directories that look like Git repositories (have the "
-"'objects' and 'refs' subdirectories), even if they do not have the 'git-"
+"Allow pulling from all directories that look like Git repositories (have the"
+" 'objects' and 'refs' subdirectories), even if they do not have the 'git-"
"daemon-export-ok' file."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:82
-#, fuzzy, no-wrap
-#| msgid "--int"
+#, no-wrap
msgid "--inetd"
-msgstr "--int"
+msgstr "--inetd"
#. type: Plain text
#: en/git-daemon.txt:86
@@ -28348,30 +27778,28 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:111
msgid ""
-"Maximum number of concurrent clients, defaults to 32. Set it to zero for no "
-"limit."
+"Maximum number of concurrent clients, defaults to 32. Set it to zero for no"
+" limit."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:112
-#, fuzzy, no-wrap
-#| msgid "--system"
+#, no-wrap
msgid "--syslog"
-msgstr "--system"
+msgstr "--syslog"
#. type: Plain text
#: en/git-daemon.txt:115
msgid ""
-"Log to syslog instead of stderr. Note that this option does not imply --"
-"verbose, thus by default only error conditions will be logged."
+"Log to syslog instead of stderr. Note that this option does not imply "
+"--verbose, thus by default only error conditions will be logged."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:116
-#, fuzzy, no-wrap
-#| msgid "--patch"
+#, no-wrap
msgid "--user-path"
-msgstr "--patch"
+msgstr "--user-path"
#. type: Labeled list
#: en/git-daemon.txt:117
@@ -28398,7 +27826,7 @@ msgstr ""
#: en/git-daemon.txt:129
#, no-wrap
msgid "--reuseaddr"
-msgstr ""
+msgstr "--reuseaddr"
#. type: Plain text
#: en/git-daemon.txt:133
@@ -28422,8 +27850,8 @@ msgstr "--file=<file>"
#. type: Plain text
#: en/git-daemon.txt:140
msgid ""
-"Save the process id in 'file'. Ignored when the daemon is run under `--"
-"inetd`."
+"Save the process id in 'file'. Ignored when the daemon is run under "
+"`--inetd`."
msgstr ""
#. type: Labeled list
@@ -28441,10 +27869,10 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:148
msgid ""
-"Change daemon's uid and gid before entering the service loop. When only `--"
-"user` is given without `--group`, the primary group ID for the user is "
-"used. The values of the option are given to `getpwnam(3)` and `getgrnam(3)` "
-"and numeric IDs are not supported."
+"Change daemon's uid and gid before entering the service loop. When only "
+"`--user` is given without `--group`, the primary group ID for the user is "
+"used. The values of the option are given to `getpwnam(3)` and `getgrnam(3)`"
+" and numeric IDs are not supported."
msgstr ""
#. type: Plain text
@@ -28483,7 +27911,8 @@ msgstr "--file=<file>"
msgid ""
"Enable/disable the service site-wide per default. Note that a service "
"disabled site-wide can still be enabled per repository if it is marked "
-"overridable and the repository enables the service with a configuration item."
+"overridable and the repository enables the service with a configuration "
+"item."
msgstr ""
#. type: Labeled list
@@ -28507,17 +27936,16 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:174
-#, fuzzy, no-wrap
-#| msgid "--ignore-errors"
+#, no-wrap
msgid "--[no-]informative-errors"
-msgstr "--ignore-errors"
+msgstr "--[no-]informative-errors"
#. type: Plain text
#: en/git-daemon.txt:182
msgid ""
"When informative errors are turned on, git-daemon will report more verbose "
-"errors to the client, differentiating conditions like \"no such repository\" "
-"from \"repository not exported\". This is more convenient for clients, but "
+"errors to the client, differentiating conditions like \"no such repository\""
+" from \"repository not exported\". This is more convenient for clients, but "
"may leak information about the existence of unexported repositories. When "
"informative errors are not enabled, all errors report \"access denied\" to "
"the client. The default is --no-informative-errors."
@@ -28532,14 +27960,14 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:193
msgid ""
-"Every time a client connects, first run an external command specified by the "
-"<path> with service name (e.g. \"upload-pack\"), path to the repository, "
-"hostname (%H), canonical hostname (%CH), IP address (%IP), and TCP port (%P) "
-"as its command-line arguments. The external command can decide to decline "
+"Every time a client connects, first run an external command specified by the"
+" <path> with service name (e.g. \"upload-pack\"), path to the repository, "
+"hostname (%H), canonical hostname (%CH), IP address (%IP), and TCP port (%P)"
+" as its command-line arguments. The external command can decide to decline "
"the service by exiting with a non-zero status (or to allow it by exiting "
-"with a zero status). It can also look at the $REMOTE_ADDR and `"
-"$REMOTE_PORT` environment variables to learn about the requestor when making "
-"this decision."
+"with a zero status). It can also look at the $REMOTE_ADDR and "
+"`$REMOTE_PORT` environment variables to learn about the requestor when "
+"making this decision."
msgstr ""
#. type: Plain text
@@ -28568,8 +27996,8 @@ msgstr ""
#: en/git-daemon.txt:212
msgid ""
"These services can be globally enabled/disabled using the command-line "
-"options of this command. If finer-grained control is desired (e.g. to allow "
-"'git archive' to be run against only in a few selected repositories the "
+"options of this command. If finer-grained control is desired (e.g. to allow"
+" 'git archive' to be run against only in a few selected repositories the "
"daemon serves), the per-repository configuration file can be used to enable "
"or disable them."
msgstr ""
@@ -28617,8 +28045,8 @@ msgid ""
"disabled by default, as there is _no_ authentication in the protocol (in "
"other words, anybody can push anything into the repository, including "
"removal of refs). This is solely meant for a closed LAN setting where "
-"everybody is friendly. This service can be enabled by setting `daemon."
-"receivepack` configuration item to `true`."
+"everybody is friendly. This service can be enabled by setting "
+"`daemon.receivepack` configuration item to `true`."
msgstr ""
#. type: Labeled list
@@ -28644,8 +28072,8 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:248
msgid ""
-"To set up 'git daemon' as an inetd service that handles any repository under "
-"the whitelisted set of directories, /pub/foo and /pub/bar, place an entry "
+"To set up 'git daemon' as an inetd service that handles any repository under"
+" the whitelisted set of directories, /pub/foo and /pub/bar, place an entry "
"like the following into /etc/inetd all on one line:"
msgstr ""
@@ -28687,8 +28115,8 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:277
msgid ""
-"In this example, the root-level directory `/pub` will contain a subdirectory "
-"for each virtual host name supported. Further, both hosts advertise "
+"In this example, the root-level directory `/pub` will contain a subdirectory"
+" for each virtual host name supported. Further, both hosts advertise "
"repositories simply as `git://www.example.com/software/repo.git`. For "
"pre-1.4.0 clients, a symlink from `/software` into the appropriate default "
"repository could be made as well."
@@ -28721,8 +28149,8 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:295
msgid ""
-"In this example, the root-level directory `/pub` will contain a subdirectory "
-"for each virtual host IP address supported. Repositories can still be "
+"In this example, the root-level directory `/pub` will contain a subdirectory"
+" for each virtual host IP address supported. Repositories can still be "
"accessed by hostname though, assuming they correspond to these IP addresses."
msgstr ""
@@ -28759,10 +28187,9 @@ msgstr ""
#. type: Title =
#: en/git-describe.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-diff(1)"
+#, no-wrap
msgid "git-describe(1)"
-msgstr "git-diff(1)"
+msgstr "git-describe(1)"
#. type: Plain text
#: en/git-describe.txt:7
@@ -28816,8 +28243,8 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:36
msgid ""
-"Describe the working tree. It means describe HEAD and appends <mark> (`-"
-"dirty` by default) if the working tree is dirty."
+"Describe the working tree. It means describe HEAD and appends <mark> "
+"(`-dirty` by default) if the working tree is dirty."
msgstr ""
#. type: Plain text
@@ -28837,16 +28264,15 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:47
-#, fuzzy, no-wrap
-#| msgid "--contains <commit>"
+#, no-wrap
msgid "--contains"
-msgstr "--contains <commit>"
+msgstr "--contains"
#. type: Plain text
#: en/git-describe.txt:51
msgid ""
-"Instead of finding the tag that predates the commit, find the tag that comes "
-"after the commit, and thus contains it. Automatically implies --tags."
+"Instead of finding the tag that predates the commit, find the tag that comes"
+" after the commit, and thus contains it. Automatically implies --tags."
msgstr ""
#. type: Plain text
@@ -28867,17 +28293,16 @@ msgstr ""
#: en/git-describe.txt:64
msgid ""
"Instead of considering only the 10 most recent tags as candidates to "
-"describe the input commit-ish consider up to <n> candidates. Increasing <n> "
-"above 10 will take slightly longer but may produce a more accurate result. "
-"An <n> of 0 will cause only exact matches to be output."
+"describe the input commit-ish consider up to <n> candidates. Increasing <n>"
+" above 10 will take slightly longer but may produce a more accurate result."
+" An <n> of 0 will cause only exact matches to be output."
msgstr ""
#. type: Labeled list
#: en/git-describe.txt:65
-#, fuzzy, no-wrap
-#| msgid "--ignore-unmatch"
+#, no-wrap
msgid "--exact-match"
-msgstr "--ignore-unmatch"
+msgstr "--exact-match"
#. type: Plain text
#: en/git-describe.txt:68
@@ -28890,13 +28315,13 @@ msgstr ""
#: en/git-describe.txt:69 en/git-ls-files.txt:151
#, no-wrap
msgid "--debug"
-msgstr ""
+msgstr "--debug"
#. type: Plain text
#: en/git-describe.txt:73
msgid ""
-"Verbosely display information about the searching strategy being employed to "
-"standard error. The tag name will still be printed to standard out."
+"Verbosely display information about the searching strategy being employed to"
+" standard error. The tag name will still be printed to standard out."
msgstr ""
#. type: Plain text
@@ -28904,10 +28329,11 @@ msgstr ""
msgid ""
"Always output the long format (the tag, the number of commits and the "
"abbreviated commit name) even when it matches a tag. This is useful when "
-"you want to see parts of the commit object name in \"describe\" output, even "
-"when the commit in question happens to be a tagged version. Instead of just "
-"emitting the tag name, it will describe such a commit as v1.2-0-gdeadbee "
-"(0th commit since tag v1.2 that points at object deadbee....)."
+"you want to see parts of the commit object name in \"describe\" output, even"
+" when the commit in question happens to be a tagged version. Instead of "
+"just emitting the tag name, it will describe such a commit as "
+"v1.2-0-gdeadbee (0th commit since tag v1.2 that points at object "
+"deadbee....)."
msgstr ""
#. type: Labeled list
@@ -28937,19 +28363,18 @@ msgstr ""
msgid ""
"Do not consider tags matching the given `glob(7)` pattern, excluding the "
"\"refs/tags/\" prefix. This can be used to narrow the tag space and find "
-"only tags matching some meaningful criteria. If given multiple times, a list "
-"of patterns will be accumulated and tags matching any of the patterns will "
+"only tags matching some meaningful criteria. If given multiple times, a list"
+" of patterns will be accumulated and tags matching any of the patterns will "
"be excluded. When combined with --match a tag will be considered when it "
-"matches at least one --match pattern and does not match any of the --exclude "
-"patterns. Use `--no-exclude` to clear and reset the list of patterns."
+"matches at least one --match pattern and does not match any of the --exclude"
+" patterns. Use `--no-exclude` to clear and reset the list of patterns."
msgstr ""
#. type: Labeled list
#: en/git-describe.txt:101 en/git-diff-tree.txt:111 en/git-name-rev.txt:61
-#, fuzzy, no-wrap
-#| msgid "--all"
+#, no-wrap
msgid "--always"
-msgstr "--all"
+msgstr "--always"
#. type: Plain text
#: en/git-describe.txt:103 en/git-name-rev.txt:63
@@ -28960,7 +28385,7 @@ msgstr ""
#: en/git-describe.txt:104 en/rev-list-options.txt:121
#, no-wrap
msgid "--first-parent"
-msgstr ""
+msgstr "--first-parent"
#. type: Plain text
#: en/git-describe.txt:108
@@ -28996,8 +28421,8 @@ msgstr ""
#: en/git-describe.txt:130
msgid ""
"The number of additional commits is the number of commits which would be "
-"displayed by \"git log v1.0.4..parent\". The hash suffix is \"-g\" + 7-char "
-"abbreviation for the tip commit of parent (which was "
+"displayed by \"git log v1.0.4..parent\". The hash suffix is \"-g\" + 7-char"
+" abbreviation for the tip commit of parent (which was "
"`2414721b194453f058079d897d13c4e377f92dc6`). The \"g\" prefix stands for "
"\"git\" and is used to allow describing the version of a software depending "
"on the SCM the software is managed with. This is useful in an environment "
@@ -29059,10 +28484,10 @@ msgstr ""
#: en/git-describe.txt:156
msgid ""
"Note that the suffix you get if you type these commands today may be longer "
-"than what Linus saw above when he ran these commands, as your Git repository "
-"may have new commits whose object names begin with 975b that did not exist "
-"back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate "
-"these commits."
+"than what Linus saw above when he ran these commands, as your Git repository"
+" may have new commits whose object names begin with 975b that did not exist "
+"back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate"
+" these commits."
msgstr ""
#. type: Title -
@@ -29074,8 +28499,8 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:166
msgid ""
-"For each commit-ish supplied, 'git describe' will first look for a tag which "
-"tags exactly that commit. Annotated tags will always be preferred over "
+"For each commit-ish supplied, 'git describe' will first look for a tag which"
+" tags exactly that commit. Annotated tags will always be preferred over "
"lightweight tags, and tags with newer dates will always be preferred over "
"tags with older dates. If an exact match is found, its name will be output "
"and searching will stop."
@@ -29086,9 +28511,9 @@ msgstr ""
msgid ""
"If an exact match was not found, 'git describe' will walk back through the "
"commit history to locate an ancestor commit which has been tagged. The "
-"ancestor's tag will be output along with an abbreviation of the input commit-"
-"ish's SHA-1. If `--first-parent` was specified then the walk will only "
-"consider the first parent of each commit."
+"ancestor's tag will be output along with an abbreviation of the input "
+"commit-ish's SHA-1. If `--first-parent` was specified then the walk will "
+"only consider the first parent of each commit."
msgstr ""
#. type: Plain text
@@ -29103,25 +28528,26 @@ msgstr ""
#. type: Title =
#: en/git-diff-files.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-diff(1)"
+#, no-wrap
msgid "git-diff-files(1)"
-msgstr "git-diff(1)"
+msgstr "git-diff-files(1)"
-#
#. type: Plain text
#: en/git-diff-files.txt:7
#, fuzzy
-#| msgid "git-rm - Remove files from the working tree and from the index"
+#| msgid ""
+#| "git-rm - Remove files from the working tree and from the index"
msgid "git-diff-files - Compares files in the working tree and the index"
msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
-#
#. type: Plain text
#: en/git-diff-files.txt:13
#, fuzzy, no-wrap
-#| msgid "'git diff' [<common diff options>] <commit>{0,2} [--] [<path>...]"
-msgid "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]\n"
+#| msgid ""
+#| "'git diff' [<common diff options>] <commit>{0,2} [--] [<path>...]"
+msgid ""
+"'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] "
+"[<path>...]\n"
msgstr "'git diff' [<common diff options>] <commit>{0,2} [--] [<path>...]"
#. type: Plain text
@@ -29172,7 +28598,7 @@ msgstr ""
#: en/rev-list-options.txt:873
#, no-wrap
msgid "--cc"
-msgstr ""
+msgstr "--cc"
#. type: Plain text
#: en/git-diff-files.txt:43
@@ -29189,16 +28615,15 @@ msgstr ""
#. type: Title =
#: en/git-diff-index.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-diff(1)"
+#, no-wrap
msgid "git-diff-index(1)"
-msgstr "git-diff(1)"
+msgstr "git-diff-index(1)"
-#
#. type: Plain text
#: en/git-diff-index.txt:7
#, fuzzy
-#| msgid "git-rm - Remove files from the working tree and from the index"
+#| msgid ""
+#| "git-rm - Remove files from the working tree and from the index"
msgid "git-diff-index - Compare a tree to the working tree or index"
msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
@@ -29206,7 +28631,9 @@ msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
#: en/git-diff-index.txt:13
#, fuzzy, no-wrap
#| msgid "'git diff' [--options] --cached [<commit>] [--] [<path>...]"
-msgid "'git diff-index' [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]\n"
+msgid ""
+"'git diff-index' [-m] [--cached] [<common diff options>] <tree-ish> "
+"[<path>...]\n"
msgstr "'git diff' [--options] --cached [<commit>] [--] [<path>...]"
#. type: Plain text
@@ -29312,8 +28739,8 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:75
msgid ""
-"In fact, `git diff-index --cached` *should* always be entirely equivalent to "
-"actually doing a 'git write-tree' and comparing that. Except this one is "
+"In fact, `git diff-index --cached` *should* always be entirely equivalent to"
+" actually doing a 'git write-tree' and comparing that. Except this one is "
"much nicer for the case where you just want to check where you are."
msgstr ""
@@ -29321,8 +28748,8 @@ msgstr ""
#: en/git-diff-index.txt:79
msgid ""
"So doing a `git diff-index --cached` is basically very useful when you are "
-"asking yourself \"what have I already marked for being committed, and what's "
-"the difference to a previous tree\"."
+"asking yourself \"what have I already marked for being committed, and what's"
+" the difference to a previous tree\"."
msgstr ""
#. type: Title -
@@ -29337,8 +28764,8 @@ msgstr "--cached"
msgid ""
"The \"non-cached\" mode takes a different approach, and is potentially the "
"more useful of the two in that what it does can't be emulated with a 'git "
-"write-tree' + 'git diff-tree'. Thus that's the default mode. The non-cached "
-"version asks the question:"
+"write-tree' + 'git diff-tree'. Thus that's the default mode. The non-cached"
+" version asks the question:"
msgstr ""
#. type: Plain text
@@ -29352,9 +28779,9 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:93
msgid ""
-"which is obviously a very useful question too, since that tells you what you "
-"*could* commit. Again, the output matches the 'git diff-tree -r' output to a "
-"tee, but with a twist."
+"which is obviously a very useful question too, since that tells you what you"
+" *could* commit. Again, the output matches the 'git diff-tree -r' output to "
+"a tee, but with a twist."
msgstr ""
#. type: Plain text
@@ -29387,8 +28814,8 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:113
msgid ""
-"As with other commands of this type, 'git diff-index' does not actually look "
-"at the contents of the file at all. So maybe `kernel/sched.c` hasn't "
+"As with other commands of this type, 'git diff-index' does not actually look"
+" at the contents of the file at all. So maybe `kernel/sched.c` hasn't "
"actually changed, and it's just that you touched it. In either case, it's a "
"note that you need to 'git update-index' it to make the index be in sync."
msgstr ""
@@ -29405,12 +28832,10 @@ msgstr ""
#. type: Title =
#: en/git-difftool.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-citool(1)"
+#, no-wrap
msgid "git-difftool(1)"
-msgstr "git-citool(1)"
+msgstr "git-difftool(1)"
-#
#. type: Plain text
#: en/git-difftool.txt:7
#, fuzzy
@@ -29439,29 +28864,28 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:23
-#, fuzzy, no-wrap
-#| msgid "--full-diff"
+#, no-wrap
msgid "--dir-diff"
-msgstr "--full-diff"
+msgstr "--dir-diff"
#. type: Plain text
#: en/git-difftool.txt:27
msgid ""
-"Copy the modified files to a temporary location and perform a directory diff "
-"on them. This mode never prompts before launching the diff tool."
+"Copy the modified files to a temporary location and perform a directory diff"
+" on them. This mode never prompts before launching the diff tool."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:28 en/git-mergetool.txt:70
#, no-wrap
msgid "-y"
-msgstr ""
+msgstr "-y"
#. type: Labeled list
#: en/git-difftool.txt:29 en/git-mergetool.txt:71
#, no-wrap
msgid "--no-prompt"
-msgstr ""
+msgstr "--no-prompt"
#. type: Plain text
#: en/git-difftool.txt:31
@@ -29472,7 +28896,7 @@ msgstr ""
#: en/git-difftool.txt:32 en/git-mergetool.txt:78
#, no-wrap
msgid "--prompt"
-msgstr ""
+msgstr "--prompt"
#. type: Plain text
#: en/git-difftool.txt:36
@@ -29506,8 +28930,8 @@ msgstr ""
#: en/git-difftool.txt:47
msgid ""
"If a diff tool is not specified, 'git difftool' will use the configuration "
-"variable `diff.tool`. If the configuration variable `diff.tool` is not set, "
-"'git difftool' will pick a suitable default."
+"variable `diff.tool`. If the configuration variable `diff.tool` is not set,"
+" 'git difftool' will pick a suitable default."
msgstr ""
#. type: Plain text
@@ -29530,21 +28954,21 @@ msgstr ""
#. type: Plain text
#: en/git-difftool.txt:68
msgid ""
-"When 'git difftool' is invoked with this tool (either through the `-t` or `--"
-"tool` option or the `diff.tool` configuration variable) the configured "
-"command line will be invoked with the following variables available: `"
-"$LOCAL` is set to the name of the temporary file containing the contents of "
-"the diff pre-image and `$REMOTE` is set to the name of the temporary file "
+"When 'git difftool' is invoked with this tool (either through the `-t` or "
+"`--tool` option or the `diff.tool` configuration variable) the configured "
+"command line will be invoked with the following variables available: "
+"`$LOCAL` is set to the name of the temporary file containing the contents of"
+" the diff pre-image and `$REMOTE` is set to the name of the temporary file "
"containing the contents of the diff post-image. `$MERGED` is the name of "
-"the file which is being compared. `$BASE` is provided for compatibility with "
-"custom merge tool commands and has the same value as `$MERGED`."
+"the file which is being compared. `$BASE` is provided for compatibility with"
+" custom merge tool commands and has the same value as `$MERGED`."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:69 en/git-mergetool.txt:67
#, no-wrap
msgid "--tool-help"
-msgstr ""
+msgstr "--tool-help"
#. type: Plain text
#: en/git-difftool.txt:71
@@ -29553,10 +28977,9 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:72
-#, fuzzy, no-wrap
-#| msgid "--no-hardlinks"
+#, no-wrap
msgid "--[no-]symlinks"
-msgstr "--no-hardlinks"
+msgstr "--[no-]symlinks"
#. type: Plain text
#: en/git-difftool.txt:77
@@ -29599,13 +29022,13 @@ msgstr ""
#: en/git-update-index.txt:114 en/rev-list-options.txt:245
#, no-wrap
msgid "-g"
-msgstr ""
+msgstr "-g"
#. type: Labeled list
#: en/git-difftool.txt:89
#, no-wrap
msgid "--[no-]gui"
-msgstr ""
+msgstr "--[no-]gui"
#. type: Plain text
#: en/git-difftool.txt:94
@@ -29619,7 +29042,7 @@ msgstr ""
#: en/git-difftool.txt:95
#, no-wrap
msgid "--[no-]trust-exit-code"
-msgstr ""
+msgstr "--[no-]trust-exit-code"
#. type: Plain text
#: en/git-difftool.txt:100
@@ -29664,7 +29087,7 @@ msgstr ""
#: en/git-difftool.txt:114
#, no-wrap
msgid "diff.guitool"
-msgstr ""
+msgstr "diff.guitool"
#. type: Plain text
#: en/git-difftool.txt:116
@@ -29697,7 +29120,6 @@ msgstr ""
msgid "See the `--trust-exit-code` option above for more details."
msgstr ""
-#
#. type: Plain text
#: en/git-difftool.txt:138
#, fuzzy
@@ -29713,7 +29135,6 @@ msgstr ""
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
-#
#. type: Plain text
#: en/git-difftool.txt:144
#, fuzzy
@@ -29724,10 +29145,9 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-diff(1)"
+#, no-wrap
msgid "git-diff-tree(1)"
-msgstr "git-diff(1)"
+msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
@@ -29763,7 +29183,6 @@ msgid ""
"Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
-#
#. type: Plain text
#: en/git-diff-tree.txt:31
#, fuzzy
@@ -29807,8 +29226,8 @@ msgstr ""
msgid ""
"When `--stdin` is specified, the command does not take <tree-ish> arguments "
"from the command line. Instead, it reads lines containing either two "
-"<tree>, one <commit>, or a list of <commit> from its standard input. (Use a "
-"single space as separator.)"
+"<tree>, one <commit>, or a list of <commit> from its standard input. (Use a"
+" single space as separator.)"
msgstr ""
#. type: Plain text
@@ -29863,7 +29282,7 @@ msgstr ""
#: en/git-diff-tree.txt:87
#, no-wrap
msgid "--no-commit-id"
-msgstr ""
+msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:90
@@ -29898,8 +29317,8 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:114
msgid ""
-"Show the commit itself and the commit log message even if the diff itself is "
-"empty."
+"Show the commit itself and the commit log message even if the diff itself is"
+" empty."
msgstr ""
#. type: Title -
@@ -30009,7 +29428,6 @@ msgstr ""
msgid "git-diff(1)"
msgstr "git-diff(1)"
-#
#. type: Plain text
#: en/git-diff.txt:7
msgid "git-diff - Show changes between commits, commit and working tree, etc"
@@ -30032,8 +29450,8 @@ msgstr ""
#: en/git-diff.txt:23
msgid ""
"Show changes between the working tree and the index or a tree, changes "
-"between the index and a tree, changes between two trees, changes between two "
-"blob objects, or changes between two files on disk."
+"between the index and a tree, changes between two trees, changes between two"
+" blob objects, or changes between two files on disk."
msgstr ""
#. type: Labeled list
@@ -30042,25 +29460,24 @@ msgstr ""
msgid "'git diff' [--options] [--] [<path>...]"
msgstr "'git diff' [--options] [--] [<path>...]"
-#
#. type: Plain text
#: en/git-diff.txt:31
#, fuzzy
#| msgid ""
#| "This form is to view the changes you made relative to the index (staging "
#| "area for the next commit). In other words, the differences are what you "
-#| "_could_ tell git to further add to the index but you still haven't. You "
-#| "can stage these changes by using linkgit:git-add[1]."
+#| "_could_ tell git to further add to the index but you still haven't. You can"
+#| " stage these changes by using linkgit:git-add[1]."
msgid ""
"This form is to view the changes you made relative to the index (staging "
"area for the next commit). In other words, the differences are what you "
-"_could_ tell Git to further add to the index but you still haven't. You can "
-"stage these changes by using linkgit:git-add[1]."
+"_could_ tell Git to further add to the index but you still haven't. You can"
+" stage these changes by using linkgit:git-add[1]."
msgstr ""
-"Zeige die Unterschiede zwischen dem Arbeitsbereich und dem Index (Bereich in "
-"dem die n채chste Eintragung (commit) vorbereitet wird). Mit andern Worten, "
-"alle 횆nderungen im Arbeitsbereich die man noch nicht mit 'git add' oder 'git "
-"rm' hinzugef체gt hat, aber noch hinzuf체gen k철nnte."
+"Zeige die Unterschiede zwischen dem Arbeitsbereich und dem Index (Bereich in"
+" dem die n채chste Eintragung (commit) vorbereitet wird). Mit andern Worten, "
+"alle 횆nderungen im Arbeitsbereich die man noch nicht mit 'git add' oder 'git"
+" rm' hinzugef체gt hat, aber noch hinzuf체gen k철nnte."
#. type: Labeled list
#: en/git-diff.txt:32
@@ -30072,8 +29489,8 @@ msgstr "'git diff' [--options] [--] [<path>...]"
#. type: Plain text
#: en/git-diff.txt:40
msgid ""
-"This form is to compare the given two paths on the filesystem. You can omit "
-"the `--no-index` option when running the command in a working tree "
+"This form is to compare the given two paths on the filesystem. You can omit"
+" the `--no-index` option when running the command in a working tree "
"controlled by Git and at least one of the paths points outside the working "
"tree, or when running the command outside a working tree controlled by Git."
msgstr ""
@@ -30084,14 +29501,13 @@ msgstr ""
msgid "'git diff' [--options] --cached [<commit>] [--] [<path>...]"
msgstr "'git diff' [--options] --cached [<commit>] [--] [<path>...]"
-#
#. type: Plain text
#: en/git-diff.txt:50
#, fuzzy
#| msgid ""
-#| "This form is to view the changes you staged for the next commit relative "
-#| "to the named <commit>. Typically you would want comparison with the "
-#| "latest commit, so if you do not give <commit>, it defaults to HEAD."
+#| "This form is to view the changes you staged for the next commit relative to "
+#| "the named <commit>. Typically you would want comparison with the latest "
+#| "commit, so if you do not give <commit>, it defaults to HEAD."
msgid ""
"This form is to view the changes you staged for the next commit relative to "
"the named <commit>. Typically you would want comparison with the latest "
@@ -30110,7 +29526,6 @@ msgstr ""
msgid "'git diff' [--options] <commit> [--] [<path>...]"
msgstr "'git diff' [--options] <commit> [--] [<path>...]"
-#
#. type: Plain text
#: en/git-diff.txt:58
msgid ""
@@ -30129,7 +29544,6 @@ msgstr ""
msgid "'git diff' [--options] <commit> <commit> [--] [<path>...]"
msgstr "'git diff' [--options] <commit> <commit> [--] [<path>...]"
-#
#. type: Plain text
#: en/git-diff.txt:63
msgid "This is to view the changes between two arbitrary <commit>."
@@ -30141,7 +29555,6 @@ msgstr "Zeige die 횆nderungen zwischen zwei Eintragungen (commits)."
msgid "'git diff' [--options] <commit>..<commit> [--] [<path>...]"
msgstr "'git diff' [--options] <commit>..<commit> [--] [<path>...]"
-#
#. type: Plain text
#: en/git-diff.txt:69
msgid ""
@@ -30157,61 +29570,58 @@ msgstr ""
msgid "'git diff' [--options] <commit>\\...<commit> [--] [<path>...]"
msgstr "'git diff' [--options] <commit>\\...<commit> [--] [<path>...]"
-#
#. type: Plain text
#: en/git-diff.txt:77
msgid ""
"This form is to view the changes on the branch containing and up to the "
-"second <commit>, starting at a common ancestor of both <commit>. \"git diff "
-"A\\...B\" is equivalent to \"git diff $(git-merge-base A B) B\". You can "
+"second <commit>, starting at a common ancestor of both <commit>. \"git diff"
+" A\\...B\" is equivalent to \"git diff $(git-merge-base A B) B\". You can "
"omit any one of <commit>, which has the same effect as using HEAD instead."
msgstr ""
"Zeige die 횆nderungen im Arbeitszweig (branch) der die zweite Eintragung "
"(commit) enth채lt, ausgehend vom gemeinsamen Ursprung beider <commit>. \"git "
-"diff A\\...B\" ist somit equivalent zu \"git diff $(git-merge-base A B) B\". "
-"Bleibt einer der beiden <commit> unerw채hnt, wird statt dessen HEAD verwendet."
+"diff A\\...B\" ist somit equivalent zu \"git diff $(git-merge-base A B) B\"."
+" Bleibt einer der beiden <commit> unerw채hnt, wird statt dessen HEAD "
+"verwendet."
-#
#. type: Plain text
#: en/git-diff.txt:82
#, fuzzy
#| msgid ""
-#| "Just in case if you are doing something exotic, it should be noted that "
-#| "all of the <commit> in the above description, except for the last two "
-#| "forms that use \"..\" notations, can be any <tree-ish>."
+#| "Just in case if you are doing something exotic, it should be noted that all "
+#| "of the <commit> in the above description, except for the last two forms that"
+#| " use \"..\" notations, can be any <tree-ish>."
msgid ""
"Just in case if you are doing something exotic, it should be noted that all "
"of the <commit> in the above description, except in the last two forms that "
"use \"..\" notations, can be any <tree>."
msgstr ""
"F체r alle exotischen Anwendungsf채lle sei erw채hnt, da횩 alle <commit> in der "
-"obigen Beschreibung (ausgenommen die letzten beiden mit der \"..\" Notation) "
-"auch baumartig (<tree-ish> verwendet werden k철nnen."
+"obigen Beschreibung (ausgenommen die letzten beiden mit der \"..\" Notation)"
+" auch baumartig (<tree-ish> verwendet werden k철nnen."
-#
#. type: Plain text
#: en/git-diff.txt:89
#, fuzzy
#| msgid ""
#| "For a more complete list of ways to spell <commit>, see \"SPECIFYING "
-#| "REVISIONS\" section in linkgit:git-rev-parse[1]. However, \"diff\" is "
-#| "about comparing two _endpoints_, not ranges, and the range notations "
-#| "(\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a "
-#| "range as defined in the \"SPECIFYING RANGES\" section in linkgit:git-rev-"
-#| "parse[1]."
+#| "REVISIONS\" section in linkgit:git-rev-parse[1]. However, \"diff\" is about"
+#| " comparing two _endpoints_, not ranges, and the range notations "
+#| "(\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range "
+#| "as defined in the \"SPECIFYING RANGES\" section in linkgit:git-rev-parse[1]."
msgid ""
"For a more complete list of ways to spell <commit>, see \"SPECIFYING "
"REVISIONS\" section in linkgit:gitrevisions[7]. However, \"diff\" is about "
-"comparing two _endpoints_, not ranges, and the range notations (\"<commit>.."
-"<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in "
-"the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
+"comparing two _endpoints_, not ranges, and the range notations "
+"(\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range "
+"as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
msgstr ""
"F체r eine detailliertere Liste der M철glichkeiten <commit> anzugeben, siehe "
"das Kapitel \"SPECIFYING REVISIONS\" in linkgit:git-rev-parse[1]. "
"Allerdings vergleicht \"diff\" immer zwei Versionen miteinander und keine "
-"Bereiche. Die Angaben (\"<commit>..<commit>\" und \"<commit>\\...<commit>"
-"\") bezeichnen also keine 'Bereiche' wie im \"SPECIFYING RANGES\" Kapitel "
-"in linkgit:git-rev-parse[1] beschrieben."
+"Bereiche. Die Angaben (\"<commit>..<commit>\" und \"<commit>\\...<commit>\")"
+" bezeichnen also keine 'Bereiche' wie im \"SPECIFYING RANGES\" Kapitel in "
+"linkgit:git-rev-parse[1] beschrieben."
#. type: Labeled list
#: en/git-diff.txt:90
@@ -30227,15 +29637,14 @@ msgid ""
"objects."
msgstr ""
-#
#. type: Plain text
#: en/git-diff.txt:104
msgid ""
"The <paths> parameters, when given, are used to limit the diff to the named "
"paths (you can give directory names and get diff for all files under them)."
msgstr ""
-"Werden Dateipfad Angaben getroffen so schr채nkt dies den Vergleich (diff) auf "
-"diese Dateipfade ein. Handelt es sich um Verzeichnisnamen, so wird der "
+"Werden Dateipfad Angaben getroffen so schr채nkt dies den Vergleich (diff) auf"
+" diese Dateipfade ein. Handelt es sich um Verzeichnisnamen, so wird der "
"Vergleich auf alle Dateien unterhalb dieser Verzeichnisse angewendet."
#. type: Labeled list
@@ -30256,7 +29665,6 @@ msgstr ""
"$ git diff --cached <2>\n"
"$ git diff HEAD <3>\n"
-#
#. type: Plain text
#: en/git-diff.txt:120
msgid "Changes in the working tree not yet staged for the next commit."
@@ -30264,17 +29672,15 @@ msgstr ""
"횆nderungen im Arbeitsbereich, die noch nicht im Index f체r die n채chste "
"Eintragung (commit) vorbereitet wurden."
-#
#. type: Plain text
#: en/git-diff.txt:122
msgid ""
-"Changes between the index and your last commit; what you would be committing "
-"if you run \"git commit\" without \"-a\" option."
+"Changes between the index and your last commit; what you would be committing"
+" if you run \"git commit\" without \"-a\" option."
msgstr ""
"횆nderungen zwischen dem Index und der letzten Eintragung (commit), also was "
"im Falle von 'git commit' (ohne \"-a\") eingetragen werden w체rde."
-#
#. type: Plain text
#: en/git-diff.txt:124
msgid ""
@@ -30302,7 +29708,6 @@ msgstr ""
"$ git diff HEAD -- ./test <2>\n"
"$ git diff HEAD^ HEAD <3>\n"
-#
#. type: Plain text
#: en/git-diff.txt:135
msgid ""
@@ -30312,7 +29717,6 @@ msgstr ""
"Anstatt mit der neuesten Version des aktuellen Versionszweiges (branch) zu "
"vergleichen, verwende die neueste Version des \"test\" Versionszweiges."
-#
#. type: Plain text
#: en/git-diff.txt:138
msgid ""
@@ -30324,7 +29728,6 @@ msgstr ""
"Versionszweites. Der Vergleich wird allerdings auf die Datei \"./test\" "
"eingeschr채nkt."
-#
#. type: Plain text
#: en/git-diff.txt:139
msgid "Compare the version before the last commit and the last commit."
@@ -30350,7 +29753,6 @@ msgstr ""
"$ git diff topic..master <2>\n"
"$ git diff topic...master <3>\n"
-#
#. type: Plain text
#: en/git-diff.txt:149
msgid "Changes between the tips of the topic and the master branches."
@@ -30358,14 +29760,12 @@ msgstr ""
"Vergleich zwischen den neuesten Versionen des 'topic' und des 'master' "
"Versionszweiges."
-#
#. type: Plain text
#: en/git-diff.txt:150 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52
#: en/git-web--browse.txt:52
msgid "Same as above."
msgstr "Ident mit dem vorhergehenden Beispiel."
-#
#. type: Plain text
#: en/git-diff.txt:152
msgid ""
@@ -30393,25 +29793,23 @@ msgstr ""
"$ git diff --name-status <2>\n"
"$ git diff arch/i386 include/asm-i386 <3>\n"
-#
#. type: Plain text
#: en/git-diff.txt:163
#, fuzzy
#| msgid ""
#| "Show only modification, rename and copy, but not addition nor deletion."
-msgid "Show only modification, rename, and copy, but not addition or deletion."
+msgid ""
+"Show only modification, rename, and copy, but not addition or deletion."
msgstr ""
"Zeige nur 횆nderungen, Umbenennungen und Kopien, aber keine L철schungen oder "
"Hinzuf체gungen."
-#
#. type: Plain text
#: en/git-diff.txt:165
msgid "Show only names and the nature of change, but not actual diff output."
msgstr ""
"Zeige nur Namen und die Art der 횆nderung aber keine genauen Unterschiede."
-#
#. type: Plain text
#: en/git-diff.txt:166
msgid "Limit diff output to named subtrees."
@@ -30433,7 +29831,6 @@ msgstr ""
"$ git diff --find-copies-harder -B -C <1>\n"
"$ git diff -R <2>\n"
-#
#. type: Plain text
#: en/git-diff.txt:176
msgid ""
@@ -30443,13 +29840,11 @@ msgstr ""
"F체hre extra Iterationen durch um Umbenennungen, Kopien und komplett "
"neugeschriebene Teile zu finden (sehr zeitaufwendig!)."
-#
#. type: Plain text
#: en/git-diff.txt:177
msgid "Output diff in reverse."
msgstr "Ausgabe in umgekehrter Reihenfolge."
-#
#. type: Plain text
#: en/git-diff.txt:186
#, fuzzy
@@ -30457,18 +29852,17 @@ msgstr "Ausgabe in umgekehrter Reihenfolge."
#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
#| "merge[1], linkgit:git-commit-tree[1]"
msgid ""
-"diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:"
-"gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
+"diff(1), linkgit:git-difftool[1], linkgit:git-log[1], "
+"linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
msgstr ""
"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
"merge[1], linkgit:git-commit-tree[1]"
#. type: Title =
#: en/git-fast-export.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-fsck-objects(1)"
+#, no-wrap
msgid "git-fast-export(1)"
-msgstr "git-fsck-objects(1)"
+msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
@@ -30527,9 +29921,9 @@ msgstr ""
msgid ""
"When asking to 'abort' (which is the default), this program will die when "
"encountering a signed tag. With 'strip', the tags will silently be made "
-"unsigned, with 'warn-strip' they will be made unsigned but a warning will be "
-"displayed, with 'verbatim', they will be silently exported and with 'warn', "
-"they will be exported, but you will see a warning."
+"unsigned, with 'warn-strip' they will be made unsigned but a warning will be"
+" displayed, with 'verbatim', they will be silently exported and with 'warn',"
+" they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
@@ -30552,8 +29946,8 @@ msgid ""
"When asking to 'abort' (which is the default), this program will die when "
"encountering such a tag. With 'drop' it will omit such tags from the "
"output. With 'rewrite', if the tagged object is a commit, it will rewrite "
-"the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-"
-"list[1])"
+"the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-"
+"rev-list[1])"
msgstr ""
#. type: Labeled list
@@ -30589,11 +29983,11 @@ msgstr "--template=<file>"
msgid ""
"Dumps the internal marks table to <file> when complete. Marks are written "
"one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks "
-"for blobs are ignored. Backends can use this file to validate imports after "
-"they have been completed, or to save the marks table across incremental "
+"for blobs are ignored. Backends can use this file to validate imports after"
+" they have been completed, or to save the marks table across incremental "
"runs. As <file> is only opened and truncated at completion, the same path "
-"can also be safely given to --import-marks. The file will not be written if "
-"no new object has been marked/exported."
+"can also be safely given to --import-marks. The file will not be written if"
+" no new object has been marked/exported."
msgstr ""
#. type: Labeled list
@@ -30622,10 +30016,9 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:84
-#, fuzzy, no-wrap
-#| msgid "--missing-ok"
+#, no-wrap
msgid "--fake-missing-tagger"
-msgstr "--missing-ok"
+msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:89
@@ -30639,7 +30032,7 @@ msgstr ""
#: en/git-fast-export.txt:90
#, no-wrap
msgid "--use-done-feature"
-msgstr ""
+msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:93
@@ -30650,10 +30043,9 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:94
-#, fuzzy, no-wrap
-#| msgid "--no-track"
+#, no-wrap
msgid "--no-data"
-msgstr "--no-track"
+msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:101
@@ -30667,10 +30059,9 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
-#, fuzzy, no-wrap
-#| msgid "--full-diff"
+#, no-wrap
msgid "--full-tree"
-msgstr "--full-diff"
+msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:107
@@ -30685,7 +30076,7 @@ msgstr ""
#: en/git-fast-export.txt:108
#, no-wrap
msgid "--anonymize"
-msgstr ""
+msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:112
@@ -30696,10 +30087,9 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:113
-#, fuzzy, no-wrap
-#| msgid "--refresh"
+#, no-wrap
msgid "--refspec"
-msgstr "--refresh"
+msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:116
@@ -30719,8 +30109,8 @@ msgstr ""
msgid ""
"A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that "
"specifies the specific objects and references to export. For example, "
-"`master~10..master` causes the current master reference to be exported along "
-"with all objects added since its 10th ancestor commit."
+"`master~10..master` causes the current master reference to be exported along"
+" with all objects added since its 10th ancestor commit."
msgstr ""
#. type: delimited block -
@@ -30756,8 +30146,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:147
msgid ""
-"Note that this assumes that none of the blobs and commit messages referenced "
-"by that revision range contains the string 'refs/heads/master'."
+"Note that this assumes that none of the blobs and commit messages referenced"
+" by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
@@ -30858,17 +30248,16 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:211
msgid ""
-"Since 'git fast-import' cannot tag trees, you will not be able to export the "
-"linux.git repository completely, as it contains a tag referencing a tree "
+"Since 'git fast-import' cannot tag trees, you will not be able to export the"
+" linux.git repository completely, as it contains a tag referencing a tree "
"instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-fsck-objects(1)"
+#, no-wrap
msgid "git-fast-import(1)"
-msgstr "git-fsck-objects(1)"
+msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
@@ -30893,8 +30282,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
msgid ""
-"fast-import reads a mixed command/data stream from standard input and writes "
-"one or more packfiles directly into the current repository. When EOF is "
+"fast-import reads a mixed command/data stream from standard input and writes"
+" one or more packfiles directly into the current repository. When EOF is "
"received on standard input, fast import writes out updated branch and tag "
"refs, fully updating the current repository with the newly imported data."
msgstr ""
@@ -30902,8 +30291,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
msgid ""
-"The fast-import backend itself can import into an empty repository (one that "
-"has already been initialized by 'git init') or incrementally update an "
+"The fast-import backend itself can import into an empty repository (one that"
+" has already been initialized by 'git init') or incrementally update an "
"existing populated repository. Whether or not incremental imports are "
"supported from a particular foreign source depends on the frontend program "
"in use."
@@ -30925,18 +30314,17 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:47
-#, fuzzy, no-wrap
-#| msgid "status"
+#, no-wrap
msgid "--stats"
-msgstr "status"
+msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:52
msgid ""
-"Display some basic statistics about the objects fast-import has created, the "
-"packfiles they were stored into, and the memory used by fast-import during "
-"this run. Showing this output is currently the default, but can be disabled "
-"with --quiet."
+"Display some basic statistics about the objects fast-import has created, the"
+" packfiles they were stored into, and the memory used by fast-import during "
+"this run. Showing this output is currently the default, but can be disabled"
+" with --quiet."
msgstr ""
#. type: Title ~
@@ -30969,22 +30357,22 @@ msgstr ""
#: en/git-fast-import.txt:67
msgid ""
"Specify the type of dates the frontend will supply to fast-import within "
-"`author`, `committer` and `tagger` commands. See ``Date Formats'' below for "
-"details about which formats are supported, and their syntax."
+"`author`, `committer` and `tagger` commands. See ``Date Formats'' below for"
+" details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:68
#, no-wrap
msgid "--done"
-msgstr ""
+msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:73
msgid ""
-"Terminate with error if there is no `done` command at the end of the "
-"stream. This option might be useful for detecting errors that cause the "
-"frontend to terminate before it has started to write a stream."
+"Terminate with error if there is no `done` command at the end of the stream."
+" This option might be useful for detecting errors that cause the frontend "
+"to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
@@ -31008,8 +30396,9 @@ msgstr ""
msgid ""
"Before processing any input, load the marks specified in <file>. The input "
"file must exist, must be readable, and must use the same format as produced "
-"by --export-marks. Multiple options may be supplied to import more than one "
-"set of marks. If a mark is defined to different values, the last file wins."
+"by --export-marks. Multiple options may be supplied to import more than one"
+" set of marks. If a mark is defined to different values, the last file "
+"wins."
msgstr ""
#. type: Labeled list
@@ -31029,7 +30418,7 @@ msgstr ""
#: en/git-fast-import.txt:98
#, no-wrap
msgid "--[no-]relative-marks"
-msgstr ""
+msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:105
@@ -31044,8 +30433,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:108
msgid ""
-"Relative and non-relative marks may be combined by interweaving --(no-)-"
-"relative-marks with the --(import|export)-marks= options."
+"Relative and non-relative marks may be combined by interweaving "
+"--(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
@@ -31077,8 +30466,8 @@ msgstr ""
#: en/git-fast-import.txt:121
msgid ""
"Maximum size of a blob that fast-import will attempt to create a delta for, "
-"expressed in bytes. The default is 512m (512 MiB). Some importers may wish "
-"to lower this on systems with constrained memory."
+"expressed in bytes. The default is 512m (512 MiB). Some importers may wish"
+" to lower this on systems with constrained memory."
msgstr ""
#. type: Labeled list
@@ -31105,14 +30494,15 @@ msgstr "--template=<file>"
#: en/git-fast-import.txt:134
msgid ""
"After creating a packfile, print a line of data to <file> listing the "
-"filename of the packfile and the last commit on each branch that was written "
-"to that packfile. This information may be useful after importing projects "
+"filename of the packfile and the last commit on each branch that was written"
+" to that packfile. This information may be useful after importing projects "
"whose total object set exceeds the 4 GiB packfile limit, as these commits "
"can be used as edge points during calls to 'git pack-objects'."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:135 en/git-pack-objects.txt:110 en/git-repack.txt:108
+#: en/git-fast-import.txt:135 en/git-pack-objects.txt:110
+#: en/git-repack.txt:108
#, no-wrap
msgid "--max-pack-size=<n>"
msgstr ""
@@ -31122,7 +30512,6 @@ msgstr ""
msgid "Maximum size of each output packfile. The default is unlimited."
msgstr ""
-#
#. type: Plain text
#: en/git-fast-import.txt:141
#, fuzzy
@@ -31143,18 +30532,18 @@ msgid ""
"amount of memory usage and processing time. Assuming the frontend is able "
"to keep up with fast-import and feed it a constant stream of data, import "
"times for projects holding 10+ years of history and containing 100,000+ "
-"individual commits are generally completed in just 1-2 hours on quite modest "
-"(~$2,000 USD) hardware."
+"individual commits are generally completed in just 1-2 hours on quite modest"
+" (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:156
msgid ""
-"Most bottlenecks appear to be in foreign source data access (the source just "
-"cannot extract revisions fast enough) or disk IO (fast-import writes as fast "
-"as the disk will take the data). Imports will run faster if the source data "
-"is stored on a different drive than the destination Git repository (due to "
-"less IO contention)."
+"Most bottlenecks appear to be in foreign source data access (the source just"
+" cannot extract revisions fast enough) or disk IO (fast-import writes as "
+"fast as the disk will take the data). Imports will run faster if the source"
+" data is stored on a different drive than the destination Git repository "
+"(due to less IO contention)."
msgstr ""
#. type: Title -
@@ -31195,11 +30584,11 @@ msgid ""
"fast-import does not lock the branch or tag refs it is actively importing. "
"After the import, during its ref update phase, fast-import tests each "
"existing branch ref to verify the update will be a fast-forward update (the "
-"commit stored in the ref is contained in the new history of the commit to be "
-"written). If the update is not a fast-forward update, fast-import will skip "
-"updating that ref and instead prints a warning message. fast-import will "
-"always attempt to update all branch refs, and does not stop on the first "
-"failure."
+"commit stored in the ref is contained in the new history of the commit to be"
+" written). If the update is not a fast-forward update, fast-import will "
+"skip updating that ref and instead prints a warning message. fast-import "
+"will always attempt to update all branch refs, and does not stop on the "
+"first failure."
msgstr ""
#. type: Plain text
@@ -31231,8 +30620,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:206
msgid ""
-"fast-import does not use or alter the current working directory, or any file "
-"within it. (It does however update the current Git repository, as "
+"fast-import does not use or alter the current working directory, or any file"
+" within it. (It does however update the current Git repository, as "
"referenced by `GIT_DIR`.) Therefore an import frontend may use the working "
"directory for its own purposes, such as extracting file revisions from the "
"foreign source. This ignorance of the working directory also allows fast-"
@@ -31250,10 +30639,10 @@ msgstr "Output format"
#. type: Plain text
#: en/git-fast-import.txt:214
msgid ""
-"With the exception of raw file data (which Git does not interpret) the fast-"
-"import input format is text (ASCII) based. This text based format "
-"simplifies development and debugging of frontend programs, especially when a "
-"higher level language such as Perl, Python or Ruby is being used."
+"With the exception of raw file data (which Git does not interpret) the "
+"fast-import input format is text (ASCII) based. This text based format "
+"simplifies development and debugging of frontend programs, especially when a"
+" higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
@@ -31262,9 +30651,9 @@ msgid ""
"fast-import is very strict about its input. Where we say SP below we mean "
"*exactly* one space. Likewise LF means one (and only one) linefeed and HT "
"one (and only one) horizontal tab. Supplying additional whitespace "
-"characters will cause unexpected results, such as branch names or file names "
-"with leading or trailing spaces in their name, or early termination of fast-"
-"import when it encounters unexpected input."
+"characters will cause unexpected results, such as branch names or file names"
+" with leading or trailing spaces in their name, or early termination of "
+"fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
@@ -31315,18 +30704,18 @@ msgstr ""
#: en/git-fast-import.txt:246
msgid ""
"The time of the event is specified by `<time>` as the number of seconds "
-"since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII "
-"decimal integer."
+"since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII"
+" decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:252
msgid ""
-"The local offset is specified by `<offutc>` as a positive or negative offset "
-"from UTC. For example EST (which is 5 hours behind UTC) would be expressed "
-"in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not "
-"affect `<time>`; it is used only as an advisement to help formatting "
-"routines display the timestamp."
+"The local offset is specified by `<offutc>` as a positive or negative offset"
+" from UTC. For example EST (which is 5 hours behind UTC) would be "
+"expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset "
+"does not affect `<time>`; it is used only as an advisement to help "
+"formatting routines display the timestamp."
msgstr ""
#. type: Plain text
@@ -31334,8 +30723,8 @@ msgstr ""
msgid ""
"If the local offset is not available in the source material, use ``+0000'', "
"or the most common local offset. For example many organizations have a CVS "
-"repository which has only ever been accessed by users who are located in the "
-"same location and time zone. In this case a reasonable offset from UTC "
+"repository which has only ever been accessed by users who are located in the"
+" same location and time zone. In this case a reasonable offset from UTC "
"could be assumed."
msgstr ""
@@ -31370,16 +30759,17 @@ msgstr ""
msgid ""
"Some malformed strings may be accepted as valid dates. In some of these "
"cases Git will still be able to obtain the correct date from the malformed "
-"string. There are also some types of malformed strings which Git will parse "
-"wrong, and yet consider valid. Seriously malformed strings will be rejected."
+"string. There are also some types of malformed strings which Git will parse"
+" wrong, and yet consider valid. Seriously malformed strings will be "
+"rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:280
msgid ""
"Unlike the `raw` format above, the time zone/UTC offset information "
-"contained in an RFC 2822 date string is used to adjust the date value to UTC "
-"prior to storage. Therefore it is important that this information be as "
+"contained in an RFC 2822 date string is used to adjust the date value to UTC"
+" prior to storage. Therefore it is important that this information be as "
"accurate as possible."
msgstr ""
@@ -31394,9 +30784,9 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:290
msgid ""
-"Frontends should prefer the `raw` format if the source material already uses "
-"UNIX-epoch format, can be coaxed to give dates in that format, or its format "
-"is easily convertible to it, as there is no ambiguity in parsing."
+"Frontends should prefer the `raw` format if the source material already uses"
+" UNIX-epoch format, can be coaxed to give dates in that format, or its "
+"format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
@@ -31408,8 +30798,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
msgid ""
-"Always use the current time and time zone. The literal `now` must always be "
-"supplied for `<when>`."
+"Always use the current time and time zone. The literal `now` must always be"
+" supplied for `<when>`."
msgstr ""
#. type: Plain text
@@ -31432,8 +30822,8 @@ msgstr ""
#: en/git-fast-import.txt:311
msgid ""
"If separate `author` and `committer` commands are used in a `commit` the "
-"timestamps may not match, as the system clock will be polled twice (once for "
-"each command). The only way to ensure that both author and committer "
+"timestamps may not match, as the system clock will be polled twice (once for"
+" each command). The only way to ensure that both author and committer "
"identity information has the same timestamp is to omit `author` (thus "
"copying from `committer`) or to use a date format other than `now`."
msgstr ""
@@ -31530,8 +30920,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:349
msgid ""
-"Causes fast-import to echo the entire line to its own standard output. This "
-"command is optional and is not needed to perform an import."
+"Causes fast-import to echo the entire line to its own standard output. This"
+" command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
@@ -31583,8 +30973,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:369
msgid ""
-"Causes fast-import to print a line describing a directory entry in 'ls-tree' "
-"format to the file descriptor set with `--cat-blob-fd` or `stdout` if "
+"Causes fast-import to print a line describing a directory entry in 'ls-tree'"
+" format to the file descriptor set with `--cat-blob-fd` or `stdout` if "
"unspecified."
msgstr ""
@@ -31618,8 +31008,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:383
msgid ""
-"Create or update a branch with a new commit, recording one logical change to "
-"the project."
+"Create or update a branch with a new commit, recording one logical change to"
+" the project."
msgstr ""
#. type: delimited block .
@@ -31661,11 +31051,11 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:414
msgid ""
-"The `data` command following `committer` must supply the commit message (see "
-"below for `data` command syntax). To import an empty commit message use a 0 "
-"length data. Commit messages are free-form and are not interpreted by Git. "
-"Currently they must be encoded in UTF-8, as fast-import does not permit "
-"other encodings to be specified."
+"The `data` command following `committer` must supply the commit message (see"
+" below for `data` command syntax). To import an empty commit message use a "
+"0 length data. Commit messages are free-form and are not interpreted by "
+"Git. Currently they must be encoded in UTF-8, as fast-import does not "
+"permit other encodings to be specified."
msgstr ""
#. type: Plain text
@@ -31719,11 +31109,11 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:445
msgid ""
-"Here `<name>` is the person's display name (for example ``Com M Itter'') and "
-"`<email>` is the person's email address (``\\cm@example.com''). `LT` and "
+"Here `<name>` is the person's display name (for example ``Com M Itter'') and"
+" `<email>` is the person's email address (``\\cm@example.com''). `LT` and "
"`GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. "
-"These are required to delimit the email address from the other fields in the "
-"line. Note that `<name>` and `<email>` are free-form and may contain any "
+"These are required to delimit the email address from the other fields in the"
+" line. Note that `<name>` and `<email>` are free-form and may contain any "
"sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 "
"encoded."
msgstr ""
@@ -31755,13 +31145,13 @@ msgstr ""
#: en/git-fast-import.txt:468
msgid ""
"Omitting the `from` command in the first commit of a new branch will cause "
-"fast-import to create that commit with no ancestor. This tends to be desired "
-"only for the initial commit of a project. If the frontend creates all files "
-"from scratch when making a new branch, a `merge` command may be used instead "
-"of `from` to start the commit with an empty tree. Omitting the `from` "
-"command on existing branches is usually desired, as the current commit on "
-"that branch is automatically assumed to be the first ancestor of the new "
-"commit."
+"fast-import to create that commit with no ancestor. This tends to be desired"
+" only for the initial commit of a project. If the frontend creates all "
+"files from scratch when making a new branch, a `merge` command may be used "
+"instead of `from` to start the commit with an empty tree. Omitting the "
+"`from` command on existing branches is usually desired, as the current "
+"commit on that branch is automatically assumed to be the first ancestor of "
+"the new commit."
msgstr ""
#. type: Plain text
@@ -31792,10 +31182,10 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:485
msgid ""
-"The reason fast-import uses `:` to denote a mark reference is this character "
-"is not legal in a Git branch name. The leading `:` makes it easy to "
-"distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/"
-"heads/42`), or an abbreviated SHA-1 which happened to consist only of "
+"The reason fast-import uses `:` to denote a mark reference is this character"
+" is not legal in a Git branch name. The leading `:` makes it easy to "
+"distinguish between the mark 42 (`:42`) and the branch 42 (`42` or "
+"`refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of "
"base-10 digits."
msgstr ""
@@ -31819,14 +31209,15 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:495
msgid ""
-"The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
+"The special null SHA-1 (40 zeros) specifies that the branch is to be "
+"removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:498
msgid ""
-"The special case of restarting an incremental import from the current branch "
-"value should be written as:"
+"The special case of restarting an incremental import from the current branch"
+" value should be written as:"
msgstr ""
#. type: delimited block -
@@ -31857,8 +31248,8 @@ msgstr "--merged"
msgid ""
"Includes one additional ancestor commit. The additional ancestry link does "
"not change the way the tree state is built at this commit. If the `from` "
-"command is omitted when creating a new branch, the first `merge` commit will "
-"be the first ancestor of the current commit, and the branch will start out "
+"command is omitted when creating a new branch, the first `merge` commit will"
+" be the first ancestor of the current commit, and the branch will start out "
"with no files. An unlimited number of `merge` commands per commit are "
"permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
@@ -31879,8 +31270,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:526
msgid ""
-"Included in a `commit` command to add a new file or change the content of an "
-"existing file. This command has two different means of specifying the "
+"Included in a `commit` command to add a new file or change the content of an"
+" existing file. This command has two different means of specifying the "
"content of the file."
msgstr ""
@@ -31922,8 +31313,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:545
msgid ""
-"The data content for the file has not been supplied yet. The frontend wants "
-"to supply it as part of this modify command."
+"The data content for the file has not been supplied yet. The frontend wants"
+" to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
@@ -31942,15 +31333,15 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
msgid ""
-"In both formats `<mode>` is the type of file entry, specified in octal. Git "
-"only supports the following modes:"
+"In both formats `<mode>` is the type of file entry, specified in octal. Git"
+" only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:559
msgid ""
-"`100644` or `644`: A normal (not-executable) file. The majority of files in "
-"most projects use this mode. If in doubt, this is what you want."
+"`100644` or `644`: A normal (not-executable) file. The majority of files in"
+" most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
@@ -31967,8 +31358,8 @@ msgstr ""
#: en/git-fast-import.txt:564
msgid ""
"`160000`: A gitlink, SHA-1 of the object refers to a commit in another "
-"repository. Git links can only be specified by SHA or through a commit mark. "
-"They are used to implement submodules."
+"repository. Git links can only be specified by SHA or through a commit mark."
+" They are used to implement submodules."
msgstr ""
#. type: Plain text
@@ -31988,8 +31379,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:573
msgid ""
-"A `<path>` string must use UNIX-style directory separators (forward slash `/"
-"`), may contain any byte other than `LF`, and must not start with double "
+"A `<path>` string must use UNIX-style directory separators (forward slash "
+"`/`), may contain any byte other than `LF`, and must not start with double "
"quote (`\"`)."
msgstr ""
@@ -31997,11 +31388,11 @@ msgstr ""
#: en/git-fast-import.txt:580
msgid ""
"A path can use C-style string quoting; this is accepted in all cases and "
-"mandatory if the filename starts with double quote or contains `LF`. In C-"
-"style quoting, the complete name should be surrounded with double quotes, "
+"mandatory if the filename starts with double quote or contains `LF`. In "
+"C-style quoting, the complete name should be surrounded with double quotes, "
"and any `LF`, backslash, or double quote characters must be escaped by "
-"preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it"
-"\"`)."
+"preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in "
+"it\"`)."
msgstr ""
#. type: Plain text
@@ -32027,13 +31418,14 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:588
msgid ""
-"contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` "
-"are invalid)."
+"contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar`"
+" are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:590
-msgid "The root of the tree can be represented by an empty string as `<path>`."
+msgid ""
+"The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
@@ -32066,8 +31458,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
msgid ""
-"here `<path>` is the complete path of the file or subdirectory to be removed "
-"from the branch. See `filemodify` above for a detailed description of "
+"here `<path>` is the complete path of the file or subdirectory to be removed"
+" from the branch. See `filemodify` above for a detailed description of "
"`<path>`."
msgstr ""
@@ -32082,8 +31474,8 @@ msgstr ""
msgid ""
"Recursively copies an existing file or subdirectory to a different location "
"within the branch. The existing file or directory must exist. If the "
-"destination exists it will be completely replaced by the content copied from "
-"the source."
+"destination exists it will be completely replaced by the content copied from"
+" the source."
msgstr ""
#. type: delimited block .
@@ -32097,15 +31489,15 @@ msgstr ""
msgid ""
"here the first `<path>` is the source location and the second `<path>` is "
"the destination. See `filemodify` above for a detailed description of what "
-"`<path>` may look like. To use a source path that contains SP the path must "
-"be quoted."
+"`<path>` may look like. To use a source path that contains SP the path must"
+" be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
msgid ""
-"A `filecopy` command takes effect immediately. Once the source location has "
-"been copied to the destination any future commands applied to the source "
+"A `filecopy` command takes effect immediately. Once the source location has"
+" been copied to the destination any future commands applied to the source "
"location will not impact the destination of the copy."
msgstr ""
@@ -32184,10 +31576,10 @@ msgstr ""
msgid ""
"Issuing a `filedeleteall` followed by the needed `filemodify` commands to "
"set the correct content will produce the same results as sending only the "
-"needed `filemodify` and `filedelete` commands. The `filedeleteall` approach "
-"may however require fast-import to use slightly more memory per active "
-"branch (less than 1 MiB for even most large projects); so frontends that can "
-"easily obtain only the affected paths for a commit are encouraged to do so."
+"needed `filemodify` and `filedelete` commands. The `filedeleteall` approach"
+" may however require fast-import to use slightly more memory per active "
+"branch (less than 1 MiB for even most large projects); so frontends that can"
+" easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
@@ -32200,8 +31592,8 @@ msgstr ""
#: en/git-fast-import.txt:693
msgid ""
"Included in a `commit` `<notes_ref>` command to add a new note annotating a "
-"`<commit-ish>` or change this annotation contents. Internally it is similar "
-"to filemodify 100644 on `<commit-ish>` path (maybe split into "
+"`<commit-ish>` or change this annotation contents. Internally it is similar"
+" to filemodify 100644 on `<commit-ish>` path (maybe split into "
"subdirectories). It's not advised to use any other commands to write to the "
"`<notes_ref>` tree except `filedeleteall` to delete all existing notes in "
"this tree. This command has two different means of specifying the content "
@@ -32225,15 +31617,15 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:706
msgid ""
-"Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior "
-"`blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
+"Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior"
+" `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:711
msgid ""
-"The data content for the note has not been supplied yet. The frontend wants "
-"to supply it as part of this modify command."
+"The data content for the note has not been supplied yet. The frontend wants"
+" to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
@@ -32260,11 +31652,11 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:729
msgid ""
-"Arranges for fast-import to save a reference to the current object, allowing "
-"the frontend to recall this object at a future point in time, without "
+"Arranges for fast-import to save a reference to the current object, allowing"
+" the frontend to recall this object at a future point in time, without "
"knowing its SHA-1. Here the current object is the object creation command "
-"the `mark` command appears within. This can be `commit`, `tag`, and `blob`, "
-"but `commit` is the most common usage."
+"the `mark` command appears within. This can be `commit`, `tag`, and `blob`,"
+" but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
@@ -32277,16 +31669,16 @@ msgstr ""
#: en/git-fast-import.txt:738
msgid ""
"where `<idnum>` is the number assigned by the frontend to this mark. The "
-"value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is "
-"reserved and cannot be used as a mark. Only values greater than or equal to "
-"1 may be used as marks."
+"value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is"
+" reserved and cannot be used as a mark. Only values greater than or equal "
+"to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:742
msgid ""
-"New marks are created automatically. Existing marks can be moved to another "
-"object simply by reusing the same `<idnum>` in another `mark` command."
+"New marks are created automatically. Existing marks can be moved to another"
+" object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Plain text
@@ -32346,9 +31738,9 @@ msgstr ""
#: en/git-fast-import.txt:777
msgid ""
"The `data` command following `tagger` must supply the annotated tag message "
-"(see below for `data` command syntax). To import an empty tag message use a "
-"0 length data. Tag messages are free-form and are not interpreted by Git. "
-"Currently they must be encoded in UTF-8, as fast-import does not permit "
+"(see below for `data` command syntax). To import an empty tag message use a"
+" 0 length data. Tag messages are free-form and are not interpreted by Git."
+" Currently they must be encoded in UTF-8, as fast-import does not permit "
"other encodings to be specified."
msgstr ""
@@ -32356,20 +31748,21 @@ msgstr ""
#: en/git-fast-import.txt:785
msgid ""
"Signing annotated tags during import from within fast-import is not "
-"supported. Trying to include your own PGP/GPG signature is not recommended, "
-"as the frontend does not (easily) have access to the complete set of bytes "
+"supported. Trying to include your own PGP/GPG signature is not recommended,"
+" as the frontend does not (easily) have access to the complete set of bytes "
"which normally goes into such a signature. If signing is required, create "
"lightweight tags from within fast-import with `reset`, then create the "
-"annotated versions of those tags offline with the standard 'git tag' process."
+"annotated versions of those tags offline with the standard 'git tag' "
+"process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:792
msgid ""
-"Creates (or recreates) the named branch, optionally starting from a specific "
-"revision. The reset command allows a frontend to issue a new `from` command "
-"for an existing branch, or to create a new branch from an existing commit "
-"without creating a new commit."
+"Creates (or recreates) the named branch, optionally starting from a specific"
+" revision. The reset command allows a frontend to issue a new `from` "
+"command for an existing branch, or to create a new branch from an existing "
+"commit without creating a new commit."
msgstr ""
#. type: delimited block .
@@ -32431,8 +31824,8 @@ msgstr ""
#: en/git-fast-import.txt:832
msgid ""
"The mark command is optional here as some frontends have chosen to generate "
-"the Git SHA-1 for the blob on their own, and feed that directly to "
-"`commit`. This is typically more work than it's worth however, as marks are "
+"the Git SHA-1 for the blob on their own, and feed that directly to `commit`."
+" This is typically more work than it's worth however, as marks are "
"inexpensive to store and easy to use."
msgstr ""
@@ -32446,8 +31839,8 @@ msgstr ""
#: en/git-fast-import.txt:841
msgid ""
"Supplies raw data (for use as blob/file content, commit messages, or "
-"annotated tag messages) to fast-import. Data can be supplied using an exact "
-"byte count or delimited with a terminating line. Real frontends intended "
+"annotated tag messages) to fast-import. Data can be supplied using an exact"
+" byte count or delimited with a terminating line. Real frontends intended "
"for production-quality conversions should always use the exact byte count "
"format, as it is more robust and performs better. The delimited format is "
"intended primarily for testing fast-import."
@@ -32486,17 +31879,17 @@ msgstr ""
msgid ""
"where `<count>` is the exact number of bytes appearing within `<raw>`. The "
"value of `<count>` is expressed as an ASCII decimal integer. The `LF` on "
-"either side of `<raw>` is not included in `<count>` and will not be included "
-"in the imported data."
+"either side of `<raw>` is not included in `<count>` and will not be included"
+" in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:864
msgid ""
-"The `LF` after `<raw>` is optional (it used to be required) but "
-"recommended. Always including it makes debugging a fast-import stream "
-"easier as the next command always starts in column 0 of the next line, even "
-"if `<raw>` did not end with an `LF`."
+"The `LF` after `<raw>` is optional (it used to be required) but recommended."
+" Always including it makes debugging a fast-import stream easier as the "
+"next command always starts in column 0 of the next line, even if `<raw>` did"
+" not end with an `LF`."
msgstr ""
#. type: Labeled list
@@ -32509,8 +31902,8 @@ msgstr ""
#: en/git-fast-import.txt:870
msgid ""
"A delimiter string is used to mark the end of the data. fast-import will "
-"compute the length by searching for the delimiter. This format is primarily "
-"useful for testing and is not recommended for real data."
+"compute the length by searching for the delimiter. This format is primarily"
+" useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
@@ -32527,8 +31920,8 @@ msgstr ""
#: en/git-fast-import.txt:884
msgid ""
"where `<delim>` is the chosen delimiter string. The string `<delim>` must "
-"not appear on a line by itself within `<raw>`, as otherwise fast-import will "
-"think the data ends earlier than it really does. The `LF` immediately "
+"not appear on a line by itself within `<raw>`, as otherwise fast-import will"
+" think the data ends earlier than it really does. The `LF` immediately "
"trailing `<raw>` is part of `<raw>`. This is one of the limitations of the "
"delimited format, it is impossible to supply a data chunk which does not "
"have an LF as its last byte."
@@ -32603,9 +31996,9 @@ msgstr ""
#: en/git-fast-import.txt:931
msgid ""
"The `<any>` part of the command may contain any sequence of bytes that does "
-"not contain `LF`. The `LF` after the command is optional. Callers may wish "
-"to process the output through a tool such as sed to remove the leading part "
-"of the line, for example:"
+"not contain `LF`. The `LF` after the command is optional. Callers may wish"
+" to process the output through a tool such as sed to remove the leading part"
+" of the line, for example:"
msgstr ""
#. type: delimited block =
@@ -32618,8 +32011,8 @@ msgstr ""
#: en/git-fast-import.txt:939
msgid ""
"Placing a `progress` command immediately after a `checkpoint` will inform "
-"the reader when the `checkpoint` has been completed and it can safely access "
-"the refs that fast-import updated."
+"the reader when the `checkpoint` has been completed and it can safely access"
+" the refs that fast-import updated."
msgstr ""
#. type: Plain text
@@ -32641,9 +32034,9 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:955
msgid ""
-"This command can be used anywhere in the stream that comments are accepted. "
-"In particular, the `get-mark` command can be used in the middle of a commit "
-"but not in the middle of a `data` command."
+"This command can be used anywhere in the stream that comments are accepted."
+" In particular, the `get-mark` command can be used in the middle of a "
+"commit but not in the middle of a `data` command."
msgstr ""
#. type: Plain text
@@ -32692,17 +32085,17 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
msgid ""
-"This command can be used anywhere in the stream that comments are accepted. "
-"In particular, the `cat-blob` command can be used in the middle of a commit "
-"but not in the middle of a `data` command."
+"This command can be used anywhere in the stream that comments are accepted."
+" In particular, the `cat-blob` command can be used in the middle of a "
+"commit but not in the middle of a `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:996
msgid ""
"Prints information about the object at a path to a file descriptor "
-"previously arranged with the `--cat-blob-fd` argument. This allows printing "
-"a blob from the active commit (with `cat-blob`) or copying a blob or tree "
+"previously arranged with the `--cat-blob-fd` argument. This allows printing"
+" a blob from the active commit (with `cat-blob`) or copying a blob or tree "
"from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
@@ -32723,8 +32116,8 @@ msgstr ""
#: en/git-fast-import.txt:1004
msgid ""
"This form can only be used in the middle of a `commit`. The path names a "
-"directory entry within fast-import's active commit. The path must be quoted "
-"in this case."
+"directory entry within fast-import's active commit. The path must be quoted"
+" in this case."
msgstr ""
#. type: delimited block .
@@ -32793,8 +32186,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1046
msgid ""
-"Require that fast-import supports the specified feature, or abort if it does "
-"not."
+"Require that fast-import supports the specified feature, or abort if it does"
+" not."
msgstr ""
#. type: delimited block .
@@ -32861,12 +32254,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1071
msgid ""
-"Like --import-marks except in two respects: first, only one \"feature import-"
-"marks\" or \"feature import-marks-if-exists\" command is allowed per stream; "
-"second, an --import-marks= or --import-marks-if-exists command-line option "
-"overrides any of these \"feature\" commands in the stream; third, \"feature "
-"import-marks-if-exists\" like a corresponding command-line option silently "
-"skips a nonexistent file."
+"Like --import-marks except in two respects: first, only one \"feature "
+"import-marks\" or \"feature import-marks-if-exists\" command is allowed per "
+"stream; second, an --import-marks= or --import-marks-if-exists command-line "
+"option overrides any of these \"feature\" commands in the stream; third, "
+"\"feature import-marks-if-exists\" like a corresponding command-line option "
+"silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
@@ -32890,11 +32283,11 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1082
msgid ""
-"Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command "
-"respectively. Versions of fast-import not supporting the specified command "
-"will exit with a message indicating so. This lets the import error out "
-"early with a clear message, rather than wasting time on the early part of an "
-"import before the unsupported command is detected."
+"Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command"
+" respectively. Versions of fast-import not supporting the specified command"
+" will exit with a message indicating so. This lets the import error out "
+"early with a clear message, rather than wasting time on the early part of an"
+" import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
@@ -32931,9 +32324,10 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1103
msgid ""
-"Processes the specified option so that git fast-import behaves in a way that "
-"suits the frontend's needs. Note that options specified by the frontend are "
-"overridden by any options the user may specify to git fast-import itself."
+"Processes the specified option so that git fast-import behaves in a way that"
+" suits the frontend's needs. Note that options specified by the frontend "
+"are overridden by any options the user may specify to git fast-import "
+"itself."
msgstr ""
#. type: delimited block .
@@ -32946,23 +32340,23 @@ msgstr ""
#: en/git-fast-import.txt:1111
msgid ""
"The `<option>` part of the command may contain any of the options listed in "
-"the OPTIONS section that do not change import semantics, without the leading "
-"`--` and is treated in the same way."
+"the OPTIONS section that do not change import semantics, without the leading"
+" `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1115
msgid ""
"Option commands must be the first commands on the input (not counting "
-"feature commands), to give an option command after any non-option command is "
-"an error."
+"feature commands), to give an option command after any non-option command is"
+" an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1118
msgid ""
-"The following command-line options change import semantics and may therefore "
-"not be passed as option:"
+"The following command-line options change import semantics and may therefore"
+" not be passed as option:"
msgstr ""
#. type: Plain text
@@ -32980,8 +32374,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1133
msgid ""
-"If the `--done` command-line option or `feature done` command is in use, the "
-"`done` command is mandatory and marks the end of the stream."
+"If the `--done` command-line option or `feature done` command is in use, the"
+" `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
@@ -32993,8 +32387,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1142
msgid ""
-"New objects written by fast-import are not available immediately. Most fast-"
-"import commands have no visible effect until the next checkpoint (or "
+"New objects written by fast-import are not available immediately. Most "
+"fast-import commands have no visible effect until the next checkpoint (or "
"completion). The frontend can send commands to fill fast-import's input "
"pipe without worrying about how quickly they will take effect, which "
"improves performance by simplifying scheduling."
@@ -33029,8 +32423,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
msgid ""
-"To avoid deadlock, such frontends must completely consume any pending output "
-"from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes "
+"To avoid deadlock, such frontends must completely consume any pending output"
+" from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes "
"to fast-import that might block."
msgstr ""
@@ -33044,8 +32438,8 @@ msgstr ""
#: en/git-fast-import.txt:1170
msgid ""
"If fast-import is supplied invalid input it will terminate with a non-zero "
-"exit status and create a crash report in the top level of the Git repository "
-"it was importing into. Crash reports contain a snapshot of the internal "
+"exit status and create a crash report in the top level of the Git repository"
+" it was importing into. Crash reports contain a snapshot of the internal "
"fast-import state as well as the most recent commands that lead up to the "
"crash."
msgstr ""
@@ -33063,12 +32457,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1185
msgid ""
-"After writing a crash report fast-import will close the current packfile and "
-"export the marks table. This allows the frontend developer to inspect the "
-"repository state and resume the import from the point where it crashed. The "
-"modified branches and tags are not updated during a crash, as the import did "
-"not complete successfully. Branch and tag information can be found in the "
-"crash report and must be applied manually if the update is needed."
+"After writing a crash report fast-import will close the current packfile and"
+" export the marks table. This allows the frontend developer to inspect the "
+"repository state and resume the import from the point where it crashed. The"
+" modified branches and tags are not updated during a crash, as the import "
+"did not complete successfully. Branch and tag information can be found in "
+"the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
@@ -33202,8 +32596,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1254
msgid ""
-"The following tips and tricks have been collected from various users of fast-"
-"import, and are offered here as suggestions."
+"The following tips and tricks have been collected from various users of "
+"fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
@@ -33215,20 +32609,20 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1264
msgid ""
-"When doing a repository conversion, use a unique mark per commit (`mark :"
-"<n>`) and supply the --export-marks option on the command line. fast-import "
-"will dump a file which lists every mark and the Git object SHA-1 that "
-"corresponds to it. If the frontend can tie the marks back to the source "
-"repository, it is easy to verify the accuracy and completeness of the import "
-"by comparing each Git commit to the corresponding source revision."
+"When doing a repository conversion, use a unique mark per commit (`mark "
+":<n>`) and supply the --export-marks option on the command line. fast-"
+"import will dump a file which lists every mark and the Git object SHA-1 that"
+" corresponds to it. If the frontend can tie the marks back to the source "
+"repository, it is easy to verify the accuracy and completeness of the import"
+" by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
msgid ""
"Coming from a system such as Perforce or Subversion this should be quite "
-"simple, as the fast-import mark can also be the Perforce changeset number or "
-"the Subversion revision number."
+"simple, as the fast-import mark can also be the Perforce changeset number or"
+" the Subversion revision number."
msgstr ""
#. type: Title ~
@@ -33250,8 +32644,8 @@ msgstr ""
#: en/git-fast-import.txt:1279
msgid ""
"The branch LRU builtin to fast-import tends to behave very well, and the "
-"cost of activating an inactive branch is so low that bouncing around between "
-"branches has virtually no impact on import performance."
+"cost of activating an inactive branch is so low that bouncing around between"
+" branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
@@ -33287,8 +32681,8 @@ msgstr ""
msgid ""
"Importing these tags as-is in Git is impossible without making at least one "
"commit which ``fixes up'' the files to match the content of the tag. Use "
-"fast-import's `reset` command to reset a dummy branch outside of your normal "
-"branch space to the base commit for the tag, then commit one or more file "
+"fast-import's `reset` command to reset a dummy branch outside of your normal"
+" branch space to the base commit for the tag, then commit one or more file "
"fixup commits, and finally tag the dummy branch."
msgstr ""
@@ -33298,24 +32692,24 @@ msgid ""
"For example since all normal branches are stored under `refs/heads/` name "
"the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup "
"branch used by the importer to have namespace conflicts with real branches "
-"imported from the source (the name `TAG_FIXUP` is not `refs/heads/"
-"TAG_FIXUP`)."
+"imported from the source (the name `TAG_FIXUP` is not "
+"`refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1311
msgid ""
"When committing fixups, consider using `merge` to connect the commit(s) "
-"which are supplying file revisions to the fixup branch. Doing so will allow "
-"tools such as 'git blame' to track through the real commit history and "
+"which are supplying file revisions to the fixup branch. Doing so will allow"
+" tools such as 'git blame' to track through the real commit history and "
"properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1314
msgid ""
-"After fast-import terminates the frontend will need to do `rm .git/"
-"TAG_FIXUP` to remove the dummy branch."
+"After fast-import terminates the frontend will need to do `rm "
+".git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
@@ -33360,11 +32754,11 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1341
msgid ""
-"If you are repacking very old imported data (e.g. older than the last year), "
-"consider expending some extra CPU time and supplying --window=50 (or higher) "
-"when you run 'git repack'. This will take longer, but will also produce a "
-"smaller packfile. You only need to expend the effort once, and everyone "
-"using your project will benefit from the smaller repository."
+"If you are repacking very old imported data (e.g. older than the last year),"
+" consider expending some extra CPU time and supplying --window=50 (or "
+"higher) when you run 'git repack'. This will take longer, but will also "
+"produce a smaller packfile. You only need to expend the effort once, and "
+"everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
@@ -33402,20 +32796,20 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1367
msgid ""
-"Frontends which have efficient access to all revisions of a single file (for "
-"example reading an RCS/CVS ,v file) can choose to supply all revisions of "
+"Frontends which have efficient access to all revisions of a single file (for"
+" example reading an RCS/CVS ,v file) can choose to supply all revisions of "
"that file as a sequence of consecutive `blob` commands. This allows fast-"
"import to deltify the different file revisions against each other, saving "
-"space in the final packfile. Marks can be used to later identify individual "
-"file revisions during a sequence of `commit` commands."
+"space in the final packfile. Marks can be used to later identify individual"
+" file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1374
msgid ""
"The packfile(s) created by fast-import do not encourage good disk access "
-"patterns. This is caused by fast-import writing the data in the order it is "
-"received on standard input, while Git typically organizes data within "
+"patterns. This is caused by fast-import writing the data in the order it is"
+" received on standard input, while Git typically organizes data within "
"packfiles to make the most recent (current tip) data appear before "
"historical data. Git also clusters commits together, speeding up revision "
"traversal through better cache locality."
@@ -33428,8 +32822,8 @@ msgid ""
"with `git repack -a -d` after fast-import completes, allowing Git to "
"reorganize the packfiles for faster data access. If blob deltas are "
"suboptimal (see above) then also adding the `-f` option to force "
-"recomputation of all deltas can significantly reduce the final packfile size "
-"(30-50% smaller can be quite typical)."
+"recomputation of all deltas can significantly reduce the final packfile size"
+" (30-50% smaller can be quite typical)."
msgstr ""
#. type: Title -
@@ -33444,8 +32838,8 @@ msgid ""
"There are a number of factors which affect how much memory fast-import "
"requires to perform an import. Like critical sections of core Git, fast-"
"import uses its own memory allocators to amortize any overheads associated "
-"with malloc. In practice fast-import tends to amortize any malloc overheads "
-"to 0, due to its use of large block allocations."
+"with malloc. In practice fast-import tends to amortize any malloc overheads"
+" to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
@@ -33459,9 +32853,9 @@ msgstr ""
msgid ""
"fast-import maintains an in-memory structure for every object written in "
"this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit "
-"system the structure is 40 bytes (due to the larger pointer sizes). Objects "
-"in the table are not deallocated until fast-import terminates. Importing 2 "
-"million objects on a 32 bit system will require approximately 64 MiB of "
+"system the structure is 40 bytes (due to the larger pointer sizes). Objects"
+" in the table are not deallocated until fast-import terminates. Importing 2"
+" million objects on a 32 bit system will require approximately 64 MiB of "
"memory."
msgstr ""
@@ -33500,8 +32894,8 @@ msgstr "<newbranch>"
#. type: Plain text
#: en/git-fast-import.txt:1418
msgid ""
-"Branches are classified as active and inactive. The memory usage of the two "
-"classes is significantly different."
+"Branches are classified as active and inactive. The memory usage of the two"
+" classes is significantly different."
msgstr ""
#. type: Plain text
@@ -33517,11 +32911,11 @@ msgstr ""
#: en/git-fast-import.txt:1431
msgid ""
"Active branches have the same overhead as inactive branches, but also "
-"contain copies of every tree that has been recently modified on that "
-"branch. If subtree `include` has not been modified since the branch became "
-"active, its contents will not be loaded into memory, but if subtree `src` "
-"has been modified by a commit since the branch became active, then its "
-"contents will be loaded in memory."
+"contain copies of every tree that has been recently modified on that branch."
+" If subtree `include` has not been modified since the branch became active,"
+" its contents will not be loaded into memory, but if subtree `src` has been "
+"modified by a commit since the branch became active, then its contents will "
+"be loaded in memory."
msgstr ""
#. type: Plain text
@@ -33536,8 +32930,8 @@ msgstr ""
msgid ""
"fast-import automatically moves active branches to inactive status based on "
"a simple least-recently-used algorithm. The LRU chain is updated on each "
-"`commit` command. The maximum number of active branches can be increased or "
-"decreased on the command line with --active-branches=."
+"`commit` command. The maximum number of active branches can be increased or"
+" decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
@@ -33566,8 +32960,8 @@ msgstr ""
#: en/git-fast-import.txt:1455
msgid ""
"Files (and pointers to subtrees) within active trees require 52 or 64 bytes "
-"(32/64 bit platforms) per entry. To conserve space, file and tree names are "
-"pooled in a common string table, allowing the filename ``Makefile'' to use "
+"(32/64 bit platforms) per entry. To conserve space, file and tree names are"
+" pooled in a common string table, allowing the filename ``Makefile'' to use "
"just 16 bytes (after including the string header overhead) no matter how "
"many times it occurs within the project."
msgstr ""
@@ -33590,20 +32984,18 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1468
msgid ""
-"Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile "
-"early, simulating a `checkpoint` command. The impatient operator can use "
-"this facility to peek at the objects and refs from an import in progress, at "
-"the cost of some added running time and worse compression."
+"Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile"
+" early, simulating a `checkpoint` command. The impatient operator can use "
+"this facility to peek at the objects and refs from an import in progress, at"
+" the cost of some added running time and worse compression."
msgstr ""
#. type: Title =
#: en/git-fetch-pack.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-checkout(1)"
+#, no-wrap
msgid "git-fetch-pack(1)"
-msgstr "git-checkout(1)"
+msgstr "git-fetch-pack(1)"
-#
#. type: Plain text
#: en/git-fetch-pack.txt:7
#, fuzzy
@@ -33654,15 +33046,15 @@ msgstr ""
#: en/git-fetch-pack.txt:43 en/git-send-pack.txt:46
msgid ""
"Take the list of refs from stdin, one per line. If there are refs specified "
-"on the command line in addition to this option, then the refs from stdin are "
-"processed after those on the command line."
+"on the command line in addition to this option, then the refs from stdin are"
+" processed after those on the command line."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:47 en/git-send-pack.txt:50
msgid ""
-"If `--stateless-rpc` is specified together with this option then the list of "
-"refs must be in packet format (pkt-line). Each ref must be in a separate "
+"If `--stateless-rpc` is specified together with this option then the list of"
+" refs must be in packet format (pkt-line). Each ref must be in a separate "
"packet, and the list must end with a flush packet."
msgstr ""
@@ -33677,15 +33069,16 @@ msgstr ""
#: en/git-fetch-pack.txt:59
msgid ""
"Do not invoke 'git unpack-objects' on received data, but create a single "
-"packfile out of it instead, and store it in the object database. If provided "
-"twice then the pack is locked against repacking."
+"packfile out of it instead, and store it in the object database. If provided"
+" twice then the pack is locked against repacking."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:60 en/git-pack-objects.txt:184 en/git-send-pack.txt:64
+#: en/git-fetch-pack.txt:60 en/git-pack-objects.txt:184
+#: en/git-send-pack.txt:64
#, no-wrap
msgid "--thin"
-msgstr ""
+msgstr "--thin"
#. type: Plain text
#: en/git-fetch-pack.txt:63
@@ -33696,18 +33089,17 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:64 en/git-pack-objects.txt:81
-#, fuzzy, no-wrap
-#| msgid "--include"
+#, no-wrap
msgid "--include-tag"
-msgstr "--include"
+msgstr "--include-tag"
#. type: Plain text
#: en/git-fetch-pack.txt:69
msgid ""
-"If the remote side supports it, annotated tags objects will be downloaded on "
-"the same connection as the other objects if the object the tag references is "
-"downloaded. The caller must otherwise determine the tags this option made "
-"available."
+"If the remote side supports it, annotated tags objects will be downloaded on"
+" the same connection as the other objects if the object the tag references "
+"is downloaded. The caller must otherwise determine the tags this option "
+"made available."
msgstr ""
#. type: Labeled list
@@ -33748,8 +33140,8 @@ msgstr "--upload-pack <upload-pack>"
#: en/git-fetch-pack.txt:89
msgid ""
"Limit fetching to ancestor-chains not longer than n. 'git-upload-pack' "
-"treats the special depth 2147483647 as infinite even if there is an ancestor-"
-"chain that long."
+"treats the special depth 2147483647 as infinite even if there is an "
+"ancestor-chain that long."
msgstr ""
#. type: Plain text
@@ -33761,10 +33153,9 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:99
-#, fuzzy, no-wrap
-#| msgid "--interactive"
+#, no-wrap
msgid "--deepen-relative"
-msgstr "--interactive"
+msgstr "--deepen-relative"
#. type: Plain text
#: en/git-fetch-pack.txt:103
@@ -33775,10 +33166,9 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:104 en/merge-options.txt:113
-#, fuzzy, no-wrap
-#| msgid "--no-merged"
+#, no-wrap
msgid "--no-progress"
-msgstr "--no-merged"
+msgstr "--no-progress"
#. type: Plain text
#: en/git-fetch-pack.txt:106
@@ -33789,7 +33179,7 @@ msgstr ""
#: en/git-fetch-pack.txt:107 en/git-index-pack.txt:77
#, no-wrap
msgid "--check-self-contained-and-connected"
-msgstr ""
+msgstr "--check-self-contained-and-connected"
#. type: Plain text
#: en/git-fetch-pack.txt:110
@@ -33798,7 +33188,6 @@ msgid ""
"connected."
msgstr ""
-#
#. type: Plain text
#: en/git-fetch-pack.txt:113 en/git-push.txt:267 en/git-send-pack.txt:63
#, fuzzy
@@ -33824,9 +33213,9 @@ msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:121
msgid ""
-"The remote heads to update from. This is relative to $GIT_DIR (e.g. \"HEAD"
-"\", \"refs/heads/master\"). When unspecified, update from all heads the "
-"remote side has."
+"The remote heads to update from. This is relative to $GIT_DIR (e.g. "
+"\"HEAD\", \"refs/heads/master\"). When unspecified, update from all heads "
+"the remote side has."
msgstr ""
#. type: Plain text
@@ -33839,12 +33228,10 @@ msgstr ""
#. type: Title =
#: en/git-fetch.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-branch(1)"
+#, no-wrap
msgid "git-fetch(1)"
-msgstr "git-branch(1)"
+msgstr "git-fetch(1)"
-#
#. type: Plain text
#: en/git-fetch.txt:7
#, fuzzy
@@ -33866,9 +33253,9 @@ msgstr ""
#: en/git-fetch.txt:24
msgid ""
"Fetch branches and/or tags (collectively, \"refs\") from one or more other "
-"repositories, along with the objects necessary to complete their histories. "
-"Remote-tracking branches are updated (see the description of <refspec> below "
-"for ways to control this behavior)."
+"repositories, along with the objects necessary to complete their histories."
+" Remote-tracking branches are updated (see the description of <refspec> "
+"below for ways to control this behavior)."
msgstr ""
#. type: Plain text
@@ -33886,8 +33273,9 @@ msgstr ""
#: en/git-fetch.txt:37
msgid ""
"'git fetch' can fetch from either a single named repository or URL, or from "
-"several repositories at once if <group> is given and there is a remotes."
-"<group> entry in the configuration file. (See linkgit:git-config[1])."
+"several repositories at once if <group> is given and there is a "
+"remotes.<group> entry in the configuration file. (See linkgit:git-"
+"config[1])."
msgstr ""
#. type: Plain text
@@ -33901,8 +33289,8 @@ msgstr ""
#: en/git-fetch.txt:44
msgid ""
"The names of refs that are fetched, together with the object names they "
-"point at, are written to `.git/FETCH_HEAD`. This information may be used by "
-"scripts or other git commands, such as linkgit:git-pull[1]."
+"point at, are written to `.git/FETCH_HEAD`. This information may be used by"
+" scripts or other git commands, such as linkgit:git-pull[1]."
msgstr ""
#. type: Title -
@@ -33915,9 +33303,9 @@ msgstr ""
#: en/git-fetch.txt:61
msgid ""
"You often interact with the same remote repository by regularly and "
-"repeatedly fetching from it. In order to keep track of the progress of such "
-"a remote repository, `git fetch` allows you to configure `remote."
-"<repository>.fetch` configuration variables."
+"repeatedly fetching from it. In order to keep track of the progress of such"
+" a remote repository, `git fetch` allows you to configure "
+"`remote.<repository>.fetch` configuration variables."
msgstr ""
#. type: Plain text
@@ -33942,12 +33330,12 @@ msgstr ""
#: en/git-fetch.txt:80
msgid ""
"When `git fetch` is run without specifying what branches and/or tags to "
-"fetch on the command line, e.g. `git fetch origin` or `git fetch`, `remote."
-"<repository>.fetch` values are used as the refspecs--they specify which refs "
-"to fetch and which local refs to update. The example above will fetch all "
-"branches that exist in the `origin` (i.e. any ref that matches the left-hand "
-"side of the value, `refs/heads/*`) and update the corresponding remote-"
-"tracking branches in the `refs/remotes/origin/*` hierarchy."
+"fetch on the command line, e.g. `git fetch origin` or `git fetch`, "
+"`remote.<repository>.fetch` values are used as the refspecs--they specify "
+"which refs to fetch and which local refs to update. The example above will "
+"fetch all branches that exist in the `origin` (i.e. any ref that matches the"
+" left-hand side of the value, `refs/heads/*`) and update the corresponding "
+"remote-tracking branches in the `refs/remotes/origin/*` hierarchy."
msgstr ""
#. type: Plain text
@@ -33955,8 +33343,8 @@ msgstr ""
msgid ""
"When `git fetch` is run with explicit branches and/or tags to fetch on the "
"command line, e.g. `git fetch origin master`, the <refspec>s given on the "
-"command line determine what are to be fetched (e.g. `master` in the example, "
-"which is a short-hand for `master:`, which in turn means \"fetch the "
+"command line determine what are to be fetched (e.g. `master` in the example,"
+" which is a short-hand for `master:`, which in turn means \"fetch the "
"'master' branch but I do not explicitly say what remote-tracking branch to "
"update with it from the command line\"), and the example command will fetch "
"_only_ the 'master' branch. The `remote.<repository>.fetch` values "
@@ -34005,9 +33393,9 @@ msgstr ""
#: en/git-fetch.txt:123
msgid ""
"In compact output mode, specified with configuration variable fetch.output, "
-"if either entire `<from>` or `<to>` is found in the other string, it will be "
-"substituted with `*` in the other string. For example, `master -> origin/"
-"master` becomes `master -> origin/*`."
+"if either entire `<from>` or `<to>` is found in the other string, it will be"
+" substituted with `*` in the other string. For example, `master -> "
+"origin/master` becomes `master -> origin/*`."
msgstr ""
#. type: Labeled list
@@ -34047,7 +33435,7 @@ msgstr ""
#: en/git-fetch.txt:128 en/git-push.txt:332
#, no-wrap
msgid "`-`"
-msgstr ""
+msgstr "`-`"
#. type: Plain text
#: en/git-fetch.txt:129
@@ -34148,14 +33536,15 @@ msgstr ""
#: en/git-fetch.txt:153
msgid ""
"A human-readable explanation. In the case of successfully fetched refs, no "
-"explanation is needed. For a failed ref, the reason for failure is described."
+"explanation is needed. For a failed ref, the reason for failure is "
+"described."
msgstr ""
-#
#. type: Plain text
#: en/git-fetch.txt:158
#, fuzzy
-#| msgid "List or delete (if used with -d) the remote-tracking branches."
+#| msgid ""
+#| "List or delete (if used with -d) the remote-tracking branches."
msgid "Update the remote-tracking branches:"
msgstr ""
"Auflisten oder L철schen (wenn die '-d' Option gleichzeitig verwendet wird) "
@@ -34190,16 +33579,16 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:177
msgid ""
-"This updates (or creates, as necessary) branches `pu` and `tmp` in the local "
-"repository by fetching from the branches (respectively) `pu` and `maint` "
+"This updates (or creates, as necessary) branches `pu` and `tmp` in the local"
+" repository by fetching from the branches (respectively) `pu` and `maint` "
"from the remote repository."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:180
msgid ""
-"The `pu` branch will be updated even if it is does not fast-forward, because "
-"it is prefixed with a plus sign; `tmp` will not be."
+"The `pu` branch will be updated even if it is does not fast-forward, because"
+" it is prefixed with a plus sign; `tmp` will not be."
msgstr ""
#. type: Plain text
@@ -34227,10 +33616,11 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:194
msgid ""
-"The first command fetches the `maint` branch from the repository at `git://"
-"git.kernel.org/pub/scm/git/git.git` and the second command uses `FETCH_HEAD` "
-"to examine the branch with linkgit:git-log[1]. The fetched objects will "
-"eventually be removed by git's built-in housekeeping (see linkgit:git-gc[1])."
+"The first command fetches the `maint` branch from the repository at "
+"`git://git.kernel.org/pub/scm/git/git.git` and the second command uses "
+"`FETCH_HEAD` to examine the branch with linkgit:git-log[1]. The fetched "
+"objects will eventually be removed by git's built-in housekeeping (see "
+"linkgit:git-gc[1])."
msgstr ""
#. type: Title -
@@ -34244,21 +33634,19 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:205 en/git-pull.txt:250
msgid ""
-"Using --recurse-submodules can only fetch new commits in already checked out "
-"submodules right now. When e.g. upstream added a new submodule in the just "
-"fetched commits of the superproject the submodule itself can not be fetched, "
-"making it impossible to check out that submodule later without having to do "
-"a fetch again. This is expected to be fixed in a future Git version."
+"Using --recurse-submodules can only fetch new commits in already checked out"
+" submodules right now. When e.g. upstream added a new submodule in the just "
+"fetched commits of the superproject the submodule itself can not be fetched,"
+" making it impossible to check out that submodule later without having to do"
+" a fetch again. This is expected to be fixed in a future Git version."
msgstr ""
#. type: Title =
#: en/git-filter-branch.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-branch(1)"
+#, no-wrap
msgid "git-filter-branch(1)"
-msgstr "git-branch(1)"
+msgstr "git-filter-branch(1)"
-#
#. type: Plain text
#: en/git-filter-branch.txt:7
#, fuzzy
@@ -34284,11 +33672,11 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:27
msgid ""
-"Lets you rewrite Git revision history by rewriting the branches mentioned in "
-"the <rev-list options>, applying custom filters on each revision. Those "
-"filters can modify each tree (e.g. removing a file or running a perl rewrite "
-"on all files) or information about each commit. Otherwise, all information "
-"(including original commit times or merge information) will be preserved."
+"Lets you rewrite Git revision history by rewriting the branches mentioned in"
+" the <rev-list options>, applying custom filters on each revision. Those "
+"filters can modify each tree (e.g. removing a file or running a perl rewrite"
+" on all files) or information about each commit. Otherwise, all information"
+" (including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
@@ -34296,9 +33684,10 @@ msgstr ""
msgid ""
"The command will only rewrite the _positive_ refs mentioned in the command "
"line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify "
-"no filters, the commits will be recommitted without any changes, which would "
-"normally have no effect. Nevertheless, this may be useful in the future for "
-"compensating for some Git bugs or such, therefore such a usage is permitted."
+"no filters, the commits will be recommitted without any changes, which would"
+" normally have no effect. Nevertheless, this may be useful in the future "
+"for compensating for some Git bugs or such, therefore such a usage is "
+"permitted."
msgstr ""
#. type: Plain text
@@ -34329,16 +33718,16 @@ msgstr ""
#: en/git-filter-branch.txt:52
msgid ""
"Always verify that the rewritten version is correct: The original refs, if "
-"different from the rewritten ones, will be stored in the namespace 'refs/"
-"original/'."
+"different from the rewritten ones, will be stored in the namespace "
+"'refs/original/'."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:56
msgid ""
"Note that since this operation is very I/O expensive, it might be a good "
-"idea to redirect the temporary directory off-disk with the `-d` option, e.g. "
-"on tmpfs. Reportedly the speedup is very noticeable."
+"idea to redirect the temporary directory off-disk with the `-d` option, e.g."
+" on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
@@ -34353,11 +33742,11 @@ msgid ""
"The filters are applied in the order as listed below. The <command> "
"argument is always evaluated in the shell context using the 'eval' command "
"(with the notable exception of the commit filter, for technical reasons). "
-"Prior to that, the `$GIT_COMMIT` environment variable will be set to contain "
-"the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, "
+"Prior to that, the `$GIT_COMMIT` environment variable will be set to contain"
+" the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, "
"GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, "
-"and GIT_COMMITTER_DATE are taken from the current commit and exported to the "
-"environment, in order to affect the author and committer identities of the "
+"and GIT_COMMITTER_DATE are taken from the current commit and exported to the"
+" environment, in order to affect the author and committer identities of the "
"replacement commit created by linkgit:git-commit-tree[1] after the filters "
"have run."
msgstr ""
@@ -34374,8 +33763,9 @@ msgstr ""
msgid ""
"A 'map' function is available that takes an \"original sha1 id\" argument "
"and outputs a \"rewritten sha1 id\" if the commit has been already "
-"rewritten, and \"original sha1 id\" otherwise; the 'map' function can return "
-"several ids on separate lines if your commit filter emitted multiple commits."
+"rewritten, and \"original sha1 id\" otherwise; the 'map' function can return"
+" several ids on separate lines if your commit filter emitted multiple "
+"commits."
msgstr ""
#. type: Labeled list
@@ -34402,11 +33792,11 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:99
msgid ""
-"This is the filter for rewriting the tree and its contents. The argument is "
-"evaluated in shell with the working directory set to the root of the checked "
-"out tree. The new tree is then used as-is (new files are auto-added, "
-"disappeared files are auto-removed - neither .gitignore files nor any other "
-"ignore rules *HAVE ANY EFFECT*!)."
+"This is the filter for rewriting the tree and its contents. The argument is"
+" evaluated in shell with the working directory set to the root of the "
+"checked out tree. The new tree is then used as-is (new files are auto-"
+"added, disappeared files are auto-removed - neither .gitignore files nor any"
+" other ignore rules *HAVE ANY EFFECT*!)."
msgstr ""
#. type: Labeled list
@@ -34434,10 +33824,10 @@ msgstr ""
#: en/git-filter-branch.txt:114
msgid ""
"This is the filter for rewriting the commit's parent list. It will receive "
-"the parent string on stdin and shall output the new parent string on "
-"stdout. The parent string is in the format described in linkgit:git-commit-"
-"tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and "
-"\"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
+"the parent string on stdin and shall output the new parent string on stdout."
+" The parent string is in the format described in linkgit:git-commit-"
+"tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and"
+" \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
@@ -34524,8 +33914,8 @@ msgid ""
"Nearly proper rewriting of tag objects is supported. If the tag has a "
"message attached, a new tag object will be created with the same message, "
"author, and timestamp. If the tag has a signature attached, the signature "
-"will be stripped. It is by definition impossible to preserve signatures. The "
-"reason this is \"nearly\" proper, is because ideally if the tag did not "
+"will be stripped. It is by definition impossible to preserve signatures. The"
+" reason this is \"nearly\" proper, is because ideally if the tag did not "
"change (points to the same object, has the same name, etc.) it should "
"retain any signature. That is not the case, signatures will always be "
"removed, buyer beware. There is also no support for changing the author or "
@@ -34549,10 +33939,9 @@ msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:169
-#, fuzzy, no-wrap
-#| msgid "--allow-empty"
+#, no-wrap
msgid "--prune-empty"
-msgstr "--allow-empty"
+msgstr "--prune-empty"
#. type: Plain text
#: en/git-filter-branch.txt:176
@@ -34599,11 +33988,10 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:194
msgid ""
-"'git filter-branch' refuses to start with an existing temporary directory or "
-"when there are already refs starting with 'refs/original/', unless forced."
+"'git filter-branch' refuses to start with an existing temporary directory or"
+" when there are already refs starting with 'refs/original/', unless forced."
msgstr ""
-#
#. type: Labeled list
#: en/git-filter-branch.txt:195
#, fuzzy, no-wrap
@@ -34660,17 +34048,19 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:232
msgid ""
-"Using `--index-filter` with 'git rm' yields a significantly faster version. "
-"Like with using `rm filename`, `git rm --cached filename` will fail if the "
-"file is absent from the tree of a commit. If you want to \"completely forget"
-"\" a file, it does not matter when it entered history, so we also add `--"
-"ignore-unmatch`:"
+"Using `--index-filter` with 'git rm' yields a significantly faster version."
+" Like with using `rm filename`, `git rm --cached filename` will fail if the"
+" file is absent from the tree of a commit. If you want to \"completely "
+"forget\" a file, it does not matter when it entered history, so we also add "
+"`--ignore-unmatch`:"
msgstr ""
#. type: delimited block -
#: en/git-filter-branch.txt:235
#, no-wrap
-msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
+msgid ""
+"git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename'"
+" HEAD\n"
msgstr ""
#. type: Plain text
@@ -34681,8 +34071,8 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:241
msgid ""
-"To rewrite the repository to look as if `foodir/` had been its project root, "
-"and discard all other history:"
+"To rewrite the repository to look as if `foodir/` had been its project root,"
+" and discard all other history:"
msgstr ""
#. type: delimited block -
@@ -34702,8 +34092,8 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:253
msgid ""
-"To set a commit (which typically is at the tip of another history) to be the "
-"parent of the current initial commit, in order to paste the other history "
+"To set a commit (which typically is at the tip of another history) to be the"
+" parent of the current initial commit, in order to paste the other history "
"behind the current history:"
msgstr ""
@@ -34966,9 +34356,9 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:414
msgid ""
-"Clone it with `git clone file:///path/to/repo`. The clone will not have the "
-"removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain "
-"path just hardlinks everything!)"
+"Clone it with `git clone file:///path/to/repo`. The clone will not have the"
+" removed objects. See linkgit:git-clone[1]. (Note that cloning with a "
+"plain path just hardlinks everything!)"
msgstr ""
#. type: Plain text
@@ -34976,7 +34366,8 @@ msgstr ""
msgid ""
"If you really don't want to clone it, for whatever reasons, check the "
"following points instead (in this order). This is a very destructive "
-"approach, so *make a backup* or go back to cloning it. You have been warned."
+"approach, so *make a backup* or go back to cloning it. You have been "
+"warned."
msgstr ""
#. type: Plain text
@@ -35002,13 +34393,13 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:441
msgid ""
-"git-filter-branch allows you to make complex shell-scripted rewrites of your "
-"Git history, but you probably don't need this flexibility if you're simply "
+"git-filter-branch allows you to make complex shell-scripted rewrites of your"
+" Git history, but you probably don't need this flexibility if you're simply "
"_removing unwanted data_ like large files or passwords. For those "
-"operations you may want to consider http://rtyley.github.io/bfg-repo-cleaner/"
-"[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-branch, "
-"typically at least 10-50x faster for those use-cases, and with quite "
-"different characteristics:"
+"operations you may want to consider http://rtyley.github.io/bfg-repo-"
+"cleaner/[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-"
+"branch, typically at least 10-50x faster for those use-cases, and with quite"
+" different characteristics:"
msgstr ""
#. type: Plain text
@@ -35026,10 +34417,10 @@ msgstr ""
#: en/git-filter-branch.txt:455
msgid ""
"By default The BFG takes full advantage of multi-core machines, cleansing "
-"commit file-trees in parallel. git-filter-branch cleans commits sequentially "
-"(i.e. in a single-threaded manner), though it _is_ possible to write filters "
-"that include their own parallelism, in the scripts executed against each "
-"commit."
+"commit file-trees in parallel. git-filter-branch cleans commits sequentially"
+" (i.e. in a single-threaded manner), though it _is_ possible to write "
+"filters that include their own parallelism, in the scripts executed against "
+"each commit."
msgstr ""
#. type: Plain text
@@ -35042,10 +34433,9 @@ msgstr ""
#. type: Title =
#: en/git-fmt-merge-msg.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-merge-one-file(1)"
+#, no-wrap
msgid "git-fmt-merge-msg(1)"
-msgstr "git-merge-one-file(1)"
+msgstr "git-fmt-merge-msg(1)"
#. type: Plain text
#: en/git-fmt-merge-msg.txt:7
@@ -35064,8 +34454,8 @@ msgstr ""
#: en/git-fmt-merge-msg.txt:20
msgid ""
"Takes the list of merged objects on stdin and produces a suitable commit "
-"message to be used for the merge commit, usually to be passed as the '<merge-"
-"message>' argument of 'git merge'."
+"message to be used for the merge commit, usually to be passed as the "
+"'<merge-message>' argument of 'git merge'."
msgstr ""
#. type: Plain text
@@ -35092,21 +34482,21 @@ msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:46
-#, fuzzy, no-wrap
-#| msgid "--no-color"
+#, no-wrap
msgid "--no-log"
-msgstr "--no-color"
+msgstr "--no-log"
#. type: Plain text
#: en/git-fmt-merge-msg.txt:37
-msgid "Do not list one-line descriptions from the actual commits being merged."
+msgid ""
+"Do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:38
#, no-wrap
msgid "--[no-]summary"
-msgstr ""
+msgstr "--[no-]summary"
#. type: Plain text
#: en/git-fmt-merge-msg.txt:41
@@ -35150,7 +34540,8 @@ msgstr ""
#. type: Plain text
#: en/git-fmt-merge-msg.txt:59
msgid ""
-"Synonym to `merge.log`; this is deprecated and will be removed in the future."
+"Synonym to `merge.log`; this is deprecated and will be removed in the "
+"future."
msgstr ""
#. type: delimited block -
@@ -35170,10 +34561,9 @@ msgstr ""
#. type: Title =
#: en/git-for-each-ref.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-branch(1)"
+#, no-wrap
msgid "git-for-each-ref(1)"
-msgstr "git-branch(1)"
+msgstr "git-for-each-ref(1)"
#. type: Plain text
#: en/git-for-each-ref.txt:7
@@ -35194,10 +34584,11 @@ msgstr ""
#: en/git-for-each-ref.txt:25
msgid ""
"Iterate over all refs that match `<pattern>` and show them according to the "
-"given `<format>`, after sorting them according to the given set of `<key>`. "
-"If `<count>` is given, stop after showing that many refs. The interpolated "
-"values in `<format>` can optionally be quoted as string literals in the "
-"specified host language allowing their direct evaluation in that language."
+"given `<format>`, after sorting them according to the given set of `<key>`."
+" If `<count>` is given, stop after showing that many refs. The "
+"interpolated values in `<format>` can optionally be quoted as string "
+"literals in the specified host language allowing their direct evaluation in "
+"that language."
msgstr ""
#. type: Labeled list
@@ -35238,10 +34629,10 @@ msgstr ""
msgid ""
"A string that interpolates `%(fieldname)` from the object pointed at by a "
"ref being shown. If `fieldname` is prefixed with an asterisk (`*`) and the "
-"ref points at a tag object, the value for the field in the object tag refers "
-"is used. When unspecified, defaults to `%(objectname) SPC %(objecttype) TAB "
-"%(refname)`. It also interpolates `%%` to `%`, and `%xx` where `xx` are hex "
-"digits interpolates to character with hex code `xx`; for example `%00` "
+"ref points at a tag object, the value for the field in the object tag refers"
+" is used. When unspecified, defaults to `%(objectname) SPC %(objecttype) "
+"TAB %(refname)`. It also interpolates `%%` to `%`, and `%xx` where `xx` are"
+" hex digits interpolates to character with hex code `xx`; for example `%00` "
"interpolates to `\\0` (NUL), `%09` to `\\t` (TAB) and `%0a` to `\\n` (LF)."
msgstr ""
@@ -35255,35 +34646,34 @@ msgstr "<filepattern>..."
#. type: Plain text
#: en/git-for-each-ref.txt:57
msgid ""
-"If one or more patterns are given, only refs are shown that match against at "
-"least one pattern, either using fnmatch(3) or literally, in the latter case "
-"matching completely or from the beginning up to a slash."
+"If one or more patterns are given, only refs are shown that match against at"
+" least one pattern, either using fnmatch(3) or literally, in the latter case"
+" matching completely or from the beginning up to a slash."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:58
-#, fuzzy, no-wrap
-#| msgid "--shared"
+#, no-wrap
msgid "--shell"
-msgstr "--shared"
+msgstr "--shell"
#. type: Labeled list
#: en/git-for-each-ref.txt:59
#, no-wrap
msgid "--perl"
-msgstr ""
+msgstr "--perl"
#. type: Labeled list
#: en/git-for-each-ref.txt:60
#, no-wrap
msgid "--python"
-msgstr ""
+msgstr "--python"
#. type: Labeled list
#: en/git-for-each-ref.txt:61
#, no-wrap
msgid "--tcl"
-msgstr ""
+msgstr "--tcl"
#. type: Plain text
#: en/git-for-each-ref.txt:66
@@ -35293,7 +34683,6 @@ msgid ""
"produce a scriptlet that can directly be `eval`ed."
msgstr ""
-#
#. type: Plain text
#: en/git-for-each-ref.txt:69
#, fuzzy
@@ -35337,7 +34726,6 @@ msgstr ""
msgid "--contains [<object>]"
msgstr "--contains <commit>"
-#
#. type: Plain text
#: en/git-for-each-ref.txt:81
#, fuzzy
@@ -35383,15 +34771,16 @@ msgid ""
"The name of the ref (the part after $GIT_DIR/). For a non-ambiguous short "
"name of the ref append `:short`. The option core.warnAmbiguousRefs is used "
"to select the strict abbreviation mode. If `lstrip=<N>` (`rstrip=<N>`) is "
-"appended, strips `<N>` slash-separated path components from the front (back) "
-"of the refname (e.g. `%(refname:lstrip=2)` turns `refs/tags/foo` into `foo` "
-"and `%(refname:rstrip=2)` turns `refs/tags/foo` into `refs`). If `<N>` is a "
-"negative number, strip as many path components as necessary from the "
+"appended, strips `<N>` slash-separated path components from the front (back)"
+" of the refname (e.g. `%(refname:lstrip=2)` turns `refs/tags/foo` into `foo`"
+" and `%(refname:rstrip=2)` turns `refs/tags/foo` into `refs`). If `<N>` is "
+"a negative number, strip as many path components as necessary from the "
"specified end to leave `-<N>` path components (e.g. `%(refname:lstrip=-2)` "
-"turns `refs/tags/foo` into `tags/foo` and `%(refname:rstrip=-1)` turns `refs/"
-"tags/foo` into `refs`). When the ref does not have enough components, the "
-"result becomes an empty string if stripping with positive <N>, or it becomes "
-"the full refname if stripping with negative <N>. Neither is an error."
+"turns `refs/tags/foo` into `tags/foo` and `%(refname:rstrip=-1)` turns "
+"`refs/tags/foo` into `refs`). When the ref does not have enough components, "
+"the result becomes an empty string if stripping with positive <N>, or it "
+"becomes the full refname if stripping with negative <N>. Neither is an "
+"error."
msgstr ""
#. type: Plain text
@@ -35430,10 +34819,10 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:125
msgid ""
-"The object name (aka SHA-1). For a non-ambiguous abbreviation of the object "
-"name append `:short`. For an abbreviation of the object name with desired "
-"length append `:short=<length>`, where the minimum length is MINIMUM_ABBREV. "
-"The length may be exceeded to ensure unique object names."
+"The object name (aka SHA-1). For a non-ambiguous abbreviation of the object"
+" name append `:short`. For an abbreviation of the object name with desired "
+"length append `:short=<length>`, where the minimum length is MINIMUM_ABBREV."
+" The length may be exceeded to ensure unique object names."
msgstr ""
#. type: Labeled list
@@ -35446,15 +34835,15 @@ msgstr ""
#: en/git-for-each-ref.txt:140
msgid ""
"The name of a local ref which can be considered ``upstream'' from the "
-"displayed ref. Respects `:short`, `:lstrip` and `:rstrip` in the same way as "
-"`refname` above. Additionally respects `:track` to show \"[ahead N, behind "
-"M]\" and `:trackshort` to show the terse version: \">\" (ahead), \"<"
-"\" (behind), \"<>\" (ahead and behind), or \"=\" (in sync). `:track` also "
-"prints \"[gone]\" whenever unknown upstream ref is encountered. Append `:"
-"track,nobracket` to show tracking information without brackets (i.e \"ahead "
-"N, behind M\"). Has no effect if the ref does not have tracking information "
-"associated with it. All the options apart from `nobracket` are mutually "
-"exclusive, but if used together the last option is selected."
+"displayed ref. Respects `:short`, `:lstrip` and `:rstrip` in the same way as"
+" `refname` above. Additionally respects `:track` to show \"[ahead N, behind"
+" M]\" and `:trackshort` to show the terse version: \">\" (ahead), \"<\" "
+"(behind), \"<>\" (ahead and behind), or \"=\" (in sync). `:track` also "
+"prints \"[gone]\" whenever unknown upstream ref is encountered. Append "
+"`:track,nobracket` to show tracking information without brackets (i.e "
+"\"ahead N, behind M\"). Has no effect if the ref does not have tracking "
+"information associated with it. All the options apart from `nobracket` are "
+"mutually exclusive, but if used together the last option is selected."
msgstr ""
#. type: Labeled list
@@ -35467,8 +34856,8 @@ msgstr ""
#: en/git-for-each-ref.txt:147
msgid ""
"The name of a local ref which represents the `@{push}` location for the "
-"displayed ref. Respects `:short`, `:lstrip`, `:rstrip`, `:track`, and `:"
-"trackshort` options as `upstream` does. Produces an empty string if no "
+"displayed ref. Respects `:short`, `:lstrip`, `:rstrip`, `:track`, and "
+"`:trackshort` options as `upstream` does. Produces an empty string if no "
"`@{push}` ref is configured."
msgstr ""
@@ -35502,13 +34891,13 @@ msgstr ""
msgid ""
"Left-, middle-, or right-align the content between %(align:...) and %(end). "
"The \"align:\" is followed by `width=<width>` and `position=<position>` in "
-"any order separated by a comma, where the `<position>` is either left, right "
-"or middle, default being left and `<width>` is the total length of the "
+"any order separated by a comma, where the `<position>` is either left, right"
+" or middle, default being left and `<width>` is the total length of the "
"content with alignment. For brevity, the \"width=\" and/or \"position=\" "
"prefixes may be omitted, and bare <width> and <position> used instead. For "
-"instance, `%(align:<width>,<position>)`. If the contents length is more than "
-"the width then no alignment is performed. If used with `--quote` everything "
-"in between %(align:...) and %(end) is quoted, but if nested then only the "
+"instance, `%(align:<width>,<position>)`. If the contents length is more than"
+" the width then no alignment is performed. If used with `--quote` everything"
+" in between %(align:...) and %(end) is quoted, but if nested then only the "
"topmost level performs quoting."
msgstr ""
@@ -35526,10 +34915,10 @@ msgid ""
"there is an atom with value or string literal after the %(if) then "
"everything after the %(then) is printed, else if the %(else) atom is used, "
"then everything after %(else) is printed. We ignore space when evaluating "
-"the string before %(then), this is useful when we use the %(HEAD) atom which "
-"prints either \"*\" or \" \" and we want to apply the 'if' condition only on "
-"the 'HEAD' ref. Append \":equals=<string>\" or \":notequals=<string>\" to "
-"compare the value between the %(if:...) and %(then) atoms with the given "
+"the string before %(then), this is useful when we use the %(HEAD) atom which"
+" prints either \"*\" or \" \" and we want to apply the 'if' condition only "
+"on the 'HEAD' ref. Append \":equals=<string>\" or \":notequals=<string>\" "
+"to compare the value between the %(if:...) and %(then) atoms with the given "
"string."
msgstr ""
@@ -35550,8 +34939,8 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:193
msgid ""
-"In addition to the above, for commit and tag objects, the header field names "
-"(`tree`, `parent`, `object`, `type`, and `tag`) can be used to specify the "
+"In addition to the above, for commit and tag objects, the header field names"
+" (`tree`, `parent`, `object`, `type`, and `tag`) can be used to specify the "
"value in the header field."
msgstr ""
@@ -35578,19 +34967,19 @@ msgid ""
"The complete message in a commit and tag object is `contents`. Its first "
"line is `contents:subject`, where subject is the concatenation of all lines "
"of the commit message up to the first blank line. The next line is "
-"'contents:body', where body is all of the lines after the first blank line. "
-"The optional GPG signature is `contents:signature`. The first `N` lines of "
-"the message is obtained using `contents:lines=N`. Additionally, the "
-"trailers as interpreted by linkgit:git-interpret-trailers[1] are obtained as "
-"'contents:trailers'."
+"'contents:body', where body is all of the lines after the first blank line."
+" The optional GPG signature is `contents:signature`. The first `N` lines "
+"of the message is obtained using `contents:lines=N`. Additionally, the "
+"trailers as interpreted by linkgit:git-interpret-trailers[1] are obtained as"
+" 'contents:trailers'."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:215
msgid ""
"For sorting purposes, fields with numeric values sort in numeric order "
-"(`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`). "
-"All other fields are used to sort in their byte-value order."
+"(`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`)."
+" All other fields are used to sort in their byte-value order."
msgstr ""
#. type: Plain text
@@ -35611,9 +35000,9 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:226
msgid ""
-"As a special case for the date-type fields, you may specify a format for the "
-"date by adding `:` followed by date format name (see the values the `--date` "
-"option to linkgit:git-rev-list[1] takes)."
+"As a special case for the date-type fields, you may specify a format for the"
+" date by adding `:` followed by date format name (see the values the "
+"`--date` option to linkgit:git-rev-list[1] takes)."
msgstr ""
#. type: Plain text
@@ -35635,8 +35024,8 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:241
msgid ""
-"An example directly producing formatted text. Show the most recent 3 tagged "
-"commits:"
+"An example directly producing formatted text. Show the most recent 3 tagged"
+" commits:"
msgstr ""
#. type: delimited block -
@@ -35687,8 +35076,8 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:272
msgid ""
-"A bit more elaborate report on tags, demonstrating that the format may be an "
-"entire script:"
+"A bit more elaborate report on tags, demonstrating that the format may be an"
+" entire script:"
msgstr ""
#. type: delimited block -
@@ -35776,7 +35165,9 @@ msgstr ""
#. type: delimited block -
#: en/git-for-each-ref.txt:328
#, no-wrap
-msgid "git for-each-ref --format=\"%(if)%(HEAD)%(then)* %(else) %(end)%(refname:short)\" refs/heads/\n"
+msgid ""
+"git for-each-ref --format=\"%(if)%(HEAD)%(then)* %(else) "
+"%(end)%(refname:short)\" refs/heads/\n"
msgstr ""
#. type: Plain text
@@ -35789,15 +35180,16 @@ msgstr ""
#. type: delimited block -
#: en/git-for-each-ref.txt:336
#, no-wrap
-msgid "git for-each-ref --format=\"%(refname)%(if)%(authorname)%(then) Authored by: %(authorname)%(end)\"\n"
+msgid ""
+"git for-each-ref --format=\"%(refname)%(if)%(authorname)%(then) Authored by:"
+" %(authorname)%(end)\"\n"
msgstr ""
#. type: Title =
#: en/git-format-patch.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-branch(1)"
+#, no-wrap
msgid "git-format-patch(1)"
-msgstr "git-branch(1)"
+msgstr "git-format-patch(1)"
#. type: Plain text
#: en/git-format-patch.txt:7
@@ -35850,8 +35242,8 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:46
msgid ""
-"Generic <revision range> expression (see \"SPECIFYING REVISIONS\" section in "
-"linkgit:gitrevisions[7]) means the commits in the specified range."
+"Generic <revision range> expression (see \"SPECIFYING REVISIONS\" section in"
+" linkgit:gitrevisions[7]) means the commits in the specified range."
msgstr ""
#. type: Plain text
@@ -35860,8 +35252,8 @@ msgid ""
"The first rule takes precedence in the case of a single <commit>. To apply "
"the second rule, i.e., format everything since the beginning of history up "
"until <commit>, use the '\\--root' option: `git format-patch --root "
-"<commit>`. If you want to format only <commit> itself, you can do this with "
-"`git format-patch -1 <commit>`."
+"<commit>`. If you want to format only <commit> itself, you can do this with"
+" `git format-patch -1 <commit>`."
msgstr ""
#. type: Plain text
@@ -35878,12 +35270,12 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:66
msgid ""
-"If `-o` is specified, output files are created in <dir>. Otherwise they are "
-"created in the current working directory. The default path can be set with "
+"If `-o` is specified, output files are created in <dir>. Otherwise they are"
+" created in the current working directory. The default path can be set with "
"the `format.outputDirectory` configuration option. The `-o` option takes "
"precedence over `format.outputDirectory`. To store patches in the current "
-"working directory even when `format.outputDirectory` points elsewhere, use `-"
-"o .`."
+"working directory even when `format.outputDirectory` points elsewhere, use "
+"`-o .`."
msgstr ""
#. type: Plain text
@@ -35906,8 +35298,8 @@ msgstr ""
#: en/git-format-patch.txt:79
msgid ""
"If given `--thread`, `git-format-patch` will generate `In-Reply-To` and "
-"`References` headers to make the second and subsequent patch mails appear as "
-"replies to the first mail; this also generates a `Message-Id` header to "
+"`References` headers to make the second and subsequent patch mails appear as"
+" replies to the first mail; this also generates a `Message-Id` header to "
"reference."
msgstr ""
@@ -35945,7 +35337,7 @@ msgstr ""
#: en/git-format-patch.txt:94 en/git-shortlog.txt:30
#, no-wrap
msgid "--numbered"
-msgstr ""
+msgstr "--numbered"
#. type: Plain text
#: en/git-format-patch.txt:96
@@ -35954,10 +35346,9 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:98
-#, fuzzy, no-wrap
-#| msgid "--no-merged"
+#, no-wrap
msgid "--no-numbered"
-msgstr "--no-merged"
+msgstr "--no-numbered"
#. type: Plain text
#: en/git-format-patch.txt:100
@@ -35979,20 +35370,20 @@ msgstr ""
#: en/git-format-patch.txt:104
#, no-wrap
msgid "--numbered-files"
-msgstr ""
+msgstr "--numbered-files"
#. type: Plain text
#: en/git-format-patch.txt:107
msgid ""
-"Output file names will be a simple number sequence without the default first "
-"line of the commit appended."
+"Output file names will be a simple number sequence without the default first"
+" line of the commit appended."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:109
#, no-wrap
msgid "--keep-subject"
-msgstr ""
+msgstr "--keep-subject"
#. type: Plain text
#: en/git-format-patch.txt:112
@@ -36012,13 +35403,13 @@ msgstr ""
#: en/git-format-patch.txt:119 en/git-pack-objects.txt:57
#, no-wrap
msgid "--stdout"
-msgstr ""
+msgstr "--stdout"
#. type: Plain text
#: en/git-format-patch.txt:122
msgid ""
-"Print all commits to the standard output in mbox format, instead of creating "
-"a file for each one."
+"Print all commits to the standard output in mbox format, instead of creating"
+" a file for each one."
msgstr ""
#. type: Labeled list
@@ -36037,10 +35428,9 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:128
-#, fuzzy, no-wrap
-#| msgid "--no-track"
+#, no-wrap
msgid "--no-attach"
-msgstr "--no-track"
+msgstr "--no-attach"
#. type: Plain text
#: en/git-format-patch.txt:131
@@ -36070,10 +35460,9 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:138
-#, fuzzy, no-wrap
-#| msgid "--no-track"
+#, no-wrap
msgid "--no-thread"
-msgstr "--no-track"
+msgstr "--no-thread"
#. type: Plain text
#: en/git-format-patch.txt:143
@@ -36087,8 +35476,8 @@ msgstr ""
#: en/git-format-patch.txt:149
msgid ""
"The optional <style> argument can be either `shallow` or `deep`. 'shallow' "
-"threading makes every mail a reply to the head of the series, where the head "
-"is chosen from the cover letter, the `--in-reply-to`, and the first patch "
+"threading makes every mail a reply to the head of the series, where the head"
+" is chosen from the cover letter, the `--in-reply-to`, and the first patch "
"mail, in this order. 'deep' threading makes every mail a reply to the "
"previous one."
msgstr ""
@@ -36104,8 +35493,8 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:157
msgid ""
-"Beware that the default for 'git send-email' is to thread emails itself. If "
-"you want `git format-patch` to take care of threading, you will want to "
+"Beware that the default for 'git send-email' is to thread emails itself. If"
+" you want `git format-patch` to take care of threading, you will want to "
"ensure that threading is disabled for `git send-email`."
msgstr ""
@@ -36127,14 +35516,15 @@ msgstr ""
#: en/git-format-patch.txt:163
#, no-wrap
msgid "--ignore-if-in-upstream"
-msgstr ""
+msgstr "--ignore-if-in-upstream"
#. type: Plain text
#: en/git-format-patch.txt:169
msgid ""
-"Do not include a patch that matches a commit in <until>..<since>. This will "
-"examine all patches reachable from <since> but not from <until> and compare "
-"them with the patches being generated, and any patch that matches is ignored."
+"Do not include a patch that matches a commit in <until>..<since>. This will"
+" examine all patches reachable from <since> but not from <until> and compare"
+" them with the patches being generated, and any patch that matches is "
+"ignored."
msgstr ""
#. type: Labeled list
@@ -36156,14 +35546,14 @@ msgstr ""
#: en/git-format-patch.txt:176
#, no-wrap
msgid "--rfc"
-msgstr ""
+msgstr "--rfc"
#. type: Plain text
#: en/git-format-patch.txt:180
msgid ""
-"Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments"
-"\"; use this when sending an experimental patch for discussion rather than "
-"application."
+"Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For "
+"Comments\"; use this when sending an experimental patch for discussion "
+"rather than application."
msgstr ""
#. type: Labeled list
@@ -36182,10 +35572,10 @@ msgstr ""
#: en/git-format-patch.txt:189
msgid ""
"Mark the series as the <n>-th iteration of the topic. The output filenames "
-"have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, "
-"but configurable via the `--subject-prefix` option) has ` v<n>` appended to "
-"it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file "
-"that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
+"have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default,"
+" but configurable via the `--subject-prefix` option) has ` v<n>` appended to"
+" it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file"
+" that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
@@ -36220,7 +35610,7 @@ msgstr ""
#: en/git-format-patch.txt:202
#, no-wrap
msgid "--from"
-msgstr ""
+msgstr "--from"
#. type: Labeled list
#: en/git-format-patch.txt:203
@@ -36267,7 +35657,7 @@ msgstr ""
#: en/git-format-patch.txt:225
#, no-wrap
msgid "--[no-]cover-letter"
-msgstr ""
+msgstr "--[no-]cover-letter"
#. type: Plain text
#: en/git-format-patch.txt:229
@@ -36294,8 +35684,8 @@ msgstr ""
#: en/git-format-patch.txt:241
msgid ""
"The expected use case of this is to write supporting explanation for the "
-"commit that does not belong to the commit log message proper, and include it "
-"with the patch submission. While one can simply write these explanations "
+"commit that does not belong to the commit log message proper, and include it"
+" with the patch submission. While one can simply write these explanations "
"after `format-patch` has run but before sending, keeping them as Git notes "
"allows them to be maintained between versions of the patch series (but see "
"the discussion of the `notes.rewrite` configuration options in linkgit:git-"
@@ -36357,10 +35747,9 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:264
-#, fuzzy, no-wrap
-#| msgid "--no-abbrev"
+#, no-wrap
msgid "--no-binary"
-msgstr "--no-abbrev"
+msgstr "--no-binary"
#. type: Plain text
#: en/git-format-patch.txt:269
@@ -36374,7 +35763,7 @@ msgstr ""
#: en/git-format-patch.txt:270
#, no-wrap
msgid "--zero-commit"
-msgstr ""
+msgstr "--zero-commit"
#. type: Plain text
#: en/git-format-patch.txt:273
@@ -36401,8 +35790,8 @@ msgstr ""
#: en/git-format-patch.txt:285
msgid ""
"Treat the revision argument as a <revision range>, even if it is just a "
-"single commit (that would normally be treated as a <since>). Note that root "
-"commits included in the specified range are always formatted as creation "
+"single commit (that would normally be treated as a <since>). Note that root"
+" commits included in the specified range are always formatted as creation "
"patches, independently of this flag."
msgstr ""
@@ -36522,11 +35911,11 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:363
msgid ""
-"When sending a patch this way, most often you are sending your own patch, so "
-"in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit "
-"`From:` and `Date:` lines from the patch file. The patch title is likely to "
-"be different from the subject of the discussion the patch is in response to, "
-"so it is likely that you would want to keep the Subject: line, like the "
+"When sending a patch this way, most often you are sending your own patch, so"
+" in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit"
+" `From:` and `Date:` lines from the patch file. The patch title is likely "
+"to be different from the subject of the discussion the patch is in response "
+"to, so it is likely that you would want to keep the Subject: line, like the "
"example above."
msgstr ""
@@ -36596,8 +35985,8 @@ msgstr ""
#: en/git-format-patch.txt:396
msgid ""
"The patch itself does not apply cleanly. That is _bad_ but does not have "
-"much to do with your MUA. You might want to rebase the patch with linkgit:"
-"git-rebase[1] before regenerating it in this case."
+"much to do with your MUA. You might want to rebase the patch with "
+"linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
@@ -36643,8 +36032,8 @@ msgstr ""
msgid ""
"GMail does not have any way to turn off line wrapping in the web interface, "
"so it will mangle any emails that you send. You can however use \"git send-"
-"email\" and send your patches through the GMail SMTP server, or use any IMAP "
-"email client to connect to the google IMAP server and forward the emails "
+"email\" and send your patches through the GMail SMTP server, or use any IMAP"
+" email client to connect to the google IMAP server and forward the emails "
"through that."
msgstr ""
@@ -36658,8 +36047,8 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:428
msgid ""
-"For hints on submission using the IMAP interface, see the EXAMPLE section of "
-"linkgit:git-imap-send[1]."
+"For hints on submission using the IMAP interface, see the EXAMPLE section of"
+" linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
@@ -36672,7 +36061,8 @@ msgstr ""
#: en/git-format-patch.txt:434
msgid ""
"By default, Thunderbird will both wrap emails as well as flag them as being "
-"'format=flowed', both of which will make the resulting email unusable by Git."
+"'format=flowed', both of which will make the resulting email unusable by "
+"Git."
msgstr ""
#. type: Plain text
@@ -36692,12 +36082,12 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:448
msgid ""
-"Install the Toggle Word Wrap add-on that is available from https://addons."
-"mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry "
-"\"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick "
-"off. Now you can compose the message as you otherwise do (cut + paste, 'git "
-"format-patch' | 'git imap-send', etc), but you have to insert line breaks "
-"manually in any text that you type."
+"Install the Toggle Word Wrap add-on that is available from "
+"https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a "
+"menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you "
+"can tick off. Now you can compose the message as you otherwise do (cut + "
+"paste, 'git format-patch' | 'git imap-send', etc), but you have to insert "
+"line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
@@ -36764,9 +36154,9 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:483
msgid ""
-"The following Thunderbird extensions are needed: AboutConfig from http://"
-"aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles."
-"php?lng=en&pg=8"
+"The following Thunderbird extensions are needed: AboutConfig from "
+"http://aboutconfig.mozdev.org/ and External Editor from "
+"http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
@@ -36778,15 +36168,16 @@ msgstr ""
#: en/git-format-patch.txt:490
msgid ""
"Before opening a compose window, use Edit->Account Settings to uncheck the "
-"\"Compose messages in HTML format\" setting in the \"Composition & Addressing"
-"\" panel of the account to be used to send the patch."
+"\"Compose messages in HTML format\" setting in the \"Composition & "
+"Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:494
msgid ""
-"In the main Thunderbird window, 'before' you open the compose window for the "
-"patch, use Tools->about:config to set the following to the indicated values:"
+"In the main Thunderbird window, 'before' you open the compose window for the"
+" patch, use Tools->about:config to set the following to the indicated "
+"values:"
msgstr ""
#. type: delimited block -
@@ -36869,8 +36260,8 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:533
msgid ""
-"Back in the compose window: add whatever other text you wish to the message, "
-"complete the addressing and subject fields, and press send."
+"Back in the compose window: add whatever other text you wish to the message,"
+" complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
@@ -36917,10 +36308,10 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:564
msgid ""
-"With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--"
-"cover-letter` of using `Z..C` instead of `-3 C` to specify the range), the "
-"base tree information block is shown at the end of the first message the "
-"command outputs (either the first patch, or the cover letter), like this:"
+"With `git format-patch --base=P -3 C` (or variants thereof, e.g. with "
+"`--cover-letter` of using `Z..C` instead of `-3 C` to specify the range), "
+"the base tree information block is shown at the end of the first message the"
+" command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
@@ -36950,8 +36341,8 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:583
msgid ""
-"You can also use `git format-patch --base=P -3 C` to generate patches for A, "
-"B and C, and the identifiers for P, X, Y, Z are appended at the end of the "
+"You can also use `git format-patch --base=P -3 C` to generate patches for A,"
+" B and C, and the identifiers for P, X, Y, Z are appended at the end of the "
"first message."
msgstr ""
@@ -36961,8 +36352,8 @@ msgid ""
"If set `--base=auto` in cmdline, it will track base commit automatically, "
"the base commit will be the merge base of tip commit of the remote-tracking "
"branch and revision-range specified in cmdline. For a local branch, you "
-"need to track a remote branch by `git branch --set-upstream-to` before using "
-"this option."
+"need to track a remote branch by `git branch --set-upstream-to` before using"
+" this option."
msgstr ""
#. type: Plain text
@@ -36978,7 +36369,6 @@ msgstr ""
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
msgstr ""
-#
#. type: Plain text
#: en/git-format-patch.txt:602
#, fuzzy
@@ -36989,8 +36379,8 @@ msgid ""
"Extract all commits which are in the current branch but not in the origin "
"branch:"
msgstr ""
-"die Commits an, die im Zweig \"experimentell\" aber nicht im Zweig \"stabil"
-"\" get채tigt wurden. Dagegen zeigt"
+"die Commits an, die im Zweig \"experimentell\" aber nicht im Zweig "
+"\"stabil\" get채tigt wurden. Dagegen zeigt"
#. type: delimited block -
#: en/git-format-patch.txt:605
@@ -36998,13 +36388,12 @@ msgstr ""
msgid "$ git format-patch origin\n"
msgstr ""
-#
#. type: Plain text
#: en/git-format-patch.txt:608
#, fuzzy
#| msgid ""
-#| "If you leave out the commit name, 'git-grep' will search any of the files "
-#| "it manages in your current directory. So"
+#| "If you leave out the commit name, 'git-grep' will search any of the files it"
+#| " manages in your current directory. So"
msgid "For each commit a separate file is created in the current directory."
msgstr ""
"Falls Sie den Namen des Commits nicht angeben sucht 'git-grep' in den "
@@ -37013,7 +36402,8 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:611
msgid ""
-"Extract all commits that lead to 'origin' since the inception of the project:"
+"Extract all commits that lead to 'origin' since the inception of the "
+"project:"
msgstr ""
#. type: delimited block -
@@ -37049,15 +36439,15 @@ msgid ""
"Additionally, it detects and handles renames and complete rewrites "
"intelligently to produce a renaming patch. A renaming patch reduces the "
"amount of text output, and generally makes it easier to review. Note that "
-"non-Git \"patch\" programs won't understand renaming patches, so use it only "
-"when you know the recipient uses Git to apply your patch."
+"non-Git \"patch\" programs won't understand renaming patches, so use it only"
+" when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:630
msgid ""
-"Extract three topmost commits from the current branch and format them as e-"
-"mailable patches:"
+"Extract three topmost commits from the current branch and format them as "
+"e-mailable patches:"
msgstr ""
#. type: delimited block -
@@ -37067,11 +36457,11 @@ msgstr ""
msgid "$ git format-patch -3\n"
msgstr "$ git commit -a\n"
-#
#. type: Plain text
#: en/git-format-patch.txt:638
#, fuzzy
-#| msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
+#| msgid ""
+#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
@@ -37081,7 +36471,6 @@ msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid "git-fsck-objects(1)"
msgstr "git-fsck-objects(1)"
-#
#. type: Plain text
#: en/git-fsck-objects.txt:7
msgid ""
@@ -37091,7 +36480,6 @@ msgstr ""
"git-fsck-objects - 체berpr체ft die Verbundenheit und Korrektheit der Objekte "
"in der Datenbank"
-#
#. type: Plain text
#: en/git-fsck-objects.txt:13
#, fuzzy, no-wrap
@@ -37099,7 +36487,6 @@ msgstr ""
msgid "'git fsck-objects' ...\n"
msgstr "'git fsck-objects' ..."
-#
#. type: Plain text
#: en/git-fsck-objects.txt:19
msgid ""
@@ -37111,18 +36498,16 @@ msgstr ""
#. type: Title =
#: en/git-fsck.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-fsck-objects(1)"
+#, no-wrap
msgid "git-fsck(1)"
-msgstr "git-fsck-objects(1)"
+msgstr "git-fsck(1)"
-#
#. type: Plain text
#: en/git-fsck.txt:7
#, fuzzy
#| msgid ""
-#| "git-fsck-objects - Verifies the connectivity and validity of the objects "
-#| "in the database"
+#| "git-fsck-objects - Verifies the connectivity and validity of the objects in "
+#| "the database"
msgid ""
"git-fsck - Verifies the connectivity and validity of the objects in the "
"database"
@@ -37157,7 +36542,7 @@ msgstr ""
#: en/git-fsck.txt:30
#, no-wrap
msgid "--unreachable"
-msgstr ""
+msgstr "--unreachable"
#. type: Plain text
#: en/git-fsck.txt:33
@@ -37170,13 +36555,13 @@ msgstr ""
#: en/git-fsck.txt:34
#, no-wrap
msgid "--[no-]dangling"
-msgstr ""
+msgstr "--[no-]dangling"
#. type: Plain text
#: en/git-fsck.txt:37
msgid ""
-"Print objects that exist but that are never 'directly' used (default). `--"
-"no-dangling` can be used to omit this information from the output."
+"Print objects that exist but that are never 'directly' used (default). "
+"`--no-dangling` can be used to omit this information from the output."
msgstr ""
#. type: Plain text
@@ -37191,10 +36576,9 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:44
-#, fuzzy, no-wrap
-#| msgid "--cached"
+#, no-wrap
msgid "--cache"
-msgstr "--cached"
+msgstr "--cache"
#. type: Plain text
#: en/git-fsck.txt:47
@@ -37205,10 +36589,9 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:48
-#, fuzzy, no-wrap
-#| msgid "--no-color"
+#, no-wrap
msgid "--no-reflogs"
-msgstr "--no-color"
+msgstr "--no-reflogs"
#. type: Plain text
#: en/git-fsck.txt:53
@@ -37220,27 +36603,26 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:54
-#, fuzzy, no-wrap
-#| msgid "--full-diff"
+#, no-wrap
msgid "--full"
-msgstr "--full-diff"
+msgstr "--full"
#. type: Plain text
#: en/git-fsck.txt:63
msgid ""
"Check not just objects in GIT_OBJECT_DIRECTORY ($GIT_DIR/objects), but also "
"the ones found in alternate object pools listed in "
-"GIT_ALTERNATE_OBJECT_DIRECTORIES or $GIT_DIR/objects/info/alternates, and in "
-"packed Git archives found in $GIT_DIR/objects/pack and corresponding pack "
-"subdirectories in alternate object pools. This is now default; you can turn "
-"it off with --no-full."
+"GIT_ALTERNATE_OBJECT_DIRECTORIES or $GIT_DIR/objects/info/alternates, and in"
+" packed Git archives found in $GIT_DIR/objects/pack and corresponding pack "
+"subdirectories in alternate object pools. This is now default; you can turn"
+" it off with --no-full."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:64
#, no-wrap
msgid "--connectivity-only"
-msgstr ""
+msgstr "--connectivity-only"
#. type: Plain text
#: en/git-fsck.txt:68
@@ -37254,14 +36636,14 @@ msgstr ""
#: en/git-fsck.txt:69 en/git-index-pack.txt:74 en/git-unpack-objects.txt:44
#, no-wrap
msgid "--strict"
-msgstr ""
+msgstr "--strict"
#. type: Plain text
#: en/git-fsck.txt:76
msgid ""
"Enable more strict checking, namely to catch a file mode recorded with g+w "
-"bit set, which was created by older versions of Git. Existing repositories, "
-"including the Linux kernel, Git itself, and sparse repository have old "
+"bit set, which was created by older versions of Git. Existing repositories,"
+" including the Linux kernel, Git itself, and sparse repository have old "
"objects that triggers this check, but it is recommended to check new "
"projects with this flag."
msgstr ""
@@ -37275,22 +36657,21 @@ msgstr ""
#: en/git-fsck.txt:80
#, no-wrap
msgid "--lost-found"
-msgstr ""
+msgstr "--lost-found"
#. type: Plain text
#: en/git-fsck.txt:85
msgid ""
-"Write dangling objects into .git/lost-found/commit/ or .git/lost-found/"
-"other/, depending on type. If the object is a blob, the contents are "
+"Write dangling objects into .git/lost-found/commit/ or .git/lost-"
+"found/other/, depending on type. If the object is a blob, the contents are "
"written into the file, rather than its object name."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:86
-#, fuzzy, no-wrap
-#| msgid "--rename-section"
+#, no-wrap
msgid "--name-objects"
-msgstr "--rename-section"
+msgstr "--name-objects"
#. type: Plain text
#: en/git-fsck.txt:91
@@ -37304,27 +36685,28 @@ msgstr ""
#: en/git-fsck.txt:98
msgid ""
"Progress status is reported on the standard error stream by default when it "
-"is attached to a terminal, unless --no-progress or --verbose is specified. --"
-"progress forces progress status even if the standard error stream is not "
+"is attached to a terminal, unless --no-progress or --verbose is specified. "
+"--progress forces progress status even if the standard error stream is not "
"directed to a terminal."
msgstr ""
#. type: Plain text
#: en/git-fsck.txt:108
msgid ""
-"git-fsck tests SHA-1 and general object sanity, and it does full tracking of "
-"the resulting reachability and everything else. It prints out any corruption "
-"it finds (missing or bad objects), and if you use the `--unreachable` flag "
-"it will also print out objects that exist but that aren't reachable from any "
-"of the specified head nodes (or the default set, as mentioned above)."
+"git-fsck tests SHA-1 and general object sanity, and it does full tracking of"
+" the resulting reachability and everything else. It prints out any "
+"corruption it finds (missing or bad objects), and if you use the "
+"`--unreachable` flag it will also print out objects that exist but that "
+"aren't reachable from any of the specified head nodes (or the default set, "
+"as mentioned above)."
msgstr ""
#. type: Plain text
#: en/git-fsck.txt:112
msgid ""
-"Any corrupt objects you will have to find in backups or other archives (i."
-"e., you can just remove them and do an 'rsync' with some other site in the "
-"hopes that somebody else has the object you have corrupted)."
+"Any corrupt objects you will have to find in backups or other archives "
+"(i.e., you can just remove them and do an 'rsync' with some other site in "
+"the hopes that somebody else has the object you have corrupted)."
msgstr ""
#. type: Title -
@@ -37336,7 +36718,8 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:116
#, no-wrap
-msgid "expect dangling commits - potential heads - due to lack of head information"
+msgid ""
+"expect dangling commits - potential heads - due to lack of head information"
msgstr ""
#. type: Plain text
@@ -37368,8 +36751,8 @@ msgstr ""
msgid ""
"The <type> object <object>, isn't actually referred to directly or "
"indirectly in any of the trees or commits seen. This can mean that there's "
-"another root node that you're not specifying or that the tree is corrupt. If "
-"you haven't missed a root node then you might as well delete unreachable "
+"another root node that you're not specifying or that the tree is corrupt. If"
+" you haven't missed a root node then you might as well delete unreachable "
"nodes since they can't be used."
msgstr ""
@@ -37382,7 +36765,8 @@ msgstr ""
#. type: Plain text
#: en/git-fsck.txt:135
msgid ""
-"The <type> object <object>, is referred to but isn't present in the database."
+"The <type> object <object>, is referred to but isn't present in the "
+"database."
msgstr ""
#. type: Labeled list
@@ -37452,10 +36836,9 @@ msgstr ""
#. type: Title =
#: en/git-gc.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-log(1)"
+#, no-wrap
msgid "git-gc(1)"
-msgstr "git-log(1)"
+msgstr "git-gc(1)"
#. type: Plain text
#: en/git-gc.txt:7
@@ -37465,7 +36848,9 @@ msgstr ""
#. type: Plain text
#: en/git-gc.txt:13
#, no-wrap
-msgid "'git gc' [--aggressive] [--auto] [--quiet] [--prune=<date> | --no-prune] [--force]\n"
+msgid ""
+"'git gc' [--aggressive] [--auto] [--quiet] [--prune=<date> | --no-prune] "
+"[--force]\n"
msgstr ""
#. type: Plain text
@@ -37504,7 +36889,7 @@ msgstr "% git config --get-all core.gitproxy\n"
#: en/git-gc.txt:36 en/git-read-tree.txt:71
#, no-wrap
msgid "--aggressive"
-msgstr ""
+msgstr "--aggressive"
#. type: Plain text
#: en/git-gc.txt:43
@@ -37520,24 +36905,24 @@ msgstr ""
#: en/git-gc.txt:44
#, no-wrap
msgid "--auto"
-msgstr ""
+msgstr "--auto"
#. type: Plain text
#: en/git-gc.txt:49
msgid ""
"With this option, 'git gc' checks whether any housekeeping is required; if "
-"not, it exits without performing any work. Some git commands run `git gc --"
-"auto` after performing operations that could create many loose objects."
+"not, it exits without performing any work. Some git commands run `git gc "
+"--auto` after performing operations that could create many loose objects."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:56
msgid ""
"Housekeeping is required if there are too many loose objects or too many "
-"packs in the repository. If the number of loose objects exceeds the value of "
-"the `gc.auto` configuration variable, then all loose objects are combined "
-"into a single pack using `git repack -d -l`. Setting the value of `gc.auto` "
-"to 0 disables automatic packing of loose objects."
+"packs in the repository. If the number of loose objects exceeds the value of"
+" the `gc.auto` configuration variable, then all loose objects are combined "
+"into a single pack using `git repack -d -l`. Setting the value of `gc.auto`"
+" to 0 disables automatic packing of loose objects."
msgstr ""
#. type: Plain text
@@ -37545,8 +36930,8 @@ msgstr ""
msgid ""
"If the number of packs exceeds the value of `gc.autoPackLimit`, then "
"existing packs (except those marked with a `.keep` file) are consolidated "
-"into a single pack by using the `-A` option of 'git repack'. Setting `gc."
-"autoPackLimit` to 0 disables automatic consolidation of packs."
+"into a single pack by using the `-A` option of 'git repack'. Setting "
+"`gc.autoPackLimit` to 0 disables automatic consolidation of packs."
msgstr ""
#. type: Labeled list
@@ -37562,16 +36947,15 @@ msgid ""
"Prune loose objects older than date (default is 2 weeks ago, overridable by "
"the config variable `gc.pruneExpire`). --prune=all prunes loose objects "
"regardless of their age and increases the risk of corruption if another "
-"process is writing to the repository concurrently; see \"NOTES\" below. --"
-"prune is on by default."
+"process is writing to the repository concurrently; see \"NOTES\" below. "
+"--prune is on by default."
msgstr ""
#. type: Labeled list
#: en/git-gc.txt:71 en/git-pack-refs.txt:57
-#, fuzzy, no-wrap
-#| msgid "--no-abbrev"
+#, no-wrap
msgid "--no-prune"
-msgstr "--no-abbrev"
+msgstr "--no-prune"
#. type: Plain text
#: en/git-gc.txt:73
@@ -37586,17 +36970,17 @@ msgstr ""
#. type: Plain text
#: en/git-gc.txt:80
msgid ""
-"Force `git gc` to run even if there may be another `git gc` instance running "
-"on this repository."
+"Force `git gc` to run even if there may be another `git gc` instance running"
+" on this repository."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:89
msgid ""
-"The optional configuration variable `gc.reflogExpire` can be set to indicate "
-"how long historical entries within each branch's reflog should remain "
-"available in this repository. The setting is expressed as a length of time, "
-"for example '90 days' or '3 months'. It defaults to '90 days'."
+"The optional configuration variable `gc.reflogExpire` can be set to indicate"
+" how long historical entries within each branch's reflog should remain "
+"available in this repository. The setting is expressed as a length of time,"
+" for example '90 days' or '3 months'. It defaults to '90 days'."
msgstr ""
#. type: Plain text
@@ -37607,8 +36991,8 @@ msgid ""
"current branch should remain available in this repository. These types of "
"entries are generally created as a result of using `git commit --amend` or "
"`git rebase` and are the commits prior to the amend or rebase occurring. "
-"Since these changes are not part of the current project most users will want "
-"to expire them sooner. This option defaults to '30 days'."
+"Since these changes are not part of the current project most users will want"
+" to expire them sooner. This option defaults to '30 days'."
msgstr ""
#. type: Plain text
@@ -37632,15 +37016,15 @@ msgstr ""
#: en/git-gc.txt:112
msgid ""
"The optional configuration variable `gc.rerereResolved` indicates how long "
-"records of conflicted merge you resolved earlier are kept. This defaults to "
-"60 days."
+"records of conflicted merge you resolved earlier are kept. This defaults to"
+" 60 days."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:116
msgid ""
-"The optional configuration variable `gc.rerereUnresolved` indicates how long "
-"records of conflicted merge you have not resolved are kept. This defaults "
+"The optional configuration variable `gc.rerereUnresolved` indicates how long"
+" records of conflicted merge you have not resolved are kept. This defaults "
"to 15 days."
msgstr ""
@@ -37648,8 +37032,8 @@ msgstr ""
#: en/git-gc.txt:121
msgid ""
"The optional configuration variable `gc.packRefs` determines if 'git gc' "
-"runs 'git pack-refs'. This can be set to \"notbare\" to enable it within all "
-"non-bare repos or it can be set to a boolean value. This defaults to true."
+"runs 'git pack-refs'. This can be set to \"notbare\" to enable it within all"
+" non-bare repos or it can be set to a boolean value. This defaults to true."
msgstr ""
#. type: Plain text
@@ -37657,8 +37041,8 @@ msgstr ""
msgid ""
"The optional configuration variable `gc.aggressiveWindow` controls how much "
"time is spent optimizing the delta compression of the objects in the "
-"repository when the --aggressive option is specified. The larger the value, "
-"the more time is spent optimizing the delta compression. See the "
+"repository when the --aggressive option is specified. The larger the value,"
+" the more time is spent optimizing the delta compression. See the "
"documentation for the --window' option in linkgit:git-repack[1] for more "
"details. This defaults to 250."
msgstr ""
@@ -37666,8 +37050,8 @@ msgstr ""
#. type: Plain text
#: en/git-gc.txt:131
msgid ""
-"Similarly, the optional configuration variable `gc.aggressiveDepth` controls "
-"--depth option in linkgit:git-repack[1]. This defaults to 50."
+"Similarly, the optional configuration variable `gc.aggressiveDepth` controls"
+" --depth option in linkgit:git-repack[1]. This defaults to 50."
msgstr ""
#. type: Plain text
@@ -37683,23 +37067,23 @@ msgstr ""
msgid ""
"'git gc' tries very hard not to delete objects that are referenced anywhere "
"in your repository. In particular, it will keep not only objects referenced "
-"by your current set of branches and tags, but also objects referenced by the "
-"index, remote-tracking branches, refs saved by 'git filter-branch' in refs/"
-"original/, or reflogs (which may reference commits in branches that were "
-"later amended or rewound). If you are expecting some objects to be deleted "
-"and they aren't, check all of those locations and decide whether it makes "
-"sense in your case to remove those references."
+"by your current set of branches and tags, but also objects referenced by the"
+" index, remote-tracking branches, refs saved by 'git filter-branch' in "
+"refs/original/, or reflogs (which may reference commits in branches that "
+"were later amended or rewound). If you are expecting some objects to be "
+"deleted and they aren't, check all of those locations and decide whether it "
+"makes sense in your case to remove those references."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:157
msgid ""
"On the other hand, when 'git gc' runs concurrently with another process, "
-"there is a risk of it deleting an object that the other process is using but "
-"hasn't created a reference to. This may just cause the other process to fail "
-"or may corrupt the repository if the other process later adds a reference to "
-"the deleted object. Git has two features that significantly mitigate this "
-"problem:"
+"there is a risk of it deleting an object that the other process is using but"
+" hasn't created a reference to. This may just cause the other process to "
+"fail or may corrupt the repository if the other process later adds a "
+"reference to the deleted object. Git has two features that significantly "
+"mitigate this problem:"
msgstr ""
#. type: Plain text
@@ -37720,27 +37104,25 @@ msgstr ""
#: en/git-gc.txt:169
msgid ""
"However, these features fall short of a complete solution, so users who run "
-"commands concurrently have to live with some risk of corruption (which seems "
-"to be low in practice) unless they turn off automatic garbage collection "
+"commands concurrently have to live with some risk of corruption (which seems"
+" to be low in practice) unless they turn off automatic garbage collection "
"with 'git config gc.auto 0'."
msgstr ""
-#
#. type: Plain text
#: en/git-gc.txt:175
#, fuzzy
#| msgid ""
-#| "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, "
-#| "and `post-commit` hooks. See linkgit:githooks[5] for more information."
+#| "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, and "
+#| "`post-commit` hooks. See linkgit:githooks[5] for more information."
msgid ""
-"The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:"
-"githooks[5] for more information."
+"The 'git gc --auto' command will run the 'pre-auto-gc' hook. See "
+"linkgit:githooks[5] for more information."
msgstr ""
"Dieser Befehl kann die folgenden Einsprungspunkte (hooks) aufrufen: `commit-"
-"msg`, `prepare-commit-msg`, `pre-commit` und `post-commit`. Siehe linkgit:"
-"githooks[5] f체r weitere Information."
+"msg`, `prepare-commit-msg`, `pre-commit` und `post-commit`. Siehe "
+"linkgit:githooks[5] f체r weitere Information."
-#
#. type: Plain text
#: en/git-gc.txt:183
#, fuzzy
@@ -37748,18 +37130,17 @@ msgstr ""
#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
#| "merge[1], linkgit:git-commit-tree[1]"
msgid ""
-"linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-"
-"rerere[1]"
+"linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] "
+"linkgit:git-rerere[1]"
msgstr ""
"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
"merge[1], linkgit:git-commit-tree[1]"
#. type: Title =
#: en/git-get-tar-commit-id.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-get-tar-commit-id(1)"
-msgstr "git-commit(1)"
+msgstr "git-get-tar-commit-id(1)"
#. type: Plain text
#: en/git-get-tar-commit-id.txt:7
@@ -37788,17 +37169,16 @@ msgstr ""
#: en/git-get-tar-commit-id.txt:27
msgid ""
"If no commit ID is found, 'git get-tar-commit-id' quietly exists with a "
-"return code of 1. This can happen if the archive had not been created using "
-"'git archive' or if the first parameter of 'git archive' had been a tree ID "
-"instead of a commit ID or tag."
+"return code of 1. This can happen if the archive had not been created using"
+" 'git archive' or if the first parameter of 'git archive' had been a tree ID"
+" instead of a commit ID or tag."
msgstr ""
#. type: Title =
#: en/git-grep.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-rm(1)"
+#, no-wrap
msgid "git-grep(1)"
-msgstr "git-rm(1)"
+msgstr "git-grep(1)"
#. type: Plain text
#: en/git-grep.txt:7
@@ -37836,15 +37216,15 @@ msgstr ""
msgid ""
"Look for specified patterns in the tracked files in the work tree, blobs "
"registered in the index file, or blobs in given tree objects. Patterns are "
-"lists of one or more search expressions separated by newline characters. An "
-"empty string as search expression matches all lines."
+"lists of one or more search expressions separated by newline characters. An"
+" empty string as search expression matches all lines."
msgstr ""
#. type: Plain text
#: en/git-grep.txt:61
msgid ""
-"Number of grep worker threads to use. If unset (or set to 0), 8 threads are "
-"used by default (for now)."
+"Number of grep worker threads to use. If unset (or set to 0), 8 threads are"
+" used by default (for now)."
msgstr ""
#. type: Labeled list
@@ -37872,10 +37252,9 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:79
-#, fuzzy, no-wrap
-#| msgid "--track"
+#, no-wrap
msgid "--untracked"
-msgstr "--track"
+msgstr "--untracked"
#. type: Plain text
#: en/git-grep.txt:82
@@ -37888,7 +37267,7 @@ msgstr ""
#: en/git-grep.txt:83
#, no-wrap
msgid "--no-exclude-standard"
-msgstr ""
+msgstr "--no-exclude-standard"
#. type: Plain text
#: en/git-grep.txt:86
@@ -37901,7 +37280,7 @@ msgstr ""
#: en/git-grep.txt:87 en/git-ls-files.txt:97
#, no-wrap
msgid "--exclude-standard"
-msgstr ""
+msgstr "--exclude-standard"
#. type: Plain text
#: en/git-grep.txt:91
@@ -37929,9 +37308,9 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:104
msgid ""
-"For internal use only. In order to produce uniform output with the --"
-"recurse-submodules option, this option can be used to provide the basename "
-"of a parent's <tree> object to a submodule so the submodule can prefix its "
+"For internal use only. In order to produce uniform output with the "
+"--recurse-submodules option, this option can be used to provide the basename"
+" of a parent's <tree> object to a submodule so the submodule can prefix its "
"output with the parent's name rather than the SHA1 of the submodule."
msgstr ""
@@ -37976,8 +37355,8 @@ msgstr "--depth <depth>"
#. type: Plain text
#: en/git-grep.txt:130
msgid ""
-"For each <pathspec> given on command line, descend at most <depth> levels of "
-"directories. A negative value means no limit. This option is ignored if "
+"For each <pathspec> given on command line, descend at most <depth> levels of"
+" directories. A negative value means no limit. This option is ignored if "
"<pathspec> contains active wildcards. In other words if \"a*\" matches a "
"directory named \"a*\", \"*\" is matched literally so --max-depth is still "
"effective."
@@ -37985,10 +37364,9 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:132
-#, fuzzy, no-wrap
-#| msgid "--get-regexp"
+#, no-wrap
msgid "--word-regexp"
-msgstr "--get-regexp"
+msgstr "--word-regexp"
#. type: Plain text
#: en/git-grep.txt:136
@@ -38000,10 +37378,9 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:138
-#, fuzzy, no-wrap
-#| msgid "--ignore-unmatch"
+#, no-wrap
msgid "--invert-match"
-msgstr "--ignore-unmatch"
+msgstr "--invert-match"
#. type: Plain text
#: en/git-grep.txt:140
@@ -38020,10 +37397,9 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:149 en/git-ls-files.txt:136 en/git-ls-tree.txt:68
-#, fuzzy, no-wrap
-#| msgid "--full-diff"
+#, no-wrap
msgid "--full-name"
-msgstr "--full-diff"
+msgstr "--full-name"
#. type: Plain text
#: en/git-grep.txt:154 en/git-ls-files.txt:141
@@ -38041,10 +37417,9 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:156 en/rev-list-options.txt:85
-#, fuzzy, no-wrap
-#| msgid "--get-regexp"
+#, no-wrap
msgid "--extended-regexp"
-msgstr "--get-regexp"
+msgstr "--extended-regexp"
#. type: Labeled list
#: en/git-grep.txt:157
@@ -38054,10 +37429,9 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:158 en/rev-list-options.txt:80
-#, fuzzy, no-wrap
-#| msgid "--get-regexp"
+#, no-wrap
msgid "--basic-regexp"
-msgstr "--get-regexp"
+msgstr "--basic-regexp"
#. type: Plain text
#: en/git-grep.txt:161
@@ -38068,10 +37442,9 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:163 en/rev-list-options.txt:94
-#, fuzzy, no-wrap
-#| msgid "--get-regexp"
+#, no-wrap
msgid "--perl-regexp"
-msgstr "--get-regexp"
+msgstr "--perl-regexp"
#. type: Plain text
#: en/git-grep.txt:166
@@ -38089,7 +37462,7 @@ msgstr ""
#: en/git-grep.txt:168 en/rev-list-options.txt:90
#, no-wrap
msgid "--fixed-strings"
-msgstr ""
+msgstr "--fixed-strings"
#. type: Plain text
#: en/git-grep.txt:171
@@ -38100,7 +37473,7 @@ msgstr ""
#: en/git-grep.txt:173
#, no-wrap
msgid "--line-number"
-msgstr ""
+msgstr "--line-number"
#. type: Plain text
#: en/git-grep.txt:175
@@ -38111,7 +37484,7 @@ msgstr ""
#: en/git-grep.txt:177
#, no-wrap
msgid "--files-with-matches"
-msgstr ""
+msgstr "--files-with-matches"
#. type: Labeled list
#: en/git-grep.txt:179
@@ -38123,7 +37496,7 @@ msgstr ""
#: en/git-grep.txt:180
#, no-wrap
msgid "--files-without-match"
-msgstr ""
+msgstr "--files-without-match"
#. type: Plain text
#: en/git-grep.txt:185
@@ -38165,7 +37538,7 @@ msgstr ""
#: en/git-grep.txt:202 en/rev-list-options.txt:848
#, no-wrap
msgid "--count"
-msgstr ""
+msgstr "--count"
#. type: Plain text
#: en/git-grep.txt:205
@@ -38180,13 +37553,12 @@ msgid ""
"auto."
msgstr ""
-#
#. type: Plain text
#: en/git-grep.txt:214
#, fuzzy
#| msgid ""
-#| "Turn off branch colors, even when the configuration file gives the "
-#| "default to color output."
+#| "Turn off branch colors, even when the configuration file gives the default "
+#| "to color output."
msgid ""
"Turn off match highlighting, even when the configuration file gives the "
"default to color output. Same as `--color=never`."
@@ -38198,7 +37570,7 @@ msgstr ""
#: en/git-grep.txt:215
#, no-wrap
msgid "--break"
-msgstr ""
+msgstr "--break"
#. type: Plain text
#: en/git-grep.txt:217
@@ -38209,7 +37581,7 @@ msgstr ""
#: en/git-grep.txt:218
#, no-wrap
msgid "--heading"
-msgstr ""
+msgstr "--heading"
#. type: Plain text
#: en/git-grep.txt:221
@@ -38222,15 +37594,15 @@ msgstr ""
#: en/git-grep.txt:223
#, no-wrap
msgid "--show-function"
-msgstr ""
+msgstr "--show-function"
#. type: Plain text
#: en/git-grep.txt:229
msgid ""
-"Show the preceding line that contains the function name of the match, unless "
-"the matching line is a function name itself. The name is determined in the "
-"same way as 'git diff' works out patch hunk headers (see 'Defining a custom "
-"hunk-header' in linkgit:gitattributes[5])."
+"Show the preceding line that contains the function name of the match, unless"
+" the matching line is a function name itself. The name is determined in the"
+" same way as 'git diff' works out patch hunk headers (see 'Defining a custom"
+" hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
@@ -38314,8 +37686,8 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:256
msgid ""
-"Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' "
-"for more information."
+"Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION'"
+" for more information."
msgstr ""
#. type: Labeled list
@@ -38334,28 +37706,27 @@ msgstr ""
#: en/git-grep.txt:265
msgid ""
"The next parameter is the pattern. This option has to be used for patterns "
-"starting with `-` and should be used in scripts passing user input to grep. "
-"Multiple patterns are combined by 'or'."
+"starting with `-` and should be used in scripts passing user input to grep."
+" Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:266
#, no-wrap
msgid "--and"
-msgstr ""
+msgstr "--and"
#. type: Labeled list
#: en/git-grep.txt:267
#, no-wrap
msgid "--or"
-msgstr ""
+msgstr "--or"
#. type: Labeled list
#: en/git-grep.txt:268 en/git-rev-parse.txt:129 en/rev-list-options.txt:131
-#, fuzzy, no-wrap
-#| msgid "--no-track"
+#, no-wrap
msgid "--not"
-msgstr "--no-track"
+msgstr "--not"
#. type: Labeled list
#: en/git-grep.txt:269
@@ -38366,17 +37737,16 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:274
msgid ""
-"Specify how multiple patterns are combined using Boolean expressions. `--"
-"or` is the default operator. `--and` has higher precedence than `--or`. `-"
-"e` has to be used for all patterns."
+"Specify how multiple patterns are combined using Boolean expressions. "
+"`--or` is the default operator. `--and` has higher precedence than `--or`."
+" `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:275 en/rev-list-options.txt:67
-#, fuzzy, no-wrap
-#| msgid "--allow-empty"
+#, no-wrap
msgid "--all-match"
-msgstr "--allow-empty"
+msgstr "--all-match"
#. type: Plain text
#: en/git-grep.txt:279
@@ -38429,7 +37799,6 @@ msgstr ""
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
-#
#. type: Plain text
#: en/git-grep.txt:303
#, fuzzy
@@ -38470,10 +37839,9 @@ msgstr ""
#. type: Title =
#: en/git-gui.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-log(1)"
+#, no-wrap
msgid "git-gui(1)"
-msgstr "git-log(1)"
+msgstr "git-gui(1)"
#. type: Plain text
#: en/git-gui.txt:7
@@ -38513,9 +37881,9 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32
-#: en/git-shell.txt:25 en/git-submodule.txt:60 en/git-svn.txt:29
-#: en/git-worktree.txt:47
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42
+#: en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:60
+#: en/git-svn.txt:29 en/git-worktree.txt:47
#, no-wrap
msgid "COMMANDS"
msgstr "COMMANDS"
@@ -38546,7 +37914,6 @@ msgid ""
"selected through the browser are opened in the blame viewer."
msgstr ""
-#
#. type: Labeled list
#: en/git-gui.txt:41
#, fuzzy, no-wrap
@@ -38559,7 +37926,8 @@ msgstr "'git citool'"
msgid ""
"Start 'git gui' and arrange to make exactly one commit before exiting and "
"returning to the shell. The interface is limited to only commit actions, "
-"slightly reducing the application's startup time and simplifying the menubar."
+"slightly reducing the application's startup time and simplifying the "
+"menubar."
msgstr ""
#. type: Labeled list
@@ -38616,7 +37984,6 @@ msgid ""
"center on line '100'."
msgstr ""
-#
#. type: Labeled list
#: en/git-gui.txt:74
#, fuzzy, no-wrap
@@ -38658,7 +38025,6 @@ msgid ""
"mergetool[1]"
msgstr ""
-#
#. type: Labeled list
#: en/git-gui.txt:92
#, fuzzy, no-wrap
@@ -38702,8 +38068,8 @@ msgstr ""
#: en/git-gui.txt:114
msgid ""
"'git gui' is actually maintained as an independent project, but stable "
-"versions are distributed as part of the Git suite for the convenience of end "
-"users."
+"versions are distributed as part of the Git suite for the convenience of end"
+" users."
msgstr ""
#. type: Plain text
@@ -38730,15 +38096,15 @@ msgstr ""
#. type: Title =
#: en/git-hash-object.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-fsck-objects(1)"
+#, no-wrap
msgid "git-hash-object(1)"
-msgstr "git-fsck-objects(1)"
+msgstr "git-hash-object(1)"
#. type: Plain text
#: en/git-hash-object.txt:7
msgid ""
-"git-hash-object - Compute object ID and optionally creates a blob from a file"
+"git-hash-object - Compute object ID and optionally creates a blob from a "
+"file"
msgstr ""
#. type: Plain text
@@ -38784,10 +38150,9 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:37
-#, fuzzy, no-wrap
-#| msgid "--patch"
+#, no-wrap
msgid "--stdin-paths"
-msgstr "--patch"
+msgstr "--stdin-paths"
#. type: Plain text
#: en/git-hash-object.txt:40
@@ -38800,8 +38165,8 @@ msgstr ""
#: en/git-hash-object.txt:50
msgid ""
"Hash object as it were located at the given path. The location of file does "
-"not directly influence on the hash value, but path is used to determine what "
-"Git filters should be applied to the object before it can be placed to the "
+"not directly influence on the hash value, but path is used to determine what"
+" Git filters should be applied to the object before it can be placed to the "
"object database, and, as result of applying filters, the actual blob put "
"into the object database may differ from the given file. This option is "
"mainly useful for hashing temporary files located outside of the working "
@@ -38810,41 +38175,39 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:51
-#, fuzzy, no-wrap
-#| msgid "--no-color"
+#, no-wrap
msgid "--no-filters"
-msgstr "--no-color"
+msgstr "--no-filters"
#. type: Plain text
#: en/git-hash-object.txt:56
msgid ""
"Hash the contents as is, ignoring any input filter that would have been "
-"chosen by the attributes mechanism, including the end-of-line conversion. If "
-"the file is read from standard input then this is always implied, unless the "
-"`--path` option is given."
+"chosen by the attributes mechanism, including the end-of-line conversion. If"
+" the file is read from standard input then this is always implied, unless "
+"the `--path` option is given."
msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:57
#, no-wrap
msgid "--literally"
-msgstr ""
+msgstr "--literally"
#. type: Plain text
#: en/git-hash-object.txt:62
msgid ""
"Allow `--stdin` to hash any garbage into a loose object which might not "
-"otherwise pass standard object parsing or git-fsck checks. Useful for stress-"
-"testing Git itself or reproducing characteristics of corrupt or bogus "
-"objects encountered in the wild."
+"otherwise pass standard object parsing or git-fsck checks. Useful for "
+"stress-testing Git itself or reproducing characteristics of corrupt or bogus"
+" objects encountered in the wild."
msgstr ""
#. type: Title =
#: en/git-help.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-log(1)"
+#, no-wrap
msgid "git-help(1)"
-msgstr "git-log(1)"
+msgstr "git-help(1)"
#. type: Plain text
#: en/git-help.txt:7
@@ -38863,8 +38226,8 @@ msgstr ""
#: en/git-help.txt:20
msgid ""
"With no options and no COMMAND or GUIDE given, the synopsis of the 'git' "
-"command and a list of the most commonly used Git commands are printed on the "
-"standard output."
+"command and a list of the most commonly used Git commands are printed on the"
+" standard output."
msgstr ""
#. type: Plain text
@@ -38877,8 +38240,8 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:26
msgid ""
-"If the option `--guide` or `-g` is given, a list of the useful Git guides is "
-"also printed on the standard output."
+"If the option `--guide` or `-g` is given, a list of the useful Git guides is"
+" also printed on the standard output."
msgstr ""
#. type: Plain text
@@ -38892,8 +38255,8 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:34
msgid ""
-"Note that `git --help ...` is identical to `git help ...` because the former "
-"is internally converted into the latter."
+"Note that `git --help ...` is identical to `git help ...` because the former"
+" is internally converted into the latter."
msgstr ""
#. type: Plain text
@@ -38917,34 +38280,33 @@ msgstr ""
#: en/git-help.txt:47
#, no-wrap
msgid "--guides"
-msgstr ""
+msgstr "--guides"
#. type: Plain text
#: en/git-help.txt:50
msgid ""
-"Prints a list of useful guides on the standard output. This option overrides "
-"any given command or guide name."
+"Prints a list of useful guides on the standard output. This option overrides"
+" any given command or guide name."
msgstr ""
#. type: Labeled list
#: en/git-help.txt:52
-#, fuzzy, no-wrap
-#| msgid "--int"
+#, no-wrap
msgid "--info"
-msgstr "--int"
+msgstr "--info"
#. type: Plain text
#: en/git-help.txt:55
msgid ""
-"Display manual page for the command in the 'info' format. The 'info' program "
-"will be used for that purpose."
+"Display manual page for the command in the 'info' format. The 'info' program"
+" will be used for that purpose."
msgstr ""
#. type: Labeled list
#: en/git-help.txt:57
#, no-wrap
msgid "--man"
-msgstr ""
+msgstr "--man"
#. type: Plain text
#: en/git-help.txt:61
@@ -38965,7 +38327,7 @@ msgstr ""
#: en/git-help.txt:67
#, no-wrap
msgid "--web"
-msgstr ""
+msgstr "--web"
#. type: Plain text
#: en/git-help.txt:70
@@ -38977,11 +38339,11 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:76
msgid ""
-"The web browser can be specified using the configuration variable `help."
-"browser`, or `web.browser` if the former is not set. If none of these config "
-"variables is set, the 'git web{litdd}browse' helper script (called by 'git "
-"help') will pick a suitable default. See linkgit:git-web{litdd}browse[1] for "
-"more information about this."
+"The web browser can be specified using the configuration variable "
+"`help.browser`, or `web.browser` if the former is not set. If none of these "
+"config variables is set, the 'git web{litdd}browse' helper script (called by"
+" 'git help') will pick a suitable default. See linkgit:git-"
+"web{litdd}browse[1] for more information about this."
msgstr ""
#. type: Title -
@@ -39060,8 +38422,8 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:114
msgid ""
-"Values for other tools can be used if there is a corresponding `man.<tool>."
-"cmd` configuration entry (see below)."
+"Values for other tools can be used if there is a corresponding "
+"`man.<tool>.cmd` configuration entry (see below)."
msgstr ""
#. type: Plain text
@@ -39097,8 +38459,8 @@ msgstr ""
#: en/git-help.txt:133
msgid ""
"If everything fails, or if no viewer is configured, the viewer specified in "
-"the `GIT_MAN_VIEWER` environment variable will be tried. If that fails too, "
-"the 'man' program will be tried anyway."
+"the `GIT_MAN_VIEWER` environment variable will be tried. If that fails too,"
+" the 'man' program will be tried anyway."
msgstr ""
#. type: Plain text
@@ -39129,8 +38491,8 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:159
msgid ""
-"When 'konqueror' is specified in the `man.viewer` configuration variable, we "
-"launch 'kfmclient' to try to open the man page on an already opened "
+"When 'konqueror' is specified in the `man.viewer` configuration variable, we"
+" launch 'kfmclient' to try to open the man page on an already opened "
"konqueror in a new tab if possible."
msgstr ""
@@ -39174,8 +38536,8 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:180
msgid ""
-"Note that all these configuration variables should probably be set using the "
-"`--global` flag, for example like this:"
+"Note that all these configuration variables should probably be set using the"
+" `--global` flag, for example like this:"
msgstr ""
#. type: delimited block -
@@ -39200,10 +38562,9 @@ msgstr ""
#. type: Title =
#: en/git-http-backend.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-branch(1)"
+#, no-wrap
msgid "git-http-backend(1)"
-msgstr "git-branch(1)"
+msgstr "git-http-backend(1)"
#. type: Plain text
#: en/git-http-backend.txt:7
@@ -39221,8 +38582,8 @@ msgstr ""
msgid ""
"A simple CGI program to serve the contents of a Git repository to Git "
"clients accessing the repository over http:// and https:// protocols. The "
-"program supports clients fetching using both the smart HTTP protocol and the "
-"backwards-compatible dumb HTTP protocol, as well as clients pushing using "
+"program supports clients fetching using both the smart HTTP protocol and the"
+" backwards-compatible dumb HTTP protocol, as well as clients pushing using "
"the smart HTTP protocol."
msgstr ""
@@ -39239,8 +38600,8 @@ msgstr ""
#: en/git-http-backend.txt:31
msgid ""
"By default, only the `upload-pack` service is enabled, which serves 'git "
-"fetch-pack' and 'git ls-remote' clients, which are invoked from 'git fetch', "
-"'git pull', and 'git clone'. If the client is authenticated, the `receive-"
+"fetch-pack' and 'git ls-remote' clients, which are invoked from 'git fetch',"
+" 'git pull', and 'git clone'. If the client is authenticated, the `receive-"
"pack` service is enabled, which serves 'git send-pack' clients, which is "
"invoked from 'git push'."
msgstr ""
@@ -39262,10 +38623,10 @@ msgstr ""
#: en/git-http-backend.txt:44
msgid ""
"This serves Git clients older than version 1.6.6 that are unable to use the "
-"upload pack service. When enabled, clients are able to read any file within "
-"the repository, including objects that are no longer reachable from a branch "
-"but are still present. It is enabled by default, but a repository can "
-"disable it by setting this configuration item to `false`."
+"upload pack service. When enabled, clients are able to read any file within"
+" the repository, including objects that are no longer reachable from a "
+"branch but are still present. It is enabled by default, but a repository "
+"can disable it by setting this configuration item to `false`."
msgstr ""
#. type: Labeled list
@@ -39308,8 +38669,8 @@ msgstr ""
#: en/git-http-backend.txt:65
msgid ""
"To determine the location of the repository on disk, 'git http-backend' "
-"concatenates the environment variables PATH_INFO, which is set automatically "
-"by the web server, and GIT_PROJECT_ROOT, which must be set manually in the "
+"concatenates the environment variables PATH_INFO, which is set automatically"
+" by the web server, and GIT_PROJECT_ROOT, which must be set manually in the "
"web server configuration. If GIT_PROJECT_ROOT is not set, 'git http-"
"backend' reads PATH_TRANSLATED, which is also set automatically by the web "
"server."
@@ -39318,8 +38679,8 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:70
msgid ""
-"All of the following examples map `http://$hostname/git/foo/bar.git` to `/"
-"var/www/git/foo/bar.git`."
+"All of the following examples map `http://$hostname/git/foo/bar.git` to "
+"`/var/www/git/foo/bar.git`."
msgstr ""
#. type: Labeled list
@@ -39331,8 +38692,8 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:75
msgid ""
-"Ensure mod_cgi, mod_alias, and mod_env are enabled, set GIT_PROJECT_ROOT (or "
-"DocumentRoot) appropriately, and create a ScriptAlias to the CGI:"
+"Ensure mod_cgi, mod_alias, and mod_env are enabled, set GIT_PROJECT_ROOT (or"
+" DocumentRoot) appropriately, and create a ScriptAlias to the CGI:"
msgstr ""
#. type: delimited block -
@@ -39406,13 +38767,13 @@ msgstr ""
#: en/git-http-backend.txt:125
msgid ""
"In this mode, the server will not request authentication until the client "
-"actually starts the object negotiation phase of the push, rather than during "
-"the initial contact. For this reason, you must also enable the `http."
-"receivepack` config option in any repositories that should accept a push. "
-"The default behavior, if `http.receivepack` is not set, is to reject any "
-"pushes by unauthenticated users; the initial request will therefore report "
-"`403 Forbidden` to the client, without even giving an opportunity for "
-"authentication."
+"actually starts the object negotiation phase of the push, rather than during"
+" the initial contact. For this reason, you must also enable the "
+"`http.receivepack` config option in any repositories that should accept a "
+"push. The default behavior, if `http.receivepack` is not set, is to reject "
+"any pushes by unauthenticated users; the initial request will therefore "
+"report `403 Forbidden` to the client, without even giving an opportunity for"
+" authentication."
msgstr ""
#. type: Plain text
@@ -39485,8 +38846,8 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:168
msgid ""
-"Similar to the above, but Apache can be used to return static files that are "
-"stored on disk.\tOn many systems this may be more efficient as Apache can "
+"Similar to the above, but Apache can be used to return static files that are"
+" stored on disk.\tOn many systems this may be more efficient as Apache can "
"ask the kernel to copy the file contents from the file system directly to "
"the network:"
msgstr ""
@@ -39652,13 +39013,13 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:266
msgid ""
-"The `GIT_HTTP_MAX_REQUEST_BUFFER` environment variable (or the `http."
-"maxRequestBuffer` config variable) may be set to change the largest ref "
-"negotiation request that git will handle during a fetch; any fetch requiring "
-"a larger buffer will not succeed. This value should not normally need to be "
-"changed, but may be helpful if you are fetching from a repository with an "
-"extremely large number of refs. The value can be specified with a unit (e."
-"g., `100M` for 100 megabytes). The default is 10 megabytes."
+"The `GIT_HTTP_MAX_REQUEST_BUFFER` environment variable (or the "
+"`http.maxRequestBuffer` config variable) may be set to change the largest "
+"ref negotiation request that git will handle during a fetch; any fetch "
+"requiring a larger buffer will not succeed. This value should not normally "
+"need to be changed, but may be helpful if you are fetching from a repository"
+" with an extremely large number of refs. The value can be specified with a "
+"unit (e.g., `100M` for 100 megabytes). The default is 10 megabytes."
msgstr ""
#. type: Plain text
@@ -39679,10 +39040,9 @@ msgstr ""
#. type: Title =
#: en/git-http-fetch.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-checkout(1)"
+#, no-wrap
msgid "git-http-fetch(1)"
-msgstr "git-checkout(1)"
+msgstr "git-http-fetch(1)"
#. type: Plain text
#: en/git-http-fetch.txt:7
@@ -39692,7 +39052,9 @@ msgstr ""
#. type: Plain text
#: en/git-http-fetch.txt:13
#, no-wrap
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid ""
+"'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] "
+"[--stdin] <commit> <url>\n"
msgstr ""
#. type: Plain text
@@ -39722,7 +39084,6 @@ msgstr "-C <commit>"
msgid "Either the hash or the filename under [URL]/refs/ to pull."
msgstr ""
-#
#. type: Plain text
#: en/git-http-fetch.txt:29
#, fuzzy
@@ -39755,8 +39116,8 @@ msgstr "-F <file>"
#. type: Plain text
#: en/git-http-fetch.txt:39
msgid ""
-"Writes the commit-id into the filename under $GIT_DIR/refs/<filename> on the "
-"local end after the transfer is complete."
+"Writes the commit-id into the filename under $GIT_DIR/refs/<filename> on the"
+" local end after the transfer is complete."
msgstr ""
#. type: Plain text
@@ -39776,7 +39137,7 @@ msgstr ""
#: en/git-http-fetch.txt:46
#, no-wrap
msgid "--recover"
-msgstr ""
+msgstr "--recover"
#. type: Plain text
#: en/git-http-fetch.txt:49
@@ -39787,10 +39148,9 @@ msgstr ""
#. type: Title =
#: en/git-http-push.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-init-db(1)"
+#, no-wrap
msgid "git-http-push(1)"
-msgstr "git-init-db(1)"
+msgstr "git-http-push(1)"
#. type: Plain text
#: en/git-http-push.txt:7
@@ -39800,7 +39160,9 @@ msgstr ""
#. type: Plain text
#: en/git-http-push.txt:13
#, no-wrap
-msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>...]\n"
+msgid ""
+"'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> "
+"[<ref>...]\n"
msgstr ""
#. type: Plain text
@@ -39822,8 +39184,8 @@ msgstr ""
#: en/git-http-push.txt:29
msgid ""
"Do not assume that the remote repository is complete in its current state, "
-"and verify all objects in the entire local ref's history exist in the remote "
-"repository."
+"and verify all objects in the entire local ref's history exist in the remote"
+" repository."
msgstr ""
#. type: Plain text
@@ -39850,8 +39212,8 @@ msgstr ""
#: en/git-http-push.txt:49
msgid ""
"Remove <ref> from remote repository. The specified branch cannot be the "
-"remote HEAD. If -d is specified the following other conditions must also be "
-"met:"
+"remote HEAD. If -d is specified the following other conditions must also be"
+" met:"
msgstr ""
#. type: Plain text
@@ -39895,8 +39257,8 @@ msgstr ""
msgid ""
"A '<ref>' specification can be either a single pattern, or a pair of such "
"patterns separated by a colon \":\" (this means that a ref name cannot have "
-"a colon in it). A single pattern '<name>' is just a shorthand for '<name>:"
-"<name>'."
+"a colon in it). A single pattern '<name>' is just a shorthand for "
+"'<name>:<name>'."
msgstr ""
#. type: Plain text
@@ -39939,8 +39301,8 @@ msgid ""
"Without `--force`, the <src> ref is stored at the remote only if <dst> does "
"not exist, or <dst> is a proper subset (i.e. an ancestor) of <src>. This "
"check, known as \"fast-forward check\", is performed in order to avoid "
-"accidentally overwriting the remote ref and lose other peoples' commits from "
-"there."
+"accidentally overwriting the remote ref and lose other peoples' commits from"
+" there."
msgstr ""
#. type: Plain text
@@ -39957,10 +39319,9 @@ msgstr ""
#. type: Title =
#: en/git-imap-send.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-imap-send(1)"
-msgstr "git-add(1)"
+msgstr "git-imap-send(1)"
#. type: Plain text
#: en/git-imap-send.txt:7
@@ -39979,8 +39340,8 @@ msgstr ""
msgid ""
"This command uploads a mailbox generated with 'git format-patch' into an "
"IMAP drafts folder. This allows patches to be sent as other email is when "
-"using mail clients that cannot read mailbox files directly. The command also "
-"works with any general mailbox in which emails have the fields \"From\", "
+"using mail clients that cannot read mailbox files directly. The command also"
+" works with any general mailbox in which emails have the fields \"From\", "
"\"Date\", and \"Subject\" in that order."
msgstr ""
@@ -40005,7 +39366,7 @@ msgstr "--quiet"
#: en/git-imap-send.txt:40
#, no-wrap
msgid "--curl"
-msgstr ""
+msgstr "--curl"
#. type: Plain text
#: en/git-imap-send.txt:44
@@ -40016,10 +39377,9 @@ msgstr ""
#. type: Labeled list
#: en/git-imap-send.txt:45
-#, fuzzy, no-wrap
-#| msgid "--no-color"
+#, no-wrap
msgid "--no-curl"
-msgstr "--no-color"
+msgstr "--no-curl"
#. type: Plain text
#: en/git-imap-send.txt:49
@@ -40031,8 +39391,8 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:56
msgid ""
-"To use the tool, imap.folder and either imap.tunnel or imap.host must be set "
-"to appropriate values."
+"To use the tool, imap.folder and either imap.tunnel or imap.host must be set"
+" to appropriate values."
msgstr ""
#. type: Labeled list
@@ -40044,8 +39404,9 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:64
msgid ""
-"The folder to drop the mails into, which is typically the Drafts folder. For "
-"example: \"INBOX.Drafts\", \"INBOX/Drafts\" or \"[Gmail]/Drafts\". Required."
+"The folder to drop the mails into, which is typically the Drafts folder. For"
+" example: \"INBOX.Drafts\", \"INBOX/Drafts\" or \"[Gmail]/Drafts\". "
+"Required."
msgstr ""
#. type: Labeled list
@@ -40148,11 +39509,11 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:104
msgid ""
-"Specify authenticate method for authentication with IMAP server. If Git was "
-"built with the NO_CURL option, or if your curl version is older than 7.34.0, "
-"or if you're running git-imap-send with the `--no-curl` option, the only "
-"supported method is 'CRAM-MD5'. If this is not set then 'git imap-send' uses "
-"the basic IMAP plaintext LOGIN command."
+"Specify authenticate method for authentication with IMAP server. If Git was"
+" built with the NO_CURL option, or if your curl version is older than "
+"7.34.0, or if you're running git-imap-send with the `--no-curl` option, the "
+"only supported method is 'CRAM-MD5'. If this is not set then 'git imap-send'"
+" uses the basic IMAP plaintext LOGIN command."
msgstr ""
#. type: Plain text
@@ -40206,8 +39567,8 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:143
msgid ""
-"To submit patches using GMail's IMAP interface, first, edit your ~/."
-"gitconfig to specify your account settings:"
+"To submit patches using GMail's IMAP interface, first, edit your "
+"~/.gitconfig to specify your account settings:"
msgstr ""
#. type: delimited block -
@@ -40237,7 +39598,9 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:159
#, no-wrap
-msgid " $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
+msgid ""
+" $ git format-patch --cover-letter -M --stdout origin/master | git imap-"
+"send\n"
msgstr ""
#. type: Plain text
@@ -40259,9 +39622,9 @@ msgstr ""
msgid ""
"It is still your responsibility to make sure that the email message sent by "
"your email program meets the standards of your project. Many projects do "
-"not like patches to be attached. Some mail agents will transform patches (e."
-"g. wrap lines, send them as format=flowed) in ways that make them fail. You "
-"will get angry flames ridiculing you if you don't check this."
+"not like patches to be attached. Some mail agents will transform patches "
+"(e.g. wrap lines, send them as format=flowed) in ways that make them fail. "
+"You will get angry flames ridiculing you if you don't check this."
msgstr ""
#. type: Plain text
@@ -40273,20 +39636,19 @@ msgid ""
" http://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email\n"
msgstr ""
-#
#. type: Plain text
#: en/git-imap-send.txt:180
#, fuzzy
-#| msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
+#| msgid ""
+#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid "linkgit:git-format-patch[1], linkgit:git-send-email[1], mbox(5)"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-index-pack.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-init-db(1)"
+#, no-wrap
msgid "git-index-pack(1)"
-msgstr "git-init-db(1)"
+msgstr "git-index-pack(1)"
#. type: Plain text
#: en/git-index-pack.txt:7
@@ -40325,8 +39687,8 @@ msgstr "-F <file>"
#. type: Plain text
#: en/git-index-pack.txt:37
msgid ""
-"Write the generated pack index into the specified file. Without this option "
-"the name of pack index file is constructed from the name of packed archive "
+"Write the generated pack index into the specified file. Without this option"
+" the name of pack index file is constructed from the name of packed archive "
"file by replacing .pack with .idx (and the program fails if the name of "
"packed archive does not end with .pack)."
msgstr ""
@@ -40335,8 +39697,8 @@ msgstr ""
#: en/git-index-pack.txt:47
msgid ""
"When this flag is provided, the pack is read from stdin instead and a copy "
-"is then written to <pack-file>. If <pack-file> is not specified, the pack is "
-"written to objects/pack/ directory of the current Git repository with a "
+"is then written to <pack-file>. If <pack-file> is not specified, the pack is"
+" written to objects/pack/ directory of the current Git repository with a "
"default name determined from the pack content. If <pack-file> is not "
"specified consider using --keep to prevent a race condition between this "
"process and 'git repack'."
@@ -40346,7 +39708,7 @@ msgstr ""
#: en/git-index-pack.txt:48
#, no-wrap
msgid "--fix-thin"
-msgstr ""
+msgstr "--fix-thin"
#. type: Plain text
#: en/git-index-pack.txt:53
@@ -40361,9 +39723,9 @@ msgstr ""
#: en/git-index-pack.txt:61
msgid ""
"Before moving the index into its final destination create an empty .keep "
-"file for the associated pack file. This option is usually necessary with --"
-"stdin to prevent a simultaneous 'git repack' process from deleting the newly "
-"constructed pack and index before refs can be updated to use objects "
+"file for the associated pack file. This option is usually necessary with "
+"--stdin to prevent a simultaneous 'git repack' process from deleting the "
+"newly constructed pack and index before refs can be updated to use objects "
"contained in the pack."
msgstr ""
@@ -40379,8 +39741,8 @@ msgstr "--message=<msg>"
msgid ""
"Like --keep create a .keep file before moving the index into its final "
"destination, but rather than creating an empty file place '<msg>' followed "
-"by an LF into the .keep file. The '<msg>' message can later be searched for "
-"within all .keep files to locate any which have outlived their usefulness."
+"by an LF into the .keep file. The '<msg>' message can later be searched for"
+" within all .keep files to locate any which have outlived their usefulness."
msgstr ""
#. type: Labeled list
@@ -40457,7 +39819,6 @@ msgstr ""
msgid "keep file used as a lock to prevent the race with 'git repack'"
msgstr ""
-#
#. type: Plain text
#: en/git-index-pack.txt:102
#, fuzzy
@@ -40471,7 +39832,6 @@ msgstr "Ident mit dem vorhergehenden Beispiel."
msgid "git-init-db(1)"
msgstr "git-init-db(1)"
-#
#. type: Plain text
#: en/git-init-db.txt:7
#, fuzzy
@@ -40479,15 +39839,19 @@ msgstr "git-init-db(1)"
msgid "git-init-db - Creates an empty Git repository"
msgstr "git-init-db - Erstellt ein leeres git-Repository"
-#
#. type: Plain text
#: en/git-init-db.txt:13
#, fuzzy, no-wrap
-#| msgid "'git init-db' [-q | --quiet] [--template=<template_directory>] [--shared[=<permissions>]]"
-msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] [--separate-git-dir <git dir>] [--shared[=<permissions>]]\n"
-msgstr "'git init-db' [-q | --quiet] [--template=<vorlageverzeichnis>] [--shared[=<berechtigungen>]]"
+#| msgid ""
+#| "'git init-db' [-q | --quiet] [--template=<template_directory>] "
+#| "[--shared[=<permissions>]]"
+msgid ""
+"'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] "
+"[--separate-git-dir <git dir>] [--shared[=<permissions>]]\n"
+msgstr ""
+"'git init-db' [-q | --quiet] [--template=<vorlageverzeichnis>] "
+"[--shared[=<berechtigungen>]]"
-#
#. type: Plain text
#: en/git-init-db.txt:20
msgid ""
@@ -40499,12 +39863,10 @@ msgstr ""
#. type: Title =
#: en/git-init.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-init-db(1)"
+#, no-wrap
msgid "git-init(1)"
-msgstr "git-init-db(1)"
+msgstr "git-init(1)"
-#
#. type: Plain text
#: en/git-init.txt:7
#, fuzzy
@@ -40513,24 +39875,27 @@ msgid ""
"git-init - Create an empty Git repository or reinitialize an existing one"
msgstr "git-init-db - Erstellt ein leeres git-Repository"
-#
#. type: Plain text
#: en/git-init.txt:15
#, fuzzy, no-wrap
-#| msgid "'git init-db' [-q | --quiet] [--template=<template_directory>] [--shared[=<permissions>]]"
+#| msgid ""
+#| "'git init-db' [-q | --quiet] [--template=<template_directory>] "
+#| "[--shared[=<permissions>]]"
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
"\t [--separate-git-dir <git dir>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
-msgstr "'git init-db' [-q | --quiet] [--template=<vorlageverzeichnis>] [--shared[=<berechtigungen>]]"
+msgstr ""
+"'git init-db' [-q | --quiet] [--template=<vorlageverzeichnis>] "
+"[--shared[=<berechtigungen>]]"
#. type: Plain text
#: en/git-init.txt:24
msgid ""
"This command creates an empty Git repository - basically a `.git` directory "
"with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template "
-"files. An initial `HEAD` file that references the HEAD of the master branch "
-"is also created."
+"files. An initial `HEAD` file that references the HEAD of the master branch"
+" is also created."
msgstr ""
#. type: Plain text
@@ -40543,8 +39908,8 @@ msgstr ""
#. type: Plain text
#: en/git-init.txt:32
msgid ""
-"If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` "
-"environment variable then the sha1 directories are created underneath - "
+"If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY`"
+" environment variable then the sha1 directories are created underneath - "
"otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
@@ -40602,10 +39967,10 @@ msgstr ""
#. type: Plain text
#: en/git-init.txt:75
msgid ""
-"Specify that the Git repository is to be shared amongst several users. This "
-"allows users belonging to the same group to push into that repository. When "
-"specified, the config variable \"core.sharedRepository\" is set so that "
-"files and directories under `$GIT_DIR` are created with the requested "
+"Specify that the Git repository is to be shared amongst several users. This"
+" allows users belonging to the same group to push into that repository. "
+"When specified, the config variable \"core.sharedRepository\" is set so that"
+" files and directories under `$GIT_DIR` are created with the requested "
"permissions. When not specified, Git will use permissions reported by "
"umask(2)."
msgstr ""
@@ -40699,8 +40064,8 @@ msgstr ""
#. type: Plain text
#: en/git-init.txt:121
msgid ""
-"Files and directories in the template directory whose name do not start with "
-"a dot will be copied to the `$GIT_DIR` after it is created."
+"Files and directories in the template directory whose name do not start with"
+" a dot will be copied to the `$GIT_DIR` after it is created."
msgstr ""
#. type: Plain text
@@ -40718,15 +40083,13 @@ msgstr ""
msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
msgstr ""
-#
#. type: Plain text
#: en/git-init.txt:129
#, fuzzy
msgid "the `init.templateDir` configuration variable; or"
msgstr ""
"#-#-#-#-# git-branch-de.po (PACKAGE VERSION) #-#-#-#-#\n"
-"Dies ist das Gegenteil der '--track' Option, wodurch 'git pull' nicht mehr "
-"automatisch auf den fernen Entwicklungszweig (remote branch) zugreift.\n"
+"Dies ist das Gegenteil der '--track' Option, wodurch 'git pull' nicht mehr automatisch auf den fernen Entwicklungszweig (remote branch) zugreift.\n"
"#-#-#-#-# git-checkout-de.po (PACKAGE VERSION) #-#-#-#-#\n"
"Ignore the branch.autosetupmerge configuration variable."
@@ -40775,7 +40138,6 @@ msgstr ""
msgid "Create a /path/to/my/codebase/.git directory."
msgstr ""
-#
#. type: Plain text
#: en/git-init.txt:154
#, fuzzy
@@ -40783,11 +40145,11 @@ msgstr ""
msgid "Add all existing files to the index."
msgstr "git-add - F체ge Dateiinhalte zum Index hinzu."
-#
#. type: Plain text
#: en/git-init.txt:155
#, fuzzy
-#| msgid "Compare the version before the last commit and the last commit."
+#| msgid ""
+#| "Compare the version before the last commit and the last commit."
msgid "Record the pristine state as the first commit in the history."
msgstr ""
"Vergleiche die Version vor der letzen Eintragung (commit) mit der letzten "
@@ -40795,10 +40157,9 @@ msgstr ""
#. type: Title =
#: en/git-instaweb.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-init-db(1)"
+#, no-wrap
msgid "git-instaweb(1)"
-msgstr "git-init-db(1)"
+msgstr "git-instaweb(1)"
#. type: Plain text
#: en/git-instaweb.txt:7
@@ -40830,7 +40191,7 @@ msgstr ""
#: en/git-instaweb.txt:28
#, no-wrap
msgid "--httpd"
-msgstr ""
+msgstr "--httpd"
#. type: Plain text
#: en/git-instaweb.txt:34
@@ -40843,23 +40204,22 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:36
-#, fuzzy, no-wrap
-#| msgid "--patch"
+#, no-wrap
msgid "--module-path"
-msgstr "--patch"
+msgstr "--module-path"
#. type: Plain text
#: en/git-instaweb.txt:39
msgid ""
-"The module path (only needed if httpd is Apache). (Default: /usr/lib/"
-"apache2/modules)"
+"The module path (only needed if httpd is Apache). (Default: "
+"/usr/lib/apache2/modules)"
msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:41
#, no-wrap
msgid "--port"
-msgstr ""
+msgstr "--port"
#. type: Plain text
#: en/git-instaweb.txt:43
@@ -40870,14 +40230,14 @@ msgstr ""
#: en/git-instaweb.txt:45
#, no-wrap
msgid "--browser"
-msgstr ""
+msgstr "--browser"
#. type: Plain text
#: en/git-instaweb.txt:51
msgid ""
"The web browser that should be used to view the gitweb page. This will be "
-"passed to the 'git web{litdd}browse' helper script along with the URL of the "
-"gitweb instance. See linkgit:git-web{litdd}browse[1] for more information "
+"passed to the 'git web{litdd}browse' helper script along with the URL of the"
+" gitweb instance. See linkgit:git-web{litdd}browse[1] for more information "
"about this. If the script fails, the URL will be printed to stdout."
msgstr ""
@@ -40891,7 +40251,7 @@ msgstr ""
#: en/git-instaweb.txt:53
#, no-wrap
msgid "--start"
-msgstr ""
+msgstr "--start"
#. type: Plain text
#: en/git-instaweb.txt:56
@@ -40910,7 +40270,7 @@ msgstr ""
#: en/git-instaweb.txt:58
#, no-wrap
msgid "--stop"
-msgstr ""
+msgstr "--stop"
#. type: Plain text
#: en/git-instaweb.txt:62
@@ -40930,7 +40290,7 @@ msgstr ""
#: en/git-instaweb.txt:64
#, no-wrap
msgid "--restart"
-msgstr ""
+msgstr "--restart"
#. type: Plain text
#: en/git-instaweb.txt:67
@@ -40966,21 +40326,23 @@ msgstr ""
#. type: Title =
#: en/git-interpret-trailers.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-write-tree(1)"
+#, no-wrap
msgid "git-interpret-trailers(1)"
-msgstr "git-write-tree(1)"
+msgstr "git-interpret-trailers(1)"
#. type: Plain text
#: en/git-interpret-trailers.txt:7
msgid ""
-"git-interpret-trailers - help add structured information into commit messages"
+"git-interpret-trailers - help add structured information into commit "
+"messages"
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:12
#, no-wrap
-msgid "'git interpret-trailers' [--in-place] [--trim-empty] [(--trailer <token>[(=|:)<value>])...] [<file>...]\n"
+msgid ""
+"'git interpret-trailers' [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]\n"
msgstr ""
#. type: Plain text
@@ -40994,8 +40356,8 @@ msgstr ""
#: en/git-interpret-trailers.txt:24
msgid ""
"This command reads some patches or commit messages from either the <file> "
-"arguments or the standard input if no <file> is specified. Then this command "
-"applies the arguments passed using the `--trailer` option, if any, to the "
+"arguments or the standard input if no <file> is specified. Then this command"
+" applies the arguments passed using the `--trailer` option, if any, to the "
"commit message part of each input file. The result is emitted on the "
"standard output."
msgstr ""
@@ -41012,8 +40374,8 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:36
msgid ""
-"By default, a '<token>=<value>' or '<token>:<value>' argument given using `--"
-"trailer` will be appended after the existing trailers only if the last "
+"By default, a '<token>=<value>' or '<token>:<value>' argument given using "
+"`--trailer` will be appended after the existing trailers only if the last "
"trailer has a different (<token>, <value>) pair (or if there is no existing "
"trailer). The <token> and <value> parts will be trimmed to remove starting "
"and trailing whitespace, and the resulting trimmed <token> and <value> will "
@@ -41037,8 +40399,8 @@ msgstr ""
#: en/git-interpret-trailers.txt:49
msgid ""
"By default the new trailer will appear at the end of all the existing "
-"trailers. If there is no existing trailer, the new trailer will appear after "
-"the commit message part of the output, and, if there is no line with only "
+"trailers. If there is no existing trailer, the new trailer will appear after"
+" the commit message part of the output, and, if there is no line with only "
"spaces at the end of the commit message part, one blank line will be added "
"before the new trailer."
msgstr ""
@@ -41067,17 +40429,16 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:67
msgid ""
-"Note that 'trailers' do not follow and are not intended to follow many rules "
-"for RFC 822 headers. For example they do not follow the encoding rules and "
+"Note that 'trailers' do not follow and are not intended to follow many rules"
+" for RFC 822 headers. For example they do not follow the encoding rules and "
"probably many other rules."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:70
-#, fuzzy, no-wrap
-#| msgid "--include"
+#, no-wrap
msgid "--in-place"
-msgstr "--include"
+msgstr "--in-place"
#. type: Plain text
#: en/git-interpret-trailers.txt:72
@@ -41086,10 +40447,9 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:73
-#, fuzzy, no-wrap
-#| msgid "--allow-empty"
+#, no-wrap
msgid "--trim-empty"
-msgstr "--allow-empty"
+msgstr "--trim-empty"
#. type: Plain text
#: en/git-interpret-trailers.txt:77
@@ -41108,8 +40468,8 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:82
msgid ""
-"Specify a (<token>, <value>) pair that should be applied as a trailer to the "
-"input messages. See the description of this command."
+"Specify a (<token>, <value>) pair that should be applied as a trailer to the"
+" input messages. See the description of this command."
msgstr ""
#. type: Labeled list
@@ -41140,9 +40500,9 @@ msgid ""
"For example, if the value for this option is \"%=$\", then only lines using "
"the format '<token><sep><value>' with <sep> containing '%', '=' or '$' and "
"then spaces will be considered trailers. And '%' will be the default "
-"separator used, so by default trailers will appear like: '<token>% "
-"<value>' (one percent sign and one space will appear between the token and "
-"the value)."
+"separator used, so by default trailers will appear like: '<token>% <value>' "
+"(one percent sign and one space will appear between the token and the "
+"value)."
msgstr ""
#. type: Labeled list
@@ -41164,15 +40524,15 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:110
msgid ""
-"If it is `end`, then each new trailer will appear at the end of the existing "
-"trailers."
+"If it is `end`, then each new trailer will appear at the end of the existing"
+" trailers."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:113
msgid ""
-"If it is `start`, then each new trailer will appear at the start, instead of "
-"the end, of the existing trailers."
+"If it is `start`, then each new trailer will appear at the start, instead of"
+" the end, of the existing trailers."
msgstr ""
#. type: Plain text
@@ -41227,8 +40587,8 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:137
msgid ""
-"With `add`, a new trailer will be added, even if some trailers with the same "
-"(<token>, <value>) pair are already in the message."
+"With `add`, a new trailer will be added, even if some trailers with the same"
+" (<token>, <value>) pair are already in the message."
msgstr ""
#. type: Plain text
@@ -41242,8 +40602,8 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:145
msgid ""
-"With `doNothing`, nothing will be done; that is no new trailer will be added "
-"if there is already one with the same <token> in the message."
+"With `doNothing`, nothing will be done; that is no new trailer will be added"
+" if there is already one with the same <token> in the message."
msgstr ""
#. type: Labeled list
@@ -41287,8 +40647,8 @@ msgstr ""
msgid ""
"This `key` will be used instead of <token> in the trailer. At the end of "
"this key, a separator can appear and then some space characters. By default "
-"the only valid separator is ':', but this can be changed using the `trailer."
-"separators` config variable."
+"the only valid separator is ':', but this can be changed using the "
+"`trailer.separators` config variable."
msgstr ""
#. type: Plain text
@@ -41308,8 +40668,8 @@ msgstr ""
#: en/git-interpret-trailers.txt:172
msgid ""
"This option takes the same values as the 'trailer.where' configuration "
-"variable and it overrides what is specified by that option for trailers with "
-"the specified <token>."
+"variable and it overrides what is specified by that option for trailers with"
+" the specified <token>."
msgstr ""
#. type: Labeled list
@@ -41322,8 +40682,8 @@ msgstr ""
#: en/git-interpret-trailers.txt:177
msgid ""
"This option takes the same values as the 'trailer.ifexist' configuration "
-"variable and it overrides what is specified by that option for trailers with "
-"the specified <token>."
+"variable and it overrides what is specified by that option for trailers with"
+" the specified <token>."
msgstr ""
#. type: Labeled list
@@ -41336,8 +40696,8 @@ msgstr ""
#: en/git-interpret-trailers.txt:182
msgid ""
"This option takes the same values as the 'trailer.ifmissing' configuration "
-"variable and it overrides what is specified by that option for trailers with "
-"the specified <token>."
+"variable and it overrides what is specified by that option for trailers with"
+" the specified <token>."
msgstr ""
#. type: Labeled list
@@ -41365,8 +40725,8 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:197
msgid ""
-"If the command contains the `$ARG` string, this string will be replaced with "
-"the <value> part of an existing trailer with the same <token>, if any, "
+"If the command contains the `$ARG` string, this string will be replaced with"
+" the <value> part of an existing trailer with the same <token>, if any, "
"before the command is launched."
msgstr ""
@@ -41470,8 +40830,8 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:256
msgid ""
-"Configure a 'sign' trailer with a command to automatically add a 'Signed-off-"
-"by: ' with the author information only if there is no 'Signed-off-by: ' "
+"Configure a 'sign' trailer with a command to automatically add a 'Signed-"
+"off-by: ' with the author information only if there is no 'Signed-off-by: ' "
"already, and show how it works:"
msgstr ""
@@ -41589,11 +40949,11 @@ msgid ""
"$ chmod +x .git/hooks/commit-msg\n"
msgstr ""
-#
#. type: Plain text
#: en/git-interpret-trailers.txt:336
#, fuzzy
-#| msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
+#| msgid ""
+#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid ""
"linkgit:git-commit[1], linkgit:git-format-patch[1], linkgit:git-config[1]"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
@@ -41604,7 +40964,6 @@ msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid "git-log(1)"
msgstr "git-log(1)"
-#
#. type: Plain text
#: en/git-log.txt:7
msgid "git-log - Show commit logs"
@@ -41617,13 +40976,11 @@ msgstr "git-log - Zeigt die Geschichte des Projekts"
msgid "'git log' [<options>] [<revision range>] [[\\--] <path>...]\n"
msgstr "'git diff' [--options] <commit> [--] [<path>...]"
-#
#. type: Plain text
#: en/git-log.txt:17
msgid "Shows the commit logs."
msgstr "Zeigt die Geschichte des Projekts"
-#
#. type: Plain text
#: en/git-log.txt:22
#, fuzzy
@@ -41636,9 +40993,9 @@ msgid ""
"control what is shown and how, and options applicable to the `git diff-*` "
"commands to control how the changes each commit introduces are shown."
msgstr ""
-"Das Kommando akzeptiert dieselben Optionen wie 'git-rev-list' und 'git-diff-"
-"*' um die Ausgabeformate der Commits und deren Unterschiede zu kontrollieren "
-"und zu limitieren."
+"Das Kommando akzeptiert dieselben Optionen wie 'git-rev-list' und 'git-"
+"diff-*' um die Ausgabeformate der Commits und deren Unterschiede zu "
+"kontrollieren und zu limitieren."
#. type: Labeled list
#: en/git-log.txt:27
@@ -41646,7 +41003,6 @@ msgstr ""
msgid "--follow"
msgstr "--follow"
-#
#. type: Plain text
#: en/git-log.txt:30
#, fuzzy
@@ -41658,10 +41014,9 @@ msgstr "Zeigt die Geschichte inklusive Umbennenungen an."
#. type: Labeled list
#: en/git-log.txt:31
-#, fuzzy, no-wrap
-#| msgid "--decorate"
+#, no-wrap
msgid "--no-decorate"
-msgstr "--decorate"
+msgstr "--no-decorate"
#. type: Labeled list
#: en/git-log.txt:32
@@ -41673,10 +41028,10 @@ msgstr ""
#: en/git-log.txt:40
msgid ""
"Print out the ref names of any commits that are shown. If 'short' is "
-"specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/"
-"remotes/' will not be printed. If 'full' is specified, the full ref name "
-"(including prefix) will be printed. If 'auto' is specified, then if the "
-"output is going to a terminal, the ref names are shown as if 'short' were "
+"specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and "
+"'refs/remotes/' will not be printed. If 'full' is specified, the full ref "
+"name (including prefix) will be printed. If 'auto' is specified, then if the"
+" output is going to a terminal, the ref names are shown as if 'short' were "
"given, otherwise no ref names are shown. The default option is 'short'."
msgstr ""
@@ -41684,9 +41039,8 @@ msgstr ""
#: en/git-log.txt:41
#, no-wrap
msgid "--source"
-msgstr ""
+msgstr "--source"
-#
#. type: Plain text
#: en/git-log.txt:44
#, fuzzy
@@ -41700,7 +41054,7 @@ msgstr "Zeigt den Referenznamen f체r jeden dargestellt Commits."
#: en/git-log.txt:45
#, no-wrap
msgid "--use-mailmap"
-msgstr ""
+msgstr "--use-mailmap"
#. type: Plain text
#: en/git-log.txt:49
@@ -41715,16 +41069,15 @@ msgstr ""
msgid "--full-diff"
msgstr "--full-diff"
-#
#. type: Plain text
#: en/git-log.txt:56
#, fuzzy
#| msgid ""
#| "Without this flag, \"git log -p <paths>...\" shows commits that touch the "
-#| "specified paths, and diffs about the same specified paths. With this, "
-#| "the full diff is shown for commits that touch the specified paths; this "
-#| "means that \"<paths>...\" limits only commits, and doesn't limit diff for "
-#| "those commits."
+#| "specified paths, and diffs about the same specified paths. With this, the "
+#| "full diff is shown for commits that touch the specified paths; this means "
+#| "that \"<paths>...\" limits only commits, and doesn't limit diff for those "
+#| "commits."
msgid ""
"Without this flag, `git log -p <path>...` shows commits that touch the "
"specified paths, and diffs about the same specified paths. With this, the "
@@ -41754,8 +41107,8 @@ msgstr "--log-size"
#: en/git-log.txt:65
msgid ""
"Include a line ``log size <number>'' in the output for each commit, where "
-"<number> is the length of that commit's message in bytes. Intended to speed "
-"up tools that read log messages from `git log` output by allowing them to "
+"<number> is the length of that commit's message in bytes. Intended to speed"
+" up tools that read log messages from `git log` output by allowing them to "
"allocate space in advance."
msgstr ""
@@ -41790,11 +41143,11 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:85
msgid ""
-"Show only commits in the specified revision range. When no <revision range> "
-"is specified, it defaults to `HEAD` (i.e. the whole history leading to the "
+"Show only commits in the specified revision range. When no <revision range>"
+" is specified, it defaults to `HEAD` (i.e. the whole history leading to the "
"current commit). `origin..HEAD` specifies all the commits reachable from "
-"the current commit (i.e. `HEAD`), but not from `origin`. For a complete list "
-"of ways to spell <revision range>, see the 'Specifying Ranges' section of "
+"the current commit (i.e. `HEAD`), but not from `origin`. For a complete list"
+" of ways to spell <revision range>, see the 'Specifying Ranges' section of "
"linkgit:gitrevisions[7]."
msgstr ""
@@ -41833,7 +41186,6 @@ msgstr ""
msgid "`git log --no-merges`"
msgstr "git log --no-merges"
-#
#. type: Plain text
#: en/git-log.txt:112
msgid "Show the whole commit history, but skip any merges"
@@ -41846,7 +41198,6 @@ msgstr "Zeigt die gesamte Projektgeschichte, jedoch ohne Zusammenf체hrungen."
msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
msgstr "git log v2.6.12.. include/scsi drivers/scsi"
-#
#. type: Plain text
#: en/git-log.txt:117
#, fuzzy
@@ -41867,13 +41218,12 @@ msgstr ""
msgid "`git log --since=\"2 weeks ago\" -- gitk`"
msgstr "git log --since=\"2 weeks ago\" \\-- gitk"
-#
#. type: Plain text
#: en/git-log.txt:123
#, fuzzy
#| msgid ""
-#| "Show the changes during the last two weeks to the file 'gitk'. The \"--"
-#| "\" is necessary to avoid confusion with the *branch* named 'gitk'"
+#| "Show the changes during the last two weeks to the file 'gitk'. The \"--\" "
+#| "is necessary to avoid confusion with the *branch* named 'gitk'"
msgid ""
"Show the changes during the last two weeks to the file 'gitk'. The ``--'' "
"is necessary to avoid confusion with the *branch* named 'gitk'"
@@ -41889,15 +41239,14 @@ msgstr ""
msgid "`git log --name-status release..test`"
msgstr "git log --name-status release..test"
-#
#. type: Plain text
#: en/git-log.txt:129
msgid ""
-"Show the commits that are in the \"test\" branch but not yet in the \"release"
-"\" branch, along with the list of paths each commit modifies."
+"Show the commits that are in the \"test\" branch but not yet in the "
+"\"release\" branch, along with the list of paths each commit modifies."
msgstr ""
-"Zeigt Commits, die in dem Zweig \"test\" aber nicht in dem Zweig \"release\" "
-"vorkommen, zusammen mit einer Liste alle ge채nderten Pfade je Commit an."
+"Zeigt Commits, die in dem Zweig \"test\" aber nicht in dem Zweig \"release\""
+" vorkommen, zusammen mit einer Liste alle ge채nderten Pfade je Commit an."
#. type: Labeled list
#: en/git-log.txt:130
@@ -41906,16 +41255,15 @@ msgstr ""
msgid "`git log --follow builtin/rev-list.c`"
msgstr "git log --follow builtin-rev-list.c"
-#
#. type: Plain text
#: en/git-log.txt:135
#, fuzzy
#| msgid ""
-#| "Shows the commits that changed builtin-rev-list.c, including those "
-#| "commits that occurred before the file was given its present name."
+#| "Shows the commits that changed builtin-rev-list.c, including those commits "
+#| "that occurred before the file was given its present name."
msgid ""
-"Shows the commits that changed `builtin/rev-list.c`, including those commits "
-"that occurred before the file was given its present name."
+"Shows the commits that changed `builtin/rev-list.c`, including those commits"
+" that occurred before the file was given its present name."
msgstr ""
"Zeigt die Commits, die die Datei 'builtin-rev-list.c' und deren vorheriger "
"Namen ge채ndert haben, an."
@@ -41929,8 +41277,8 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:141
msgid ""
-"Shows all commits that are in any of local branches but not in any of remote-"
-"tracking branches for 'origin' (what you have that origin doesn't)."
+"Shows all commits that are in any of local branches but not in any of "
+"remote-tracking branches for 'origin' (what you have that origin doesn't)."
msgstr ""
#. type: Labeled list
@@ -41970,7 +41318,8 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:159
-msgid "Shows how the function `main()` in the file `main.c` evolved over time."
+msgid ""
+"Shows how the function `main()` in the file `main.c` evolved over time."
msgstr ""
#. type: Labeled list
@@ -41980,7 +41329,6 @@ msgstr ""
msgid "`git log -3`"
msgstr "$ git log -p\n"
-#
#. type: Plain text
#: en/git-log.txt:163
#, fuzzy
@@ -41988,7 +41336,6 @@ msgstr "$ git log -p\n"
msgid "Limits the number of commits to show to 3."
msgstr "Limitiert die Anzahl der angezeigten Commits."
-#
#. type: Plain text
#: en/git-log.txt:174
#, fuzzy
@@ -42021,15 +41368,15 @@ msgstr ""
#: en/git-log.txt:188
msgid ""
"Default format for human-readable dates. (Compare the `--date` option.) "
-"Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 "
-"2010 -0500`."
+"Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34"
+" 2010 -0500`."
msgstr ""
#. type: Plain text
#: en/git-log.txt:200
msgid ""
-"If `false`, `git log` and related commands will not treat the initial commit "
-"as a big creation event. Any root commits in `git log -p` output would be "
+"If `false`, `git log` and related commands will not treat the initial commit"
+" as a big creation event. Any root commits in `git log -p` output would be "
"shown without a diff attached. The default is `true`."
msgstr ""
@@ -42052,7 +41399,6 @@ msgstr ""
msgid "mailmap.*"
msgstr ""
-#
#. type: Plain text
#: en/git-log.txt:207
#, fuzzy
@@ -42072,29 +41418,29 @@ msgstr ""
#: en/git-log.txt:217
msgid ""
"May be an unabbreviated ref name or a glob and may be specified multiple "
-"times. A warning will be issued for refs that do not exist, but a glob that "
-"does not match any refs is silently ignored."
+"times. A warning will be issued for refs that do not exist, but a glob that"
+" does not match any refs is silently ignored."
msgstr ""
#. type: Plain text
#: en/git-log.txt:221
msgid ""
"This setting can be disabled by the `--no-notes` option, overridden by the "
-"`GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--"
-"notes=<ref>` option."
+"`GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the "
+"`--notes=<ref>` option."
msgstr ""
#. type: Title =
#: en/git-ls-files.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-merge-one-file(1)"
+#, no-wrap
msgid "git-ls-files(1)"
-msgstr "git-merge-one-file(1)"
+msgstr "git-ls-files(1)"
#. type: Plain text
#: en/git-ls-files.txt:7
msgid ""
-"git-ls-files - Show information about files in the index and the working tree"
+"git-ls-files - Show information about files in the index and the working "
+"tree"
msgstr ""
#. type: Plain text
@@ -42127,21 +41473,20 @@ msgid ""
"One or more of the options below may be used to determine the files shown:"
msgstr ""
-#
#. type: Plain text
#: en/git-ls-files.txt:38
#, fuzzy
#| msgid "Show untracked files (Default: 'all')."
msgid "Show cached files in the output (default)"
msgstr ""
-"Zeige alle von git nicht verwalteten (untracked) Dateien an (Standard: 'all')"
+"Zeige alle von git nicht verwalteten (untracked) Dateien an (Standard: "
+"'all')"
#. type: Labeled list
#: en/git-ls-files.txt:40
-#, fuzzy, no-wrap
-#| msgid "--decorate"
+#, no-wrap
msgid "--deleted"
-msgstr "--decorate"
+msgstr "--deleted"
#. type: Plain text
#: en/git-ls-files.txt:42
@@ -42152,7 +41497,7 @@ msgstr ""
#: en/git-ls-files.txt:44
#, no-wrap
msgid "--modified"
-msgstr ""
+msgstr "--modified"
#. type: Plain text
#: en/git-ls-files.txt:46
@@ -42163,7 +41508,7 @@ msgstr ""
#: en/git-ls-files.txt:48
#, no-wrap
msgid "--others"
-msgstr ""
+msgstr "--others"
#. type: Plain text
#: en/git-ls-files.txt:50
@@ -42172,10 +41517,9 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:52 en/git-status.txt:97
-#, fuzzy, no-wrap
-#| msgid "--ignore-errors"
+#, no-wrap
msgid "--ignored"
-msgstr "--ignore-errors"
+msgstr "--ignored"
#. type: Plain text
#: en/git-ls-files.txt:57
@@ -42189,7 +41533,7 @@ msgstr ""
#: en/git-ls-files.txt:59
#, no-wrap
msgid "--stage"
-msgstr ""
+msgstr "--stage"
#. type: Plain text
#: en/git-ls-files.txt:61
@@ -42199,10 +41543,9 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:62
-#, fuzzy, no-wrap
-#| msgid "<directory>"
+#, no-wrap
msgid "--directory"
-msgstr "<directory>"
+msgstr "--directory"
#. type: Plain text
#: en/git-ls-files.txt:65
@@ -42215,7 +41558,7 @@ msgstr ""
#: en/git-ls-files.txt:66
#, no-wrap
msgid "--no-empty-directory"
-msgstr ""
+msgstr "--no-empty-directory"
#. type: Plain text
#: en/git-ls-files.txt:68
@@ -42224,10 +41567,9 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:70 en/git-update-index.txt:65
-#, fuzzy, no-wrap
-#| msgid "--merged"
+#, no-wrap
msgid "--unmerged"
-msgstr "--merged"
+msgstr "--unmerged"
#. type: Plain text
#: en/git-ls-files.txt:72
@@ -42238,7 +41580,7 @@ msgstr ""
#: en/git-ls-files.txt:74
#, no-wrap
msgid "--killed"
-msgstr ""
+msgstr "--killed"
#. type: Plain text
#: en/git-ls-files.txt:78
@@ -42250,8 +41592,8 @@ msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:82
msgid ""
-"\\0 line termination on output and do not quote filenames. See OUTPUT below "
-"for more information."
+"\\0 line termination on output and do not quote filenames. See OUTPUT below"
+" for more information."
msgstr ""
#. type: Labeled list
@@ -42309,10 +41651,9 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:101
-#, fuzzy, no-wrap
-#| msgid "--ignore-unmatch"
+#, no-wrap
msgid "--error-unmatch"
-msgstr "--ignore-unmatch"
+msgstr "--error-unmatch"
#. type: Plain text
#: en/git-ls-files.txt:104
@@ -42454,15 +41795,15 @@ msgstr ""
#: en/git-ls-files.txt:150 en/git-ls-tree.txt:67
msgid ""
"Instead of showing the full 40-byte hexadecimal object lines, show only a "
-"partial prefix. Non default number of digits can be specified with --"
-"abbrev=<n>."
+"partial prefix. Non default number of digits can be specified with "
+"--abbrev=<n>."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:156
msgid ""
-"After each line that describes a file, add more data about its cache entry. "
-"This is intended to show as much information as possible for manual "
+"After each line that describes a file, add more data about its cache entry."
+" This is intended to show as much information as possible for manual "
"inspection; the exact format may change at any time."
msgstr ""
@@ -42470,15 +41811,15 @@ msgstr ""
#: en/git-ls-files.txt:157
#, no-wrap
msgid "--eol"
-msgstr ""
+msgstr "--eol"
#. type: Plain text
#: en/git-ls-files.txt:162
msgid ""
"Show <eolinfo> and <eolattr> of files. <eolinfo> is the file content "
"identification used by Git when the \"text\" attribute is \"auto\" (or not "
-"set and core.autocrlf is not false). <eolinfo> is either \"-text\", \"none"
-"\", \"lf\", \"crlf\", \"mixed\" or \"\"."
+"set and core.autocrlf is not false). <eolinfo> is either \"-text\", "
+"\"none\", \"lf\", \"crlf\", \"mixed\" or \"\"."
msgstr ""
#. type: Plain text
@@ -42501,8 +41842,8 @@ msgstr ""
#: en/git-ls-files.txt:173
msgid ""
"Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tree "
-"(\"w/<eolinfo>\") are shown for regular files, followed by the (\"attr/"
-"<eolattr>\")."
+"(\"w/<eolinfo>\") are shown for regular files, followed by the "
+"(\"attr/<eolattr>\")."
msgstr ""
#. type: Labeled list
@@ -42558,8 +41899,8 @@ msgstr ""
#: en/git-ls-files.txt:199
msgid ""
"For an unmerged path, instead of recording a single mode/SHA-1 pair, the "
-"index records up to three such pairs; one from tree O in stage 1, A in stage "
-"2, and B in stage 3. This information can be used by the user (or the "
+"index records up to three such pairs; one from tree O in stage 1, A in stage"
+" 2, and B in stage 3. This information can be used by the user (or the "
"porcelain) to see what should eventually be recorded at the path. (see "
"linkgit:git-read-tree[1] for more information on state)"
msgstr ""
@@ -42574,9 +41915,9 @@ msgstr ""
#: en/git-ls-files.txt:213
msgid ""
"'git ls-files' can use a list of \"exclude patterns\" when traversing the "
-"directory tree and finding files to show when the flags --others or --"
-"ignored are specified. linkgit:gitignore[5] specifies the format of exclude "
-"patterns."
+"directory tree and finding files to show when the flags --others or "
+"--ignored are specified. linkgit:gitignore[5] specifies the format of "
+"exclude patterns."
msgstr ""
#. type: Plain text
@@ -42595,15 +41936,15 @@ msgstr ""
#: en/git-ls-files.txt:223
msgid ""
"The command-line flag --exclude-from=<file> specifies a file containing a "
-"list of patterns. Patterns are ordered in the same order they appear in the "
-"file."
+"list of patterns. Patterns are ordered in the same order they appear in the"
+" file."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:229
msgid ""
-"The command-line flag --exclude-per-directory=<name> specifies a name of the "
-"file in each directory 'git ls-files' examines, normally `.gitignore`. "
+"The command-line flag --exclude-per-directory=<name> specifies a name of the"
+" file in each directory 'git ls-files' examines, normally `.gitignore`. "
"Files in deeper directories take precedence. Patterns are ordered in the "
"same order they appear in the files."
msgstr ""
@@ -42611,27 +41952,25 @@ msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:235
msgid ""
-"A pattern specified on the command line with --exclude or read from the file "
-"specified with --exclude-from is relative to the top of the directory tree. "
-"A pattern read from a file specified by --exclude-per-directory is relative "
-"to the directory that the pattern file appears in."
+"A pattern specified on the command line with --exclude or read from the file"
+" specified with --exclude-from is relative to the top of the directory tree."
+" A pattern read from a file specified by --exclude-per-directory is "
+"relative to the directory that the pattern file appears in."
msgstr ""
-#
#. type: Plain text
#: en/git-ls-files.txt:239
#, fuzzy
-#| msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
+#| msgid ""
+#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid "linkgit:git-read-tree[1], linkgit:gitignore[5]"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
-#
#. type: Title =
#: en/git-ls-remote.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-remote(1)"
+#, no-wrap
msgid "git-ls-remote(1)"
-msgstr "git-remote(1)"
+msgstr "git-ls-remote(1)"
#. type: Plain text
#: en/git-ls-remote.txt:7
@@ -42658,7 +41997,7 @@ msgstr ""
#: en/git-ls-remote.txt:25 en/git-show-ref.txt:41
#, no-wrap
msgid "--heads"
-msgstr ""
+msgstr "--heads"
#. type: Plain text
#: en/git-ls-remote.txt:32
@@ -42670,10 +42009,9 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:33
-#, fuzzy, no-wrap
-#| msgid "--refresh"
+#, no-wrap
msgid "--refs"
-msgstr "--refresh"
+msgstr "--refs"
#. type: Plain text
#: en/git-ls-remote.txt:35
@@ -42711,25 +42049,23 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:52
-#, fuzzy, no-wrap
-#| msgid "--get-all"
+#, no-wrap
msgid "--get-url"
-msgstr "--get-all"
+msgstr "--get-url"
#. type: Plain text
#: en/git-ls-remote.txt:56
msgid ""
-"Expand the URL of the given remote repository taking into account any \"url."
-"<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit "
-"without talking to the remote."
+"Expand the URL of the given remote repository taking into account any "
+"\"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit"
+" without talking to the remote."
msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:57
-#, fuzzy, no-wrap
-#| msgid "--system"
+#, no-wrap
msgid "--symref"
-msgstr "--system"
+msgstr "--symref"
#. type: Plain text
#: en/git-ls-remote.txt:62
@@ -42750,9 +42086,9 @@ msgstr ""
#. type: Plain text
#: en/git-ls-remote.txt:73
msgid ""
-"When unspecified, all references, after filtering done with --heads and --"
-"tags, are shown. When <refs>... are specified, only references matching the "
-"given patterns are displayed."
+"When unspecified, all references, after filtering done with --heads and "
+"--tags, are shown. When <refs>... are specified, only references matching "
+"the given patterns are displayed."
msgstr ""
#. type: Plain text
@@ -42778,10 +42114,9 @@ msgstr ""
#. type: Title =
#: en/git-ls-tree.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-write-tree(1)"
+#, no-wrap
msgid "git-ls-tree(1)"
-msgstr "git-write-tree(1)"
+msgstr "git-ls-tree(1)"
#. type: Plain text
#: en/git-ls-tree.txt:7
@@ -42818,12 +42153,12 @@ msgstr ""
msgid ""
"the behaviour is similar to that of \"/bin/ls\" in that the '<path>' is "
"taken as relative to the current working directory. E.g. when you are in a "
-"directory 'sub' that has a directory 'dir', you can run 'git ls-tree -r HEAD "
-"dir' to list the contents of the tree (that is 'sub/dir' in `HEAD`). You "
-"don't want to give a tree that is not at the root level (e.g. `git ls-tree -"
-"r HEAD:sub dir`) in this case, as that would result in asking for 'sub/sub/"
-"dir' in the `HEAD` commit. However, the current working directory can be "
-"ignored by passing --full-tree option."
+"directory 'sub' that has a directory 'dir', you can run 'git ls-tree -r HEAD"
+" dir' to list the contents of the tree (that is 'sub/dir' in `HEAD`). You "
+"don't want to give a tree that is not at the root level (e.g. `git ls-tree "
+"-r HEAD:sub dir`) in this case, as that would result in asking for "
+"'sub/sub/dir' in the `HEAD` commit. However, the current working directory "
+"can be ignored by passing --full-tree option."
msgstr ""
#. type: Plain text
@@ -42844,8 +42179,8 @@ msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:50
msgid ""
-"Show tree entries even when going to recurse them. Has no effect if `-r` was "
-"not passed. `-d` implies `-t`."
+"Show tree entries even when going to recurse them. Has no effect if `-r` was"
+" not passed. `-d` implies `-t`."
msgstr ""
#. type: Plain text
@@ -42868,8 +42203,8 @@ msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:71
msgid ""
-"Instead of showing the path names relative to the current working directory, "
-"show the full path names."
+"Instead of showing the path names relative to the current working directory,"
+" show the full path names."
msgstr ""
#. type: Plain text
@@ -42890,8 +42225,8 @@ msgstr "<path>..."
#: en/git-ls-tree.txt:80
msgid ""
"When paths are given, show them (note that this isn't really raw pathnames, "
-"but rather a list of patterns to match). Otherwise implicitly uses the root "
-"level of the tree as the sole path argument."
+"but rather a list of patterns to match). Otherwise implicitly uses the root"
+" level of the tree as the sole path argument."
msgstr ""
#. type: Title -
@@ -42935,10 +42270,9 @@ msgstr ""
#. type: Title =
#: en/git-mailinfo.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-log(1)"
+#, no-wrap
msgid "git-mailinfo(1)"
-msgstr "git-log(1)"
+msgstr "git-mailinfo(1)"
#. type: Plain text
#: en/git-mailinfo.txt:7
@@ -42949,16 +42283,18 @@ msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:13
#, no-wrap
-msgid "'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n] [--[no-]scissors] <msg> <patch>\n"
+msgid ""
+"'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n] [--[no-]scissors] "
+"<msg> <patch>\n"
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:23
msgid ""
-"Reads a single e-mail message from the standard input, and writes the commit "
-"log message in <msg> file, and the patches in <patch> file. The author "
-"name, e-mail and e-mail subject are written out to the standard output to be "
-"used by 'git am' to create a commit. It is usually not necessary to use "
+"Reads a single e-mail message from the standard input, and writes the commit"
+" log message in <msg> file, and the patches in <patch> file. The author "
+"name, e-mail and e-mail subject are written out to the standard output to be"
+" used by 'git am' to create a commit. It is usually not necessary to use "
"this command directly. See linkgit:git-am[1] instead."
msgstr ""
@@ -42967,8 +42303,8 @@ msgstr ""
msgid ""
"Usually the program removes email cruft from the Subject: header line to "
"extract the title line for the commit log message. This option prevents "
-"this munging, and is most useful when used to read back 'git format-patch -"
-"k' output."
+"this munging, and is most useful when used to read back 'git format-patch "
+"-k' output."
msgstr ""
#. type: Plain text
@@ -42999,7 +42335,8 @@ msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:46
msgid ""
-"Finally, runs of whitespace are normalized to a single ASCII space character."
+"Finally, runs of whitespace are normalized to a single ASCII space "
+"character."
msgstr ""
#. type: Plain text
@@ -43013,9 +42350,9 @@ msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:58
msgid ""
-"The commit log message, author name and author email are taken from the e-"
-"mail, and after minimally decoding MIME transfer encoding, re-coded in the "
-"charset specified by i18n.commitencoding (defaulting to UTF-8) by "
+"The commit log message, author name and author email are taken from the "
+"e-mail, and after minimally decoding MIME transfer encoding, re-coded in the"
+" charset specified by i18n.commitencoding (defaulting to UTF-8) by "
"transliterating them. This used to be optional but now it is the default."
msgstr ""
@@ -43041,8 +42378,8 @@ msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:73
msgid ""
-"Copy the Message-ID header at the end of the commit message. This is useful "
-"in order to associate commits with mailing list discussions."
+"Copy the Message-ID header at the end of the commit message. This is useful"
+" in order to associate commits with mailing list discussions."
msgstr ""
#. type: Plain text
@@ -43051,16 +42388,16 @@ msgid ""
"Remove everything in body before a scissors line. A line that mainly "
"consists of scissors (either \">8\" or \"8<\") and perforation (dash \"-\") "
"marks is called a scissors line, and is used to request the reader to cut "
-"the message at that line. If such a line appears in the body of the message "
-"before the patch, everything before it (including the scissors line itself) "
-"is ignored when this option is used."
+"the message at that line. If such a line appears in the body of the message"
+" before the patch, everything before it (including the scissors line itself)"
+" is ignored when this option is used."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:87
msgid ""
-"This is useful if you want to begin your message in a discussion thread with "
-"comments and suggestions on the message you are responding to, and to "
+"This is useful if you want to begin your message in a discussion thread with"
+" comments and suggestions on the message you are responding to, and to "
"conclude it with a patch submission, separating the discussion and the "
"beginning of the proposed commit log message with a scissors line."
msgstr ""
@@ -43068,8 +42405,8 @@ msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:89
msgid ""
-"This can be enabled by default with the configuration option mailinfo."
-"scissors."
+"This can be enabled by default with the configuration option "
+"mailinfo.scissors."
msgstr ""
#. type: Plain text
@@ -43106,10 +42443,9 @@ msgstr ""
#. type: Title =
#: en/git-mailsplit.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-mailsplit(1)"
-msgstr "git-commit(1)"
+msgstr "git-mailsplit(1)"
#. type: Plain text
#: en/git-mailsplit.txt:7
@@ -43159,8 +42495,8 @@ msgstr ""
#. type: Plain text
#: en/git-mailsplit.txt:31
msgid ""
-"Root of the Maildir to split. This directory should contain the cur, tmp and "
-"new subdirectories."
+"Root of the Maildir to split. This directory should contain the cur, tmp and"
+" new subdirectories."
msgstr ""
#. type: Labeled list
@@ -43212,7 +42548,7 @@ msgstr ""
#: en/git-mailsplit.txt:48
#, no-wrap
msgid "--keep-cr"
-msgstr ""
+msgstr "--keep-cr"
#. type: Plain text
#: en/git-mailsplit.txt:50
@@ -43223,20 +42559,18 @@ msgstr ""
#: en/git-mailsplit.txt:51
#, no-wrap
msgid "--mboxrd"
-msgstr ""
+msgstr "--mboxrd"
#. type: Plain text
#: en/git-mailsplit.txt:54
-msgid ""
-"Input is of the \"mboxrd\" format and \"^>+From \" line escaping is reversed."
+msgid "Input is of the \"mboxrd\" format and \"^>+From \" line escaping is reversed."
msgstr ""
#. type: Title =
#: en/git-merge-base.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-merge-one-file(1)"
+#, no-wrap
msgid "git-merge-base(1)"
-msgstr "git-merge-one-file(1)"
+msgstr "git-merge-base(1)"
#. type: Plain text
#: en/git-merge-base.txt:7
@@ -43257,12 +42591,12 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:27
msgid ""
-"'git merge-base' finds best common ancestor(s) between two commits to use in "
-"a three-way merge. One common ancestor is 'better' than another common "
-"ancestor if the latter is an ancestor of the former. A common ancestor that "
-"does not have any better common ancestor is a 'best common ancestor', i.e. a "
-"'merge base'. Note that there can be more than one merge base for a pair of "
-"commits."
+"'git merge-base' finds best common ancestor(s) between two commits to use in"
+" a three-way merge. One common ancestor is 'better' than another common "
+"ancestor if the latter is an ancestor of the former. A common ancestor that"
+" does not have any better common ancestor is a 'best common ancestor', i.e. "
+"a 'merge base'. Note that there can be more than one merge base for a pair "
+"of commits."
msgstr ""
#. type: Title -
@@ -43282,10 +42616,10 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:38
msgid ""
-"More generally, among the two commits to compute the merge base from, one is "
-"specified by the first commit argument on the command line; the other commit "
-"is a (possibly hypothetical) commit that is a merge across all the remaining "
-"commits on the command line."
+"More generally, among the two commits to compute the merge base from, one is"
+" specified by the first commit argument on the command line; the other "
+"commit is a (possibly hypothetical) commit that is a merge across all the "
+"remaining commits on the command line."
msgstr ""
#. type: Plain text
@@ -43301,7 +42635,7 @@ msgstr ""
#: en/git-merge-base.txt:43
#, no-wrap
msgid "--octopus"
-msgstr ""
+msgstr "--octopus"
#. type: Plain text
#: en/git-merge-base.txt:47
@@ -43315,22 +42649,22 @@ msgstr ""
#: en/git-merge-base.txt:48 en/git-show-branch.txt:90
#, no-wrap
msgid "--independent"
-msgstr ""
+msgstr "--independent"
#. type: Plain text
#: en/git-merge-base.txt:54
msgid ""
"Instead of printing merge bases, print a minimal subset of the supplied "
"commits with the same ancestors. In other words, among the commits given, "
-"list those which cannot be reached from any other. This mimics the behavior "
-"of 'git show-branch --independent'."
+"list those which cannot be reached from any other. This mimics the behavior"
+" of 'git show-branch --independent'."
msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:55
#, no-wrap
msgid "--is-ancestor"
-msgstr ""
+msgstr "--is-ancestor"
#. type: Plain text
#: en/git-merge-base.txt:59
@@ -43344,16 +42678,17 @@ msgstr ""
#: en/git-merge-base.txt:60 en/git-rebase.txt:346
#, no-wrap
msgid "--fork-point"
-msgstr ""
+msgstr "--fork-point"
#. type: Plain text
#: en/git-merge-base.txt:68
msgid ""
"Find the point at which a branch (or any history that leads to <commit>) "
"forked from another branch (or any reference) <ref>. This does not just "
-"look for the common ancestor of the two commits, but also takes into account "
-"the reflog of <ref> to see if the history leading to <commit> forked from an "
-"earlier incarnation of the branch <ref> (see discussion on this mode below)."
+"look for the common ancestor of the two commits, but also takes into account"
+" the reflog of <ref> to see if the history leading to <commit> forked from "
+"an earlier incarnation of the branch <ref> (see discussion on this mode "
+"below)."
msgstr ""
#. type: Plain text
@@ -43409,8 +42744,8 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:101
msgid ""
-"the result of `git merge-base A B C` is '1'. This is because the equivalent "
-"topology with a merge commit 'M' between 'B' and 'C' is:"
+"the result of `git merge-base A B C` is '1'. This is because the equivalent"
+" topology with a merge commit 'M' between 'B' and 'C' is:"
msgstr ""
#. type: Plain text
@@ -43460,16 +42795,16 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:128
msgid ""
-"both '1' and '2' are merge-bases of A and B. Neither one is better than the "
-"other (both are 'best' merge bases). When the `--all` option is not given, "
-"it is unspecified which best one is output."
+"both '1' and '2' are merge-bases of A and B. Neither one is better than the"
+" other (both are 'best' merge bases). When the `--all` option is not given,"
+" it is unspecified which best one is output."
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:133
msgid ""
-"A common idiom to check \"fast-forward-ness\" between two commits A and B is "
-"(or at least used to be) to compute the merge base between A and B, and "
+"A common idiom to check \"fast-forward-ness\" between two commits A and B is"
+" (or at least used to be) to compute the merge base between A and B, and "
"check if it is the same as A, in which case, A is an ancestor of B. You "
"will see this idiom used often in older scripts."
msgstr ""
@@ -43536,10 +42871,10 @@ msgstr ""
#: en/git-merge-base.txt:170
msgid ""
"where `origin/master` used to point at commits B3, B2, B1 and now it points "
-"at B, and your `topic` branch was started on top of it back when `origin/"
-"master` was at B3. This mode uses the reflog of `origin/master` to find B3 "
-"as the fork point, so that the `topic` can be rebased on top of the updated "
-"`origin/master` by:"
+"at B, and your `topic` branch was started on top of it back when "
+"`origin/master` was at B3. This mode uses the reflog of `origin/master` to "
+"find B3 as the fork point, so that the `topic` can be rebased on top of the "
+"updated `origin/master` by:"
msgstr ""
#. type: Plain text
@@ -43556,21 +42891,20 @@ msgstr ""
msgid "See also"
msgstr ""
-#
#. type: Plain text
#: en/git-merge-base.txt:180
#, fuzzy
-#| msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
+#| msgid ""
+#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid ""
"linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-merge-file.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-merge-one-file(1)"
+#, no-wrap
msgid "git-merge-file(1)"
-msgstr "git-merge-one-file(1)"
+msgstr "git-merge-file(1)"
#. type: Plain text
#: en/git-merge-file.txt:7
@@ -43622,9 +42956,10 @@ msgstr ""
msgid ""
"If there are conflicts, the user should edit the result and delete one of "
"the alternatives. When `--ours`, `--theirs`, or `--union` option is in "
-"effect, however, these conflicts are resolved favouring lines from `<current-"
-"file>`, lines from `<other-file>`, or lines from both respectively. The "
-"length of the conflict markers can be given with the `--marker-size` option."
+"effect, however, these conflicts are resolved favouring lines from "
+"`<current-file>`, lines from `<other-file>`, or lines from both "
+"respectively. The length of the conflict markers can be given with the "
+"`--marker-size` option."
msgstr ""
#. type: Plain text
@@ -43639,8 +42974,8 @@ msgstr ""
#: en/git-merge-file.txt:50
msgid ""
"'git merge-file' is designed to be a minimal clone of RCS 'merge'; that is, "
-"it implements all of RCS 'merge''s functionality which is needed by linkgit:"
-"git[1]."
+"it implements all of RCS 'merge''s functionality which is needed by "
+"linkgit:git[1]."
msgstr ""
#. type: Labeled list
@@ -43671,10 +43006,9 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:70
-#, fuzzy, no-wrap
-#| msgid "diff"
+#, no-wrap
msgid "--diff3"
-msgstr "diff"
+msgstr "--diff3"
#. type: Plain text
#: en/git-merge-file.txt:72
@@ -43685,7 +43019,7 @@ msgstr ""
#: en/git-merge-file.txt:75
#, no-wrap
msgid "--union"
-msgstr ""
+msgstr "--union"
#. type: Plain text
#: en/git-merge-file.txt:78
@@ -43703,8 +43037,8 @@ msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:87
msgid ""
-"combines the changes of README.my and README.upstream since README, tries to "
-"merge them and writes the result into README.my."
+"combines the changes of README.my and README.upstream since README, tries to"
+" merge them and writes the result into README.my."
msgstr ""
#. type: Labeled list
@@ -43716,16 +43050,15 @@ msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:92
msgid ""
-"merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels `a` and "
-"`c` instead of `tmp/a123` and `tmp/c345`."
+"merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels `a` and"
+" `c` instead of `tmp/a123` and `tmp/c345`."
msgstr ""
#. type: Title =
#: en/git-merge-index.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-merge-one-file(1)"
+#, no-wrap
msgid "git-merge-index(1)"
-msgstr "git-merge-one-file(1)"
+msgstr "git-merge-index(1)"
#. type: Plain text
#: en/git-merge-index.txt:7
@@ -43838,8 +43171,8 @@ msgstr ""
#: en/git-merge-index.txt:76
msgid ""
"where the latter example shows how 'git merge-index' will stop trying to "
-"merge once anything has returned an error (i.e., `cat` returned an error for "
-"the AA file, because it didn't exist in the original, and thus 'git merge-"
+"merge once anything has returned an error (i.e., `cat` returned an error for"
+" the AA file, because it didn't exist in the original, and thus 'git merge-"
"index' didn't even try to merge the MM thing)."
msgstr ""
@@ -43849,7 +43182,6 @@ msgstr ""
msgid "git-merge-one-file(1)"
msgstr "git-merge-one-file(1)"
-#
#. type: Plain text
#: en/git-merge-one-file.txt:7
msgid ""
@@ -43858,7 +43190,6 @@ msgstr ""
"git-merge-one-file - Das Standardhilfsprogramm welches in Kombination mit "
"git-merge-index verwendet wird"
-#
#. type: Plain text
#: en/git-merge-one-file.txt:13
#, fuzzy, no-wrap
@@ -43866,16 +43197,15 @@ msgstr ""
msgid "'git merge-one-file'\n"
msgstr "'git-merge-one-file'"
-#
#. type: Plain text
#: en/git-merge-one-file.txt:18
#, fuzzy
#| msgid ""
-#| "This is the standard helper program to use with 'git-merge-index' to "
-#| "resolve a merge after the trivial merge done with 'git-read-tree -m'."
+#| "This is the standard helper program to use with 'git-merge-index' to resolve"
+#| " a merge after the trivial merge done with 'git-read-tree -m'."
msgid ""
-"This is the standard helper program to use with 'git merge-index' to resolve "
-"a merge after the trivial merge done with 'git read-tree -m'."
+"This is the standard helper program to use with 'git merge-index' to resolve"
+" a merge after the trivial merge done with 'git read-tree -m'."
msgstr ""
"Dies ist das Standardhilfsprogramm welches in Kombination mit 'git-merge-"
"index' verwendet wird, um einen merge nach einer trivialen Zusammenf체hrung "
@@ -43903,15 +43233,15 @@ msgstr ""
#: en/git-mergetool--lib.txt:19 en/git-sh-i18n.txt:19 en/git-sh-setup.txt:19
msgid ""
"This is not a command the end user would want to run. Ever. This "
-"documentation is meant for people who are studying the Porcelain-ish scripts "
-"and/or are writing new ones."
+"documentation is meant for people who are studying the Porcelain-ish scripts"
+" and/or are writing new ones."
msgstr ""
#. type: Plain text
#: en/git-mergetool--lib.txt:23
msgid ""
-"The 'git-mergetool{litdd}lib' scriptlet is designed to be sourced (using `."
-"`) by other shell scripts to set up functions for working with Git merge "
+"The 'git-mergetool{litdd}lib' scriptlet is designed to be sourced (using "
+"`.`) by other shell scripts to set up functions for working with Git merge "
"tools."
msgstr ""
@@ -43979,10 +43309,9 @@ msgstr ""
#. type: Title =
#: en/git-mergetool.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-citool(1)"
+#, no-wrap
msgid "git-mergetool(1)"
-msgstr "git-citool(1)"
+msgstr "git-mergetool(1)"
#. type: Plain text
#: en/git-mergetool.txt:7
@@ -44008,9 +43337,9 @@ msgstr ""
#: en/git-mergetool.txt:24
msgid ""
"If one or more <file> parameters are given, the merge tool program will be "
-"run to resolve differences on each file (skipping those without conflicts). "
-"Specifying a directory will include all unresolved files in that path. If "
-"no <file> names are specified, 'git mergetool' will run the merge tool "
+"run to resolve differences on each file (skipping those without conflicts)."
+" Specifying a directory will include all unresolved files in that path. If"
+" no <file> names are specified, 'git mergetool' will run the merge tool "
"program on every file with merge conflicts."
msgstr ""
@@ -44025,9 +43354,9 @@ msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:38
msgid ""
-"If a merge resolution program is not specified, 'git mergetool' will use the "
-"configuration variable `merge.tool`. If the configuration variable `merge."
-"tool` is not set, 'git mergetool' will pick a suitable default."
+"If a merge resolution program is not specified, 'git mergetool' will use the"
+" configuration variable `merge.tool`. If the configuration variable "
+"`merge.tool` is not set, 'git mergetool' will pick a suitable default."
msgstr ""
#. type: Plain text
@@ -44042,8 +43371,8 @@ msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:49
msgid ""
-"Instead of running one of the known merge tool programs, 'git mergetool' can "
-"be customized to run an alternative program by specifying the command line "
+"Instead of running one of the known merge tool programs, 'git mergetool' can"
+" be customized to run an alternative program by specifying the command line "
"to invoke in a configuration variable `mergetool.<tool>.cmd`."
msgstr ""
@@ -44053,21 +43382,22 @@ msgid ""
"When 'git mergetool' is invoked with this tool (either through the `-t` or "
"`--tool` option or the `merge.tool` configuration variable) the configured "
"command line will be invoked with `$BASE` set to the name of a temporary "
-"file containing the common base for the merge, if available; `$LOCAL` set to "
-"the name of a temporary file containing the contents of the file on the "
-"current branch; `$REMOTE` set to the name of a temporary file containing the "
-"contents of the file to be merged, and `$MERGED` set to the name of the file "
-"to which the merge tool should write the result of the merge resolution."
+"file containing the common base for the merge, if available; `$LOCAL` set to"
+" the name of a temporary file containing the contents of the file on the "
+"current branch; `$REMOTE` set to the name of a temporary file containing the"
+" contents of the file to be merged, and `$MERGED` set to the name of the "
+"file to which the merge tool should write the result of the merge "
+"resolution."
msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:66
msgid ""
"If the custom merge tool correctly indicates the success of a merge "
-"resolution with its exit code, then the configuration variable `mergetool."
-"<tool>.trustExitCode` can be set to `true`. Otherwise, 'git mergetool' will "
-"prompt the user to indicate the success of the resolution after the custom "
-"tool has exited."
+"resolution with its exit code, then the configuration variable "
+"`mergetool.<tool>.trustExitCode` can be set to `true`. Otherwise, 'git "
+"mergetool' will prompt the user to indicate the success of the resolution "
+"after the custom tool has exited."
msgstr ""
#. type: Plain text
@@ -44093,10 +43423,10 @@ msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:88
msgid ""
-"Process files in the order specified in the <orderfile>, which has one shell "
-"glob pattern per line. This overrides the `diff.orderFile` configuration "
-"variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/"
-"dev/null`."
+"Process files in the order specified in the <orderfile>, which has one shell"
+" glob pattern per line. This overrides the `diff.orderFile` configuration "
+"variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use "
+"`-O/dev/null`."
msgstr ""
#. type: Title -
@@ -44108,8 +43438,8 @@ msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:94
msgid ""
-"`git mergetool` creates `*.orig` backup files while resolving merges. These "
-"are safe to remove once a file has been merged and its `git mergetool` "
+"`git mergetool` creates `*.orig` backup files while resolving merges. These"
+" are safe to remove once a file has been merged and its `git mergetool` "
"session has completed."
msgstr ""
@@ -44117,16 +43447,15 @@ msgstr ""
#: en/git-mergetool.txt:98
msgid ""
"Setting the `mergetool.keepBackup` configuration variable to `false` causes "
-"`git mergetool` to automatically remove the backup as files are successfully "
-"merged."
+"`git mergetool` to automatically remove the backup as files are successfully"
+" merged."
msgstr ""
#. type: Title =
#: en/git-merge-tree.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-write-tree(1)"
+#, no-wrap
msgid "git-merge-tree(1)"
-msgstr "git-write-tree(1)"
+msgstr "git-merge-tree(1)"
#. type: Plain text
#: en/git-merge-tree.txt:7
@@ -44159,10 +43488,9 @@ msgstr ""
#. type: Title =
#: en/git-merge.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-mv(1)"
+#, no-wrap
msgid "git-merge(1)"
-msgstr "git-mv(1)"
+msgstr "git-merge(1)"
#. type: Plain text
#: en/git-merge.txt:7
@@ -44187,8 +43515,8 @@ msgstr ""
msgid ""
"Incorporates changes from the named commits (since the time their histories "
"diverged from the current branch) into the current branch. This command is "
-"used by 'git pull' to incorporate changes from another repository and can be "
-"used by hand to merge changes from one branch into another."
+"used by 'git pull' to incorporate changes from another repository and can be"
+" used by hand to merge changes from one branch into another."
msgstr ""
#. type: Plain text
@@ -44240,8 +43568,8 @@ msgid ""
"has resulted in conflicts. 'git merge --abort' will abort the merge process "
"and try to reconstruct the pre-merge state. However, if there were "
"uncommitted changes when the merge started (and especially if those changes "
-"were further modified after the merge was started), 'git merge --abort' will "
-"in some cases be unable to reconstruct the original (pre-merge) changes. "
+"were further modified after the merge was started), 'git merge --abort' will"
+" in some cases be unable to reconstruct the original (pre-merge) changes. "
"Therefore:"
msgstr ""
@@ -44295,7 +43623,7 @@ msgstr ""
#: en/git-merge.txt:89
#, no-wrap
msgid "--[no-]rerere-autoupdate"
-msgstr ""
+msgstr "--[no-]rerere-autoupdate"
#. type: Plain text
#: en/git-merge.txt:92
@@ -44370,8 +43698,8 @@ msgstr ""
msgid ""
"Before applying outside changes, you should get your own work in good shape "
"and committed locally, so it will not be clobbered if there are conflicts. "
-"See also linkgit:git-stash[1]. 'git pull' and 'git merge' will stop without "
-"doing anything when local uncommitted changes overlap with files that 'git "
+"See also linkgit:git-stash[1]. 'git pull' and 'git merge' will stop without"
+" doing anything when local uncommitted changes overlap with files that 'git "
"pull'/'git merge' may need to update."
msgstr ""
@@ -44379,8 +43707,8 @@ msgstr ""
#: en/git-merge.txt:139
msgid ""
"To avoid recording unrelated changes in the merge commit, 'git pull' and "
-"'git merge' will also abort if there are any changes registered in the index "
-"relative to the `HEAD` commit. (One exception is when the changed index "
+"'git merge' will also abort if there are any changes registered in the index"
+" relative to the `HEAD` commit. (One exception is when the changed index "
"entries are in the state that would result from the merge already.)"
msgstr ""
@@ -44432,8 +43760,8 @@ msgstr ""
msgid ""
"A merged version reconciling the changes from all branches to be merged is "
"committed, and your `HEAD`, index, and working tree are updated to it. It "
-"is possible to have modifications in the working tree as long as they do not "
-"overlap; the update will preserve them."
+"is possible to have modifications in the working tree as long as they do not"
+" overlap; the update will preserve them."
msgstr ""
#. type: Plain text
@@ -44465,8 +43793,8 @@ msgid ""
"For conflicting paths, the index file records up to three versions: stage 1 "
"stores the version from the common ancestor, stage 2 from `HEAD`, and stage "
"3 from `MERGE_HEAD` (you can inspect the stages with `git ls-files -u`). "
-"The working tree files contain the result of the \"merge\" program; i.e. 3-"
-"way merge results with familiar conflict markers `<<<` `===` `>>>`."
+"The working tree files contain the result of the \"merge\" program; i.e. "
+"3-way merge results with familiar conflict markers `<<<` `===` `>>>`."
msgstr ""
#. type: Plain text
@@ -44495,8 +43823,8 @@ msgstr ""
msgid ""
"When merging an annotated (and possibly signed) tag, Git always creates a "
"merge commit even if a fast-forward merge is possible, and the commit "
-"message template is prepared with the tag message. Additionally, if the tag "
-"is signed, the signature check is reported as a comment in the message "
+"message template is prepared with the tag message. Additionally, if the tag"
+" is signed, the signature check is reported as a comment in the message "
"template. See also linkgit:git-tag[1]."
msgstr ""
@@ -44504,8 +43832,8 @@ msgstr ""
#: en/git-merge.txt:202
msgid ""
"When you want to just integrate with the work leading to the commit that "
-"happens to be tagged, e.g. synchronizing with an upstream release point, you "
-"may not want to make an unnecessary merge commit."
+"happens to be tagged, e.g. synchronizing with an upstream release point, you"
+" may not want to make an unnecessary merge commit."
msgstr ""
#. type: Plain text
@@ -44539,15 +43867,15 @@ msgid ""
"overlapping ones (that is, you changed an area of the file while the other "
"side left that area intact, or vice versa) are incorporated in the final "
"result verbatim. When both sides made changes to the same area, however, "
-"Git cannot randomly pick one side over the other, and asks you to resolve it "
-"by leaving what both sides did to that area."
+"Git cannot randomly pick one side over the other, and asks you to resolve it"
+" by leaving what both sides did to that area."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:227
msgid ""
-"By default, Git uses the same style as the one used by the \"merge\" program "
-"from the RCS suite to present such a conflicted hunk, like this:"
+"By default, Git uses the same style as the one used by the \"merge\" program"
+" from the RCS suite to present such a conflicted hunk, like this:"
msgstr ""
#. type: delimited block -
@@ -44568,8 +43896,8 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:243
msgid ""
-"The area where a pair of conflicting changes happened is marked with markers "
-"`<<<<<<<`, `=======`, and `>>>>>>>`. The part before the `=======` is "
+"The area where a pair of conflicting changes happened is marked with markers"
+" `<<<<<<<`, `=======`, and `>>>>>>>`. The part before the `=======` is "
"typically your side, and the part afterwards is typically their side."
msgstr ""
@@ -44577,18 +43905,18 @@ msgstr ""
#: en/git-merge.txt:249
msgid ""
"The default format does not show what the original said in the conflicting "
-"area. You cannot tell how many lines are deleted and replaced with Barbie's "
-"remark on your side. The only thing you can tell is that your side wants to "
-"say it is hard and you'd prefer to go shopping, while the other side wants "
-"to claim it is easy."
+"area. You cannot tell how many lines are deleted and replaced with Barbie's"
+" remark on your side. The only thing you can tell is that your side wants "
+"to say it is hard and you'd prefer to go shopping, while the other side "
+"wants to claim it is easy."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:253
msgid ""
"An alternative style can be used by setting the \"merge.conflictStyle\" "
-"configuration variable to \"diff3\". In \"diff3\" style, the above conflict "
-"may look like this:"
+"configuration variable to \"diff3\". In \"diff3\" style, the above conflict"
+" may look like this:"
msgstr ""
#. type: delimited block -
@@ -44634,16 +43962,16 @@ msgstr ""
#: en/git-merge.txt:285
msgid ""
"Decide not to merge. The only clean-ups you need are to reset the index "
-"file to the `HEAD` commit to reverse 2. and to clean up working tree changes "
-"made by 2. and 3.; `git merge --abort` can be used for this."
+"file to the `HEAD` commit to reverse 2. and to clean up working tree changes"
+" made by 2. and 3.; `git merge --abort` can be used for this."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:289
msgid ""
"Resolve the conflicts. Git will mark the conflicts in the working tree. "
-"Edit the files into shape and 'git add' them to the index. Use 'git commit' "
-"to seal the deal."
+"Edit the files into shape and 'git add' them to the index. Use 'git commit'"
+" to seal the deal."
msgstr ""
#. type: Plain text
@@ -44654,8 +43982,8 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:294
msgid ""
-"Use a mergetool. `git mergetool` to launch a graphical mergetool which will "
-"work you through the merge."
+"Use a mergetool. `git mergetool` to launch a graphical mergetool which will"
+" work you through the merge."
msgstr ""
#. type: Plain text
@@ -44697,7 +44025,8 @@ msgstr "$ git merge experimentell\n"
#. type: Plain text
#: en/git-merge.txt:321
msgid ""
-"Merge branch `obsolete` into the current branch, using `ours` merge strategy:"
+"Merge branch `obsolete` into the current branch, using `ours` merge "
+"strategy:"
msgstr ""
#. type: delimited block -
@@ -44744,7 +44073,6 @@ msgid ""
"containing whitespace characters are currently not supported."
msgstr ""
-#
#. type: Plain text
#: en/git-merge.txt:360
#, fuzzy
@@ -44752,19 +44080,18 @@ msgstr ""
#| "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-"
#| "mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
msgid ""
-"linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], "
-"linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:"
-"git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
+"linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5],"
+" linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], "
+"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
msgstr ""
"linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-"
"mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title =
#: en/git-mktag.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-mv(1)"
+#, no-wrap
msgid "git-mktag(1)"
-msgstr "git-mv(1)"
+msgstr "git-mktag(1)"
#. type: Plain text
#: en/git-mktag.txt:7
@@ -44798,8 +44125,8 @@ msgstr ""
#. type: Plain text
#: en/git-mktag.txt:25
msgid ""
-"A tag signature file, to be fed to this command's standard input, has a very "
-"simple fixed format: four lines of"
+"A tag signature file, to be fed to this command's standard input, has a very"
+" simple fixed format: four lines of"
msgstr ""
#. type: Plain text
@@ -44817,19 +44144,16 @@ msgstr ""
msgid ""
"followed by some 'optional' free-form message (some tags created by older "
"Git may not have `tagger` line). The message, when exists, is separated by "
-"a blank line from the header. The message part may contain a signature that "
-"Git itself doesn't care about, but that can be verified with gpg."
+"a blank line from the header. The message part may contain a signature that"
+" Git itself doesn't care about, but that can be verified with gpg."
msgstr ""
-#
#. type: Title =
#: en/git-mktree.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-remote(1)"
+#, no-wrap
msgid "git-mktree(1)"
-msgstr "git-remote(1)"
+msgstr "git-mktree(1)"
-#
#. type: Plain text
#: en/git-mktree.txt:7
#, fuzzy
@@ -44846,10 +44170,10 @@ msgstr ""
#. type: Plain text
#: en/git-mktree.txt:20
msgid ""
-"Reads standard input in non-recursive `ls-tree` output format, and creates a "
-"tree object. The order of the tree entries is normalised by mktree so pre-"
-"sorting the input is not required. The object name of the tree object built "
-"is written to the standard output."
+"Reads standard input in non-recursive `ls-tree` output format, and creates a"
+" tree object. The order of the tree entries is normalised by mktree so pre-"
+"sorting the input is not required. The object name of the tree object built"
+" is written to the standard output."
msgstr ""
#. type: Plain text
@@ -44859,18 +44183,17 @@ msgstr ""
#. type: Labeled list
#: en/git-mktree.txt:26
-#, fuzzy, no-wrap
-#| msgid "--missing-ok"
+#, no-wrap
msgid "--missing"
-msgstr "--missing-ok"
+msgstr "--missing"
#. type: Plain text
#: en/git-mktree.txt:31
msgid ""
"Allow missing objects. The default behaviour (without this option) is to "
"verify that each tree entry's sha1 identifies an existing object. This "
-"option has no effect on the treatment of gitlink entries (aka \"submodules"
-"\") which are always allowed to be missing."
+"option has no effect on the treatment of gitlink entries (aka "
+"\"submodules\") which are always allowed to be missing."
msgstr ""
#. type: Plain text
@@ -44887,7 +44210,6 @@ msgstr ""
msgid "git-mv(1)"
msgstr "git-mv(1)"
-#
#. type: Plain text
#: en/git-mv.txt:7
msgid "git-mv - Move or rename a file, a directory, or a symlink"
@@ -44895,7 +44217,6 @@ msgstr ""
"git-mv - Eine Datei, ein Verzeichnis oder einen Symlink verschieben oder "
"umbenennen"
-#
#. type: Plain text
#: en/git-mv.txt:13
#, fuzzy, no-wrap
@@ -44903,7 +44224,6 @@ msgstr ""
msgid "'git mv' <options>... <args>...\n"
msgstr "'git mv' <Options>... <Argumente>..."
-#
#. type: Plain text
#: en/git-mv.txt:17
#, fuzzy
@@ -44926,7 +44246,6 @@ msgstr ""
" git mv [-f] [-n] <Quelle> <Ziel>\n"
" git mv [-f] [-n] [-k] <Quelle> ... <Zielverzeichnis>\n"
-#
#. type: Plain text
#: en/git-mv.txt:25
msgid ""
@@ -44941,7 +44260,6 @@ msgstr ""
"Verzeichnis sein; die gegebenen Quellen werden in dieses Verzeichnis "
"verschoben."
-#
#. type: Plain text
#: en/git-mv.txt:28
msgid ""
@@ -44951,7 +44269,6 @@ msgstr ""
"Die Bereitstellung wird nach erfolgreichem Beenden aktualisiert, die "
"횆nderung muss aber dennoch eingetragen werden."
-#
#. type: Plain text
#: en/git-mv.txt:34
msgid "Force renaming or moving of a file even if the target exists"
@@ -44959,31 +44276,29 @@ msgstr ""
"Erzwinge Umbenennen oder Verschieben einer Datei, selbst wenn das Ziel "
"bereits existiert."
-#
#. type: Plain text
#: en/git-mv.txt:39
#, fuzzy
#| msgid ""
-#| "Skip move or rename actions which would lead to an error condition. An "
-#| "error happens when a source is neither existing nor controlled by GIT, or "
-#| "when it would overwrite an existing file unless '-f' is given."
+#| "Skip move or rename actions which would lead to an error condition. An error"
+#| " happens when a source is neither existing nor controlled by GIT, or when it"
+#| " would overwrite an existing file unless '-f' is given."
msgid ""
-"Skip move or rename actions which would lead to an error condition. An error "
-"happens when a source is neither existing nor controlled by Git, or when it "
-"would overwrite an existing file unless `-f` is given."
+"Skip move or rename actions which would lead to an error condition. An error"
+" happens when a source is neither existing nor controlled by Git, or when it"
+" would overwrite an existing file unless `-f` is given."
msgstr ""
"횥berspringe Verschiebe- oder Umbenennungsaktionen, die zu einem Fehler "
"f체hren w체rden. Ein Fehler geschieht, wenn die Quelle weder vorhanden ist, "
"noch von GIT kontrolliert wird oder wenn eine bereits vorhandene Datei "
"체berschrieben werden w체rde, ausser wenn die Option '-f' gegeben wurde."
-#
#. type: Plain text
#: en/git-mv.txt:42
msgid "Do nothing; only show what would happen"
msgstr ""
-"Do nothing; only show what would happen F체hre nichts wirklich aus, zeige nur "
-"an, was geschehen w체rde."
+"Do nothing; only show what would happen F체hre nichts wirklich aus, zeige nur"
+" an, was geschehen w체rde."
#. type: Plain text
#: en/git-mv.txt:46
@@ -45000,10 +44315,10 @@ msgstr ""
#: en/git-mv.txt:54
msgid ""
"Moving a submodule using a gitfile (which means they were cloned with a Git "
-"version 1.7.8 or newer) will update the gitfile and core.worktree setting to "
-"make the submodule work in the new location. It also will attempt to update "
-"the submodule.<name>.path setting in the linkgit:gitmodules[5] file and "
-"stage that file (unless -n is used)."
+"version 1.7.8 or newer) will update the gitfile and core.worktree setting to"
+" make the submodule work in the new location. It also will attempt to "
+"update the submodule.<name>.path setting in the linkgit:gitmodules[5] file "
+"and stage that file (unless -n is used)."
msgstr ""
#. type: Plain text
@@ -45012,19 +44327,18 @@ msgid ""
"Each time a superproject update moves a populated submodule (e.g. when "
"switching between commits before and after the move) a stale submodule "
"checkout will remain in the old location and an empty directory will appear "
-"in the new location. To populate the submodule again in the new location the "
-"user will have to run \"git submodule update\" afterwards. Removing the old "
-"directory is only safe when it uses a gitfile, as otherwise the history of "
+"in the new location. To populate the submodule again in the new location the"
+" user will have to run \"git submodule update\" afterwards. Removing the old"
+" directory is only safe when it uses a gitfile, as otherwise the history of "
"the submodule will be deleted too. Both steps will be obsolete when "
"recursive submodule update has been implemented."
msgstr ""
#. type: Title =
#: en/git-name-rev.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-mv(1)"
+#, no-wrap
msgid "git-name-rev(1)"
-msgstr "git-mv(1)"
+msgstr "git-name-rev(1)"
#. type: Plain text
#: en/git-name-rev.txt:7
@@ -45042,8 +44356,8 @@ msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:19
msgid ""
-"Finds symbolic names suitable for human digestion for revisions given in any "
-"format parsable by 'git rev-parse'."
+"Finds symbolic names suitable for human digestion for revisions given in any"
+" format parsable by 'git rev-parse'."
msgstr ""
#. type: Plain text
@@ -45062,19 +44376,20 @@ msgstr ""
msgid ""
"Only use refs whose names match a given shell pattern. The pattern can be "
"one of branch name, tag name or fully qualified ref name. If given multiple "
-"times, use refs whose names match any of the given shell patterns. Use `--no-"
-"refs` to clear any previous ref patterns given."
+"times, use refs whose names match any of the given shell patterns. Use "
+"`--no-refs` to clear any previous ref patterns given."
msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:41
msgid ""
-"Do not use any ref whose name matches a given shell pattern. The pattern can "
-"be one of branch name, tag name or fully qualified ref name. If given "
+"Do not use any ref whose name matches a given shell pattern. The pattern can"
+" be one of branch name, tag name or fully qualified ref name. If given "
"multiple times, a ref will be excluded when it matches any of the given "
-"patterns. When used together with --refs, a ref will be used as a match only "
-"when it matches at least one --refs pattern and does not match any --exclude "
-"patterns. Use `--no-exclude` to clear the list of exclude patterns."
+"patterns. When used together with --refs, a ref will be used as a match only"
+" when it matches at least one --refs pattern and does not match any "
+"--exclude patterns. Use `--no-exclude` to clear the list of exclude "
+"patterns."
msgstr ""
#. type: Plain text
@@ -45094,16 +44409,15 @@ msgstr ""
#: en/git-name-rev.txt:56
msgid ""
"Instead of printing both the SHA-1 and the name, print only the name. If "
-"given with --tags the usual tag prefix of \"tags/\" is also omitted from the "
-"name, matching the output of `git-describe` more closely."
+"given with --tags the usual tag prefix of \"tags/\" is also omitted from the"
+" name, matching the output of `git-describe` more closely."
msgstr ""
#. type: Labeled list
#: en/git-name-rev.txt:57
-#, fuzzy, no-wrap
-#| msgid "--no-merged"
+#, no-wrap
msgid "--no-undefined"
-msgstr "--no-merged"
+msgstr "--no-undefined"
#. type: Plain text
#: en/git-name-rev.txt:60
@@ -45152,13 +44466,11 @@ msgstr ""
msgid "% git log | git name-rev --stdin\n"
msgstr ""
-#
#. type: Title =
#: en/git-notes.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-remote(1)"
+#, no-wrap
msgid "git-notes(1)"
-msgstr "git-remote(1)"
+msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
@@ -45195,8 +44507,8 @@ msgstr ""
msgid ""
"By default, notes are saved to and read from `refs/notes/commits`, but this "
"default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT "
-"sections below. If this ref does not exist, it will be quietly created when "
-"it is first needed to store a note."
+"sections below. If this ref does not exist, it will be quietly created when"
+" it is first needed to store a note."
msgstr ""
#. type: Plain text
@@ -45212,8 +44524,8 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
msgid ""
-"Notes can also be added to patches prepared with `git format-patch` by using "
-"the `--notes` option. Such notes are added as a patch commentary after a "
+"Notes can also be added to patches prepared with `git format-patch` by using"
+" the `--notes` option. Such notes are added as a patch commentary after a "
"three dash separator line."
msgstr ""
@@ -45248,8 +44560,8 @@ msgstr "--list"
#. type: Plain text
#: en/git-notes.txt:61
msgid ""
-"List the notes object for a given object. If no object is given, show a list "
-"of all note objects and the objects they annotate (in the format \"<note "
+"List the notes object for a given object. If no object is given, show a list"
+" of all note objects and the objects they annotate (in the format \"<note "
"object> <annotated object>\"). This is the default subcommand if no "
"subcommand is given."
msgstr ""
@@ -45264,9 +44576,9 @@ msgstr "--add"
#. type: Plain text
#: en/git-notes.txt:69
msgid ""
-"Add notes for a given object (defaults to HEAD). Abort if the object already "
-"has notes (use `-f` to overwrite existing notes). However, if you're using "
-"`add` interactively (using an editor to supply the notes contents), then - "
+"Add notes for a given object (defaults to HEAD). Abort if the object already"
+" has notes (use `-f` to overwrite existing notes). However, if you're using"
+" `add` interactively (using an editor to supply the notes contents), then - "
"instead of aborting - the existing notes will be opened in the editor (like "
"the `edit` subcommand)."
msgstr ""
@@ -45315,8 +44627,8 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:90
msgid ""
-"Append to the notes of an existing object (defaults to HEAD). Creates a new "
-"notes object if needed."
+"Append to the notes of an existing object (defaults to HEAD). Creates a new"
+" notes object if needed."
msgstr ""
#. type: Labeled list
@@ -45362,10 +44674,10 @@ msgstr ""
#: en/git-notes.txt:111
msgid ""
"If conflicts arise and a strategy for automatically resolving conflicting "
-"notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual"
-"\" resolver is used. This resolver checks out the conflicting notes in a "
-"special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to "
-"manually resolve the conflicts there. When done, the user can either "
+"notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the "
+"\"manual\" resolver is used. This resolver checks out the conflicting notes "
+"in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user "
+"to manually resolve the conflicts there. When done, the user can either "
"finalize the merge with 'git notes merge --commit', or abort the merge with "
"'git notes merge --abort'."
msgstr ""
@@ -45420,13 +44732,12 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
msgid ""
-"Use the given note message (instead of prompting). If multiple `-m` options "
-"are given, their values are concatenated as separate paragraphs. Lines "
+"Use the given note message (instead of prompting). If multiple `-m` options"
+" are given, their values are concatenated as separate paragraphs. Lines "
"starting with `#` and empty lines other than a single line between "
"paragraphs will be stripped out."
msgstr ""
-#
#. type: Plain text
#: en/git-notes.txt:146
#, fuzzy
@@ -45434,12 +44745,12 @@ msgstr ""
#| "Take the commit message from the given file. Use '-' to read the message "
#| "from the standard input."
msgid ""
-"Take the note message from the given file. Use '-' to read the note message "
-"from the standard input. Lines starting with `#` and empty lines other than "
-"a single line between paragraphs will be stripped out."
+"Take the note message from the given file. Use '-' to read the note message"
+" from the standard input. Lines starting with `#` and empty lines other "
+"than a single line between paragraphs will be stripped out."
msgstr ""
-"Nimm die Eintragungsbemerkung (commit message) der spezifizierten Datei. Mit "
-"'-' wird die Bemerkung von der Standard Eingabe gelesen."
+"Nimm die Eintragungsbemerkung (commit message) der spezifizierten Datei. Mit"
+" '-' wird die Bemerkung von der Standard Eingabe gelesen."
#. type: Labeled list
#: en/git-notes.txt:147
@@ -45458,8 +44769,8 @@ msgstr "--reuse-message=<commit>"
#. type: Plain text
#: en/git-notes.txt:152
msgid ""
-"Take the given blob object (for\texample, another note) as the note message. "
-"(Use `git notes copy <object>` instead to copy notes between objects.)"
+"Take the given blob object (for\texample, another note) as the note message."
+" (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
@@ -45476,19 +44787,18 @@ msgstr "-c <commit>"
msgid "--reedit-message=<object>"
msgstr "--reedit-message=<commit>"
-#
#. type: Plain text
#: en/git-notes.txt:157
#, fuzzy
#| msgid ""
-#| "Like '-C', but with '-c' the editor is invoked, so that the user can "
-#| "further edit the commit message."
+#| "Like '-C', but with '-c' the editor is invoked, so that the user can further"
+#| " edit the commit message."
msgid ""
-"Like '-C', but with `-c` the editor is invoked, so that the user can further "
-"edit the note message."
+"Like '-C', but with `-c` the editor is invoked, so that the user can further"
+" edit the note message."
msgstr ""
-"횆hnlich wie '-C' allerdings wird mit '-c' der Editor aufgerufen, wodurch der "
-"Benutzer die Eintragungsbemerkung vor der Eintragung 체berarbeiten kann."
+"횆hnlich wie '-C' allerdings wird mit '-c' der Editor aufgerufen, wodurch der"
+" Benutzer die Eintragungsbemerkung vor der Eintragung 체berarbeiten kann."
#. type: Plain text
#: en/git-notes.txt:161
@@ -45508,8 +44818,8 @@ msgstr "--refresh"
#: en/git-notes.txt:168
msgid ""
"Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the "
-"\"core.notesRef\" configuration. The ref specifies the full refname when it "
-"begins with `refs/notes/`; when it begins with `notes/`, `refs/` and "
+"\"core.notesRef\" configuration. The ref specifies the full refname when it"
+" begins with `refs/notes/`; when it begins with `notes/`, `refs/` and "
"otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
@@ -45545,28 +44855,28 @@ msgstr ""
#: en/git-notes.txt:191
msgid ""
"When merging notes, resolve notes conflicts using the given strategy. The "
-"following strategies are recognized: \"manual\" (default), \"ours\", \"theirs"
-"\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes."
-"mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" "
-"section below for more information on each notes merge strategy."
+"following strategies are recognized: \"manual\" (default), \"ours\", "
+"\"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the "
+"\"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE "
+"STRATEGIES\" section below for more information on each notes merge "
+"strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, fuzzy, no-wrap
-#| msgid "-C <commit>"
+#, no-wrap
msgid "--commit"
-msgstr "-C <commit>"
+msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
msgid ""
"Finalize an in-progress 'git notes merge'. Use this option when you have "
-"resolved the conflicts that 'git notes merge' stored in .git/"
-"NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git "
-"notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in ."
-"git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF "
-"symref is updated to the resulting commit."
+"resolved the conflicts that 'git notes merge' stored in "
+".git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by "
+"'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes "
+"in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the "
+".git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
@@ -45591,21 +44901,21 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
msgid ""
-"Commit notes are blobs containing extra information about an object (usually "
-"information to supplement a commit's message). These blobs are taken from "
+"Commit notes are blobs containing extra information about an object (usually"
+" information to supplement a commit's message). These blobs are taken from "
"notes refs. A notes ref is usually a branch which contains \"files\" whose "
"paths are the object names for the objects they describe, with some "
"directory separators included for performance reasons footnote:[Permitted "
-"pathnames have the form 'ab'`/`'cd'`/`'ef'`/`'...'`/`'abcdef...': a sequence "
-"of directory names of two hexadecimal digits each followed by a filename "
+"pathnames have the form 'ab'`/`'cd'`/`'ef'`/`'...'`/`'abcdef...': a sequence"
+" of directory names of two hexadecimal digits each followed by a filename "
"with the rest of the object ID.]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:236
msgid ""
-"Every notes change creates a new commit at the specified notes ref. You can "
-"therefore inspect the history of the notes by invoking, e.g., `git log -p "
+"Every notes change creates a new commit at the specified notes ref. You can"
+" therefore inspect the history of the notes by invoking, e.g., `git log -p "
"notes/commits`. Currently the commit message only records which operation "
"triggered the update, and the commit authorship is determined according to "
"the usual rules (see linkgit:git-commit[1]). These details may change in "
@@ -45629,11 +44939,12 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
msgid ""
-"The default notes merge strategy is \"manual\", which checks out conflicting "
-"notes in a special work tree for resolving notes conflicts (`.git/"
-"NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in "
-"that work tree. When done, the user can either finalize the merge with 'git "
-"notes merge --commit', or abort the merge with 'git notes merge --abort'."
+"The default notes merge strategy is \"manual\", which checks out conflicting"
+" notes in a special work tree for resolving notes conflicts "
+"(`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the "
+"conflicts in that work tree. When done, the user can either finalize the "
+"merge with 'git notes merge --commit', or abort the merge with 'git notes "
+"merge --abort'."
msgstr ""
#. type: Plain text
@@ -45668,9 +44979,9 @@ msgstr ""
#: en/git-notes.txt:275
msgid ""
"\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating "
-"the local and remote versions, this strategy also sorts the resulting lines, "
-"and removes duplicate lines from the result. This is equivalent to applying "
-"the \"cat | sort | uniq\" shell pipeline to the local and remote versions. "
+"the local and remote versions, this strategy also sorts the resulting lines,"
+" and removes duplicate lines from the result. This is equivalent to applying"
+" the \"cat | sort | uniq\" shell pipeline to the local and remote versions. "
"This strategy is useful if the notes follow a line-based format where one "
"wants to avoid duplicated lines in the merge result. Note that if either "
"the local or remote version contain duplicate lines prior to the merge, "
@@ -45680,8 +44991,8 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
msgid ""
-"You can use notes to add annotations with information that was not available "
-"at the time a commit was written."
+"You can use notes to add annotations with information that was not available"
+" at the time a commit was written."
msgstr ""
#. type: delimited block -
@@ -45742,8 +45053,8 @@ msgstr ""
msgid ""
"Which merge strategy to choose by default when resolving notes conflicts. "
"Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. "
-"Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more "
-"information on each strategy."
+"Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more"
+" information on each strategy."
msgstr ""
#. type: Plain text
@@ -45754,10 +45065,10 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
msgid ""
-"Which merge strategy to choose when doing a notes merge into refs/notes/"
-"<name>. This overrides the more general \"notes.mergeStrategy\". See the "
-"\"NOTES MERGE STRATEGIES\" section above for more information on each "
-"available strategy."
+"Which merge strategy to choose when doing a notes merge into "
+"refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\"."
+" See the \"NOTES MERGE STRATEGIES\" section above for more information on "
+"each available strategy."
msgstr ""
#. type: Plain text
@@ -45789,9 +45100,9 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
msgid ""
-"When copying notes during a rewrite, what to do if the target commit already "
-"has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or "
-"`ignore`. Defaults to `concatenate`."
+"When copying notes during a rewrite, what to do if the target commit already"
+" has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or"
+" `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
@@ -45839,8 +45150,8 @@ msgstr ""
#: en/git-notes.txt:385
msgid ""
"Colon-delimited list of refs or globs indicating which refs, in addition to "
-"the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when "
-"showing commit messages. This overrides the `notes.displayRef` setting."
+"the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when"
+" showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
@@ -45859,9 +45170,9 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:394
msgid ""
-"When copying notes during a rewrite, what to do if the target commit already "
-"has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or "
-"`ignore`. This overrides the `core.rewriteMode` setting."
+"When copying notes during a rewrite, what to do if the target commit already"
+" has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or"
+" `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
@@ -45886,12 +45197,10 @@ msgstr ""
#. type: Title =
#: en/git-p4.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-mv(1)"
+#, no-wrap
msgid "git-p4(1)"
-msgstr "git-mv(1)"
+msgstr "git-p4(1)"
-#
#. type: Plain text
#: en/git-p4.txt:7
#, fuzzy
@@ -45911,7 +45220,8 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:22
-msgid "This command provides a way to interact with p4 repositories using Git."
+msgid ""
+"This command provides a way to interact with p4 repositories using Git."
msgstr ""
#. type: Plain text
@@ -45920,8 +45230,8 @@ msgid ""
"Create a new Git repository from an existing p4 repository using 'git p4 "
"clone', giving it one or more p4 depot paths. Incorporate new commits from "
"p4 changes with 'git p4 sync'. The 'sync' command is also used to include "
-"new branches from other p4 depot paths. Submit Git changes back to p4 using "
-"'git p4 submit'. The command 'git p4 rebase' does a sync plus rebases the "
+"new branches from other p4 depot paths. Submit Git changes back to p4 using"
+" 'git p4 submit'. The command 'git p4 rebase' does a sync plus rebases the "
"current branch onto the updated p4 remote branch."
msgstr ""
@@ -45956,8 +45266,8 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:50
msgid ""
-"Update the Git repository with recent changes from p4, rebasing your work on "
-"top:"
+"Update the Git repository with recent changes from p4, rebasing your work on"
+" top:"
msgstr ""
#. type: delimited block -
@@ -46037,8 +45347,8 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:92
msgid ""
-"As development continues in the p4 repository, those changes can be included "
-"in the Git repository using:"
+"As development continues in the p4 repository, those changes can be included"
+" in the Git repository using:"
msgstr ""
#. type: delimited block -
@@ -46123,12 +45433,11 @@ msgstr ""
msgid ""
"Submitting changes from a Git repository back to the p4 repository requires "
"a separate p4 client workspace. This should be specified using the "
-"`P4CLIENT` environment variable or the Git configuration variable 'git-p4."
-"client'. The p4 client must exist, but the client root will be created and "
-"populated if it does not already exist."
+"`P4CLIENT` environment variable or the Git configuration variable "
+"'git-p4.client'. The p4 client must exist, but the client root will be "
+"created and populated if it does not already exist."
msgstr ""
-#
#. type: Plain text
#: en/git-p4.txt:143
#, fuzzy
@@ -46136,11 +45445,11 @@ msgstr ""
#| "will list commits made in the experimental branch but not in the stable "
#| "branch, while"
msgid ""
-"To submit all changes that are in the current Git branch but not in the 'p4/"
-"master' branch, use:"
+"To submit all changes that are in the current Git branch but not in the "
+"'p4/master' branch, use:"
msgstr ""
-"die Commits an, die im Zweig \"experimentell\" aber nicht im Zweig \"stabil"
-"\" get채tigt wurden. Dagegen zeigt"
+"die Commits an, die im Zweig \"experimentell\" aber nicht im Zweig "
+"\"stabil\" get채tigt wurden. Dagegen zeigt"
#. type: Plain text
#: en/git-p4.txt:148
@@ -46164,9 +45473,9 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:159
msgid ""
-"The p4 changes will be created as the user invoking 'git p4 submit'. The `--"
-"preserve-user` option will cause ownership to be modified according to the "
-"author of the Git commit. This option requires admin privileges in p4, "
+"The p4 changes will be created as the user invoking 'git p4 submit'. The "
+"`--preserve-user` option will cause ownership to be modified according to "
+"the author of the Git commit. This option requires admin privileges in p4, "
"which can be granted using 'p4 protect'."
msgstr ""
@@ -46229,8 +45538,8 @@ msgstr ""
#: en/git-p4.txt:188
msgid ""
"By default a <ref> not starting with refs/ is treated as the name of a "
-"remote-tracking branch (under refs/remotes/). This behavior can be modified "
-"using the --import-local option."
+"remote-tracking branch (under refs/remotes/). This behavior can be modified"
+" using the --import-local option."
msgstr ""
#. type: Plain text
@@ -46257,7 +45566,7 @@ msgstr ""
#: en/git-p4.txt:199
#, no-wrap
msgid "--detect-branches"
-msgstr ""
+msgstr "--detect-branches"
#. type: Plain text
#: en/git-p4.txt:202
@@ -46285,30 +45594,29 @@ msgstr ""
#: en/git-p4.txt:208
#, no-wrap
msgid "--silent"
-msgstr ""
+msgstr "--silent"
-#
#. type: Plain text
#: en/git-p4.txt:210
#, fuzzy
#| msgid "Do not interpret any more arguments as options."
msgid "Do not print any progress information."
msgstr ""
-"Diese Option kann dazu verwendet werden, Befehlszeilenoptionen von der Liste "
-"von Dateien zu trennen. Dies ist sinnvoll, wenn Dateinamen mit "
+"Diese Option kann dazu verwendet werden, Befehlszeilenoptionen von der Liste"
+" von Dateien zu trennen. Dies ist sinnvoll, wenn Dateinamen mit "
"Befehlszeilenoptionen verwechselt werden k철nnten."
#. type: Labeled list
#: en/git-p4.txt:211
#, no-wrap
msgid "--detect-labels"
-msgstr ""
+msgstr "--detect-labels"
#. type: Plain text
#: en/git-p4.txt:215
msgid ""
-"Query p4 for labels associated with the depot paths, and add them as tags in "
-"Git. Limited usefulness as only imports labels associated with new "
+"Query p4 for labels associated with the depot paths, and add them as tags in"
+" Git. Limited usefulness as only imports labels associated with new "
"changelists. Deprecated."
msgstr ""
@@ -46316,7 +45624,7 @@ msgstr ""
#: en/git-p4.txt:216 en/git-p4.txt:331
#, no-wrap
msgid "--import-labels"
-msgstr ""
+msgstr "--import-labels"
#. type: Plain text
#: en/git-p4.txt:218
@@ -46325,16 +45633,15 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:219
-#, fuzzy, no-wrap
-#| msgid "--local"
+#, no-wrap
msgid "--import-local"
-msgstr "--local"
+msgstr "--import-local"
#. type: Plain text
#: en/git-p4.txt:226
msgid ""
-"By default, p4 branches are stored in 'refs/remotes/p4/', where they will be "
-"treated as remote-tracking branches by linkgit:git-branch[1] and other "
+"By default, p4 branches are stored in 'refs/remotes/p4/', where they will be"
+" treated as remote-tracking branches by linkgit:git-branch[1] and other "
"commands. This option instead puts p4 branches in 'refs/heads/p4/'. Note "
"that future sync operations must specify `--import-local` as well so that "
"they can find the p4 branches in refs/heads."
@@ -46349,10 +45656,10 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:233
msgid ""
-"Import at most 'n' changes, rather than the entire range of changes included "
-"in the given revision specifier. A typical usage would be use '@all' as the "
-"revision specifier, but then to use '--max-changes 1000' to import only the "
-"last 1000 revisions rather than the entire revision history."
+"Import at most 'n' changes, rather than the entire range of changes included"
+" in the given revision specifier. A typical usage would be use '@all' as the"
+" revision specifier, but then to use '--max-changes 1000' to import only the"
+" last 1000 revisions rather than the entire revision history."
msgstr ""
#. type: Labeled list
@@ -46367,17 +45674,16 @@ msgid ""
"The internal block size to use when converting a revision specifier such as "
"'@all' into a list of specific change numbers. Instead of using a single "
"call to 'p4 changes' to find the full list of changes for the conversion, "
-"there are a sequence of calls to 'p4 changes -m', each of which requests one "
-"block of changes of the given size. The default block size is 500, which "
+"there are a sequence of calls to 'p4 changes -m', each of which requests one"
+" block of changes of the given size. The default block size is 500, which "
"should usually be suitable."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:243
-#, fuzzy, no-wrap
-#| msgid "--patch"
+#, no-wrap
msgid "--keep-path"
-msgstr "--patch"
+msgstr "--keep-path"
#. type: Plain text
#: en/git-p4.txt:250
@@ -46393,7 +45699,7 @@ msgstr ""
#: en/git-p4.txt:251
#, no-wrap
msgid "--use-client-spec"
-msgstr ""
+msgstr "--use-client-spec"
#. type: Plain text
#: en/git-p4.txt:254
@@ -46474,8 +45780,8 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:285
msgid ""
-"Detect renames. See linkgit:git-diff[1]. Renames will be represented in p4 "
-"using explicit 'move' operations. There is no corresponding option to "
+"Detect renames. See linkgit:git-diff[1]. Renames will be represented in p4"
+" using explicit 'move' operations. There is no corresponding option to "
"detect copies, but there are variables for both moves and copies."
msgstr ""
@@ -46483,20 +45789,20 @@ msgstr ""
#: en/git-p4.txt:286
#, no-wrap
msgid "--preserve-user"
-msgstr ""
+msgstr "--preserve-user"
#. type: Plain text
#: en/git-p4.txt:289
msgid ""
-"Re-author p4 changes before submitting to p4. This option requires p4 admin "
-"privileges."
+"Re-author p4 changes before submitting to p4. This option requires p4 admin"
+" privileges."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:290
#, no-wrap
msgid "--export-labels"
-msgstr ""
+msgstr "--export-labels"
#. type: Plain text
#: en/git-p4.txt:293
@@ -46516,24 +45822,23 @@ msgstr ""
#: en/git-p4.txt:299
#, no-wrap
msgid "--prepare-p4-only"
-msgstr ""
+msgstr "--prepare-p4-only"
#. type: Plain text
#: en/git-p4.txt:305
msgid ""
-"Apply a commit to the p4 workspace, opening, adding and deleting files in p4 "
-"as for a normal submit operation. Do not issue the final \"p4 submit\", but "
-"instead print a message about how to submit manually or revert. This option "
-"always stops after the first (oldest) commit. Git tags are not exported to "
-"p4."
+"Apply a commit to the p4 workspace, opening, adding and deleting files in p4"
+" as for a normal submit operation. Do not issue the final \"p4 submit\", "
+"but instead print a message about how to submit manually or revert. This "
+"option always stops after the first (oldest) commit. Git tags are not "
+"exported to p4."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:306
-#, fuzzy, no-wrap
-#| msgid "--shared"
+#, no-wrap
msgid "--shelve"
-msgstr "--shared"
+msgstr "--shelve"
#. type: Plain text
#: en/git-p4.txt:310
@@ -46610,9 +45915,9 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:339
msgid ""
-"The p4 depot path argument to 'git p4 sync' and 'git p4 clone' can be one or "
-"more space-separated p4 depot paths, with an optional p4 revision specifier "
-"on the end:"
+"The p4 depot path argument to 'git p4 sync' and 'git p4 clone' can be one or"
+" more space-separated p4 depot paths, with an optional p4 revision specifier"
+" on the end:"
msgstr ""
#. type: Labeled list
@@ -46623,7 +45928,8 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:342
-msgid "Import one commit with all files in the '#head' change under that tree."
+msgid ""
+"Import one commit with all files in the '#head' change under that tree."
msgstr ""
#. type: Labeled list
@@ -46659,11 +45965,11 @@ msgstr ""
msgid ""
"Import all changes from both named depot paths into a single repository. "
"Only files below these directories are included. There is not a "
-"subdirectory in Git for each \"proj1\" and \"proj2\". You must use the `--"
-"destination` option when specifying more than one depot path. The revision "
-"specifier must be specified identically on each depot path. If there are "
-"files in the depot paths with the same name, the path with the most recently "
-"updated version of the file is the one that appears in Git."
+"subdirectory in Git for each \"proj1\" and \"proj2\". You must use the "
+"`--destination` option when specifying more than one depot path. The "
+"revision specifier must be specified identically on each depot path. If "
+"there are files in the depot paths with the same name, the path with the "
+"most recently updated version of the file is the one that appears in Git."
msgstr ""
#. type: Plain text
@@ -46682,8 +45988,8 @@ msgstr ""
msgid ""
"The p4 client specification is maintained with the 'p4 client' command and "
"contains among other fields, a View that specifies how the depot is mapped "
-"into the client repository. The 'clone' and 'sync' commands can consult the "
-"client spec when given the `--use-client-spec` option or when the "
+"into the client repository. The 'clone' and 'sync' commands can consult the"
+" client spec when given the `--use-client-spec` option or when the "
"useClientSpec variable is true. After 'git p4 clone', the useClientSpec "
"variable is automatically set in the repository configuration file. This "
"allows future 'git p4 submit' commands to work properly; the submit command "
@@ -46694,10 +46000,10 @@ msgstr ""
#: en/git-p4.txt:380
msgid ""
"The full syntax for a p4 view is documented in 'p4 help views'. 'git p4' "
-"knows only a subset of the view syntax. It understands multi-line mappings, "
-"overlays with '+', exclusions with '-' and double-quotes around whitespace. "
-"Of the possible wildcards, 'git p4' only handles '...', and only when it is "
-"at the end of the path. 'git p4' will complain if it encounters an "
+"knows only a subset of the view syntax. It understands multi-line mappings,"
+" overlays with '+', exclusions with '-' and double-quotes around whitespace."
+" Of the possible wildcards, 'git p4' only handles '...', and only when it "
+"is at the end of the path. 'git p4' will complain if it encounters an "
"unhandled wildcard."
msgstr ""
@@ -46706,8 +46012,8 @@ msgstr ""
msgid ""
"Bugs in the implementation of overlap mappings exist. If multiple depot "
"paths map through overlays to the same location in the repository, 'git p4' "
-"can choose the wrong one. This is hard to solve without dedicating a client "
-"spec just for 'git p4'."
+"can choose the wrong one. This is hard to solve without dedicating a client"
+" spec just for 'git p4'."
msgstr ""
#. type: Plain text
@@ -46728,11 +46034,11 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:400
msgid ""
-"P4 does not have the same concept of a branch as Git. Instead, p4 organizes "
-"its content as a directory tree, where by convention different logical "
-"branches are in different locations in the tree. The 'p4 branch' command is "
-"used to maintain mappings between different areas in the tree, and indicate "
-"related content. 'git p4' can use these mappings to determine branch "
+"P4 does not have the same concept of a branch as Git. Instead, p4 organizes"
+" its content as a directory tree, where by convention different logical "
+"branches are in different locations in the tree. The 'p4 branch' command is"
+" used to maintain mappings between different areas in the tree, and indicate"
+" related content. 'git p4' can use these mappings to determine branch "
"relationships."
msgstr ""
@@ -46741,8 +46047,8 @@ msgstr ""
msgid ""
"If you have a repository where all the branches of interest exist as "
"subdirectories of a single depot path, you can use `--detect-branches` when "
-"cloning or syncing to have 'git p4' automatically find subdirectories in p4, "
-"and to generate these as branches in Git."
+"cloning or syncing to have 'git p4' automatically find subdirectories in p4,"
+" and to generate these as branches in Git."
msgstr ""
#. type: Plain text
@@ -46790,14 +46096,14 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:433
msgid ""
-"However, it is not necessary to create branches in p4 to be able to use them "
-"like branches. Because it is difficult to infer branch relationships "
+"However, it is not necessary to create branches in p4 to be able to use them"
+" like branches. Because it is difficult to infer branch relationships "
"automatically, a Git configuration setting 'git-p4.branchList' can be used "
-"to explicitly identify branch relationships. It is a list of \"source:"
-"destination\" pairs, like a simple p4 branch specification, where the "
-"\"source\" and \"destination\" are the path elements in the p4 repository. "
-"The example above relied on the presence of the p4 branch. Without p4 "
-"branches, the same result will occur with:"
+"to explicitly identify branch relationships. It is a list of "
+"\"source:destination\" pairs, like a simple p4 branch specification, where "
+"the \"source\" and \"destination\" are the path elements in the p4 "
+"repository. The example above relied on the presence of the p4 branch. "
+"Without p4 branches, the same result will occur with:"
msgstr ""
#. type: delimited block -
@@ -46820,16 +46126,16 @@ msgstr ""
#: en/git-p4.txt:447
msgid ""
"The fast-import mechanism used by 'git p4' creates one pack file for each "
-"invocation of 'git p4 sync'. Normally, Git garbage compression (linkgit:git-"
-"gc[1]) automatically compresses these to fewer pack files, but explicit "
-"invocation of 'git repack -adf' may improve performance."
+"invocation of 'git p4 sync'. Normally, Git garbage compression "
+"(linkgit:git-gc[1]) automatically compresses these to fewer pack files, but "
+"explicit invocation of 'git repack -adf' may improve performance."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:453
msgid ""
-"The following config settings can be used to modify 'git p4' behavior. They "
-"all are in the 'git-p4' section."
+"The following config settings can be used to modify 'git p4' behavior. They"
+" all are in the 'git-p4' section."
msgstr ""
#. type: Title ~
@@ -46950,8 +46256,8 @@ msgstr "git-branch(1)"
#: en/git-p4.txt:499
msgid ""
"One phase in branch detection involves looking at p4 branches to find new "
-"ones to import. By default, all branches are inspected. This option limits "
-"the search to just those owned by the single user named in the variable."
+"ones to import. By default, all branches are inspected. This option limits"
+" the search to just those owned by the single user named in the variable."
msgstr ""
#. type: Labeled list
@@ -47023,10 +46329,10 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:527
msgid ""
-"Specify that the p4 client spec should be used to identify p4 depot paths of "
-"interest. This is equivalent to specifying the option `--use-client-spec`. "
-"See the \"CLIENT SPEC\" section above. This variable is a boolean, not the "
-"name of a p4 client."
+"Specify that the p4 client spec should be used to identify p4 depot paths of"
+" interest. This is equivalent to specifying the option `--use-client-spec`."
+" See the \"CLIENT SPEC\" section above. This variable is a boolean, not "
+"the name of a p4 client."
msgstr ""
#. type: Labeled list
@@ -47039,8 +46345,8 @@ msgstr ""
#: en/git-p4.txt:534
msgid ""
"Perforce keeps the encoding of a path as given by the originating OS. Git "
-"expects paths encoded as UTF-8. Use this config to tell git-p4 what encoding "
-"Perforce had used for the paths. This encoding is used to transcode the "
+"expects paths encoded as UTF-8. Use this config to tell git-p4 what encoding"
+" Perforce had used for the paths. This encoding is used to transcode the "
"paths to UTF-8. As an example, Perforce on Windows often uses \"cp1252\" to "
"encode path names."
msgstr ""
@@ -47055,10 +46361,10 @@ msgstr ""
#: en/git-p4.txt:541
msgid ""
"Specify the system that is used for large (binary) files. Please note that "
-"large file systems do not support the 'git p4 submit' command. Only Git LFS "
-"is implemented right now (see https://git-lfs.github.com/ for more "
-"information). Download and install the Git LFS command line extension to use "
-"this option and configure it like this:"
+"large file systems do not support the 'git p4 submit' command. Only Git LFS"
+" is implemented right now (see https://git-lfs.github.com/ for more "
+"information). Download and install the Git LFS command line extension to use"
+" this option and configure it like this:"
msgstr ""
#. type: delimited block -
@@ -47268,8 +46574,8 @@ msgstr ""
msgid ""
"By default, any branch can be used as the source for a 'git p4 submit' "
"operation. This configuration variable, if set, permits only the named "
-"branches to be used as submit sources. Branch names must be the short names "
-"(no \"refs/heads/\"), and should be separated by commas (\",\"), with no "
+"branches to be used as submit sources. Branch names must be the short names"
+" (no \"refs/heads/\"), and should be separated by commas (\",\"), with no "
"spaces."
msgstr ""
@@ -47334,8 +46640,8 @@ msgstr "git-config(1)"
#. type: Plain text
#: en/git-p4.txt:640
msgid ""
-"Specify submit behavior when a conflict with p4 is found, as per --"
-"conflict. The default behavior is 'ask'."
+"Specify submit behavior when a conflict with p4 is found, as per --conflict."
+" The default behavior is 'ask'."
msgstr ""
#. type: Title -
@@ -47352,8 +46658,8 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:646
msgid ""
-"Cloning or syncing does not require a p4 client; file contents are collected "
-"using 'p4 print'."
+"Cloning or syncing does not require a p4 client; file contents are collected"
+" using 'p4 print'."
msgstr ""
#. type: Plain text
@@ -47374,10 +46680,9 @@ msgstr ""
#. type: Title =
#: en/git-pack-objects.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-fsck-objects(1)"
+#, no-wrap
msgid "git-pack-objects(1)"
-msgstr "git-fsck-objects(1)"
+msgstr "git-pack-objects(1)"
#. type: Plain text
#: en/git-pack-objects.txt:7
@@ -47422,9 +46727,9 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:39
msgid ""
-"A pack index file (.idx) is generated for fast, random access to the objects "
-"in the pack. Placing both the index file (.idx) and the packed archive (."
-"pack) in the pack/ subdirectory of $GIT_OBJECT_DIRECTORY (or any of the "
+"A pack index file (.idx) is generated for fast, random access to the objects"
+" in the pack. Placing both the index file (.idx) and the packed archive "
+"(.pack) in the pack/ subdirectory of $GIT_OBJECT_DIRECTORY (or any of the "
"directories on $GIT_ALTERNATE_OBJECT_DIRECTORIES) enables Git to read from "
"the pack archive."
msgstr ""
@@ -47449,8 +46754,8 @@ msgstr ""
msgid ""
"Write into a pair of files (.pack and .idx), using <base-name> to determine "
"the name of the created file. When this option is used, the two files are "
-"written in <base-name>-<SHA-1>.{pack,idx} files. <SHA-1> is a hash based on "
-"the pack content and is written to the standard output of the command."
+"written in <base-name>-<SHA-1>.{pack,idx} files. <SHA-1> is a hash based on"
+" the pack content and is written to the standard output of the command."
msgstr ""
#. type: Plain text
@@ -47462,27 +46767,25 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:61
-#, fuzzy, no-wrap
-#| msgid "--refresh"
+#, no-wrap
msgid "--revs"
-msgstr "--refresh"
+msgstr "--revs"
#. type: Plain text
#: en/git-pack-objects.txt:69
msgid ""
"Read the revision arguments from the standard input, instead of individual "
-"object names. The revision arguments are processed the same way as 'git rev-"
-"list' with the `--objects` flag uses its `commit` arguments to build the "
-"list of objects it outputs. The objects on the resulting list are packed. "
-"Besides revisions, `--not` or `--shallow <SHA-1>` lines are also accepted."
+"object names. The revision arguments are processed the same way as 'git "
+"rev-list' with the `--objects` flag uses its `commit` arguments to build the"
+" list of objects it outputs. The objects on the resulting list are packed."
+" Besides revisions, `--not` or `--shallow <SHA-1>` lines are also accepted."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:70 en/rev-list-options.txt:693
-#, fuzzy, no-wrap
-#| msgid "add untracked"
+#, no-wrap
msgid "--unpacked"
-msgstr "add untracked"
+msgstr "--unpacked"
#. type: Plain text
#: en/git-pack-objects.txt:74
@@ -47503,8 +46806,8 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:85
msgid ""
-"Include unasked-for annotated tags if the object they reference was included "
-"in the resulting packfile. This can be useful to send new tags to native "
+"Include unasked-for annotated tags if the object they reference was included"
+" in the resulting packfile. This can be useful to send new tags to native "
"Git clients."
msgstr ""
@@ -47519,11 +46822,11 @@ msgstr ""
msgid ""
"These two options affect how the objects contained in the pack are stored "
"using delta compression. The objects are first internally sorted by type, "
-"size and optionally names and compared against the other objects within --"
-"window to see if using delta compression saves space. --depth limits the "
+"size and optionally names and compared against the other objects within "
+"--window to see if using delta compression saves space. --depth limits the "
"maximum delta depth; making it too deep affects the performance on the "
-"unpacker side, because delta data needs to be applied that many times to get "
-"to the necessary object. The default value for --window is 10 and --depth "
+"unpacker side, because delta data needs to be applied that many times to get"
+" to the necessary object. The default value for --window is 10 and --depth "
"is 50."
msgstr ""
@@ -47540,8 +46843,8 @@ msgid ""
"size will dynamically scale down so as to not take up more than '<n>' bytes "
"in memory. This is useful in repositories with a mix of large and small "
"objects to not run out of memory with a large window, but still be able to "
-"take advantage of the large window for the smaller objects. The size can be "
-"suffixed with \"k\", \"m\", or \"g\". `--window-memory=0` makes memory "
+"take advantage of the large window for the smaller objects. The size can be"
+" suffixed with \"k\", \"m\", or \"g\". `--window-memory=0` makes memory "
"usage unlimited. The default is taken from the `pack.windowMemory` "
"configuration variable."
msgstr ""
@@ -47560,7 +46863,7 @@ msgstr ""
#: en/git-pack-objects.txt:118
#, no-wrap
msgid "--honor-pack-keep"
-msgstr ""
+msgstr "--honor-pack-keep"
#. type: Plain text
#: en/git-pack-objects.txt:122
@@ -47585,10 +46888,9 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:132
-#, fuzzy, no-wrap
-#| msgid "--allow-empty"
+#, no-wrap
msgid "--non-empty"
-msgstr "--allow-empty"
+msgstr "--non-empty"
#. type: Plain text
#: en/git-pack-objects.txt:135
@@ -47599,15 +46901,15 @@ msgstr ""
#: en/git-pack-objects.txt:142
#, no-wrap
msgid "--all-progress"
-msgstr ""
+msgstr "--all-progress"
#. type: Plain text
#: en/git-pack-objects.txt:152
msgid ""
"When --stdout is specified then progress report is displayed during the "
"object count and compression phases but inhibited during the write-out "
-"phase. The reason is that in some cases the output stream is directly linked "
-"to another command which may wish to display progress status of its own as "
+"phase. The reason is that in some cases the output stream is directly linked"
+" to another command which may wish to display progress status of its own as "
"it processes incoming pack data. This flag is like --progress except that "
"it forces progress report for the write-out phase as well even if --stdout "
"is used."
@@ -47617,28 +46919,28 @@ msgstr ""
#: en/git-pack-objects.txt:153
#, no-wrap
msgid "--all-progress-implied"
-msgstr ""
+msgstr "--all-progress-implied"
#. type: Plain text
#: en/git-pack-objects.txt:157
msgid ""
-"This is used to imply --all-progress whenever progress display is "
-"activated. Unlike --all-progress this flag doesn't actually force any "
-"progress display by itself."
+"This is used to imply --all-progress whenever progress display is activated."
+" Unlike --all-progress this flag doesn't actually force any progress "
+"display by itself."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:161
msgid ""
-"This flag makes the command not to report its progress on the standard error "
-"stream."
+"This flag makes the command not to report its progress on the standard error"
+" stream."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:162
#, no-wrap
msgid "--no-reuse-delta"
-msgstr ""
+msgstr "--no-reuse-delta"
#. type: Plain text
#: en/git-pack-objects.txt:168
@@ -47653,7 +46955,7 @@ msgstr ""
#: en/git-pack-objects.txt:169
#, no-wrap
msgid "--no-reuse-object"
-msgstr ""
+msgstr "--no-reuse-object"
#. type: Plain text
#: en/git-pack-objects.txt:175
@@ -47673,18 +46975,18 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:183
msgid ""
-"Specifies compression level for newly-compressed data in the generated "
-"pack. If not specified, pack compression level is determined first by pack."
-"compression, then by core.compression, and defaults to -1, the zlib default, "
-"if neither is set. Add --no-reuse-object if you want to force a uniform "
-"compression level on all data no matter the source."
+"Specifies compression level for newly-compressed data in the generated pack."
+" If not specified, pack compression level is determined first by "
+"pack.compression, then by core.compression, and defaults to -1, the zlib "
+"default, if neither is set. Add --no-reuse-object if you want to force a "
+"uniform compression level on all data no matter the source."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:188
msgid ""
-"Create a \"thin\" pack by omitting the common objects between a sender and a "
-"receiver in order to reduce network transfer. This option only makes sense "
+"Create a \"thin\" pack by omitting the common objects between a sender and a"
+" receiver in order to reduce network transfer. This option only makes sense "
"in conjunction with --stdout."
msgstr ""
@@ -47699,34 +47001,34 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:194
-#, fuzzy, no-wrap
-#| msgid "--follow"
+#, no-wrap
msgid "--shallow"
-msgstr "--follow"
+msgstr "--shallow"
#. type: Plain text
#: en/git-pack-objects.txt:198
msgid ""
-"Optimize a pack that will be provided to a client with a shallow "
-"repository. This option, combined with --thin, can result in a smaller pack "
-"at the cost of speed."
+"Optimize a pack that will be provided to a client with a shallow repository."
+" This option, combined with --thin, can result in a smaller pack at the "
+"cost of speed."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:199
#, no-wrap
msgid "--delta-base-offset"
-msgstr ""
+msgstr "--delta-base-offset"
#. type: Plain text
#: en/git-pack-objects.txt:209
msgid ""
"A packed archive can express the base object of a delta as either a 20-byte "
-"object name or as an offset in the stream, but ancient versions of Git don't "
-"understand the latter. By default, 'git pack-objects' only uses the former "
-"format for better compatibility. This option allows the command to use the "
-"latter format for compactness. Depending on the average delta chain length, "
-"this option typically shrinks the resulting packfile by 3-5 per-cent."
+"object name or as an offset in the stream, but ancient versions of Git don't"
+" understand the latter. By default, 'git pack-objects' only uses the former"
+" format for better compatibility. This option allows the command to use the"
+" latter format for compactness. Depending on the average delta chain "
+"length, this option typically shrinks the resulting packfile by 3-5 per-"
+"cent."
msgstr ""
#. type: Plain text
@@ -47754,7 +47056,7 @@ msgstr ""
#: en/git-pack-objects.txt:230
#, no-wrap
msgid "--keep-true-parents"
-msgstr ""
+msgstr "--keep-true-parents"
#. type: Plain text
#: en/git-pack-objects.txt:233
@@ -47762,21 +47064,20 @@ msgid ""
"With this option, parents that are hidden by grafts are packed nevertheless."
msgstr ""
-#
#. type: Plain text
#: en/git-pack-objects.txt:239
#, fuzzy
-#| msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
+#| msgid ""
+#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid ""
"linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-pack-redundant.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-pack-redundant(1)"
-msgstr "git-add(1)"
+msgstr "git-pack-redundant(1)"
#. type: Plain text
#: en/git-pack-redundant.txt:7
@@ -47786,7 +47087,9 @@ msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:13
#, no-wrap
-msgid "'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename ... >\n"
+msgid ""
+"'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename "
+"... >\n"
msgstr ""
#. type: Plain text
@@ -47809,8 +47112,8 @@ msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:27
msgid ""
-"git fsck --full --unreachable | cut -d ' ' -f3 | \\ git pack-redundant --all "
-"| xargs rm"
+"git fsck --full --unreachable | cut -d ' ' -f3 | \\ git pack-redundant --all"
+" | xargs rm"
msgstr ""
#. type: Plain text
@@ -47822,7 +47125,7 @@ msgstr ""
#: en/git-pack-redundant.txt:35
#, no-wrap
msgid "--alt-odb"
-msgstr ""
+msgstr "--alt-odb"
#. type: Plain text
#: en/git-pack-redundant.txt:38
@@ -47836,21 +47139,21 @@ msgstr ""
msgid "Outputs some statistics to stderr. Has a small performance penalty."
msgstr ""
-#
#. type: Plain text
#: en/git-pack-redundant.txt:47
#, fuzzy
-#| msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
+#| msgid ""
+#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid ""
-"linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
+"linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-"
+"packed[1]"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-pack-refs.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-fsck-objects(1)"
+#, no-wrap
msgid "git-pack-refs(1)"
-msgstr "git-fsck-objects(1)"
+msgstr "git-pack-refs(1)"
#. type: Plain text
#: en/git-pack-refs.txt:7
@@ -47866,8 +47169,8 @@ msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:24
msgid ""
-"Traditionally, tips of branches and tags (collectively known as 'refs') were "
-"stored one file per ref in a (sub)directory under `$GIT_DIR/refs` "
+"Traditionally, tips of branches and tags (collectively known as 'refs') were"
+" stored one file per ref in a (sub)directory under `$GIT_DIR/refs` "
"directory. While many branch tips tend to be updated often, most tags and "
"some branch tips are never updated. When a repository has hundreds or "
"thousands of tags, this one-file-per-ref format both wastes storage and "
@@ -47877,25 +47180,25 @@ msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:31
msgid ""
-"This command is used to solve the storage and performance problem by storing "
-"the refs in a single file, `$GIT_DIR/packed-refs`. When a ref is missing "
-"from the traditional `$GIT_DIR/refs` directory hierarchy, it is looked up in "
-"this file and used if found."
+"This command is used to solve the storage and performance problem by storing"
+" the refs in a single file, `$GIT_DIR/packed-refs`. When a ref is missing "
+"from the traditional `$GIT_DIR/refs` directory hierarchy, it is looked up in"
+" this file and used if found."
msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:34
msgid ""
-"Subsequent updates to branches always create new files under `$GIT_DIR/refs` "
-"directory hierarchy."
+"Subsequent updates to branches always create new files under `$GIT_DIR/refs`"
+" directory hierarchy."
msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:43
msgid ""
"A recommended practice to deal with a repository with too many refs is to "
-"pack its refs with `--all` once, and occasionally run `git pack-refs`. Tags "
-"are by definition stationary and are not expected to change. Branch heads "
+"pack its refs with `--all` once, and occasionally run `git pack-refs`. Tags"
+" are by definition stationary and are not expected to change. Branch heads "
"will be packed with the initial `pack-refs --all`, but only the currently "
"active branch heads will become unpacked, and the next `pack-refs` (without "
"`--all`) will leave them unpacked."
@@ -47914,8 +47217,8 @@ msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:61
msgid ""
-"The command usually removes loose refs under `$GIT_DIR/refs` hierarchy after "
-"packing them. This option tells it not to."
+"The command usually removes loose refs under `$GIT_DIR/refs` hierarchy after"
+" packing them. This option tells it not to."
msgstr ""
#. type: Plain text
@@ -47926,13 +47229,11 @@ msgid ""
"means \"branch <branch> exists\"."
msgstr ""
-#
#. type: Title =
#: en/git-parse-remote.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-remote(1)"
+#, no-wrap
msgid "git-parse-remote(1)"
-msgstr "git-remote(1)"
+msgstr "git-parse-remote(1)"
#. type: Plain text
#: en/git-parse-remote.txt:7
@@ -47950,17 +47251,16 @@ msgstr ""
#. type: Plain text
#: en/git-parse-remote.txt:20
msgid ""
-"This script is included in various scripts to supply routines to parse files "
-"under $GIT_DIR/remotes/ and $GIT_DIR/branches/ and configuration variables "
+"This script is included in various scripts to supply routines to parse files"
+" under $GIT_DIR/remotes/ and $GIT_DIR/branches/ and configuration variables "
"that are related to fetching, pulling and pushing."
msgstr ""
#. type: Title =
#: en/git-patch-id.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-patch-id(1)"
-msgstr "git-add(1)"
+msgstr "git-patch-id(1)"
#. type: Plain text
#: en/git-patch-id.txt:7
@@ -48007,7 +47307,7 @@ msgstr ""
#: en/git-patch-id.txt:33
#, no-wrap
msgid "--stable"
-msgstr ""
+msgstr "--stable"
#. type: Plain text
#: en/git-patch-id.txt:35
@@ -48020,15 +47320,15 @@ msgid ""
"Reordering file diffs that make up a patch does not affect the ID. In "
"particular, two patches produced by comparing the same two trees with two "
"different settings for \"-O<orderfile>\" result in the same patch ID "
-"signature, thereby allowing the computed result to be used as a key to index "
-"some meta-information about the change between the two trees;"
+"signature, thereby allowing the computed result to be used as a key to index"
+" some meta-information about the change between the two trees;"
msgstr ""
#. type: Plain text
#: en/git-patch-id.txt:47
msgid ""
-"Result is different from the value produced by git 1.9 and older or produced "
-"when an \"unstable\" hash (see --unstable below) is configured - even when "
+"Result is different from the value produced by git 1.9 and older or produced"
+" when an \"unstable\" hash (see --unstable below) is configured - even when "
"used on a diff output taken without any use of \"-O<orderfile>\", thereby "
"making existing databases storing such \"unstable\" or historical patch-ids "
"unusable."
@@ -48042,10 +47342,9 @@ msgstr ""
#. type: Labeled list
#: en/git-patch-id.txt:50
-#, fuzzy, no-wrap
-#| msgid "--unset-all"
+#, no-wrap
msgid "--unstable"
-msgstr "--unset-all"
+msgstr "--unstable"
#. type: Plain text
#: en/git-patch-id.txt:56
@@ -48069,10 +47368,9 @@ msgstr ""
#. type: Title =
#: en/git-prune-packed.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-branch(1)"
+#, no-wrap
msgid "git-prune-packed(1)"
-msgstr "git-branch(1)"
+msgstr "git-prune-packed(1)"
#. type: Plain text
#: en/git-prune-packed.txt:7
@@ -48089,7 +47387,8 @@ msgstr ""
#: en/git-prune-packed.txt:19
msgid ""
"This program searches the `$GIT_OBJECT_DIRECTORY` for all objects that "
-"currently exist in a pack file as well as the independent object directories."
+"currently exist in a pack file as well as the independent object "
+"directories."
msgstr ""
#. type: Plain text
@@ -48111,13 +47410,12 @@ msgid ""
"storage, etc."
msgstr ""
-#
#. type: Plain text
#: en/git-prune-packed.txt:35
#, fuzzy
#| msgid ""
-#| "Don't actually remove any file(s). Instead, just show if they exist in "
-#| "the index and would otherwise be removed by the command."
+#| "Don't actually remove any file(s). Instead, just show if they exist in the "
+#| "index and would otherwise be removed by the command."
msgid ""
"Don't actually remove any objects, only show those that would have been "
"removed."
@@ -48130,22 +47428,20 @@ msgstr ""
msgid "Squelch the progress indicator."
msgstr ""
-#
#. type: Plain text
#: en/git-prune-packed.txt:44
#, fuzzy
-#| msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
+#| msgid ""
+#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-prune.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-rm(1)"
+#, no-wrap
msgid "git-prune(1)"
-msgstr "git-rm(1)"
+msgstr "git-prune(1)"
-#
#. type: Plain text
#: en/git-prune.txt:7
#, fuzzy
@@ -48170,9 +47466,9 @@ msgstr ""
#: en/git-prune.txt:29
msgid ""
"This runs 'git fsck --unreachable' using all the refs available in `refs/`, "
-"optionally with additional set of objects specified on the command line, and "
-"prunes all unpacked objects unreachable from any of these head objects from "
-"the object database. In addition, it prunes the unpacked objects that are "
+"optionally with additional set of objects specified on the command line, and"
+" prunes all unpacked objects unreachable from any of these head objects from"
+" the object database. In addition, it prunes the unpacked objects that are "
"also found in packs by running 'git prune-packed'. It also removes entries "
"from .git/shallow that are not reachable by any ref."
msgstr ""
@@ -48250,25 +47546,25 @@ msgid ""
"fsck''s --unreachable option."
msgstr ""
-#
#. type: Plain text
#: en/git-prune.txt:83
#, fuzzy
-#| msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
+#| msgid ""
+#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid "linkgit:git-fsck[1], linkgit:git-gc[1], linkgit:git-reflog[1]"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-pull.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-log(1)"
+#, no-wrap
msgid "git-pull(1)"
-msgstr "git-log(1)"
+msgstr "git-pull(1)"
#. type: Plain text
#: en/git-pull.txt:7
msgid ""
-"git-pull - Fetch from and integrate with another repository or a local branch"
+"git-pull - Fetch from and integrate with another repository or a local "
+"branch"
msgstr ""
#. type: Plain text
@@ -48297,11 +47593,12 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:33
msgid ""
-"<repository> should be the name of a remote repository as passed to linkgit:"
-"git-fetch[1]. <refspec> can name an arbitrary remote ref (for example, the "
-"name of a tag) or even a collection of refs with corresponding remote-"
-"tracking branches (e.g., refs/heads/{asterisk}:refs/remotes/origin/"
-"{asterisk}), but usually it is the name of a branch in the remote repository."
+"<repository> should be the name of a remote repository as passed to "
+"linkgit:git-fetch[1]. <refspec> can name an arbitrary remote ref (for "
+"example, the name of a tag) or even a collection of refs with corresponding "
+"remote-tracking branches (e.g., "
+"refs/heads/{asterisk}:refs/remotes/origin/{asterisk}), but usually it is the"
+" name of a branch in the remote repository."
msgstr ""
#. type: Plain text
@@ -48327,10 +47624,10 @@ msgstr ""
#: en/git-pull.txt:54
msgid ""
"Then \"`git pull`\" will fetch and replay the changes from the remote "
-"`master` branch since it diverged from the local `master` (i.e., `E`) until "
-"its current commit (`C`) on top of `master` and record the result in a new "
-"commit along with the names of the two parent commits and a log message from "
-"the user describing the changes."
+"`master` branch since it diverged from the local `master` (i.e., `E`) until"
+" its current commit (`C`) on top of `master` and record the result in a new "
+"commit along with the names of the two parent commits and a log message from"
+" the user describing the changes."
msgstr ""
#. type: delimited block -
@@ -48352,10 +47649,10 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:68
msgid ""
-"In Git 1.7.0 or later, to cancel a conflicting merge, use `git reset --"
-"merge`. *Warning*: In older versions of Git, running 'git pull' with "
-"uncommitted changes is discouraged: while possible, it leaves you in a state "
-"that may be hard to back out of in the case of a conflict."
+"In Git 1.7.0 or later, to cancel a conflicting merge, use `git reset "
+"--merge`. *Warning*: In older versions of Git, running 'git pull' with "
+"uncommitted changes is discouraged: while possible, it leaves you in a state"
+" that may be hard to back out of in the case of a conflict."
msgstr ""
#. type: Plain text
@@ -48412,8 +47709,8 @@ msgstr ""
#: en/git-pull.txt:110
msgid ""
"When true, rebase the current branch on top of the upstream branch after "
-"fetching. If there is a remote-tracking branch corresponding to the upstream "
-"branch and the upstream branch was rebased since last fetched, the rebase "
+"fetching. If there is a remote-tracking branch corresponding to the upstream"
+" branch and the upstream branch was rebased since last fetched, the rebase "
"uses that information to avoid rebasing non-local changes."
msgstr ""
@@ -48452,10 +47749,9 @@ msgstr ""
#. type: Labeled list
#: en/git-pull.txt:128 en/git-svn.txt:245
-#, fuzzy, no-wrap
-#| msgid "--no-track"
+#, no-wrap
msgid "--no-rebase"
-msgstr "--no-track"
+msgstr "--no-rebase"
#. type: Plain text
#: en/git-pull.txt:130
@@ -48466,13 +47762,13 @@ msgstr ""
#: en/git-pull.txt:131 en/git-rebase.txt:442
#, no-wrap
msgid "--autostash"
-msgstr ""
+msgstr "--autostash"
#. type: Labeled list
#: en/git-pull.txt:132 en/git-rebase.txt:443
#, no-wrap
msgid "--no-autostash"
-msgstr ""
+msgstr "--no-autostash"
#. type: Plain text
#: en/git-pull.txt:137
@@ -48514,20 +47810,20 @@ msgstr ""
msgid ""
"In order to determine what URL to use to fetch from, the value of the "
"configuration `remote.<origin>.url` is consulted and if there is not any "
-"such variable, the value on `URL: ` line in `$GIT_DIR/remotes/<origin>` file "
-"is used."
+"such variable, the value on `URL: ` line in `$GIT_DIR/remotes/<origin>` file"
+" is used."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:173
msgid ""
-"In order to determine what remote branches to fetch (and optionally store in "
-"the remote-tracking branches) when the command is run without any refspec "
-"parameters on the command line, values of the configuration variable `remote."
-"<origin>.fetch` are consulted, and if there aren't any, `$GIT_DIR/remotes/"
-"<origin>` file is consulted and its `Pull: ` lines are used. In addition to "
-"the refspec formats described in the OPTIONS section, you can have a "
-"globbing refspec that looks like this:"
+"In order to determine what remote branches to fetch (and optionally store in"
+" the remote-tracking branches) when the command is run without any refspec "
+"parameters on the command line, values of the configuration variable "
+"`remote.<origin>.fetch` are consulted, and if there aren't any, "
+"`$GIT_DIR/remotes/<origin>` file is consulted and its `Pull: ` lines are "
+"used. In addition to the refspec formats described in the OPTIONS section, "
+"you can have a globbing refspec that looks like this:"
msgstr ""
#. type: delimited block -
@@ -48540,9 +47836,10 @@ msgstr ""
#: en/git-pull.txt:183
msgid ""
"A globbing refspec must have a non-empty RHS (i.e. must store what were "
-"fetched in remote-tracking branches), and its LHS and RHS must end with `/"
-"*`. The above specifies that all remote branches are tracked using remote-"
-"tracking branches in `refs/remotes/origin/` hierarchy under the same name."
+"fetched in remote-tracking branches), and its LHS and RHS must end with "
+"`/*`. The above specifies that all remote branches are tracked using "
+"remote-tracking branches in `refs/remotes/origin/` hierarchy under the same "
+"name."
msgstr ""
#. type: Plain text
@@ -48587,8 +47884,8 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:211
msgid ""
-"Update the remote-tracking branches for the repository you cloned from, then "
-"merge one of them into your current branch:"
+"Update the remote-tracking branches for the repository you cloned from, then"
+" merge one of them into your current branch:"
msgstr ""
#. type: delimited block -
@@ -48640,20 +47937,19 @@ msgid ""
"start over, you can recover with 'git reset'."
msgstr ""
-#
#. type: Plain text
#: en/git-pull.txt:254
#, fuzzy
-#| msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
+#| msgid ""
+#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid "linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-push.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-mv(1)"
+#, no-wrap
msgid "git-push(1)"
-msgstr "git-mv(1)"
+msgstr "git-push(1)"
#. type: Plain text
#: en/git-push.txt:7
@@ -48690,8 +47986,8 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:33
msgid ""
-"When the command line does not specify where to push with the `<repository>` "
-"argument, `branch.*.remote` configuration for the current branch is "
+"When the command line does not specify where to push with the `<repository>`"
+" argument, `branch.*.remote` configuration for the current branch is "
"consulted to determine where to push. If the configuration is missing, it "
"defaults to 'origin'."
msgstr ""
@@ -48745,14 +48041,15 @@ msgstr ""
msgid ""
"Specify what destination ref to update with what source object. The format "
"of a <refspec> parameter is an optional plus `+`, followed by the source "
-"object <src>, followed by a colon `:`, followed by the destination ref <dst>."
+"object <src>, followed by a colon `:`, followed by the destination ref "
+"<dst>."
msgstr ""
#. type: Plain text
#: en/git-push.txt:65
msgid ""
-"The <src> is often the name of the branch you would want to push, but it can "
-"be any arbitrary \"SHA-1 expression\", such as `master~4` or `HEAD` (see "
+"The <src> is often the name of the branch you would want to push, but it can"
+" be any arbitrary \"SHA-1 expression\", such as `master~4` or `HEAD` (see "
"linkgit:gitrevisions[7])."
msgstr ""
@@ -48776,8 +48073,8 @@ msgid ""
"remote side. By default this is only allowed if <dst> is not a tag "
"(annotated or lightweight), and then only if it can fast-forward <dst>. By "
"having the optional leading `+`, you can tell Git to update the <dst> ref "
-"even if it is not allowed by default (e.g., it is not a fast-forward.) This "
-"does *not* attempt to merge <src> into <dst>. See EXAMPLES below for "
+"even if it is not allowed by default (e.g., it is not a fast-forward.) This"
+" does *not* attempt to merge <src> into <dst>. See EXAMPLES below for "
"details."
msgstr ""
@@ -48796,17 +48093,17 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:93
msgid ""
-"The special refspec `:` (or `+:` to allow non-fast-forward updates) directs "
-"Git to push \"matching\" branches: for every branch that exists on the local "
-"side, the remote side is updated if a branch of the same name already exists "
-"on the remote side."
+"The special refspec `:` (or `+:` to allow non-fast-forward updates) directs"
+" Git to push \"matching\" branches: for every branch that exists on the "
+"local side, the remote side is updated if a branch of the same name already "
+"exists on the remote side."
msgstr ""
#. type: Plain text
#: en/git-push.txt:97
msgid ""
-"Push all branches (i.e. refs under `refs/heads/`); cannot be used with other "
-"<refspec>."
+"Push all branches (i.e. refs under `refs/heads/`); cannot be used with other"
+" <refspec>."
msgstr ""
#. type: Plain text
@@ -48814,8 +48111,8 @@ msgstr ""
msgid ""
"Remove remote branches that don't have a local counterpart. For example a "
"remote branch `tmp` will be removed if a local branch with the same name "
-"doesn't exist any more. This also respects refspecs, e.g. `git push --prune "
-"remote refs/heads/*:refs/tmp/*` would make sure that remote `refs/tmp/foo` "
+"doesn't exist any more. This also respects refspecs, e.g. `git push --prune"
+" remote refs/heads/*:refs/tmp/*` would make sure that remote `refs/tmp/foo` "
"will be removed if `refs/heads/foo` doesn't exist."
msgstr ""
@@ -48827,8 +48124,8 @@ msgid ""
"`refs/tags/`) be mirrored to the remote repository. Newly created local "
"refs will be pushed to the remote end, locally updated refs will be force "
"updated on the remote end, and deleted refs will be removed from the remote "
-"end. This is the default if the configuration option `remote.<remote>."
-"mirror` is set."
+"end. This is the default if the configuration option "
+"`remote.<remote>.mirror` is set."
msgstr ""
#. type: Plain text
@@ -48855,10 +48152,9 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:135
-#, fuzzy, no-wrap
-#| msgid "--follow"
+#, no-wrap
msgid "--follow-tags"
-msgstr "--follow"
+msgstr "--follow-tags"
#. type: Plain text
#: en/git-push.txt:142
@@ -48874,7 +48170,7 @@ msgstr ""
#: en/git-push.txt:143 en/git-send-pack.txt:73
#, no-wrap
msgid "--[no-]signed"
-msgstr ""
+msgstr "--[no-]signed"
#. type: Labeled list
#: en/git-push.txt:144 en/git-send-pack.txt:74
@@ -48888,8 +48184,8 @@ msgid ""
"GPG-sign the push request to update refs on the receiving side, to allow it "
"to be checked by the hooks and/or be logged. If `false` or `--no-signed`, "
"no signing will be attempted. If `true` or `--signed`, the push will fail "
-"if the server does not support signed pushes. If set to `if-asked`, sign if "
-"and only if the server supports signed pushes. The push will also fail if "
+"if the server does not support signed pushes. If set to `if-asked`, sign if"
+" and only if the server supports signed pushes. The push will also fail if "
"the actual call to `gpg --sign` fails. See linkgit:git-receive-pack[1] for "
"the details on the receiving end."
msgstr ""
@@ -48898,7 +48194,7 @@ msgstr ""
#: en/git-push.txt:154
#, no-wrap
msgid "--[no-]atomic"
-msgstr ""
+msgstr "--[no-]atomic"
#. type: Plain text
#: en/git-push.txt:158
@@ -48912,7 +48208,7 @@ msgstr ""
#: en/git-push.txt:160
#, no-wrap
msgid "--push-option"
-msgstr ""
+msgstr "--push-option"
#. type: Plain text
#: en/git-push.txt:164
@@ -48946,7 +48242,7 @@ msgstr ""
#: en/git-push.txt:172
#, no-wrap
msgid "--[no-]force-with-lease"
-msgstr ""
+msgstr "--[no-]force-with-lease"
#. type: Labeled list
#: en/git-push.txt:173
@@ -48963,8 +48259,8 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:177
msgid ""
-"Usually, \"git push\" refuses to update a remote ref that is not an ancestor "
-"of the local ref used to overwrite it."
+"Usually, \"git push\" refuses to update a remote ref that is not an ancestor"
+" of the local ref used to overwrite it."
msgstr ""
#. type: Plain text
@@ -48979,10 +48275,10 @@ msgstr ""
msgid ""
"Imagine that you have to rebase what you have already published. You will "
"have to bypass the \"must fast-forward\" rule in order to replace the "
-"history you originally published with the rebased history. If somebody else "
-"built on top of your original history while you are rebasing, the tip of the "
-"branch at the remote may advance with her commit, and blindly pushing with "
-"`--force` will lose her work."
+"history you originally published with the rebased history. If somebody else"
+" built on top of your original history while you are rebasing, the tip of "
+"the branch at the remote may advance with her commit, and blindly pushing "
+"with `--force` will lose her work."
msgstr ""
#. type: Plain text
@@ -48999,9 +48295,9 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:199
msgid ""
-"`--force-with-lease` alone, without specifying the details, will protect all "
-"remote refs that are going to be updated by requiring their current value to "
-"be the same as the remote-tracking branch we have for them."
+"`--force-with-lease` alone, without specifying the details, will protect all"
+" remote refs that are going to be updated by requiring their current value "
+"to be the same as the remote-tracking branch we have for them."
msgstr ""
#. type: Plain text
@@ -49018,8 +48314,8 @@ msgstr ""
msgid ""
"`--force-with-lease=<refname>:<expect>` will protect the named ref (alone), "
"if it is going to be updated, by requiring its current value to be the same "
-"as the specified value `<expect>` (which is allowed to be different from the "
-"remote-tracking branch we have for the refname, or we do not even have to "
+"as the specified value `<expect>` (which is allowed to be different from the"
+" remote-tracking branch we have for the refname, or we do not even have to "
"have such a remote-tracking branch when this form is used). If `<expect>` "
"is the empty string, then the named ref must not already exist."
msgstr ""
@@ -49036,8 +48332,8 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:220
msgid ""
-"\"--no-force-with-lease\" will cancel all the previous --force-with-lease on "
-"the command line."
+"\"--no-force-with-lease\" will cancel all the previous --force-with-lease on"
+" the command line."
msgstr ""
#. type: Plain text
@@ -49052,8 +48348,8 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:231
msgid ""
-"This flag disables these checks, and can cause the remote repository to lose "
-"commits; use it with care."
+"This flag disables these checks, and can cause the remote repository to lose"
+" commits; use it with care."
msgstr ""
#. type: Plain text
@@ -49063,8 +48359,8 @@ msgid ""
"with `push.default` set to `matching` or with multiple push destinations "
"configured with `remote.*.push` may overwrite refs other than the current "
"branch (including local refs that are strictly behind their remote "
-"counterpart). To force a push to only one branch, use a `+` in front of the "
-"refspec to push (e.g `git push origin +master` to force a push to the "
+"counterpart). To force a push to only one branch, use a `+` in front of the"
+" refspec to push (e.g `git push origin +master` to force a push to the "
"`master` branch). See the `<refspec>...` section above for details."
msgstr ""
@@ -49095,7 +48391,7 @@ msgstr ""
#: en/git-push.txt:252
#, no-wrap
msgid "--[no-]thin"
-msgstr ""
+msgstr "--[no-]thin"
#. type: Plain text
#: en/git-push.txt:257
@@ -49124,30 +48420,29 @@ msgid ""
"May be used to make sure all submodule commits used by the revisions to be "
"pushed are available on a remote-tracking branch. If 'check' is used Git "
"will verify that all submodule commits that changed in the revisions to be "
-"pushed are available on at least one remote of the submodule. If any commits "
-"are missing the push will be aborted and exit with non-zero status. If 'on-"
+"pushed are available on at least one remote of the submodule. If any commits"
+" are missing the push will be aborted and exit with non-zero status. If 'on-"
"demand' is used all submodules that changed in the revisions to be pushed "
-"will be pushed. If on-demand was not able to push all necessary revisions it "
-"will also be aborted and exit with non-zero status. If 'only' is used all "
+"will be pushed. If on-demand was not able to push all necessary revisions it"
+" will also be aborted and exit with non-zero status. If 'only' is used all "
"submodules will be recursively pushed while the superproject is left "
"unpushed. A value of 'no' or using `--no-recurse-submodules` can be used to "
-"override the push.recurseSubmodules configuration variable when no submodule "
-"recursion is required."
+"override the push.recurseSubmodules configuration variable when no submodule"
+" recursion is required."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:290
-#, fuzzy, no-wrap
-#| msgid "--no-verify"
+#, no-wrap
msgid "--[no-]verify"
-msgstr "--no-verify"
+msgstr "--[no-]verify"
#. type: Plain text
#: en/git-push.txt:294
msgid ""
-"Toggle the pre-push hook (see linkgit:githooks[5]). The default is --"
-"verify, giving the hook a chance to prevent the push. With --no-verify, the "
-"hook is bypassed completely."
+"Toggle the pre-push hook (see linkgit:githooks[5]). The default is "
+"--verify, giving the hook a chance to prevent the push. With --no-verify, "
+"the hook is bypassed completely."
msgstr ""
#. type: Plain text
@@ -49254,8 +48549,8 @@ msgid ""
"side, or because the remote repository has one of the following safety "
"options in effect: `receive.denyCurrentBranch` (for pushes to the checked "
"out branch), `receive.denyNonFastForwards` (for forced non-fast-forward "
-"updates), `receive.denyDeletes` or `receive.denyDeleteCurrent`. See linkgit:"
-"git-config[1]."
+"updates), `receive.denyDeletes` or `receive.denyDeleteCurrent`. See "
+"linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
@@ -49289,7 +48584,8 @@ msgstr ""
#: en/git-push.txt:378
msgid ""
"A human-readable explanation. In the case of successfully pushed refs, no "
-"explanation is needed. For a failed ref, the reason for failure is described."
+"explanation is needed. For a failed ref, the reason for failure is "
+"described."
msgstr ""
#. type: Title -
@@ -49424,15 +48720,15 @@ msgstr ""
#: en/git-push.txt:464
msgid ""
"There is another common situation where you may encounter non-fast-forward "
-"rejection when you try to push, and it is possible even when you are pushing "
-"into a repository nobody else pushes into. After you push commit A yourself "
-"(in the first picture in this section), replace it with \"git commit --amend"
-"\" to produce commit B, and you try to push it out, because forgot that you "
-"have pushed A out already. In such a case, and only if you are certain that "
-"nobody in the meantime fetched your earlier commit A (and started building "
-"on top of it), you can run \"git push --force\" to overwrite it. In other "
-"words, \"git push --force\" is a method reserved for a case where you do "
-"mean to lose history."
+"rejection when you try to push, and it is possible even when you are pushing"
+" into a repository nobody else pushes into. After you push commit A yourself"
+" (in the first picture in this section), replace it with \"git commit "
+"--amend\" to produce commit B, and you try to push it out, because forgot "
+"that you have pushed A out already. In such a case, and only if you are "
+"certain that nobody in the meantime fetched your earlier commit A (and "
+"started building on top of it), you can run \"git push --force\" to "
+"overwrite it. In other words, \"git push --force\" is a method reserved for "
+"a case where you do mean to lose history."
msgstr ""
#. type: Labeled list
@@ -49458,8 +48754,8 @@ msgstr ""
#: en/git-push.txt:479
msgid ""
"Without additional configuration, pushes the current branch to the "
-"configured upstream (`remote.origin.merge` configuration variable) if it has "
-"the same name as the current branch, and errors out without pushing "
+"configured upstream (`remote.origin.merge` configuration variable) if it has"
+" the same name as the current branch, and errors out without pushing "
"otherwise."
msgstr ""
@@ -49467,16 +48763,16 @@ msgstr ""
#: en/git-push.txt:483
msgid ""
"The default behavior of this command when no <refspec> is given can be "
-"configured by setting the `push` option of the remote, or the `push.default` "
-"configuration variable."
+"configured by setting the `push` option of the remote, or the `push.default`"
+" configuration variable."
msgstr ""
#. type: Plain text
#: en/git-push.txt:488
msgid ""
"For example, to default to pushing only the current branch to `origin` use "
-"`git config remote.origin.push HEAD`. Any valid <refspec> (like the ones in "
-"the examples below) can be configured as the default for `git push origin`."
+"`git config remote.origin.push HEAD`. Any valid <refspec> (like the ones in"
+" the examples below) can be configured as the default for `git push origin`."
msgstr ""
#. type: Labeled list
@@ -49488,8 +48784,9 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:493
msgid ""
-"Push \"matching\" branches to `origin`. See <refspec> in the <<OPTIONS,"
-"OPTIONS>> section above for a description of \"matching\" branches."
+"Push \"matching\" branches to `origin`. See <refspec> in the "
+"<<OPTIONS,OPTIONS>> section above for a description of \"matching\" "
+"branches."
msgstr ""
#. type: Labeled list
@@ -49507,9 +48804,9 @@ msgstr ""
#: en/git-push.txt:500
msgid ""
"Find a ref that matches `master` in the source repository (most likely, it "
-"would find `refs/heads/master`), and update the same ref (e.g. `refs/heads/"
-"master`) in `origin` repository with it. If `master` did not exist "
-"remotely, it would be created."
+"would find `refs/heads/master`), and update the same ref (e.g. "
+"`refs/heads/master`) in `origin` repository with it. If `master` did not "
+"exist remotely, it would be created."
msgstr ""
#. type: Labeled list
@@ -49533,18 +48830,18 @@ msgstr ""
#: en/git-push.txt:510
msgid ""
"Use the source ref that matches `master` (e.g. `refs/heads/master`) to "
-"update the ref that matches `satellite/master` (most probably `refs/remotes/"
-"satellite/master`) in the `mothership` repository; do the same for `dev` and "
-"`satellite/dev`."
+"update the ref that matches `satellite/master` (most probably "
+"`refs/remotes/satellite/master`) in the `mothership` repository; do the same"
+" for `dev` and `satellite/dev`."
msgstr ""
#. type: Plain text
#: en/git-push.txt:517
msgid ""
-"This is to emulate `git fetch` run on the `mothership` using `git push` that "
-"is run in the opposite direction in order to integrate the work done on "
-"`satellite`, and is often necessary when you can only make connection in one "
-"way (i.e. satellite can ssh into mothership but mothership cannot initiate "
+"This is to emulate `git fetch` run on the `mothership` using `git push` that"
+" is run in the opposite direction in order to integrate the work done on "
+"`satellite`, and is often necessary when you can only make connection in one"
+" way (i.e. satellite can ssh into mothership but mothership cannot initiate "
"connection to satellite because the latter is behind a firewall or does not "
"run sshd)."
msgstr ""
@@ -49552,9 +48849,10 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:522
msgid ""
-"After running this `git push` on the `satellite` machine, you would ssh into "
-"the `mothership` and run `git merge` there to complete the emulation of `git "
-"pull` that were run on `mothership` to pull changes made on `satellite`."
+"After running this `git push` on the `satellite` machine, you would ssh into"
+" the `mothership` and run `git merge` there to complete the emulation of "
+"`git pull` that were run on `mothership` to pull changes made on "
+"`satellite`."
msgstr ""
#. type: Labeled list
@@ -49581,8 +48879,8 @@ msgstr ""
#: en/git-push.txt:534
msgid ""
"Create the branch `experimental` in the `origin` repository by copying the "
-"current `master` branch. This form is only needed to create a new branch or "
-"tag in the remote repository when the local name and the remote name are "
+"current `master` branch. This form is only needed to create a new branch or"
+" tag in the remote repository when the local name and the remote name are "
"different; otherwise, the ref name on its own will work."
msgstr ""
@@ -49641,17 +48939,16 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:562
msgid ""
-"Commits A and B would no longer belong to a branch with a symbolic name, and "
-"so would be unreachable. As such, these commits would be removed by a `git "
-"gc` command on the origin repository."
+"Commits A and B would no longer belong to a branch with a symbolic name, and"
+" so would be unreachable. As such, these commits would be removed by a `git"
+" gc` command on the origin repository."
msgstr ""
#. type: Title =
#: en/git-quiltimport.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-citool(1)"
+#, no-wrap
msgid "git-quiltimport(1)"
-msgstr "git-citool(1)"
+msgstr "git-quiltimport(1)"
#. type: Plain text
#: en/git-quiltimport.txt:7
@@ -49678,8 +48975,8 @@ msgstr ""
#: en/git-quiltimport.txt:27
msgid ""
"For each patch the code attempts to extract the author from the patch "
-"description. If that fails it falls back to the author specified with --"
-"author. If the --author flag was not given the patch description is "
+"description. If that fails it falls back to the author specified with "
+"--author. If the --author flag was not given the patch description is "
"displayed and the user is asked to interactively enter the author of the "
"patch."
msgstr ""
@@ -49694,8 +48991,8 @@ msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:40
msgid ""
-"Walk through the patches in the series and warn if we cannot find all of the "
-"necessary information to commit a patch. At the time of this writing only "
+"Walk through the patches in the series and warn if we cannot find all of the"
+" necessary information to commit a patch. At the time of this writing only "
"missing author information is warned about."
msgstr ""
@@ -49727,8 +49024,8 @@ msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:51
msgid ""
-"The default for the patch directory is patches or the value of the `"
-"$QUILT_PATCHES` environment variable."
+"The default for the patch directory is patches or the value of the "
+"`$QUILT_PATCHES` environment variable."
msgstr ""
#. type: Labeled list
@@ -49746,18 +49043,16 @@ msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:58
msgid ""
-"The default for the series file is <patches>/series or the value of the `"
-"$QUILT_SERIES` environment variable."
+"The default for the series file is <patches>/series or the value of the "
+"`$QUILT_SERIES` environment variable."
msgstr ""
#. type: Title =
#: en/git-read-tree.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-write-tree(1)"
+#, no-wrap
msgid "git-read-tree(1)"
-msgstr "git-write-tree(1)"
+msgstr "git-read-tree(1)"
-#
#. type: Plain text
#: en/git-read-tree.txt:7
#, fuzzy
@@ -49779,15 +49074,15 @@ msgstr ""
#: en/git-read-tree.txt:23
msgid ""
"Reads the tree information given by <tree-ish> into the index, but does not "
-"actually *update* any of the files it \"caches\". (see: linkgit:git-checkout-"
-"index[1])"
+"actually *update* any of the files it \"caches\". (see: linkgit:git-"
+"checkout-index[1])"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:28
msgid ""
-"Optionally, it can merge a tree into the index, perform a fast-forward (i.e. "
-"2-way) merge, or a 3-way merge, with the `-m` flag. When used with `-m`, "
+"Optionally, it can merge a tree into the index, perform a fast-forward (i.e."
+" 2-way) merge, or a 3-way merge, with the `-m` flag. When used with `-m`, "
"the `-u` flag causes it to also update the files in the work tree with the "
"result of the merge."
msgstr ""
@@ -49809,10 +49104,9 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:40
-#, fuzzy, no-wrap
-#| msgid "--refresh"
+#, no-wrap
msgid "--reset"
-msgstr "--refresh"
+msgstr "--reset"
#. type: Plain text
#: en/git-read-tree.txt:43
@@ -49851,10 +49145,9 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:65
-#, fuzzy, no-wrap
-#| msgid "--track"
+#, no-wrap
msgid "--trivial"
-msgstr "--track"
+msgstr "--trivial"
#. type: Plain text
#: en/git-read-tree.txt:70
@@ -49876,8 +49169,8 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:80
msgid ""
-"when one side removes a path and the other side leaves the path unmodified. "
-"The resolution is to remove that path."
+"when one side removes a path and the other side leaves the path unmodified."
+" The resolution is to remove that path."
msgstr ""
#. type: Plain text
@@ -49894,8 +49187,8 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:90
msgid ""
-"Keep the current index contents, and read the contents of the named tree-ish "
-"under the directory at `<prefix>`. The command will refuse to overwrite "
+"Keep the current index contents, and read the contents of the named tree-ish"
+" under the directory at `<prefix>`. The command will refuse to overwrite "
"entries that already existed in the original index file. Note that the "
"`<prefix>/` value must end with a slash."
msgstr ""
@@ -49912,13 +49205,13 @@ msgid ""
"When running the command with `-u` and `-m` options, the merge result may "
"need to overwrite paths that are not tracked in the current branch. The "
"command usually refuses to proceed with the merge to avoid losing such a "
-"path. However this safety valve sometimes gets in the way. For example, it "
-"often happens that the other branch added a file that used to be a generated "
-"file in your branch, and the safety valve triggers when you try to switch to "
-"that branch after you ran `make` but before running `make clean` to remove "
-"the generated file. This option tells the command to read per-directory "
-"exclude file (usually '.gitignore') and allows such an untracked but "
-"explicitly ignored file to be overwritten."
+"path. However this safety valve sometimes gets in the way. For example, it"
+" often happens that the other branch added a file that used to be a "
+"generated file in your branch, and the safety valve triggers when you try to"
+" switch to that branch after you ran `make` but before running `make clean` "
+"to remove the generated file. This option tells the command to read per-"
+"directory exclude file (usually '.gitignore') and allows such an untracked "
+"but explicitly ignored file to be overwritten."
msgstr ""
#. type: Labeled list
@@ -49931,21 +49224,20 @@ msgstr "--file=<file>"
#. type: Plain text
#: en/git-read-tree.txt:117
msgid ""
-"Instead of writing the results out to `$GIT_INDEX_FILE`, write the resulting "
-"index in the named file. While the command is operating, the original index "
-"file is locked with the same mechanism as usual. The file must allow to be "
-"rename(2)ed into from a temporary file that is created next to the usual "
-"index file; typically this means it needs to be on the same filesystem as "
-"the index file itself, and you need write permission to the directories the "
-"index file and index output file are located in."
+"Instead of writing the results out to `$GIT_INDEX_FILE`, write the resulting"
+" index in the named file. While the command is operating, the original "
+"index file is locked with the same mechanism as usual. The file must allow "
+"to be rename(2)ed into from a temporary file that is created next to the "
+"usual index file; typically this means it needs to be on the same filesystem"
+" as the index file itself, and you need write permission to the directories "
+"the index file and index output file are located in."
msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:118
-#, fuzzy, no-wrap
-#| msgid "--no-checkout"
+#, no-wrap
msgid "--no-sparse-checkout"
-msgstr "--no-checkout"
+msgstr "--no-sparse-checkout"
#. type: Plain text
#: en/git-read-tree.txt:121
@@ -49954,10 +49246,9 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:122
-#, fuzzy, no-wrap
-#| msgid "--allow-empty"
+#, no-wrap
msgid "--empty"
-msgstr "--allow-empty"
+msgstr "--empty"
#. type: Plain text
#: en/git-read-tree.txt:125
@@ -49984,9 +49275,9 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:136
msgid ""
-"If `-m` is specified, 'git read-tree' can perform 3 kinds of merge, a single "
-"tree merge if only 1 tree is given, a fast-forward merge with 2 trees, or a "
-"3-way merge if 3 trees are provided."
+"If `-m` is specified, 'git read-tree' can perform 3 kinds of merge, a single"
+" tree merge if only 1 tree is given, a fast-forward merge with 2 trees, or a"
+" 3-way merge if 3 trees are provided."
msgstr ""
#. type: Title ~
@@ -49998,8 +49289,8 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:145
msgid ""
-"If only 1 tree is specified, 'git read-tree' operates as if the user did not "
-"specify `-m`, except that if the original index has an entry for a given "
+"If only 1 tree is specified, 'git read-tree' operates as if the user did not"
+" specify `-m`, except that if the original index has an entry for a given "
"pathname, and the contents of the path match with the tree being read, the "
"stat info from the index is used. (In other words, the index's stat()s take "
"precedence over the merged tree's)."
@@ -50009,8 +49300,8 @@ msgstr ""
#: en/git-read-tree.txt:149
msgid ""
"That means that if you do a `git read-tree -m <newtree>` followed by a `git "
-"checkout-index -f -u -a`, the 'git checkout-index' only checks out the stuff "
-"that really changed."
+"checkout-index -f -u -a`, the 'git checkout-index' only checks out the stuff"
+" that really changed."
msgstr ""
#. type: Plain text
@@ -50029,8 +49320,8 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:161
msgid ""
-"Typically, this is invoked as `git read-tree -m $H $M`, where $H is the head "
-"commit of the current repository, and $M is the head of a foreign tree, "
+"Typically, this is invoked as `git read-tree -m $H $M`, where $H is the head"
+" commit of the current repository, and $M is the head of a foreign tree, "
"which is simply ahead of $H (i.e. we are in a fast-forward situation)."
msgstr ""
@@ -50060,10 +49351,10 @@ msgstr ""
#: en/git-read-tree.txt:175
msgid ""
"In this case, the `git read-tree -m $H $M` command makes sure that no local "
-"change is lost as the result of this \"merge\". Here are the \"carry forward"
-"\" rules, where \"I\" denotes the index, \"clean\" means that index and work "
-"tree coincide, and \"exists\"/\"nothing\" refer to the presence of a path in "
-"the specified commit:"
+"change is lost as the result of this \"merge\". Here are the \"carry "
+"forward\" rules, where \"I\" denotes the index, \"clean\" means that index "
+"and work tree coincide, and \"exists\"/\"nothing\" refer to the presence of "
+"a path in the specified commit:"
msgstr ""
#. type: Plain text
@@ -50139,20 +49430,20 @@ msgstr ""
#: en/git-read-tree.txt:219
msgid ""
"In all \"keep index\" cases, the index entry stays as in the original index "
-"file. If the entry is not up to date, 'git read-tree' keeps the copy in the "
-"work tree intact when operating under the -u flag."
+"file. If the entry is not up to date, 'git read-tree' keeps the copy in the"
+" work tree intact when operating under the -u flag."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:230
msgid ""
-"When this form of 'git read-tree' returns successfully, you can see which of "
-"the \"local changes\" that you made were carried forward by running `git "
+"When this form of 'git read-tree' returns successfully, you can see which of"
+" the \"local changes\" that you made were carried forward by running `git "
"diff-index --cached $M`. Note that this does not necessarily match what "
"`git diff-index --cached $H` would have produced before such a two tree "
"merge. This is because of cases 18 and 19 --- if you already had the "
-"changes in $M (e.g. maybe you picked it up via e-mail in a patch form), `git "
-"diff-index --cached $H` would have told you about the change before this "
+"changes in $M (e.g. maybe you picked it up via e-mail in a patch form), `git"
+" diff-index --cached $H` would have told you about the change before this "
"merge, but it would not show in `git diff-index --cached $M` output after "
"the two-tree merge."
msgstr ""
@@ -50161,10 +49452,10 @@ msgstr ""
#: en/git-read-tree.txt:237
msgid ""
"Case 3 is slightly tricky and needs explanation. The result from this rule "
-"logically should be to remove the path if the user staged the removal of the "
-"path and then switching to a new branch. That however will prevent the "
-"initial checkout from happening, so the rule is modified to use M (new tree) "
-"only when the content of the index is empty. Otherwise the removal of the "
+"logically should be to remove the path if the user staged the removal of the"
+" path and then switching to a new branch. That however will prevent the "
+"initial checkout from happening, so the rule is modified to use M (new tree)"
+" only when the content of the index is empty. Otherwise the removal of the "
"path is kept as long as $H and $M are the same."
msgstr ""
@@ -50228,8 +49519,8 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:271
msgid ""
-"stage 1 and stage 2 are the same and stage 3 is different; take stage 3 (our "
-"branch in stage 2 did not do anything since the ancestor in stage 1 while "
+"stage 1 and stage 2 are the same and stage 3 is different; take stage 3 (our"
+" branch in stage 2 did not do anything since the ancestor in stage 1 while "
"their branch in stage 3 worked on it)"
msgstr ""
@@ -50251,10 +49542,10 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:284
msgid ""
-"OK, this all sounds like a collection of totally nonsensical rules, but it's "
-"actually exactly what you want in order to do a fast merge. The different "
-"stages represent the \"result tree\" (stage 0, aka \"merged\"), the original "
-"tree (stage 1, aka \"orig\"), and the two trees you are trying to merge "
+"OK, this all sounds like a collection of totally nonsensical rules, but it's"
+" actually exactly what you want in order to do a fast merge. The different "
+"stages represent the \"result tree\" (stage 0, aka \"merged\"), the original"
+" tree (stage 1, aka \"orig\"), and the two trees you are trying to merge "
"(stage 2 and 3 respectively)."
msgstr ""
@@ -50286,8 +49577,8 @@ msgstr ""
#: en/git-read-tree.txt:302
msgid ""
"the index file saves and restores with all this information, so you can "
-"merge things incrementally, but as long as it has entries in stages 1/2/3 (i."
-"e., \"unmerged entries\") you can't write the result. So now the merge "
+"merge things incrementally, but as long as it has entries in stages 1/2/3 "
+"(i.e., \"unmerged entries\") you can't write the result. So now the merge "
"algorithm ends up being really simple:"
msgstr ""
@@ -50301,8 +49592,8 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:309
msgid ""
-"if you find a \"stage1\", but no matching \"stage2\" or \"stage3\", you know "
-"it's been removed from both trees (it only existed in the original tree), "
+"if you find a \"stage1\", but no matching \"stage2\" or \"stage3\", you know"
+" it's been removed from both trees (it only existed in the original tree), "
"and you remove that entry."
msgstr ""
@@ -50369,8 +49660,8 @@ msgstr ""
#: en/git-read-tree.txt:351
msgid ""
"Your work tree is still based on your HEAD ($JC), but you have some edits "
-"since. Three-way merge makes sure that you have not added or modified index "
-"entries since $JC, and if you haven't, then does the right thing. So with "
+"since. Three-way merge makes sure that you have not added or modified index"
+" entries since $JC, and if you haven't, then does the right thing. So with "
"the following sequence:"
msgstr ""
@@ -50405,12 +49696,12 @@ msgstr ""
msgid ""
"In other words, there is no need to worry about what exists only in the "
"working tree. When you have local changes in a part of the project that is "
-"not involved in the merge, your changes do not interfere with the merge, and "
-"are kept intact. When they *do* interfere, the merge does not even start "
-"('git read-tree' complains loudly and fails without modifying anything). In "
-"such a case, you can simply continue doing what you were in the middle of "
-"doing, and when your working tree is ready (i.e. you have finished your work-"
-"in-progress), attempt the merge again."
+"not involved in the merge, your changes do not interfere with the merge, and"
+" are kept intact. When they *do* interfere, the merge does not even start "
+"('git read-tree' complains loudly and fails without modifying anything). In"
+" such a case, you can simply continue doing what you were in the middle of "
+"doing, and when your working tree is ready (i.e. you have finished your "
+"work-in-progress), attempt the merge again."
msgstr ""
#. type: Title -
@@ -50432,12 +49723,12 @@ msgstr ""
msgid ""
"'git read-tree' and other merge-based commands ('git merge', 'git "
"checkout'...) can help maintaining the skip-worktree bitmap and working "
-"directory update. `$GIT_DIR/info/sparse-checkout` is used to define the skip-"
-"worktree reference bitmap. When 'git read-tree' needs to update the working "
-"directory, it resets the skip-worktree bit in the index based on this file, "
-"which uses the same syntax as .gitignore files. If an entry matches a "
-"pattern in this file, skip-worktree will not be set on that entry. "
-"Otherwise, skip-worktree will be set."
+"directory update. `$GIT_DIR/info/sparse-checkout` is used to define the "
+"skip-worktree reference bitmap. When 'git read-tree' needs to update the "
+"working directory, it resets the skip-worktree bit in the index based on "
+"this file, which uses the same syntax as .gitignore files. If an entry "
+"matches a pattern in this file, skip-worktree will not be set on that entry."
+" Otherwise, skip-worktree will be set."
msgstr ""
#. type: Plain text
@@ -50452,8 +49743,8 @@ msgstr ""
#: en/git-read-tree.txt:401
msgid ""
"While `$GIT_DIR/info/sparse-checkout` is usually used to specify what files "
-"are in, you can also specify what files are _not_ in, using negate patterns. "
-"For example, to remove the file `unwanted`:"
+"are in, you can also specify what files are _not_ in, using negate patterns."
+" For example, to remove the file `unwanted`:"
msgstr ""
#. type: delimited block -
@@ -50467,10 +49758,10 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:413
msgid ""
-"Another tricky thing is fully repopulating the working directory when you no "
-"longer want sparse checkout. You cannot just disable \"sparse checkout\" "
-"because skip-worktree bits are still in the index and your working directory "
-"is still sparsely populated. You should re-populate the working directory "
+"Another tricky thing is fully repopulating the working directory when you no"
+" longer want sparse checkout. You cannot just disable \"sparse checkout\" "
+"because skip-worktree bits are still in the index and your working directory"
+" is still sparsely populated. You should re-populate the working directory "
"with the `$GIT_DIR/info/sparse-checkout` file content as follows:"
msgstr ""
@@ -50485,26 +49776,24 @@ msgstr "*\n"
#: en/git-read-tree.txt:422
msgid ""
"Then you can disable sparse checkout. Sparse checkout support in 'git read-"
-"tree' and similar commands is disabled by default. You need to turn `core."
-"sparseCheckout` on in order to have sparse checkout support."
+"tree' and similar commands is disabled by default. You need to turn "
+"`core.sparseCheckout` on in order to have sparse checkout support."
msgstr ""
-#
#. type: Plain text
#: en/git-read-tree.txt:428
#, fuzzy
-#| msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
+#| msgid ""
+#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid ""
"linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; linkgit:gitignore[5]"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
-#
#. type: Title =
#: en/git-rebase.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-remote(1)"
+#, no-wrap
msgid "git-rebase(1)"
-msgstr "git-remote(1)"
+msgstr "git-rebase(1)"
#. type: Plain text
#: en/git-rebase.txt:7
@@ -50533,11 +49822,11 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:28
msgid ""
-"If <upstream> is not specified, the upstream configured in branch.<name>."
-"remote and branch.<name>.merge options will be used (see linkgit:git-"
-"config[1] for details) and the `--fork-point` option is assumed. If you are "
-"currently not on any branch or if the current branch does not have a "
-"configured upstream, the rebase will abort."
+"If <upstream> is not specified, the upstream configured in "
+"branch.<name>.remote and branch.<name>.merge options will be used (see "
+"linkgit:git-config[1] for details) and the `--fork-point` option is assumed."
+" If you are currently not on any branch or if the current branch does not "
+"have a configured upstream, the rebase will abort."
msgstr ""
#. type: Plain text
@@ -50546,16 +49835,16 @@ msgid ""
"All changes made by commits in the current branch but that are not in "
"<upstream> are saved to a temporary area. This is the same set of commits "
"that would be shown by `git log <upstream>..HEAD`; or by `git log "
-"'fork_point'..HEAD`, if `--fork-point` is active (see the description on `--"
-"fork-point` below); or by `git log HEAD`, if the `--root` option is "
+"'fork_point'..HEAD`, if `--fork-point` is active (see the description on "
+"`--fork-point` below); or by `git log HEAD`, if the `--root` option is "
"specified."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:40
msgid ""
-"The current branch is reset to <upstream>, or <newbase> if the --onto option "
-"was supplied. This has the exact same effect as `git reset --hard "
+"The current branch is reset to <upstream>, or <newbase> if the --onto option"
+" was supplied. This has the exact same effect as `git reset --hard "
"<upstream>` (or <newbase>). ORIG_HEAD is set to point at the tip of the "
"branch before the reset."
msgstr ""
@@ -50564,10 +49853,10 @@ msgstr ""
#: en/git-rebase.txt:46
msgid ""
"The commits that were previously saved into the temporary area are then "
-"reapplied to the current branch, one by one, in order. Note that any commits "
-"in HEAD which introduce the same textual changes as a commit in HEAD.."
-"<upstream> are omitted (i.e., a patch already accepted upstream with a "
-"different commit message or timestamp will be skipped)."
+"reapplied to the current branch, one by one, in order. Note that any commits"
+" in HEAD which introduce the same textual changes as a commit in "
+"HEAD..<upstream> are omitted (i.e., a patch already accepted upstream with a"
+" different commit message or timestamp will be skipped)."
msgstr ""
#. type: Plain text
@@ -50583,8 +49872,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:55
-msgid ""
-"Assume the following history exists and the current branch is \"topic\":"
+msgid "Assume the following history exists and the current branch is \"topic\":"
msgstr ""
#. type: delimited block -
@@ -50669,16 +49957,16 @@ msgstr ""
#: en/git-rebase.txt:103
msgid ""
"Here is how you would transplant a topic branch based on one branch to "
-"another, to pretend that you forked the topic branch from the latter branch, "
-"using `rebase --onto`."
+"another, to pretend that you forked the topic branch from the latter branch,"
+" using `rebase --onto`."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:107
msgid ""
"First let's assume your 'topic' is based on branch 'next'. For example, a "
-"feature developed in 'topic' depends on some functionality which is found in "
-"'next'."
+"feature developed in 'topic' depends on some functionality which is found in"
+" 'next'."
msgstr ""
#. type: delimited block -
@@ -50859,8 +50147,8 @@ msgstr ""
#: en/git-rebase.txt:221
msgid ""
"If set to \"warn\", print warnings about removed commits in interactive "
-"mode. If set to \"error\", print the warnings and stop the rebase. If set to "
-"\"ignore\", no checking is done. \"ignore\" by default."
+"mode. If set to \"error\", print the warnings and stop the rebase. If set to"
+" \"ignore\", no checking is done. \"ignore\" by default."
msgstr ""
#. type: Plain text
@@ -50887,8 +50175,8 @@ msgstr ""
#: en/git-rebase.txt:236
msgid ""
"As a special case, you may use \"A\\...B\" as a shortcut for the merge base "
-"of A and B if there is exactly one merge base. You can leave out at most one "
-"of A and B, in which case it defaults to HEAD."
+"of A and B if there is exactly one merge base. You can leave out at most one"
+" of A and B, in which case it defaults to HEAD."
msgstr ""
#. type: Plain text
@@ -50915,10 +50203,9 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:255 en/sequencer.txt:6
-#, fuzzy, no-wrap
-#| msgid "--quiet"
+#, no-wrap
msgid "--quit"
-msgstr "--quiet"
+msgstr "--quit"
#. type: Plain text
#: en/git-rebase.txt:259
@@ -50929,10 +50216,9 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:260
-#, fuzzy, no-wrap
-#| msgid "--allow-empty"
+#, no-wrap
msgid "--keep-empty"
-msgstr "--allow-empty"
+msgstr "--keep-empty"
#. type: Plain text
#: en/git-rebase.txt:263
@@ -50947,10 +50233,9 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:267
-#, fuzzy, no-wrap
-#| msgid "--edit"
+#, no-wrap
msgid "--edit-todo"
-msgstr "--edit"
+msgstr "--edit-todo"
#. type: Plain text
#: en/git-rebase.txt:269
@@ -51005,8 +50290,8 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:299
msgid ""
-"Pass the <strategy-option> through to the merge strategy. This implies `--"
-"merge` and, if no strategy has been specified, `-s recursive`. Note the "
+"Pass the <strategy-option> through to the merge strategy. This implies "
+"`--merge` and, if no strategy has been specified, `-s recursive`. Note the "
"reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
@@ -51023,8 +50308,8 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:317
msgid ""
-"Show a diffstat of what changed upstream since the last rebase. The diffstat "
-"is also controlled by the configuration option rebase.stat."
+"Show a diffstat of what changed upstream since the last rebase. The diffstat"
+" is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
@@ -51032,7 +50317,6 @@ msgstr ""
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
-#
#. type: Plain text
#: en/git-rebase.txt:324
#, fuzzy
@@ -51042,30 +50326,28 @@ msgstr ""
msgid ""
"This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
-"Diese Option schaltet die pre-commit und commit-msg Einsprungspunkte (hooks) "
-"aus. Siehe auch linkgit:githooks[5]."
+"Diese Option schaltet die pre-commit und commit-msg Einsprungspunkte (hooks)"
+" aus. Siehe auch linkgit:githooks[5]."
#. type: Labeled list
#: en/git-rebase.txt:325 en/git-rev-parse.txt:98 en/git-show-ref.txt:59
#: en/git-tag.txt:80
-#, fuzzy, no-wrap
-#| msgid "--no-verify"
+#, no-wrap
msgid "--verify"
-msgstr "--no-verify"
+msgstr "--verify"
#. type: Plain text
#: en/git-rebase.txt:328
msgid ""
-"Allows the pre-rebase hook to run, which is the default. This option can be "
-"used to override --no-verify. See also linkgit:githooks[5]."
+"Allows the pre-rebase hook to run, which is the default. This option can be"
+" used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:336
-#, fuzzy, no-wrap
-#| msgid "--force"
+#, no-wrap
msgid "--force-rebase"
-msgstr "--force"
+msgstr "--force-rebase"
#. type: Plain text
#: en/git-rebase.txt:339
@@ -51080,15 +50362,15 @@ msgid ""
"You may find this (or --no-ff with an interactive rebase) helpful after "
"reverting a topic branch merge, as this option recreates the topic branch "
"with fresh commits so it can be remerged successfully without needing to "
-"\"revert the reversion\" (see the link:howto/revert-a-faulty-merge."
-"html[revert-a-faulty-merge How-To] for details)."
+"\"revert the reversion\" (see the link:howto/revert-a-faulty-"
+"merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:347
#, no-wrap
msgid "--no-fork-point"
-msgstr ""
+msgstr "--no-fork-point"
#. type: Plain text
#: en/git-rebase.txt:351
@@ -51100,11 +50382,11 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:357
msgid ""
-"When --fork-point is active, 'fork_point' will be used instead of <upstream> "
-"to calculate the set of commits to rebase, where 'fork_point' is the result "
-"of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:"
-"git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> "
-"will be used as a fallback."
+"When --fork-point is active, 'fork_point' will be used instead of <upstream>"
+" to calculate the set of commits to rebase, where 'fork_point' is the result"
+" of `git merge-base --fork-point <upstream> <branch>` command (see "
+"linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the "
+"<upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
@@ -51124,16 +50406,17 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:372
msgid ""
-"These flags are passed to 'git am' to easily change the dates of the rebased "
-"commits (see linkgit:git-am[1]). Incompatible with the --interactive option."
+"These flags are passed to 'git am' to easily change the dates of the rebased"
+" commits (see linkgit:git-am[1]). Incompatible with the --interactive "
+"option."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:378
msgid ""
-"Make a list of the commits which are about to be rebased. Let the user edit "
-"that list before rebasing. This mode can also be used to split commits (see "
-"SPLITTING COMMITS below)."
+"Make a list of the commits which are about to be rebased. Let the user edit"
+" that list before rebasing. This mode can also be used to split commits "
+"(see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
@@ -51148,7 +50431,7 @@ msgstr ""
#: en/git-rebase.txt:384 en/git-svn.txt:642
#, no-wrap
msgid "--preserve-merges"
-msgstr ""
+msgstr "--preserve-merges"
#. type: Plain text
#: en/git-rebase.txt:388
@@ -51228,9 +50511,9 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:424
msgid ""
-"Rebase all commits reachable from <branch>, instead of limiting them with an "
-"<upstream>. This allows you to rebase the root commit(s) on a branch. When "
-"used with --onto, it will skip changes already contained in <newbase> "
+"Rebase all commits reachable from <branch>, instead of limiting them with an"
+" <upstream>. This allows you to rebase the root commit(s) on a branch. "
+"When used with --onto, it will skip changes already contained in <newbase> "
"(instead of <upstream>) whereas without --onto it will operate on every "
"change. When used together with both --onto and --preserve-merges, 'all' "
"root commits will be rewritten to have <newbase> as parent instead."
@@ -51240,19 +50523,19 @@ msgstr ""
#: en/git-rebase.txt:425
#, no-wrap
msgid "--autosquash"
-msgstr ""
+msgstr "--autosquash"
#. type: Labeled list
#: en/git-rebase.txt:426
#, no-wrap
msgid "--no-autosquash"
-msgstr ""
+msgstr "--no-autosquash"
#. type: Plain text
#: en/git-rebase.txt:435
msgid ""
-"When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), "
-"and there is a commit whose title begins with the same ..., automatically "
+"When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"),"
+" and there is a commit whose title begins with the same ..., automatically "
"modify the todo list of rebase -i so that the commit marked for squashing "
"comes right after the commit to be modified, and change the action of the "
"moved commit from `pick` to `squash` (or `fixup`). Ignores subsequent "
@@ -51278,23 +50561,22 @@ msgstr ""
msgid ""
"Automatically create a temporary stash before the operation begins, and "
"apply it after the operation ends. This means that you can run rebase on a "
-"dirty worktree. However, use with care: the final stash application after a "
-"successful rebase might result in non-trivial conflicts."
+"dirty worktree. However, use with care: the final stash application after a"
+" successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:450 en/merge-options.txt:35
-#, fuzzy, no-wrap
-#| msgid "--no-verify"
+#, no-wrap
msgid "--no-ff"
-msgstr "--no-verify"
+msgstr "--no-ff"
#. type: Plain text
#: en/git-rebase.txt:454
msgid ""
"With --interactive, cherry-pick all rebased commits instead of fast-"
-"forwarding over the unchanged ones. This ensures that the entire history of "
-"the rebased branch is composed of new commits."
+"forwarding over the unchanged ones. This ensures that the entire history of"
+" the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
@@ -51307,8 +50589,9 @@ msgstr ""
msgid ""
"You may find this helpful after reverting a topic branch merge, as this "
"option recreates the topic branch with fresh commits so it can be remerged "
-"successfully without needing to \"revert the reversion\" (see the link:howto/"
-"revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
+"successfully without needing to \"revert the reversion\" (see the "
+"link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for "
+"details)."
msgstr ""
#. type: Title -
@@ -51320,8 +50603,8 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:470
msgid ""
-"You should understand the implications of using 'git rebase' on a repository "
-"that you share. See also RECOVERING FROM UPSTREAM REBASE below."
+"You should understand the implications of using 'git rebase' on a repository"
+" that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
@@ -51329,8 +50612,8 @@ msgstr ""
msgid ""
"When the git-rebase command is run, it will first execute a \"pre-rebase\" "
"hook if one exists. You can use this hook to do sanity checks and reject "
-"the rebase if it isn't appropriate. Please see the template pre-rebase hook "
-"script for an example."
+"the rebase if it isn't appropriate. Please see the template pre-rebase hook"
+" script for an example."
msgstr ""
#. type: Plain text
@@ -51424,11 +50707,11 @@ msgstr "-C <commit>"
#. type: Plain text
#: en/git-rebase.txt:510
msgid ""
-"Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect "
-"commit it fixes, because that commit is buried deeply in a patch series. "
-"That is exactly what interactive rebase is for: use it after plenty of \"a"
-"\"s and \"b\"s, by rearranging and editing commits, and squashing multiple "
-"commits into one."
+"Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect"
+" commit it fixes, because that commit is buried deeply in a patch series. "
+"That is exactly what interactive rebase is for: use it after plenty of "
+"\"a\"s and \"b\"s, by rearranging and editing commits, and squashing "
+"multiple commits into one."
msgstr ""
#. type: Plain text
@@ -51447,8 +50730,8 @@ msgstr ""
msgid ""
"An editor will be fired up with all the commits in your current branch "
"(ignoring merge commits), which come after the given commit. You can "
-"reorder the commits in this list to your heart's content, and you can remove "
-"them. The list looks more or less like this:"
+"reorder the commits in this list to your heart's content, and you can remove"
+" them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
@@ -51463,8 +50746,8 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:529
msgid ""
-"The oneline descriptions are purely for your pleasure; 'git rebase' will not "
-"look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this "
+"The oneline descriptions are purely for your pleasure; 'git rebase' will not"
+" look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this "
"example), so do not delete or edit the names."
msgstr ""
@@ -51486,27 +50769,27 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:540
msgid ""
-"To drop a commit, replace the command \"pick\" with \"drop\", or just delete "
-"the matching line."
+"To drop a commit, replace the command \"pick\" with \"drop\", or just delete"
+" the matching line."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:548
msgid ""
-"If you want to fold two or more commits into one, replace the command \"pick"
-"\" for the second and subsequent commits with \"squash\" or \"fixup\". If "
-"the commits had different authors, the folded commit will be attributed to "
-"the author of the first commit. The suggested commit message for the folded "
-"commit is the concatenation of the commit messages of the first commit and "
-"of those with the \"squash\" command, but omits the commit messages of "
-"commits with the \"fixup\" command."
+"If you want to fold two or more commits into one, replace the command "
+"\"pick\" for the second and subsequent commits with \"squash\" or \"fixup\"."
+" If the commits had different authors, the folded commit will be attributed"
+" to the author of the first commit. The suggested commit message for the "
+"folded commit is the concatenation of the commit messages of the first "
+"commit and of those with the \"squash\" command, but omits the commit "
+"messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:552
msgid ""
-"'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when "
-"a command fails due to merge errors. When you are done editing and/or "
+"'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when"
+" a command fails due to merge errors. When you are done editing and/or "
"resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
@@ -51562,10 +50845,10 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:585
msgid ""
-"Reordering and editing commits usually creates untested intermediate steps. "
-"You may want to check that your history editing did not break anything by "
-"running a test, or at least recompiling at intermediate points in history by "
-"using the \"exec\" command (shortcut \"x\"). You may do so by creating a "
+"Reordering and editing commits usually creates untested intermediate steps."
+" You may want to check that your history editing did not break anything by "
+"running a test, or at least recompiling at intermediate points in history by"
+" using the \"exec\" command (shortcut \"x\"). You may do so by creating a "
"todo list like this one:"
msgstr ""
@@ -51585,17 +50868,17 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:599
msgid ""
-"The interactive rebase will stop when a command fails (i.e. exits with non-0 "
-"status) to give you an opportunity to fix the problem. You can continue with "
-"`git rebase --continue`."
+"The interactive rebase will stop when a command fails (i.e. exits with non-0"
+" status) to give you an opportunity to fix the problem. You can continue "
+"with `git rebase --continue`."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:604
msgid ""
-"The \"exec\" command launches the command in a shell (the one specified in `"
-"$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell "
-"features (like \"cd\", \">\", \";\" ...). The command is run from the root "
+"The \"exec\" command launches the command in a shell (the one specified in "
+"`$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell"
+" features (like \"cd\", \">\", \";\" ...). The command is run from the root "
"of the working tree."
msgstr ""
@@ -51636,17 +50919,17 @@ msgstr ""
#: en/git-rebase.txt:630
msgid ""
"In interactive mode, you can mark commits with the action \"edit\". "
-"However, this does not necessarily mean that 'git rebase' expects the result "
-"of this edit to be exactly one commit. Indeed, you can undo the commit, or "
-"you can add other commits. This can be used to split a commit into two:"
+"However, this does not necessarily mean that 'git rebase' expects the result"
+" of this edit to be exactly one commit. Indeed, you can undo the commit, or"
+" you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:634
msgid ""
"Start an interactive rebase with `git rebase -i <commit>^`, where <commit> "
-"is the commit you want to split. In fact, any commit range will do, as long "
-"as it contains that commit."
+"is the commit you want to split. In fact, any commit range will do, as long"
+" as it contains that commit."
msgstr ""
#. type: Plain text
@@ -51657,23 +50940,24 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:640
msgid ""
-"When it comes to editing that commit, execute `git reset HEAD^`. The effect "
-"is that the HEAD is rewound by one, and the index follows suit. However, "
+"When it comes to editing that commit, execute `git reset HEAD^`. The effect"
+" is that the HEAD is rewound by one, and the index follows suit. However, "
"the working tree stays the same."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:644
msgid ""
-"Now add the changes to the index that you want to have in the first commit. "
-"You can use `git add` (possibly interactively) or 'git gui' (or both) to do "
-"that."
+"Now add the changes to the index that you want to have in the first commit."
+" You can use `git add` (possibly interactively) or 'git gui' (or both) to "
+"do that."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:647
msgid ""
-"Commit the now-current index with whatever commit message is appropriate now."
+"Commit the now-current index with whatever commit message is appropriate "
+"now."
msgstr ""
#. type: Plain text
@@ -51801,8 +51085,8 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:720
msgid ""
-"This happens if the 'subsystem' rebase had conflicts, or used `--"
-"interactive` to omit, edit, squash, or fixup commits; or if the upstream "
+"This happens if the 'subsystem' rebase had conflicts, or used "
+"`--interactive` to omit, edit, squash, or fixup commits; or if the upstream "
"used one of `commit --amend`, `reset`, or `filter-branch`."
msgstr ""
@@ -51877,8 +51161,8 @@ msgstr ""
#: en/git-rebase.txt:760
msgid ""
"The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended "
-"and your 'topic' began\", that is, what the old merge-base between them "
-"was. You will have to find a way to name the last commit of the old "
+"and your 'topic' began\", that is, what the old merge-base between them was."
+" You will have to find a way to name the last commit of the old "
"'subsystem', for example:"
msgstr ""
@@ -51893,8 +51177,8 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:767
msgid ""
-"Relative to the tip of 'topic': knowing that your 'topic' has three commits, "
-"the old tip of 'subsystem' must be `topic~3`."
+"Relative to the tip of 'topic': knowing that your 'topic' has three commits,"
+" the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
@@ -51922,9 +51206,9 @@ msgstr ""
#: en/git-rebase.txt:784
msgid ""
"The todo list presented by `--preserve-merges --interactive` does not "
-"represent the topology of the revision graph. Editing commits and rewording "
-"their commit messages should work fine, but attempts to reorder commits tend "
-"to produce counterintuitive results."
+"represent the topology of the revision graph. Editing commits and rewording"
+" their commit messages should work fine, but attempts to reorder commits "
+"tend to produce counterintuitive results."
msgstr ""
#. type: Plain text
@@ -51960,12 +51244,10 @@ msgstr ""
#. type: Title =
#: en/git-receive-pack.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-checkout(1)"
+#, no-wrap
msgid "git-receive-pack(1)"
-msgstr "git-checkout(1)"
+msgstr "git-receive-pack(1)"
-#
#. type: Plain text
#: en/git-receive-pack.txt:7
#, fuzzy
@@ -51998,10 +51280,10 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:28
msgid ""
-"The command allows for creation and fast-forwarding of sha1 refs (heads/"
-"tags) on the remote end (strictly speaking, it is the local end 'git-receive-"
-"pack' runs, but to the user who is sitting at the send-pack end, it is "
-"updating the remote. Confused?)"
+"The command allows for creation and fast-forwarding of sha1 refs "
+"(heads/tags) on the remote end (strictly speaking, it is the local end 'git-"
+"receive-pack' runs, but to the user who is sitting at the send-pack end, it "
+"is updating the remote. Confused?)"
msgstr ""
#. type: Plain text
@@ -52067,9 +51349,9 @@ msgstr ""
msgid ""
"When accepting a signed push (see linkgit:git-push[1]), the signed push "
"certificate is stored in a blob and an environment variable `GIT_PUSH_CERT` "
-"can be consulted for its object name. See the description of `post-receive` "
-"hook for an example. In addition, the certificate is verified using GPG and "
-"the result is exported with the following environment variables:"
+"can be consulted for its object name. See the description of `post-receive`"
+" hook for an example. In addition, the certificate is verified using GPG "
+"and the result is exported with the following environment variables:"
msgstr ""
#. type: Labeled list
@@ -52081,8 +51363,8 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:69
msgid ""
-"The name and the e-mail address of the owner of the key that signed the push "
-"certificate."
+"The name and the e-mail address of the owner of the key that signed the push"
+" certificate."
msgstr ""
#. type: Labeled list
@@ -52135,7 +51417,7 @@ msgstr ""
#: en/git-receive-pack.txt:86
#, no-wrap
msgid "`UNSOLICITED`"
-msgstr ""
+msgstr "`UNSOLICITED`"
#. type: Plain text
#: en/git-receive-pack.txt:89
@@ -52146,7 +51428,7 @@ msgstr ""
#: en/git-receive-pack.txt:89
#, no-wrap
msgid "`MISSING`"
-msgstr ""
+msgstr "`MISSING`"
#. type: Plain text
#: en/git-receive-pack.txt:91
@@ -52157,7 +51439,7 @@ msgstr ""
#: en/git-receive-pack.txt:91
#, no-wrap
msgid "`BAD`"
-msgstr ""
+msgstr "`BAD`"
#. type: Plain text
#: en/git-receive-pack.txt:93
@@ -52168,7 +51450,7 @@ msgstr ""
#: en/git-receive-pack.txt:93
#, no-wrap
msgid "`OK`"
-msgstr ""
+msgstr "`OK`"
#. type: Plain text
#: en/git-receive-pack.txt:95
@@ -52179,7 +51461,7 @@ msgstr ""
#: en/git-receive-pack.txt:95
#, no-wrap
msgid "`SLOP`"
-msgstr ""
+msgstr "`SLOP`"
#. type: Plain text
#: en/git-receive-pack.txt:99
@@ -52201,8 +51483,8 @@ msgid ""
"\"git push --signed\" sent a nonce different from what we asked it to send "
"now, but in a different session whose starting time is different by this "
"many seconds from the current session. Only meaningful when "
-"`GIT_PUSH_CERT_NONCE_STATUS` says `SLOP`. Also read about `receive."
-"certNonceSlop` variable in linkgit:git-config[1]."
+"`GIT_PUSH_CERT_NONCE_STATUS` says `SLOP`. Also read about "
+"`receive.certNonceSlop` variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
@@ -52215,10 +51497,10 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:116
msgid ""
-"If the pre-receive hook exits with a non-zero exit status no updates will be "
-"performed, and the update, post-receive and post-update hooks will not be "
-"invoked either. This can be useful to quickly bail out if the update is not "
-"to be supported."
+"If the pre-receive hook exits with a non-zero exit status no updates will be"
+" performed, and the update, post-receive and post-update hooks will not be "
+"invoked either. This can be useful to quickly bail out if the update is not"
+" to be supported."
msgstr ""
#. type: Title -
@@ -52244,8 +51526,8 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:130
msgid ""
-"The refname parameter is relative to $GIT_DIR; e.g. for the master head this "
-"is \"refs/heads/master\". The two sha1 arguments are the object names for "
+"The refname parameter is relative to $GIT_DIR; e.g. for the master head this"
+" is \"refs/heads/master\". The two sha1 arguments are the object names for "
"the refname before and after the update. Note that the hook is called "
"before the refname is updated, so either sha1-old is 0\\{40} (meaning there "
"is no such ref yet), or it should match what is recorded in refname."
@@ -52263,8 +51545,8 @@ msgstr ""
msgid ""
"Successful execution (a zero exit status) of this hook does not ensure the "
"ref will actually be updated, it is only a prerequisite. As such it is not "
-"a good idea to send notices (e.g. email) from this hook. Consider using the "
-"post-receive hook instead."
+"a good idea to send notices (e.g. email) from this hook. Consider using the"
+" post-receive hook instead."
msgstr ""
#. type: Title -
@@ -52296,8 +51578,8 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:159
msgid ""
-"The `GIT_PUSH_CERT*` environment variables can be inspected, just as in `pre-"
-"receive` hook, after accepting a signed push."
+"The `GIT_PUSH_CERT*` environment variables can be inspected, just as in "
+"`pre-receive` hook, after accepting a signed push."
msgstr ""
#. type: Plain text
@@ -52350,9 +51632,9 @@ msgstr ""
msgid ""
"Note that it is possible for refname to not have sha1-new when this hook "
"runs. This can easily occur if another user modifies the ref after it was "
-"updated by 'git-receive-pack', but before the hook was able to evaluate it. "
-"It is recommended that hooks rely on sha1-new rather than the current value "
-"of refname."
+"updated by 'git-receive-pack', but before the hook was able to evaluate it."
+" It is recommended that hooks rely on sha1-new rather than the current "
+"value of refname."
msgstr ""
#. type: Title -
@@ -52364,10 +51646,10 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:205
msgid ""
-"After all other processing, if at least one ref was updated, and if $GIT_DIR/"
-"hooks/post-update file exists and is executable, then post-update will be "
-"called with the list of refs that have been updated. This can be used to "
-"implement any repository wide cleanup tasks."
+"After all other processing, if at least one ref was updated, and if "
+"$GIT_DIR/hooks/post-update file exists and is executable, then post-update "
+"will be called with the list of refs that have been updated. This can be "
+"used to implement any repository wide cleanup tasks."
msgstr ""
#. type: Plain text
@@ -52392,27 +51674,25 @@ msgid ""
"\texec git update-server-info\n"
msgstr ""
-#
#. type: Plain text
#: en/git-receive-pack.txt:220
#, fuzzy
-#| msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
+#| msgid ""
+#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-reflog.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-log(1)"
+#, no-wrap
msgid "git-reflog(1)"
-msgstr "git-log(1)"
+msgstr "git-reflog(1)"
#. type: Plain text
#: en/git-reflog.txt:7
msgid "git-reflog - Manage reflog information"
msgstr ""
-#
#. type: Plain text
#: en/git-reflog.txt:13
#, fuzzy, no-wrap
@@ -52439,9 +51719,10 @@ msgid ""
"Reference logs, or \"reflogs\", record when the tips of branches and other "
"references were updated in the local repository. Reflogs are useful in "
"various Git commands, to specify the old value of a reference. For example, "
-"`HEAD@{2}` means \"where HEAD used to be two moves ago\", `master@{one.week."
-"ago}` means \"where master used to point to one week ago in this local "
-"repository\", and so on. See linkgit:gitrevisions[7] for more details."
+"`HEAD@{2}` means \"where HEAD used to be two moves ago\", "
+"`master@{one.week.ago}` means \"where master used to point to one week ago "
+"in this local repository\", and so on. See linkgit:gitrevisions[7] for more "
+"details."
msgstr ""
#. type: Plain text
@@ -52453,8 +51734,8 @@ msgstr ""
#: en/git-reflog.txt:44
msgid ""
"The \"show\" subcommand (which is also the default, in the absence of any "
-"subcommands) shows the log of the reference provided in the command-line (or "
-"`HEAD`, by default). The reflog covers all recent actions, and in addition "
+"subcommands) shows the log of the reference provided in the command-line (or"
+" `HEAD`, by default). The reflog covers all recent actions, and in addition "
"the `HEAD` reflog records branch switching. `git reflog show` is an alias "
"for `git log -g --abbrev-commit --pretty=oneline`; see linkgit:git-log[1] "
"for more information."
@@ -52473,8 +51754,8 @@ msgstr ""
#: en/git-reflog.txt:55
msgid ""
"The \"delete\" subcommand deletes single entries from the reflog. Its "
-"argument must be an _exact_ entry (e.g. \"`git reflog delete master@{2}`\"). "
-"This subcommand is also typically not used directly by end users."
+"argument must be an _exact_ entry (e.g. \"`git reflog delete master@{2}`\")."
+" This subcommand is also typically not used directly by end users."
msgstr ""
#. type: Plain text
@@ -52516,8 +51797,8 @@ msgstr ""
#: en/git-reflog.txt:82
msgid ""
"Prune entries older than the specified time. If this option is not "
-"specified, the expiration time is taken from the configuration setting `gc."
-"reflogExpire`, which in turn defaults to 90 days. `--expire=all` prunes "
+"specified, the expiration time is taken from the configuration setting "
+"`gc.reflogExpire`, which in turn defaults to 90 days. `--expire=all` prunes "
"entries regardless of their age; `--expire=never` turns off pruning of "
"reachable entries (but see `--expire-unreachable`)."
msgstr ""
@@ -52541,25 +51822,23 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:93
-#, fuzzy, no-wrap
-#| msgid "--update"
+#, no-wrap
msgid "--updateref"
-msgstr "--update"
+msgstr "--updateref"
#. type: Plain text
#: en/git-reflog.txt:97
msgid ""
-"Update the reference to the value of the top reflog entry (i.e. <ref>@"
-"\\{0\\}) if the previous top entry was pruned. (This option is ignored for "
-"symbolic references.)"
+"Update the reference to the value of the top reflog entry (i.e. "
+"<ref>@\\{0\\}) if the previous top entry was pruned. (This option is "
+"ignored for symbolic references.)"
msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:98
-#, fuzzy, no-wrap
-#| msgid "--refresh"
+#, no-wrap
msgid "--rewrite"
-msgstr "--refresh"
+msgstr "--rewrite"
#. type: Plain text
#: en/git-reflog.txt:102
@@ -52572,7 +51851,7 @@ msgstr ""
#: en/git-reflog.txt:103
#, no-wrap
msgid "--stale-fix"
-msgstr ""
+msgstr "--stale-fix"
#. type: Plain text
#: en/git-reflog.txt:108
@@ -52611,18 +51890,16 @@ msgstr ""
#. type: Plain text
#: en/git-reflog.txt:129
msgid ""
-"`git reflog delete` accepts options `--updateref`, `--rewrite`, `-n`, `--dry-"
-"run`, and `--verbose`, with the same meanings as when they are used with "
-"`expire`."
+"`git reflog delete` accepts options `--updateref`, `--rewrite`, `-n`, "
+"`--dry-run`, and `--verbose`, with the same meanings as when they are used "
+"with `expire`."
msgstr ""
-#
#. type: Title =
#: en/git-remote-ext.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-remote(1)"
+#, no-wrap
msgid "git-remote-ext(1)"
-msgstr "git-remote(1)"
+msgstr "git-remote-ext(1)"
#. type: Plain text
#: en/git-remote-ext.txt:7
@@ -52638,8 +51915,8 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:17
msgid ""
-"This remote helper uses the specified '<command>' to connect to a remote Git "
-"server."
+"This remote helper uses the specified '<command>' to connect to a remote Git"
+" server."
msgstr ""
#. type: Plain text
@@ -52777,7 +52054,8 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:70
msgid ""
-"Set to long name (git-upload-pack, etc...) of service helper needs to invoke."
+"Set to long name (git-upload-pack, etc...) of service helper needs to "
+"invoke."
msgstr ""
#. type: Labeled list
@@ -52859,8 +52137,8 @@ msgstr ""
msgid ""
"Represents a repository with path /repo accessed using the helper program "
"\"git-server-alias foo\". The hostname for the remote server passed in the "
-"protocol stream will be \"foo\" (this allows multiple virtual Git servers to "
-"share a link-level address)."
+"protocol stream will be \"foo\" (this allows multiple virtual Git servers to"
+" share a link-level address)."
msgstr ""
#. type: Labeled list
@@ -52873,9 +52151,9 @@ msgstr ""
#: en/git-remote-ext.txt:112
msgid ""
"Represents a repository with path '/repo with spaces' accessed using the "
-"helper program \"git-server-alias foo\". The hostname for the remote server "
-"passed in the protocol stream will be \"foo\" (this allows multiple virtual "
-"Git servers to share a link-level address)."
+"helper program \"git-server-alias foo\". The hostname for the remote server"
+" passed in the protocol stream will be \"foo\" (this allows multiple virtual"
+" Git servers to share a link-level address)."
msgstr ""
#. type: Labeled list
@@ -52887,12 +52165,11 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:118
msgid ""
-"Represents a repository accessed using the helper program \"git-ssl foo."
-"example /bar\". The type of request can be determined by the helper using "
-"environment variables (see above)."
+"Represents a repository accessed using the helper program \"git-ssl "
+"foo.example /bar\". The type of request can be determined by the helper "
+"using environment variables (see above)."
msgstr ""
-#
#. type: Plain text
#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56
#: en/git-remote-testgit.txt:27
@@ -52901,13 +52178,11 @@ msgstr ""
msgid "linkgit:gitremote-helpers[1]"
msgstr "linkgit:git-add[1]"
-#
#. type: Title =
#: en/git-remote-fd.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-remote(1)"
+#, no-wrap
msgid "git-remote-fd(1)"
-msgstr "git-remote(1)"
+msgstr "git-remote-fd(1)"
#. type: Plain text
#: en/git-remote-fd.txt:7
@@ -52933,8 +52208,8 @@ msgid ""
"If only <infd> is given, it is assumed to be a bidirectional socket "
"connected to remote Git server (git-upload-pack, git-receive-pack or git-"
"upload-archive). If both <infd> and <outfd> are given, they are assumed to "
-"be pipes connected to a remote Git server (<infd> being the inbound pipe and "
-"<outfd> being the outbound pipe."
+"be pipes connected to a remote Git server (<infd> being the inbound pipe and"
+" <outfd> being the outbound pipe."
msgstr ""
#. type: Plain text
@@ -52948,7 +52223,8 @@ msgstr ""
#: en/git-remote-fd.txt:30
msgid ""
"<anything> can be any string. It is ignored. It is meant for providing "
-"information to user in the URL in case that URL is displayed in some context."
+"information to user in the URL in case that URL is displayed in some "
+"context."
msgstr ""
#. type: Title -
@@ -52985,8 +52261,8 @@ msgstr ""
#. type: Plain text
#: en/git-remote-fd.txt:49
msgid ""
-"Push master, using file descriptor #7 to read data from git-receive-pack and "
-"file descriptor #8 to write data to same service."
+"Push master, using file descriptor #7 to read data from git-receive-pack and"
+" file descriptor #8 to write data to same service."
msgstr ""
#. type: Labeled list
@@ -52995,13 +52271,11 @@ msgstr ""
msgid "`git push fd::7,8/bar master`"
msgstr ""
-#
#. type: Title =
#: en/git-remote-testgit.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-remote(1)"
+#, no-wrap
msgid "git-remote-testgit(1)"
-msgstr "git-remote(1)"
+msgstr "git-remote-testgit(1)"
#. type: Plain text
#: en/git-remote-testgit.txt:7
@@ -53029,14 +52303,12 @@ msgid ""
"remote-testgit'."
msgstr ""
-#
#. type: Title =
#: en/git-remote.txt:2
#, no-wrap
msgid "git-remote(1)"
msgstr "git-remote(1)"
-#
#. type: Plain text
#: en/git-remote.txt:7
#, fuzzy
@@ -53063,7 +52335,6 @@ msgid ""
"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]\n"
msgstr ""
-#
#. type: Plain text
#: en/git-remote.txt:30
msgid "Manage the set of repositories (\"remotes\") whose branches you track."
@@ -53071,17 +52342,16 @@ msgstr ""
"Einen Satz Repositories (\"Remotes\"), deren Zweige von Ihnen verfolgt "
"werden, verwalten."
-#
#. type: Plain text
#: en/git-remote.txt:39
#, fuzzy
#| msgid "Be a little more verbose and show remote url after name."
msgid ""
-"Be a little more verbose and show remote url after name. NOTE: This must be "
-"placed between `remote` and `subcommand`."
-msgstr "Sei ein wenig gespr채chiger und zeige die entfernte URL nach dem Namen."
+"Be a little more verbose and show remote url after name. NOTE: This must be"
+" placed between `remote` and `subcommand`."
+msgstr ""
+"Sei ein wenig gespr채chiger und zeige die entfernte URL nach dem Namen."
-#
#. type: Plain text
#: en/git-remote.txt:46
msgid ""
@@ -53097,21 +52367,19 @@ msgstr ""
msgid "'add'"
msgstr "'add'"
-#
#. type: Plain text
#: en/git-remote.txt:52
msgid ""
"Adds a remote named <name> for the repository at <url>. The command `git "
-"fetch <name>` can then be used to create and update remote-tracking branches "
-"<name>/<branch>."
+"fetch <name>` can then be used to create and update remote-tracking branches"
+" <name>/<branch>."
msgstr ""
"Adds a remote named <name> for the repository at <url>. The command `git "
-"fetch <name>` can then be used to create and update remote-tracking branches "
-"<name>/<branch>. F체gt einen Remote mit dem Namen <Name> f체r das Repository "
-"auf <URL> hinzu. Der Befehl `git fetch <Name>` kann dann um einen Remote-"
+"fetch <name>` can then be used to create and update remote-tracking branches"
+" <name>/<branch>. F체gt einen Remote mit dem Namen <Name> f체r das Repository"
+" auf <URL> hinzu. Der Befehl `git fetch <Name>` kann dann um einen Remote-"
"verfolgenden Zweig <Name>/<Zweig> zu erstellen und zu aktualisieren."
-#
#. type: Plain text
#: en/git-remote.txt:55
msgid ""
@@ -53121,7 +52389,6 @@ msgstr ""
"Mit der Option `-f`, wird `git fetch <Name>` sofort nachdem die "
"Informationen des entfernten Servers eingerichtet wurden ausgef체hrt."
-#
#. type: Plain text
#: en/git-remote.txt:58
#, fuzzy
@@ -53135,7 +52402,6 @@ msgstr ""
"Mit der Option `-f`, wird `git fetch <Name>` sofort nachdem die "
"Informationen des entfernten Servers eingerichtet wurden ausgef체hrt."
-#
#. type: Plain text
#: en/git-remote.txt:61
#, fuzzy
@@ -53156,35 +52422,33 @@ msgid ""
"fetch[1])."
msgstr ""
-#
#. type: Plain text
#: en/git-remote.txt:70
#, fuzzy
#| msgid ""
#| "With `-t <branch>` option, instead of the default glob refspec for the "
-#| "remote to track all branches under `$GIT_DIR/remotes/<name>/`, a refspec "
-#| "to track only `<branch>` is created. You can give more than one `-t "
-#| "<branch>` to track multiple branches without grabbing all branches."
+#| "remote to track all branches under `$GIT_DIR/remotes/<name>/`, a refspec to "
+#| "track only `<branch>` is created. You can give more than one `-t <branch>` "
+#| "to track multiple branches without grabbing all branches."
msgid ""
"With `-t <branch>` option, instead of the default glob refspec for the "
"remote to track all branches under the `refs/remotes/<name>/` namespace, a "
-"refspec to track only `<branch>` is created. You can give more than one `-t "
-"<branch>` to track multiple branches without grabbing all branches."
+"refspec to track only `<branch>` is created. You can give more than one `-t"
+" <branch>` to track multiple branches without grabbing all branches."
msgstr ""
"Mit der Option `-t <Zweig>`, wird anstelle des Standardglob-Refspec f체r das "
"entfernte Repository, welches alle Zweige unter `$GIT_DIR/remotes/<Name>/` "
-"verfolgt, ein Refspec, welches nur `<Zweig>` verweltet, erstellt. Sie k철nnen "
-"mehr als einmal `-t <Zweig>` angeben, um mehrere Zweige zu verfolgen, ohne "
+"verfolgt, ein Refspec, welches nur `<Zweig>` verweltet, erstellt. Sie k철nnen"
+" mehr als einmal `-t <Zweig>` angeben, um mehrere Zweige zu verfolgen, ohne "
"alle Zweige zu erhalten."
-#
#. type: Plain text
#: en/git-remote.txt:73
#, fuzzy
#| msgid ""
-#| "With `-m <master>` option, `$GIT_DIR/remotes/<name>/HEAD` is set up to "
-#| "point at remote's `<master>` branch instead of whatever branch the `HEAD` "
-#| "at the remote repository actually points at."
+#| "With `-m <master>` option, `$GIT_DIR/remotes/<name>/HEAD` is set up to point"
+#| " at remote's `<master>` branch instead of whatever branch the `HEAD` at the "
+#| "remote repository actually points at."
msgid ""
"With `-m <master>` option, a symbolic-ref `refs/remotes/<name>/HEAD` is set "
"up to point at remote's `<master>` branch. See also the set-head command."
@@ -53193,24 +52457,23 @@ msgstr ""
"eingerichtet, dass der Zweig `<master>` anstelle eines anderen `HEAD` des "
"entfernten Repository verwendet wird."
-#
#. type: Plain text
#: en/git-remote.txt:79
#, fuzzy
#| msgid ""
#| "In mirror mode, enabled with `\\--mirror`, the refs will not be stored in "
-#| "the 'refs/remotes/' namespace, but in 'refs/heads/'. This option only "
-#| "makes sense in bare repositories. If a remote uses mirror mode, "
-#| "furthermore, `git push` will always behave as if `\\--mirror` was passed."
+#| "the 'refs/remotes/' namespace, but in 'refs/heads/'. This option only makes"
+#| " sense in bare repositories. If a remote uses mirror mode, furthermore, "
+#| "`git push` will always behave as if `\\--mirror` was passed."
msgid ""
"When a fetch mirror is created with `--mirror=fetch`, the refs will not be "
-"stored in the 'refs/remotes/' namespace, but rather everything in 'refs/' on "
-"the remote will be directly mirrored into 'refs/' in the local repository. "
+"stored in the 'refs/remotes/' namespace, but rather everything in 'refs/' on"
+" the remote will be directly mirrored into 'refs/' in the local repository. "
"This option only makes sense in bare repositories, because a fetch would "
"overwrite any local commits."
msgstr ""
-"Im Spiegelmodus, aktiviert mit `\\--mirror`, werden die Refs nicht in 'refs/"
-"remotes/' gespeichert, sondern in 'refs/heads/'. Diese Option macht "
+"Im Spiegelmodus, aktiviert mit `\\--mirror`, werden die Refs nicht in "
+"'refs/remotes/' gespeichert, sondern in 'refs/heads/'. Diese Option macht "
"lediglich Sinn in baren Repositories. Wenn ein entferntes Repository den "
"Spiegelmodus verwendet, wird sich ausserdem `git push` immer verhalten, als "
"w채re die Option `\\--mirror` angegeben."
@@ -53228,7 +52491,6 @@ msgstr ""
msgid "'rename'"
msgstr ""
-#
#. type: Plain text
#: en/git-remote.txt:87
#, fuzzy
@@ -53246,8 +52508,8 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:91
msgid ""
-"In case <old> and <new> are the same, and <old> is a file under `$GIT_DIR/"
-"remotes` or `$GIT_DIR/branches`, the remote is converted to the "
+"In case <old> and <new> are the same, and <old> is a file under "
+"`$GIT_DIR/remotes` or `$GIT_DIR/branches`, the remote is converted to the "
"configuration file format."
msgstr ""
@@ -53263,7 +52525,6 @@ msgstr ""
msgid "'rm'"
msgstr "'rm'"
-#
#. type: Plain text
#: en/git-remote.txt:97
#, fuzzy
@@ -53291,8 +52552,8 @@ msgid ""
"`refs/remotes/<name>/HEAD`) for the named remote. Having a default branch "
"for a remote is not required, but allows the name of the remote to be "
"specified in lieu of a specific branch. For example, if the default branch "
-"for `origin` is set to `master`, then `origin` may be specified wherever you "
-"would normally specify `origin/master`."
+"for `origin` is set to `master`, then `origin` may be specified wherever you"
+" would normally specify `origin/master`."
msgstr ""
#. type: Plain text
@@ -53306,11 +52567,11 @@ msgstr ""
#: en/git-remote.txt:116
msgid ""
"With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then "
-"the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., "
-"if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`"
-"\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/"
-"origin/next`. This will only work if `refs/remotes/origin/next` already "
-"exists; if not it must be fetched first."
+"the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g.,"
+" if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin "
+"-a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to "
+"`refs/remotes/origin/next`. This will only work if "
+"`refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
@@ -53423,18 +52684,16 @@ msgstr ""
msgid "'show'"
msgstr "'show'"
-#
#. type: Plain text
#: en/git-remote.txt:169
msgid "Gives some information about the remote <name>."
msgstr "Gibt Informationen 체ber das entfernte Repository <Name> aus."
-#
#. type: Plain text
#: en/git-remote.txt:172
msgid ""
-"With `-n` option, the remote heads are not queried first with `git ls-remote "
-"<name>`; cached information is used instead."
+"With `-n` option, the remote heads are not queried first with `git ls-remote"
+" <name>`; cached information is used instead."
msgstr ""
"Mit der Option `-n`, werden die entfernten Heads nicht zuerst mit `git ls-"
"remote <Name>` angezeigt; stattdessern werden zwischengespeicherte "
@@ -53446,14 +52705,13 @@ msgstr ""
msgid "'prune'"
msgstr "'prune'"
-#
#. type: Plain text
#: en/git-remote.txt:179
#, fuzzy
#| msgid ""
-#| "Deletes all stale tracking branches under <name>. These stale branches "
-#| "have already been removed from the remote repository referenced by "
-#| "<name>, but are still locally available in \"remotes/<name>\"."
+#| "Deletes all stale tracking branches under <name>. These stale branches have"
+#| " already been removed from the remote repository referenced by <name>, but "
+#| "are still locally available in \"remotes/<name>\"."
msgid ""
"Deletes all stale remote-tracking branches under <name>. These stale "
"branches have already been removed from the remote repository referenced by "
@@ -53463,7 +52721,6 @@ msgstr ""
"Zweige, die <Name> genannt wurden, wurden bereits vom entfernten Repository "
"gel철scht, sind aber noch immer lokal verf체gbar in \"remotes/<Name>\"."
-#
#. type: Plain text
#: en/git-remote.txt:182
#, fuzzy
@@ -53474,8 +52731,8 @@ msgid ""
"With `--dry-run` option, report what branches will be pruned, but do not "
"actually prune them."
msgstr ""
-"Mit der Option `--dry-run`, wird lediglich angezeigt, welche Zweige gel철scht "
-"werden w체rden, sie werden jedoch nicht gel철scht."
+"Mit der Option `--dry-run`, wird lediglich angezeigt, welche Zweige gel철scht"
+" werden w체rden, sie werden jedoch nicht gel철scht."
#. type: Labeled list
#: en/git-remote.txt:183
@@ -53483,39 +52740,37 @@ msgstr ""
msgid "'update'"
msgstr "'update'"
-#
#. type: Plain text
#: en/git-remote.txt:191
#, fuzzy
#| msgid ""
#| "Fetch updates for a named set of remotes in the repository as defined by "
-#| "remotes.<group>. If a named group is not specified on the command line, "
-#| "the configuration parameter remotes.default will get used; if remotes."
-#| "default is not defined, all remotes which do not have the configuration "
-#| "parameter remote.<name>.skipDefaultUpdate set to true will be updated. "
-#| "(See linkgit:git-config[1])."
+#| "remotes.<group>. If a named group is not specified on the command line, the"
+#| " configuration parameter remotes.default will get used; if remotes.default "
+#| "is not defined, all remotes which do not have the configuration parameter "
+#| "remote.<name>.skipDefaultUpdate set to true will be updated. (See "
+#| "linkgit:git-config[1])."
msgid ""
"Fetch updates for a named set of remotes in the repository as defined by "
-"remotes.<group>. If a named group is not specified on the command line, the "
-"configuration parameter remotes.default will be used; if remotes.default is "
-"not defined, all remotes which do not have the configuration parameter "
-"remote.<name>.skipDefaultUpdate set to true will be updated. (See linkgit:"
-"git-config[1])."
+"remotes.<group>. If a named group is not specified on the command line, the"
+" configuration parameter remotes.default will be used; if remotes.default is"
+" not defined, all remotes which do not have the configuration parameter "
+"remote.<name>.skipDefaultUpdate set to true will be updated. (See "
+"linkgit:git-config[1])."
msgstr ""
"Holt Updates f체r eine genannte Sammlung von entfernten Repositories, die in "
"remotes.<Gruppe> definiert wurden. Wenn eine genannte Gruppe nicht in der "
"Kommandozeile angegeben wurden, wird der Parameter remotes.default "
"verwendet; wenn remotes.default ebenfalls nicht gesetzt ist, werden alle "
-"entfernten Repositories, welche keinen Konfigurationsparameter remote.<Name>."
-"skipDefaultUpdate auf true gesetzt haben, aktualisiert. (Siehe linkgit:git-"
-"config[1])."
+"entfernten Repositories, welche keinen Konfigurationsparameter "
+"remote.<Name>.skipDefaultUpdate auf true gesetzt haben, aktualisiert. "
+"(Siehe linkgit:git-config[1])."
#. type: Plain text
#: en/git-remote.txt:193
msgid "With `--prune` option, prune all the remotes that are updated."
msgstr ""
-#
#. type: Plain text
#: en/git-remote.txt:201
msgid ""
@@ -53523,18 +52778,17 @@ msgid ""
"`remote.origin.fetch` configuration variables. (See linkgit:git-config[1])."
msgstr ""
"The remote configuration is achieved using the `remote.origin.url` and "
-"`remote.origin.fetch` configuration variables. (See linkgit:git-"
-"config[1]). Die Konfiguration entfernter Repositories wird durch die "
+"`remote.origin.fetch` configuration variables. (See linkgit:git-config[1])."
+" Die Konfiguration entfernter Repositories wird durch die "
"Konfigurationsvariablen `remote.origin.url` und `remote.origin.fetch` "
"erreicht. (Siehe linkgit:git-config[1])."
-#
#. type: Plain text
#: en/git-remote.txt:206
msgid "Add a new remote, fetch, and check out a branch from it"
msgstr ""
-"Ein neues entferntes Repository hinzuf체gen, den Inhalt holen und einen neuen "
-"Zweig auschecken."
+"Ein neues entferntes Repository hinzuf체gen, den Inhalt holen und einen neuen"
+" Zweig auschecken."
#. type: delimited block -
#: en/git-remote.txt:231
@@ -53565,7 +52819,6 @@ msgid ""
"...\n"
msgstr ""
-#
#. type: Plain text
#: en/git-remote.txt:234
#, fuzzy
@@ -53589,7 +52842,6 @@ msgstr ""
"$ git remote add -f -t master -m master origin git://Beispiel.com/git.git/\n"
"$ git merge origin\n"
-#
#. type: Plain text
#: en/git-remote.txt:249
msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
@@ -53597,10 +52849,9 @@ msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-repack.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-branch(1)"
+#, no-wrap
msgid "git-repack(1)"
-msgstr "git-branch(1)"
+msgstr "git-repack(1)"
#. type: Plain text
#: en/git-repack.txt:7
@@ -53610,7 +52861,9 @@ msgstr ""
#. type: Plain text
#: en/git-repack.txt:13
#, no-wrap
-msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [--window=<n>] [--depth=<n>]\n"
+msgid ""
+"'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [--window=<n>] "
+"[--depth=<n>]\n"
msgstr ""
#. type: Plain text
@@ -53626,8 +52879,8 @@ msgstr ""
msgid ""
"Instead of incrementally packing the unpacked objects, pack everything "
"referenced into a single pack. Especially useful when packing a repository "
-"that is used for private development. Use with `-d`. This will clean up the "
-"objects that `git prune` leaves behind, but `git fsck --full --dangling` "
+"that is used for private development. Use with `-d`. This will clean up the"
+" objects that `git prune` leaves behind, but `git fsck --full --dangling` "
"shows as dangling."
msgstr ""
@@ -53644,8 +52897,8 @@ msgstr ""
msgid ""
"Same as `-a`, unless `-d` is used. Then any unreachable objects in a "
"previous pack become loose, unpacked objects, instead of being left in the "
-"old pack. Unreachable objects are never intentionally added to a pack, even "
-"when repacking. This option prevents unreachable objects from being "
+"old pack. Unreachable objects are never intentionally added to a pack, even"
+" when repacking. This option prevents unreachable objects from being "
"immediately deleted by way of being left in the old pack and then removed. "
"Instead, the loose unreachable objects will be pruned according to normal "
"expiry rules with the next 'git gc' invocation. See linkgit:git-gc[1]."
@@ -53700,11 +52953,11 @@ msgstr ""
msgid ""
"These two options affect how the objects contained in the pack are stored "
"using delta compression. The objects are first internally sorted by type, "
-"size and optionally names and compared against the other objects within `--"
-"window` to see if using delta compression saves space. `--depth` limits the "
-"maximum delta depth; making it too deep affects the performance on the "
-"unpacker side, because delta data needs to be applied that many times to get "
-"to the necessary object. The default value for --window is 10 and --depth "
+"size and optionally names and compared against the other objects within "
+"`--window` to see if using delta compression saves space. `--depth` limits "
+"the maximum delta depth; making it too deep affects the performance on the "
+"unpacker side, because delta data needs to be applied that many times to get"
+" to the necessary object. The default value for --window is 10 and --depth "
"is 50."
msgstr ""
@@ -53715,33 +52968,34 @@ msgid ""
"size will dynamically scale down so as to not take up more than '<n>' bytes "
"in memory. This is useful in repositories with a mix of large and small "
"objects to not run out of memory with a large window, but still be able to "
-"take advantage of the large window for the smaller objects. The size can be "
-"suffixed with \"k\", \"m\", or \"g\". `--window-memory=0` makes memory "
+"take advantage of the large window for the smaller objects. The size can be"
+" suffixed with \"k\", \"m\", or \"g\". `--window-memory=0` makes memory "
"usage unlimited. The default is taken from the `pack.windowMemory` "
-"configuration variable. Note that the actual memory usage will be the limit "
-"multiplied by the number of threads used by linkgit:git-pack-objects[1]."
+"configuration variable. Note that the actual memory usage will be the limit"
+" multiplied by the number of threads used by linkgit:git-pack-objects[1]."
msgstr ""
#. type: Labeled list
#: en/git-repack.txt:117
#, no-wrap
msgid "--write-bitmap-index"
-msgstr ""
+msgstr "--write-bitmap-index"
#. type: Plain text
#: en/git-repack.txt:123
msgid ""
"Write a reachability bitmap index as part of the repack. This only makes "
"sense when used with `-a` or `-A`, as the bitmaps must be able to refer to "
-"all reachable objects. This option overrides the setting of `repack."
-"writeBitmaps`. This option has no effect if multiple packfiles are created."
+"all reachable objects. This option overrides the setting of "
+"`repack.writeBitmaps`. This option has no effect if multiple packfiles are "
+"created."
msgstr ""
#. type: Labeled list
#: en/git-repack.txt:124
#, no-wrap
msgid "--pack-kept-objects"
-msgstr ""
+msgstr "--pack-kept-objects"
#. type: Plain text
#: en/git-repack.txt:132
@@ -53772,7 +53026,7 @@ msgstr ""
#: en/git-repack.txt:140
#, no-wrap
msgid "--keep-unreachable"
-msgstr ""
+msgstr "--keep-unreachable"
#. type: Plain text
#: en/git-repack.txt:145
@@ -53796,21 +53050,19 @@ msgid ""
"option as the conversion is performed on the fly as needed in that case."
msgstr ""
-#
#. type: Plain text
#: en/git-repack.txt:163
#, fuzzy
-#| msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
+#| msgid ""
+#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
-#
#. type: Title =
#: en/git-replace.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-remote(1)"
+#, no-wrap
msgid "git-replace(1)"
-msgstr "git-remote(1)"
+msgstr "git-replace(1)"
#. type: Plain text
#: en/git-replace.txt:7
@@ -53897,7 +53149,6 @@ msgstr ""
msgid "$ git cat-file commit foo\n"
msgstr "$ git commit -a\n"
-#
#. type: Plain text
#: en/git-replace.txt:53
#, fuzzy
@@ -53933,20 +53184,20 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:76
msgid ""
-"Edit an object's content interactively. The existing content for <object> is "
-"pretty-printed into a temporary file, an editor is launched on the file, and "
-"the result is parsed to create a new object of the same type as <object>. A "
-"replacement ref is then created to replace <object> with the newly created "
-"object. See linkgit:git-var[1] for details about how the editor will be "
-"chosen."
+"Edit an object's content interactively. The existing content for <object> is"
+" pretty-printed into a temporary file, an editor is launched on the file, "
+"and the result is parsed to create a new object of the same type as "
+"<object>. A replacement ref is then created to replace <object> with the "
+"newly created object. See linkgit:git-var[1] for details about how the "
+"editor will be chosen."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:84
msgid ""
"When editing, provide the raw object contents rather than pretty-printed "
-"ones. Currently this only affects trees, which will be shown in their binary "
-"form. This is harder to work with, but can help when repairing a tree that "
+"ones. Currently this only affects trees, which will be shown in their binary"
+" form. This is harder to work with, but can help when repairing a tree that "
"is so corrupted it cannot be pretty-printed. Note that you may need to "
"configure your editor to cleanly read and write binary data."
msgstr ""
@@ -53961,8 +53212,8 @@ msgstr ""
#: en/git-replace.txt:93
msgid ""
"Create a graft commit. A new commit is created with the same content as "
-"<commit> except that its parents will be [<parent>...] instead of <commit>'s "
-"parents. A replacement ref is then created to replace <commit> with the "
+"<commit> except that its parents will be [<parent>...] instead of <commit>'s"
+" parents. A replacement ref is then created to replace <commit> with the "
"newly created commit. See contrib/convert-grafts-to-replace-refs.sh for an "
"example script based on this option that can convert grafts to replace refs."
msgstr ""
@@ -53984,8 +53235,8 @@ msgstr ""
#: en/git-replace.txt:100
msgid ""
"List replace refs for objects that match the given pattern (or all if no "
-"pattern is given). Typing \"git replace\" without arguments, also lists all "
-"replace refs."
+"pattern is given). Typing \"git replace\" without arguments, also lists all"
+" replace refs."
msgstr ""
#. type: Labeled list
@@ -54085,7 +53336,6 @@ msgid ""
"objects."
msgstr ""
-#
#. type: Plain text
#: en/git-replace.txt:153
#, fuzzy
@@ -54100,13 +53350,11 @@ msgstr ""
"linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-"
"mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
-#
#. type: Title =
#: en/git-request-pull.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-remote(1)"
+#, no-wrap
msgid "git-request-pull(1)"
-msgstr "git-remote(1)"
+msgstr "git-request-pull(1)"
#. type: Plain text
#: en/git-request-pull.txt:7
@@ -54183,16 +53431,17 @@ msgstr ""
#: en/git-request-pull.txt:47
msgid ""
"When the repository named by `<url>` has the commit at a tip of a ref that "
-"is different from the ref you have locally, you can use the `<local>:"
-"<remote>` syntax, to have its local name, a colon `:`, and its remote name."
+"is different from the ref you have locally, you can use the "
+"`<local>:<remote>` syntax, to have its local name, a colon `:`, and its "
+"remote name."
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:56
msgid ""
"Imagine that you built your work on your `master` branch on top of the "
-"`v1.0` release, and want it to be integrated to the project. First you push "
-"that change to your public repository for others to see:"
+"`v1.0` release, and want it to be integrated to the project. First you push"
+" that change to your public repository for others to see:"
msgstr ""
#. type: Plain text
@@ -54233,7 +53482,6 @@ msgstr ""
msgid "\tgit push https://git.ko.xz/project master:for-linus\n"
msgstr ""
-#
#. type: Plain text
#: en/git-request-pull.txt:73
#, fuzzy
@@ -54249,10 +53497,9 @@ msgstr ""
#. type: Title =
#: en/git-rerere.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-write-tree(1)"
+#, no-wrap
msgid "git-rerere(1)"
-msgstr "git-write-tree(1)"
+msgstr "git-rerere(1)"
#. type: Plain text
#: en/git-rerere.txt:7
@@ -54262,7 +53509,9 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:12
#, no-wrap
-msgid "'git rerere' ['clear'|'forget' <pathspec>|'diff'|'remaining'|'status'|'gc']\n"
+msgid ""
+"'git rerere' ['clear'|'forget' "
+"<pathspec>|'diff'|'remaining'|'status'|'gc']\n"
msgstr ""
#. type: Plain text
@@ -54286,8 +53535,8 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:29
msgid ""
-"You need to set the configuration variable rerere.enabled in order to enable "
-"this command."
+"You need to set the configuration variable rerere.enabled in order to enable"
+" this command."
msgstr ""
#. type: Plain text
@@ -54336,8 +53585,9 @@ msgstr "diff"
#: en/git-rerere.txt:55
msgid ""
"Display diffs for the current state of the resolution. It is useful for "
-"tracking what has changed while the user is resolving conflicts. Additional "
-"arguments are passed directly to the system 'diff' command installed in PATH."
+"tracking what has changed while the user is resolving conflicts. Additional"
+" arguments are passed directly to the system 'diff' command installed in "
+"PATH."
msgstr ""
#. type: Labeled list
@@ -54377,8 +53627,8 @@ msgstr ""
msgid ""
"Prune records of conflicted merges that occurred a long time ago. By "
"default, unresolved conflicts older than 15 days and resolved conflicts "
-"older than 60 days are pruned. These defaults are controlled via the `gc."
-"rerereUnresolved` and `gc.rerereResolved` configuration variables "
+"older than 60 days are pruned. These defaults are controlled via the "
+"`gc.rerereUnresolved` and `gc.rerereResolved` configuration variables "
"respectively."
msgstr ""
@@ -54387,8 +53637,8 @@ msgstr ""
msgid ""
"When your topic branch modifies an overlapping area that your master branch "
"(or upstream) touched since your topic branch forked from it, you may want "
-"to test it with the latest master, even before your topic branch is ready to "
-"be pushed upstream:"
+"to test it with the latest master, even before your topic branch is ready to"
+" be pushed upstream:"
msgstr ""
#. type: delimited block -
@@ -54433,9 +53683,9 @@ msgstr ""
#: en/git-rerere.txt:106
msgid ""
"The commits marked with `*` touch the same area in the same file; you need "
-"to resolve the conflicts when creating the commit marked with `+`. Then you "
-"can test the result to make sure your work-in-progress still works with what "
-"is in the latest master."
+"to resolve the conflicts when creating the commit marked with `+`. Then you"
+" can test the result to make sure your work-in-progress still works with "
+"what is in the latest master."
msgstr ""
#. type: Plain text
@@ -54475,8 +53725,8 @@ msgid ""
"When your topic branch is long-lived, however, your topic branch would end "
"up having many such \"Merge from master\" commits on it, which would "
"unnecessarily clutter the development history. Readers of the Linux kernel "
-"mailing list may remember that Linus complained about such too frequent test "
-"merges when a subsystem maintainer asked to pull from a branch full of "
+"mailing list may remember that Linus complained about such too frequent test"
+" merges when a subsystem maintainer asked to pull from a branch full of "
"\"useless merges\"."
msgstr ""
@@ -54526,17 +53776,17 @@ msgid ""
"Running the 'git rerere' command immediately after a conflicted automerge "
"records the conflicted working tree files, with the usual conflict markers "
"`<<<<<<<`, `=======`, and `>>>>>>>` in them. Later, after you are done "
-"resolving the conflicts, running 'git rerere' again will record the resolved "
-"state of these files. Suppose you did this when you created the test merge "
-"of master into the topic branch."
+"resolving the conflicts, running 'git rerere' again will record the resolved"
+" state of these files. Suppose you did this when you created the test merge"
+" of master into the topic branch."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:177
msgid ""
"Next time, after seeing the same conflicted automerge, running 'git rerere' "
-"will perform a three-way merge between the earlier conflicted automerge, the "
-"earlier manual resolution, and the current conflicted automerge. If this "
+"will perform a three-way merge between the earlier conflicted automerge, the"
+" earlier manual resolution, and the current conflicted automerge. If this "
"three-way merge resolves cleanly, the result is written out to your working "
"tree file, so you do not have to manually resolve it. Note that 'git "
"rerere' leaves the index file alone, so you still need to do the final "
@@ -54560,16 +53810,16 @@ msgstr ""
msgid ""
"In our example, when you do the test merge, the manual resolution is "
"recorded, and it will be reused when you do the actual merge later with the "
-"updated master and topic branch, as long as the recorded resolution is still "
-"applicable."
+"updated master and topic branch, as long as the recorded resolution is still"
+" applicable."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:194
msgid ""
-"The information 'git rerere' records is also used when running 'git "
-"rebase'. After blowing away the test merge and continuing development on "
-"the topic branch:"
+"The information 'git rerere' records is also used when running 'git rebase'."
+" After blowing away the test merge and continuing development on the topic "
+"branch:"
msgstr ""
#. type: delimited block -
@@ -54600,20 +53850,18 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:213
msgid ""
-"you could run `git rebase master topic`, to bring yourself up-to-date before "
-"your topic is ready to be sent upstream. This would result in falling back "
-"to a three-way merge, and it would conflict the same way as the test merge "
+"you could run `git rebase master topic`, to bring yourself up-to-date before"
+" your topic is ready to be sent upstream. This would result in falling back"
+" to a three-way merge, and it would conflict the same way as the test merge "
"you resolved earlier. 'git rerere' will be run by 'git rebase' to help you "
"resolve this conflict."
msgstr ""
-#
#. type: Title =
#: en/git-reset.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-remote(1)"
+#, no-wrap
msgid "git-reset(1)"
-msgstr "git-remote(1)"
+msgstr "git-reset(1)"
#. type: Plain text
#: en/git-reset.txt:7
@@ -54632,10 +53880,10 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:21
msgid ""
-"In the first and second form, copy entries from <tree-ish> to the index. In "
-"the third form, set the current branch head (HEAD) to <commit>, optionally "
-"modifying index and working tree to match. The <tree-ish>/<commit> defaults "
-"to HEAD in all forms."
+"In the first and second form, copy entries from <tree-ish> to the index. In"
+" the third form, set the current branch head (HEAD) to <commit>, optionally "
+"modifying index and working tree to match. The <tree-ish>/<commit> defaults"
+" to HEAD in all forms."
msgstr ""
#. type: Labeled list
@@ -54663,9 +53911,9 @@ msgstr ""
msgid ""
"After running `git reset <paths>` to update the index entry, you can use "
"linkgit:git-checkout[1] to check the contents out of the index to the "
-"working tree. Alternatively, using linkgit:git-checkout[1] and specifying a "
-"commit, you can copy the contents of a path out of a commit to the index and "
-"to the working tree in one go."
+"working tree. Alternatively, using linkgit:git-checkout[1] and specifying a"
+" commit, you can copy the contents of a path out of a commit to the index "
+"and to the working tree in one go."
msgstr ""
#. type: Labeled list
@@ -54710,7 +53958,7 @@ msgstr ""
#: en/git-reset.txt:53
#, no-wrap
msgid "--soft"
-msgstr ""
+msgstr "--soft"
#. type: Plain text
#: en/git-reset.txt:58
@@ -54724,7 +53972,7 @@ msgstr ""
#: en/git-reset.txt:59
#, no-wrap
msgid "--mixed"
-msgstr ""
+msgstr "--mixed"
#. type: Plain text
#: en/git-reset.txt:63
@@ -54737,16 +53985,15 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:66
msgid ""
-"If `-N` is specified, removed paths are marked as intent-to-add (see linkgit:"
-"git-add[1])."
+"If `-N` is specified, removed paths are marked as intent-to-add (see "
+"linkgit:git-add[1])."
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:67
-#, fuzzy, no-wrap
-#| msgid "--no-hardlinks"
+#, no-wrap
msgid "--hard"
-msgstr "--no-hardlinks"
+msgstr "--hard"
#. type: Plain text
#: en/git-reset.txt:70
@@ -54761,8 +54008,8 @@ msgid ""
"Resets the index and updates the files in the working tree that are "
"different between <commit> and HEAD, but keeps those which are different "
"between the index and working tree (i.e. which have changes which have not "
-"been added). If a file that is different between <commit> and the index has "
-"unstaged changes, reset is aborted."
+"been added). If a file that is different between <commit> and the index has"
+" unstaged changes, reset is aborted."
msgstr ""
#. type: Plain text
@@ -54871,8 +54118,8 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:143
msgid ""
-"\"reset\" copies the old head to .git/ORIG_HEAD; redo the commit by starting "
-"with its log message. If you do not need to edit the message further, you "
+"\"reset\" copies the old head to .git/ORIG_HEAD; redo the commit by starting"
+" with its log message. If you do not need to edit the message further, you "
"can give -C option instead."
msgstr ""
@@ -54933,8 +54180,8 @@ msgstr ""
msgid ""
"The last three commits (HEAD, HEAD^, and HEAD~2) were bad and you do not "
"want to ever see them again. Do *not* do this if you have already given "
-"these commits to somebody else. (See the \"RECOVERING FROM UPSTREAM REBASE"
-"\" section in linkgit:git-rebase[1] for the implications of doing so.)"
+"these commits to somebody else. (See the \"RECOVERING FROM UPSTREAM "
+"REBASE\" section in linkgit:git-rebase[1] for the implications of doing so.)"
msgstr ""
#. type: Labeled list
@@ -54961,8 +54208,8 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:191
msgid ""
-"Try to update from the upstream resulted in a lot of conflicts; you were not "
-"ready to spend a lot of time merging right now, so you decide to do that "
+"Try to update from the upstream resulted in a lot of conflicts; you were not"
+" ready to spend a lot of time merging right now, so you decide to do that "
"later."
msgstr ""
@@ -55065,8 +54312,8 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:246
msgid ""
-"This removes the 'WIP' commit from the commit history, and sets your working "
-"tree to the state just before you made that snapshot."
+"This removes the 'WIP' commit from the commit history, and sets your working"
+" tree to the state just before you made that snapshot."
msgstr ""
#. type: Plain text
@@ -55077,7 +54324,6 @@ msgid ""
"uncommitted."
msgstr ""
-#
#. type: Plain text
#: en/git-reset.txt:251
#, fuzzy
@@ -55125,13 +54371,15 @@ msgstr ""
msgid "Adds the file to the index again."
msgstr ""
-#
#. type: Labeled list
#: en/git-reset.txt:269
#, fuzzy, no-wrap
-#| msgid "Changes in the working tree not yet staged for the next commit."
+#| msgid ""
+#| "Changes in the working tree not yet staged for the next commit."
msgid "Keep changes in working tree while discarding some previous commits"
-msgstr "횆nderungen im Arbeitsbereich, die noch nicht im Index f체r die n채chste Eintragung (commit) vorbereitet wurden."
+msgstr ""
+"횆nderungen im Arbeitsbereich, die noch nicht im Index f체r die n채chste "
+"Eintragung (commit) vorbereitet wurden."
#. type: Plain text
#: en/git-reset.txt:276
@@ -55165,8 +54413,8 @@ msgstr ""
#: en/git-reset.txt:292
msgid ""
"In the ideal world, you could have realized that the earlier commit did not "
-"belong to the new topic when you created and switched to branch2 (i.e. \"git "
-"checkout -b branch2 start\"), but nobody is perfect."
+"belong to the new topic when you created and switched to branch2 (i.e. \"git"
+" checkout -b branch2 start\"), but nobody is perfect."
msgstr ""
#. type: Plain text
@@ -55212,18 +54460,18 @@ msgstr ""
#: en/git-reset.txt:319
msgid ""
"First, reset the history back one commit so that we remove the original "
-"commit, but leave the working tree with all the changes. The -N ensures that "
-"any new files added with HEAD are still marked so that git add -p will find "
-"them."
+"commit, but leave the working tree with all the changes. The -N ensures that"
+" any new files added with HEAD are still marked so that git add -p will find"
+" them."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:323
msgid ""
"Next, we interactively select diff hunks to add using the git add -p "
-"facility. This will ask you about each diff hunk in sequence and you can use "
-"simple commands such as \"yes, include this\", \"No don't include this\" or "
-"even the very powerful \"edit\" facility."
+"facility. This will ask you about each diff hunk in sequence and you can use"
+" simple commands such as \"yes, include this\", \"No don't include this\" or"
+" even the very powerful \"edit\" facility."
msgstr ""
#. type: Plain text
@@ -55238,10 +54486,10 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:333
msgid ""
-"Next, commit the changes stored in the index. The -c option specifies to pre-"
-"populate the commit message from the original message that you started with "
-"in the first commit. This is helpful to avoid retyping it. The HEAD@{1} is a "
-"special notation for the commit that HEAD used to be at prior to the "
+"Next, commit the changes stored in the index. The -c option specifies to "
+"pre-populate the commit message from the original message that you started "
+"with in the first commit. This is helpful to avoid retyping it. The HEAD@{1}"
+" is a special notation for the commit that HEAD used to be at prior to the "
"original reset commit (1 change ago). See linkgit:git-reflog[1] for more "
"details. You may also use any other valid commit reference."
msgstr ""
@@ -55299,8 +54547,8 @@ msgid ""
"example, the first line of the first table means that if a file is in state "
"A in the working tree, in state B in the index, in state C in HEAD and in "
"state D in the target, then \"git reset --soft target\" will leave the file "
-"in the working tree in state A and in the index in state B. It resets (i.e. "
-"moves) the HEAD (i.e. the tip of the current branch, if you are on one) to "
+"in the working tree in state A and in the index in state B. It resets (i.e."
+" moves) the HEAD (i.e. the tip of the current branch, if you are on one) to "
"\"target\" (which has the file in state D)."
msgstr ""
@@ -55391,8 +54639,8 @@ msgid ""
"starts, and that it writes the result out to the working tree. So if we see "
"some difference between the index and the target and also between the index "
"and the working tree, then it means that we are not resetting out from a "
-"state that a mergy operation left after failing with a conflict. That is why "
-"we disallow --merge option in this case."
+"state that a mergy operation left after failing with a conflict. That is why"
+" we disallow --merge option in this case."
msgstr ""
#. type: Plain text
@@ -55409,7 +54657,8 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:433
-msgid "The following tables show what happens when there are unmerged entries:"
+msgid ""
+"The following tables show what happens when there are unmerged entries:"
msgstr ""
#. type: Plain text
@@ -55443,13 +54692,11 @@ msgstr ""
msgid "X means any state and U means an unmerged index."
msgstr ""
-#
#. type: Title =
#: en/git-revert.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-remote(1)"
+#, no-wrap
msgid "git-revert(1)"
-msgstr "git-remote(1)"
+msgstr "git-revert(1)"
#. type: Plain text
#: en/git-revert.txt:7
@@ -55500,8 +54747,8 @@ msgstr ""
#. type: Plain text
#: en/git-revert.txt:48
msgid ""
-"With this option, 'git revert' will let you edit the commit message prior to "
-"committing the revert. This is the default if you run the command from a "
+"With this option, 'git revert' will let you edit the commit message prior to"
+" committing the revert. This is the default if you run the command from a "
"terminal."
msgstr ""
@@ -55540,8 +54787,8 @@ msgstr ""
#: en/git-revert.txt:79
msgid ""
"Usually the command automatically creates some commits with commit log "
-"messages stating which commits were reverted. This flag applies the changes "
-"necessary to revert the named commits to your working tree and the index, "
+"messages stating which commits were reverted. This flag applies the changes"
+" necessary to revert the named commits to your working tree and the index, "
"but does not make the commits. In addition, when this option is used, your "
"index does not have to match the HEAD commit. The revert is done against "
"the beginning state of your index."
@@ -55550,8 +54797,8 @@ msgstr ""
#. type: Plain text
#: en/git-revert.txt:82
msgid ""
-"This is useful when reverting more than one commits' effect to your index in "
-"a row."
+"This is useful when reverting more than one commits' effect to your index in"
+" a row."
msgstr ""
#. type: Labeled list
@@ -55582,13 +54829,11 @@ msgid ""
"tree and the index."
msgstr ""
-#
#. type: Title =
#: en/git-rev-list.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-remote(1)"
+#, no-wrap
msgid "git-rev-list(1)"
-msgstr "git-remote(1)"
+msgstr "git-rev-list(1)"
#. type: Plain text
#: en/git-rev-list.txt:7
@@ -55663,10 +54908,10 @@ msgstr ""
#. type: Plain text
#: en/git-rev-list.txt:77
msgid ""
-"You can think of this as a set operation. Commits given on the command line "
-"form a set of commits that are reachable from any of them, and then commits "
-"reachable from any of the ones given with '{caret}' in front are subtracted "
-"from that set. The remaining commits are what comes out in the command's "
+"You can think of this as a set operation. Commits given on the command line"
+" form a set of commits that are reachable from any of them, and then commits"
+" reachable from any of the ones given with '{caret}' in front are subtracted"
+" from that set. The remaining commits are what comes out in the command's "
"output. Various other options and paths parameters can be used to further "
"limit the result."
msgstr ""
@@ -55693,8 +54938,8 @@ msgstr ""
#: en/git-rev-list.txt:90
msgid ""
"A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand "
-"for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following "
-"may be used interchangeably:"
+"for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following"
+" may be used interchangeably:"
msgstr ""
#. type: delimited block -
@@ -55724,25 +54969,23 @@ msgstr ""
#. type: Plain text
#: en/git-rev-list.txt:110
msgid ""
-"'rev-list' is a very essential Git command, since it provides the ability to "
-"build and traverse commit ancestry graphs. For this reason, it has a lot of "
-"different options that enables it to be used by commands as different as "
+"'rev-list' is a very essential Git command, since it provides the ability to"
+" build and traverse commit ancestry graphs. For this reason, it has a lot of"
+" different options that enables it to be used by commands as different as "
"'git bisect' and 'git repack'."
msgstr ""
#. type: Title =
#: en/git-rev-parse.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-write-tree(1)"
+#, no-wrap
msgid "git-rev-parse(1)"
-msgstr "git-write-tree(1)"
+msgstr "git-rev-parse(1)"
#. type: Plain text
#: en/git-rev-parse.txt:7
msgid "git-rev-parse - Pick out and massage parameters"
msgstr ""
-#
#. type: Plain text
#: en/git-rev-parse.txt:13
#, fuzzy, no-wrap
@@ -55775,7 +55018,7 @@ msgstr ""
#: en/git-rev-parse.txt:33
#, no-wrap
msgid "--parseopt"
-msgstr ""
+msgstr "--parseopt"
#. type: Plain text
#: en/git-rev-parse.txt:35
@@ -55787,7 +55030,7 @@ msgstr ""
#: en/git-rev-parse.txt:36
#, no-wrap
msgid "--sq-quote"
-msgstr ""
+msgstr "--sq-quote"
#. type: Plain text
#: en/git-rev-parse.txt:40
@@ -55807,7 +55050,7 @@ msgstr ""
#: en/git-rev-parse.txt:44
#, no-wrap
msgid "--keep-dashdash"
-msgstr ""
+msgstr "--keep-dashdash"
#. type: Plain text
#: en/git-rev-parse.txt:47
@@ -55820,21 +55063,21 @@ msgstr ""
#: en/git-rev-parse.txt:48
#, no-wrap
msgid "--stop-at-non-option"
-msgstr ""
+msgstr "--stop-at-non-option"
#. type: Plain text
#: en/git-rev-parse.txt:52
msgid ""
"Only meaningful in `--parseopt` mode. Lets the option parser stop at the "
-"first non-option argument. This can be used to parse sub-commands that take "
-"options themselves."
+"first non-option argument. This can be used to parse sub-commands that take"
+" options themselves."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:53
#, no-wrap
msgid "--stuck-long"
-msgstr ""
+msgstr "--stuck-long"
#. type: Plain text
#: en/git-rev-parse.txt:56
@@ -55851,10 +55094,9 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:60
-#, fuzzy, no-wrap
-#| msgid "--only"
+#, no-wrap
msgid "--revs-only"
-msgstr "--only"
+msgstr "--revs-only"
#. type: Plain text
#: en/git-rev-parse.txt:63
@@ -55864,10 +55106,9 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:64
-#, fuzzy, no-wrap
-#| msgid "--no-abbrev"
+#, no-wrap
msgid "--no-revs"
-msgstr "--no-abbrev"
+msgstr "--no-revs"
#. type: Plain text
#: en/git-rev-parse.txt:67
@@ -55878,7 +55119,7 @@ msgstr ""
#: en/git-rev-parse.txt:68
#, no-wrap
msgid "--flags"
-msgstr ""
+msgstr "--flags"
#. type: Plain text
#: en/git-rev-parse.txt:70
@@ -55887,10 +55128,9 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:71
-#, fuzzy, no-wrap
-#| msgid "--no-color"
+#, no-wrap
msgid "--no-flags"
-msgstr "--no-color"
+msgstr "--no-flags"
#. type: Plain text
#: en/git-rev-parse.txt:73
@@ -55933,8 +55173,8 @@ msgstr ""
#: en/git-rev-parse.txt:90
msgid ""
"This can be used to convert arguments to a command run in a subdirectory so "
-"that they can still be used after moving to the top-level of the "
-"repository. For example:"
+"that they can still be used after moving to the top-level of the repository."
+" For example:"
msgstr ""
#. type: delimited block -
@@ -55959,8 +55199,8 @@ msgstr ""
#: en/git-rev-parse.txt:112
msgid ""
"If you want to make sure that the output actually names an object in your "
-"object database and/or can be used as a specific type of object you require, "
-"you can add the `^{type}` peeling operator to the parameter. For example, "
+"object database and/or can be used as a specific type of object you require,"
+" you can add the `^{type}` peeling operator to the parameter. For example, "
"`git rev-parse \"$VAR^{commit}\"` will make sure `$VAR` names an existing "
"object that is a commit-ish (i.e. a commit, or an annotated tag that points "
"at a commit). To make sure that `$VAR` names an existing object of any "
@@ -55971,24 +55211,24 @@ msgstr ""
#: en/git-rev-parse.txt:119
msgid ""
"Only meaningful in `--verify` mode. Do not output an error message if the "
-"first argument is not a valid object name; instead exit with non-zero status "
-"silently. SHA-1s for valid object names are printed to stdout on success."
+"first argument is not a valid object name; instead exit with non-zero status"
+" silently. SHA-1s for valid object names are printed to stdout on success."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:120
#, no-wrap
msgid "--sq"
-msgstr ""
+msgstr "--sq"
#. type: Plain text
#: en/git-rev-parse.txt:128
msgid ""
"Usually the output is made one line per flag and parameter. This option "
"makes output a single line, properly quoted for consumption by shell. "
-"Useful when you expect your parameter to contain whitespaces and newlines (e."
-"g. when using pickaxe `-S` with 'git diff-{asterisk}'). In contrast to the "
-"`--sq-quote` option, the command input is still interpreted as usual."
+"Useful when you expect your parameter to contain whitespaces and newlines "
+"(e.g. when using pickaxe `-S` with 'git diff-{asterisk}'). In contrast to "
+"the `--sq-quote` option, the command input is still interpreted as usual."
msgstr ""
#. type: Plain text
@@ -56007,8 +55247,8 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:138
msgid ""
-"A non-ambiguous short name of the objects name. The option core."
-"warnAmbiguousRefs is used to select the strict abbreviation mode."
+"A non-ambiguous short name of the objects name. The option "
+"core.warnAmbiguousRefs is used to select the strict abbreviation mode."
msgstr ""
#. type: Labeled list
@@ -56029,7 +55269,7 @@ msgstr ""
#: en/git-rev-parse.txt:145
#, no-wrap
msgid "--symbolic"
-msgstr ""
+msgstr "--symbolic"
#. type: Plain text
#: en/git-rev-parse.txt:149
@@ -56043,7 +55283,7 @@ msgstr ""
#: en/git-rev-parse.txt:150
#, no-wrap
msgid "--symbolic-full-name"
-msgstr ""
+msgstr "--symbolic-full-name"
#. type: Plain text
#: en/git-rev-parse.txt:157
@@ -56094,9 +55334,9 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:174
msgid ""
-"If a `pattern` is given, only refs matching the given shell glob are shown. "
-"If the pattern does not contain a globbing character (`?`, `*`, or `[`), it "
-"is turned into a prefix match by appending `/*`."
+"If a `pattern` is given, only refs matching the given shell glob are shown."
+" If the pattern does not contain a globbing character (`?`, `*`, or `[`), "
+"it is turned into a prefix match by appending `/*`."
msgstr ""
#. type: Labeled list
@@ -56109,8 +55349,8 @@ msgstr "--global"
#. type: Plain text
#: en/git-rev-parse.txt:181
msgid ""
-"Show all refs matching the shell glob pattern `pattern`. If the pattern does "
-"not start with `refs/`, this is automatically prepended. If the pattern "
+"Show all refs matching the shell glob pattern `pattern`. If the pattern does"
+" not start with `refs/`, this is automatically prepended. If the pattern "
"does not contain a globbing character (`?`, `*`, or `[`), it is turned into "
"a prefix match by appending `/*`."
msgstr ""
@@ -56124,18 +55364,18 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:189 en/rev-list-options.txt:171
msgid ""
-"Do not include refs matching '<glob-pattern>' that the next `--all`, `--"
-"branches`, `--tags`, `--remotes`, or `--glob` would otherwise consider. "
-"Repetitions of this option accumulate exclusion patterns up to the next `--"
-"all`, `--branches`, `--tags`, `--remotes`, or `--glob` option (other options "
-"or arguments do not clear accumulated patterns)."
+"Do not include refs matching '<glob-pattern>' that the next `--all`, "
+"`--branches`, `--tags`, `--remotes`, or `--glob` would otherwise consider. "
+"Repetitions of this option accumulate exclusion patterns up to the next "
+"`--all`, `--branches`, `--tags`, `--remotes`, or `--glob` option (other "
+"options or arguments do not clear accumulated patterns)."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:195 en/rev-list-options.txt:177
msgid ""
-"The patterns given should not begin with `refs/heads`, `refs/tags`, or `refs/"
-"remotes` when applied to `--branches`, `--tags`, or `--remotes`, "
+"The patterns given should not begin with `refs/heads`, `refs/tags`, or "
+"`refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`, "
"respectively, and they must begin with `refs/` when applied to `--glob` or "
"`--all`. If a trailing '/{asterisk}' is intended, it must be given "
"explicitly."
@@ -56163,10 +55403,9 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:205
-#, fuzzy, no-wrap
-#| msgid "--local"
+#, no-wrap
msgid "--local-env-vars"
-msgstr "--local"
+msgstr "--local-env-vars"
#. type: Plain text
#: en/git-rev-parse.txt:210
@@ -56178,10 +55417,9 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:211
-#, fuzzy, no-wrap
-#| msgid "git-diff(1)"
+#, no-wrap
msgid "--git-dir"
-msgstr "git-diff(1)"
+msgstr "--git-dir"
#. type: Plain text
#: en/git-rev-parse.txt:215
@@ -56194,15 +55432,15 @@ msgstr ""
#: en/git-rev-parse.txt:219
msgid ""
"If `$GIT_DIR` is not defined and the current directory is not detected to "
-"lie in a Git repository or work tree print a message to stderr and exit with "
-"nonzero status."
+"lie in a Git repository or work tree print a message to stderr and exit with"
+" nonzero status."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:220
#, no-wrap
msgid "--absolute-git-dir"
-msgstr ""
+msgstr "--absolute-git-dir"
#. type: Plain text
#: en/git-rev-parse.txt:223
@@ -56212,10 +55450,9 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:224
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--git-common-dir"
-msgstr "git-commit(1)"
+msgstr "--git-common-dir"
#. type: Plain text
#: en/git-rev-parse.txt:226
@@ -56226,7 +55463,7 @@ msgstr ""
#: en/git-rev-parse.txt:227
#, no-wrap
msgid "--is-inside-git-dir"
-msgstr ""
+msgstr "--is-inside-git-dir"
#. type: Plain text
#: en/git-rev-parse.txt:230
@@ -56239,21 +55476,20 @@ msgstr ""
#: en/git-rev-parse.txt:231
#, no-wrap
msgid "--is-inside-work-tree"
-msgstr ""
+msgstr "--is-inside-work-tree"
#. type: Plain text
#: en/git-rev-parse.txt:234
msgid ""
-"When the current working directory is inside the work tree of the repository "
-"print \"true\", otherwise \"false\"."
+"When the current working directory is inside the work tree of the repository"
+" print \"true\", otherwise \"false\"."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:235
-#, fuzzy, no-wrap
-#| msgid "--reference <repository>"
+#, no-wrap
msgid "--is-bare-repository"
-msgstr "--reference <repository>"
+msgstr "--is-bare-repository"
#. type: Plain text
#: en/git-rev-parse.txt:237
@@ -56294,7 +55530,7 @@ msgstr ""
#: en/git-rev-parse.txt:251
#, no-wrap
msgid "--show-cdup"
-msgstr ""
+msgstr "--show-cdup"
#. type: Plain text
#: en/git-rev-parse.txt:255
@@ -56308,7 +55544,7 @@ msgstr ""
#: en/git-rev-parse.txt:256
#, no-wrap
msgid "--show-prefix"
-msgstr ""
+msgstr "--show-prefix"
#. type: Plain text
#: en/git-rev-parse.txt:260
@@ -56321,7 +55557,7 @@ msgstr ""
#: en/git-rev-parse.txt:261
#, no-wrap
msgid "--show-toplevel"
-msgstr ""
+msgstr "--show-toplevel"
#. type: Plain text
#: en/git-rev-parse.txt:263
@@ -56343,7 +55579,7 @@ msgstr ""
#: en/git-rev-parse.txt:270
#, no-wrap
msgid "--shared-index-path"
-msgstr ""
+msgstr "--shared-index-path"
#. type: Plain text
#: en/git-rev-parse.txt:273
@@ -56373,8 +55609,8 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:281
msgid ""
-"Parse the date string, and output the corresponding --max-age= parameter for "
-"'git rev-list'."
+"Parse the date string, and output the corresponding --max-age= parameter for"
+" 'git rev-list'."
msgstr ""
#. type: Labeled list
@@ -56392,8 +55628,8 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:286
msgid ""
-"Parse the date string, and output the corresponding --min-age= parameter for "
-"'git rev-list'."
+"Parse the date string, and output the corresponding --min-age= parameter for"
+" 'git rev-list'."
msgstr ""
#. type: Labeled list
@@ -56426,10 +55662,10 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:304
msgid ""
-"It takes on the standard input the specification of the options to parse and "
-"understand, and echoes on the standard output a string suitable for `sh(1)` "
-"`eval` to replace the arguments with normalized ones. In case of error, it "
-"outputs usage on the standard error stream, and exits with code 129."
+"It takes on the standard input the specification of the options to parse and"
+" understand, and echoes on the standard output a string suitable for `sh(1)`"
+" `eval` to replace the arguments with normalized ones. In case of error, it"
+" outputs usage on the standard error stream, and exits with code 129."
msgstr ""
#. type: Plain text
@@ -56501,9 +55737,9 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:339
msgid ""
-"Use `*` to mean that this option should not be listed in the usage generated "
-"for the `-h` argument. It's shown for `--help-all` as documented in linkgit:"
-"gitcli[7]."
+"Use `*` to mean that this option should not be listed in the usage generated"
+" for the `-h` argument. It's shown for `--help-all` as documented in "
+"linkgit:gitcli[7]."
msgstr ""
#. type: Plain text
@@ -56585,7 +55821,9 @@ msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:375
#, no-wrap
-msgid "eval \"$(echo \"$OPTS_SPEC\" | git rev-parse --parseopt -- \"$@\" || echo exit $?)\"\n"
+msgid ""
+"eval \"$(echo \"$OPTS_SPEC\" | git rev-parse --parseopt -- \"$@\" || echo "
+"exit $?)\"\n"
msgstr ""
#. type: Title ~
@@ -56641,8 +55879,8 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:406
msgid ""
-"In `--sq-quote` mode, 'git rev-parse' echoes on the standard output a single "
-"line suitable for `sh(1)` `eval`. This line is made by normalizing the "
+"In `--sq-quote` mode, 'git rev-parse' echoes on the standard output a single"
+" line suitable for `sh(1)` `eval`. This line is made by normalizing the "
"arguments following `--sq-quote`. Nothing other than quoting the arguments "
"is done."
msgstr ""
@@ -56673,7 +55911,6 @@ msgstr ""
msgid "$ sh your-git-script.sh \"a b'c\"\n"
msgstr ""
-#
#. type: Plain text
#: en/git-rev-parse.txt:430
#, fuzzy
@@ -56727,34 +55964,37 @@ msgstr ""
msgid "git-rm(1)"
msgstr "git-rm(1)"
-#
#. type: Plain text
#: en/git-rm.txt:7
msgid "git-rm - Remove files from the working tree and from the index"
msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
-#
#. type: Plain text
#: en/git-rm.txt:12
#, fuzzy, no-wrap
-#| msgid "'git rm' [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>..."
-msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
-msgstr "'git rm' [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <Datei>..."
+#| msgid ""
+#| "'git rm' [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] "
+#| "<file>..."
+msgid ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] "
+"[--] <file>...\n"
+msgstr ""
+"'git rm' [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] "
+"<Datei>..."
-#
#. type: Plain text
#: en/git-rm.txt:25
#, fuzzy
#| msgid ""
-#| "Remove files from the index, or from the working tree and the index. "
-#| "'git-rm' will not remove a file from just your working directory. (There "
-#| "is no option to remove a file only from the work tree and yet keep it in "
-#| "the index; use `/bin/rm` if you want to do that.) The files being "
-#| "removed have to be identical to the tip of the branch, and no updates to "
-#| "their contents can be staged in the index, though that default behavior "
-#| "can be overridden with the `-f` option. When '--cached' is given, the "
-#| "staged content has to match either the tip of the branch or the file on "
-#| "disk, allowing the file to be removed from just the index."
+#| "Remove files from the index, or from the working tree and the index. 'git-"
+#| "rm' will not remove a file from just your working directory. (There is no "
+#| "option to remove a file only from the work tree and yet keep it in the "
+#| "index; use `/bin/rm` if you want to do that.) The files being removed have "
+#| "to be identical to the tip of the branch, and no updates to their contents "
+#| "can be staged in the index, though that default behavior can be overridden "
+#| "with the `-f` option. When '--cached' is given, the staged content has to "
+#| "match either the tip of the branch or the file on disk, allowing the file to"
+#| " be removed from just the index."
msgid ""
"Remove files from the index, or from the working tree and the index. `git "
"rm` will not remove a file from just your working directory. (There is no "
@@ -56763,13 +56003,13 @@ msgid ""
"to be identical to the tip of the branch, and no updates to their contents "
"can be staged in the index, though that default behavior can be overridden "
"with the `-f` option. When `--cached` is given, the staged content has to "
-"match either the tip of the branch or the file on disk, allowing the file to "
-"be removed from just the index."
+"match either the tip of the branch or the file on disk, allowing the file to"
+" be removed from just the index."
msgstr ""
"Entferne Dateien aus dem Index, oder aus dem Arbeitsbereich und dem Index. "
"'git-rm' wird die Datei immer auch aus dem Index entfernen - es gibt keine "
-"M철glichkeit die Datei lediglich aus dem Arbeitsbereich zu l철schen (zu diesem "
-"Zweck kann das normale '/bin/rm' verwendet werden). Die zu entfernende "
+"M철glichkeit die Datei lediglich aus dem Arbeitsbereich zu l철schen (zu diesem"
+" Zweck kann das normale '/bin/rm' verwendet werden). Die zu entfernende "
"Datei mu횩 identisch mit der letzten Version im Projektarchiv sein, und es "
"k철nnen gleichzeitig keine 횆nderungen im Index bereitgestellt werden "
"(staging). Dieses Standardverhalten kann jedoch mit der '-f' Option "
@@ -56778,41 +56018,38 @@ msgstr ""
"Datei im Arbeitsbereich. Die Datei wird bei Verwendung von '--cached' "
"ausschlie횩lich aus dem Index entfernt."
-#
#. type: Plain text
#: en/git-rm.txt:38
#, fuzzy
#| msgid ""
-#| "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all "
-#| "matching files. If you want git to expand file glob characters, you may "
-#| "need to shell-escape them. A leading directory name (e.g. `dir` to "
-#| "remove `dir/file1` and `dir/file2`) can be given to remove all files in "
-#| "the directory, and recursively all sub-directories, but this requires the "
-#| "`-r` option to be explicitly given."
-msgid ""
-"Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching "
-"files. If you want Git to expand file glob characters, you may need to "
-"shell-escape them. A leading directory name (e.g. `dir` to remove `dir/"
-"file1` and `dir/file2`) can be given to remove all files in the directory, "
-"and recursively all sub-directories, but this requires the `-r` option to be "
-"explicitly given."
+#| "Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching"
+#| " files. If you want git to expand file glob characters, you may need to "
+#| "shell-escape them. A leading directory name (e.g. `dir` to remove "
+#| "`dir/file1` and `dir/file2`) can be given to remove all files in the "
+#| "directory, and recursively all sub-directories, but this requires the `-r` "
+#| "option to be explicitly given."
+msgid ""
+"Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching"
+" files. If you want Git to expand file glob characters, you may need to "
+"shell-escape them. A leading directory name (e.g. `dir` to remove "
+"`dir/file1` and `dir/file2`) can be given to remove all files in the "
+"directory, and recursively all sub-directories, but this requires the `-r` "
+"option to be explicitly given."
msgstr ""
"Dateien die entfernt werden sollen. Dateisuchkriterien (z.B. '*.c') k철nnen "
"verwendet werden um alle\tpassenden Dateien zu entfernen. Soll sich git "
"selbst um die Erweiterung der Dateisuchkriterien k체mmern, so mu횩 dies dem "
"Befehlsprozessor angegeben werden (z.B. Documentation/\\\\*.txt). Es kann "
"auch ein Pfadname angegeben werden, um rekursiv alle in diesem Pfad "
-"befindlichen Dateien (auch in den Unterordnern) zu entfernen (z.B. 'dir' f체r "
-"'dir/datei1' und 'dir/datei2'). Allerdings mu횩 dazu die '-r' Option "
+"befindlichen Dateien (auch in den Unterordnern) zu entfernen (z.B. 'dir' f체r"
+" 'dir/datei1' und 'dir/datei2'). Allerdings mu횩 dazu die '-r' Option "
"explizit angegeben werden."
-#
#. type: Plain text
#: en/git-rm.txt:42
msgid "Override the up-to-date check."
msgstr "Ignoriere das Ergebnis der Pr체fung auf Aktualit채t der Dateien."
-#
#. type: Plain text
#: en/git-rm.txt:48
msgid ""
@@ -56822,15 +56059,13 @@ msgstr ""
"Entferne die Datei(en) nicht wirklich, sondern zeige nur ob sie im Index "
"existieren und gegebenenfalls durch den Befehl entfernt werden w체rden."
-#
#. type: Plain text
#: en/git-rm.txt:52
msgid "Allow recursive removal when a leading directory name is given."
msgstr ""
-"Erm철gliche rekursives Entfernen wenn ein f체hrender Verzeichnisname angegeben "
-"wurde."
+"Erm철gliche rekursives Entfernen wenn ein f체hrender Verzeichnisname angegeben"
+" wurde."
-#
#. type: Plain text
#: en/git-rm.txt:62
msgid ""
@@ -56847,7 +56082,6 @@ msgstr ""
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
-#
#. type: Plain text
#: en/git-rm.txt:65
msgid "Exit with a zero status even if no files matched."
@@ -56855,13 +56089,12 @@ msgstr ""
"Der Befehl wird mit einem Fehlerwert von 0 beendet, selbst wenn keine "
"Dateien verarbeitet wurden."
-#
#. type: Plain text
#: en/git-rm.txt:70
#, fuzzy
#| msgid ""
-#| "'git-rm' normally outputs one line (in the form of an \"rm\" command) "
-#| "for each file removed. This option suppresses that output."
+#| "'git-rm' normally outputs one line (in the form of an \"rm\" command) for "
+#| "each file removed. This option suppresses that output."
msgid ""
"`git rm` normally outputs one line (in the form of an `rm` command) for "
"each file removed. This option suppresses that output."
@@ -56869,20 +56102,19 @@ msgstr ""
"'git-rm' gibt normalerweise f체r jeden entfernte Datei eine Zeile (in Form "
"eines \"rm\" Befehls) aus. Mit dieser Option wird diese Ausgabe unterdr체ckt."
-#
#. type: Plain text
#: en/git-rm.txt:79
#, fuzzy
#| msgid ""
#| "The <file> list given to the command can be exact pathnames, file glob "
#| "patterns, or leading directory names. The command removes only the paths "
-#| "that are known to git. Giving the name of a file that you have not told "
-#| "git about does not remove that file."
+#| "that are known to git. Giving the name of a file that you have not told git"
+#| " about does not remove that file."
msgid ""
"The <file> list given to the command can be exact pathnames, file glob "
"patterns, or leading directory names. The command removes only the paths "
-"that are known to Git. Giving the name of a file that you have not told Git "
-"about does not remove that file."
+"that are known to Git. Giving the name of a file that you have not told Git"
+" about does not remove that file."
msgstr ""
"Die <Datei> Liste die an den Befehl 체bergeben wird, kann genaue Dateinamen, "
"Dateisuchkriterien oder f체hrende Verzeichnisnamen beinhalten. 'git-rm' wird "
@@ -56890,14 +56122,13 @@ msgstr ""
"eine Datei angegeben die von git noch nicht verwaltet wird, so wird sie "
"nicht entfernt."
-#
#. type: Plain text
#: en/git-rm.txt:84
#, fuzzy
#| msgid ""
#| "File globbing matches across directory boundaries. Thus, given two "
-#| "directories `d` and `d2`, there is a difference between using `git rm \\'d"
-#| "\\*\\'` and `git rm \\'d/\\*\\'`, as the former will also remove all of "
+#| "directories `d` and `d2`, there is a difference between using `git rm "
+#| "\\'d\\*\\'` and `git rm \\'d/\\*\\'`, as the former will also remove all of "
#| "directory `d2`."
msgid ""
"File globbing matches across directory boundaries. Thus, given two "
@@ -56918,8 +56149,8 @@ msgstr ""
#. type: Plain text
#: en/git-rm.txt:91
msgid ""
-"There is no option for `git rm` to remove from the index only the paths that "
-"have disappeared from the filesystem. However, depending on the use case, "
+"There is no option for `git rm` to remove from the index only the paths that"
+" have disappeared from the filesystem. However, depending on the use case, "
"there are several ways that can be done."
msgstr ""
@@ -56934,8 +56165,8 @@ msgstr "$ git commit -a\n"
#: en/git-rm.txt:100
msgid ""
"If you intend that your next commit should record all modifications of "
-"tracked files in the working tree and record all removals of files that have "
-"been removed from the working tree with `rm` (as opposed to `git rm`), use "
+"tracked files in the working tree and record all removals of files that have"
+" been removed from the working tree with `rm` (as opposed to `git rm`), use "
"`git commit -a`, as it will automatically notice and record all removals. "
"You can also have a similar effect without committing by using `git add -u`."
msgstr ""
@@ -56967,13 +56198,12 @@ msgstr ""
msgid "git ls-files -z | xargs -0 rm -f\n"
msgstr ""
-#
#. type: Plain text
#: en/git-rm.txt:116
#, fuzzy
#| msgid ""
-#| "Show changes between two trees, a tree and the working tree, a tree and "
-#| "the index file, or the index file and the working tree."
+#| "Show changes between two trees, a tree and the working tree, a tree and the "
+#| "index file, or the index file and the working tree."
msgid ""
"and then untar the new code in the working tree. Alternately you could "
"'rsync' the changes into the working tree."
@@ -56996,7 +56226,6 @@ msgstr ""
msgid "git add -A\n"
msgstr "$ git add .\n"
-#
#. type: Plain text
#: en/git-rm.txt:125
#, fuzzy
@@ -57031,10 +56260,10 @@ msgid ""
"version 1.7.8 or newer) will be removed from the work tree, as their "
"repository lives inside the .git directory of the superproject. If a "
"submodule (or one of those nested inside it) still uses a .git directory, "
-"`git rm` will fail - no matter if forced or not - to protect the submodule's "
-"history. If it exists the submodule.<name> section in the linkgit:"
-"gitmodules[5] file will also be removed and that file will be staged (unless "
-"--cached or -n are used)."
+"`git rm` will fail - no matter if forced or not - to protect the submodule's"
+" history. If it exists the submodule.<name> section in the "
+"linkgit:gitmodules[5] file will also be removed and that file will be staged"
+" (unless --cached or -n are used)."
msgstr ""
#. type: Plain text
@@ -57061,7 +56290,6 @@ msgstr ""
msgid "`git rm Documentation/\\*.txt`"
msgstr "git rm Documentation/\\\\*.txt"
-#
#. type: Plain text
#: en/git-rm.txt:163
#, fuzzy
@@ -57075,13 +56303,12 @@ msgstr ""
"Entfernt alle `\\*.txt` Dateien aus dem Index die im `Documentation` "
"Verzeichnis oder dessen Unterverzeichnissen liegen."
-#
#. type: Plain text
#: en/git-rm.txt:167
#, fuzzy
#| msgid ""
-#| "Note that the asterisk `\\*` is quoted from the shell in this example; "
-#| "this lets git, and not the shell, expand the pathnames of files and "
+#| "Note that the asterisk `\\*` is quoted from the shell in this example; this "
+#| "lets git, and not the shell, expand the pathnames of files and "
#| "subdirectories under the `Documentation/` directory."
msgid ""
"Note that the asterisk `*` is quoted from the shell in this example; this "
@@ -57099,7 +56326,6 @@ msgstr ""
msgid "`git rm -f git-*.sh`"
msgstr "git rm -f git-*.sh"
-#
#. type: Plain text
#: en/git-rm.txt:172
msgid ""
@@ -57115,18 +56341,17 @@ msgstr ""
msgid ""
"Each time a superproject update removes a populated submodule (e.g. when "
"switching between commits before and after the removal) a stale submodule "
-"checkout will remain in the old location. Removing the old directory is only "
-"safe when it uses a gitfile, as otherwise the history of the submodule will "
-"be deleted too. This step will be obsolete when recursive submodule update "
+"checkout will remain in the old location. Removing the old directory is only"
+" safe when it uses a gitfile, as otherwise the history of the submodule will"
+" be deleted too. This step will be obsolete when recursive submodule update "
"has been implemented."
msgstr ""
#. type: Title =
#: en/git-send-email.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-diff(1)"
+#, no-wrap
msgid "git-send-email(1)"
-msgstr "git-diff(1)"
+msgstr "git-send-email(1)"
#. type: Plain text
#: en/git-send-email.txt:7
@@ -57199,14 +56424,14 @@ msgstr ""
#: en/git-send-email.txt:48 en/git-tag.txt:60
#, no-wrap
msgid "--annotate"
-msgstr ""
+msgstr "--annotate"
#. type: Plain text
#: en/git-send-email.txt:52
msgid ""
"Review and edit each patch you're about to send. Default is the value of "
-"`sendemail.annotate`. See the CONFIGURATION section for `sendemail."
-"multiEdit`."
+"`sendemail.annotate`. See the CONFIGURATION section for "
+"`sendemail.multiEdit`."
msgstr ""
#. type: Labeled list
@@ -57218,8 +56443,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:56
msgid ""
-"Specify a \"Bcc:\" value for each email. Default is the value of `sendemail."
-"bcc`."
+"Specify a \"Bcc:\" value for each email. Default is the value of "
+"`sendemail.bcc`."
msgstr ""
#. type: Plain text
@@ -57242,10 +56467,9 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:65
-#, fuzzy, no-wrap
-#| msgid "--color"
+#, no-wrap
msgid "--compose"
-msgstr "--color"
+msgstr "--compose"
#. type: Plain text
#: en/git-send-email.txt:68
@@ -57283,9 +56507,9 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:86
msgid ""
-"Specify the sender of the emails. If not specified on the command line, the "
-"value of the `sendemail.from` configuration option is used. If neither the "
-"command-line option nor `sendemail.from` are set, then the user will be "
+"Specify the sender of the emails. If not specified on the command line, the"
+" value of the `sendemail.from` configuration option is used. If neither the"
+" command-line option nor `sendemail.from` are set, then the user will be "
"prompted for the value. The default for the prompt will be the value of "
"GIT_AUTHOR_IDENT, or GIT_COMMITTER_IDENT if that is not set, as returned by "
"\"git var -l\"."
@@ -57330,8 +56554,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:108
msgid ""
-"Only necessary if --compose is also set. If --compose is not set, this will "
-"be prompted for."
+"Only necessary if --compose is also set. If --compose is not set, this will"
+" be prompted for."
msgstr ""
#. type: Labeled list
@@ -57343,8 +56567,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:113
msgid ""
-"Specify the initial subject of the email thread. Only necessary if --"
-"compose is also set. If --compose is not set, this will be prompted for."
+"Specify the initial subject of the email thread. Only necessary if "
+"--compose is also set. If --compose is not set, this will be prompted for."
msgstr ""
#. type: Labeled list
@@ -57358,8 +56582,8 @@ msgstr ""
msgid ""
"Specify the primary recipient of the emails generated. Generally, this will "
"be the upstream maintainer of the project involved. Default is the value of "
-"the `sendemail.to` configuration value; if that is unspecified, and --to-cmd "
-"is not specified, this will be prompted for."
+"the `sendemail.to` configuration value; if that is unspecified, and --to-cmd"
+" is not specified, this will be prompted for."
msgstr ""
#. type: Labeled list
@@ -57392,8 +56616,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:134
msgid ""
-"Specify encoding of compose message. Default is the value of the 'sendemail."
-"composeencoding'; if that is unspecified, UTF-8 is assumed."
+"Specify encoding of compose message. Default is the value of the "
+"'sendemail.composeencoding'; if that is unspecified, UTF-8 is assumed."
msgstr ""
#. type: Labeled list
@@ -57411,28 +56635,27 @@ msgid ""
"but makes the raw patch email file (as saved from a MUA) much harder to "
"inspect manually. base64 is even more fool proof, but also even more "
"opaque. Default is the value of the `sendemail.transferEncoding` "
-"configuration value; if that is unspecified, git will use 8bit and not add a "
-"Content-Transfer-Encoding header."
+"configuration value; if that is unspecified, git will use 8bit and not add a"
+" Content-Transfer-Encoding header."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:145
#, no-wrap
msgid "--xmailer"
-msgstr ""
+msgstr "--xmailer"
#. type: Labeled list
#: en/git-send-email.txt:146
-#, fuzzy, no-wrap
-#| msgid "--no-merged"
+#, no-wrap
msgid "--no-xmailer"
-msgstr "--no-merged"
+msgstr "--no-xmailer"
#. type: Plain text
#: en/git-send-email.txt:150
msgid ""
-"Add (or prevent adding) the \"X-Mailer:\" header. By default, the header is "
-"added, but it can be turned off by setting the `sendemail.xmailer` "
+"Add (or prevent adding) the \"X-Mailer:\" header. By default, the header is"
+" added, but it can be turned off by setting the `sendemail.xmailer` "
"configuration variable to `false`."
msgstr ""
@@ -57451,12 +56674,13 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:162
msgid ""
-"Specify the envelope sender used to send the emails. This is useful if your "
-"default address is not the address that is subscribed to a list. In order to "
-"use the 'From' address, set the value to \"auto\". If you use the sendmail "
-"binary, you must have suitable privileges for the -f parameter. Default is "
-"the value of the `sendemail.envelopeSender` configuration variable; if that "
-"is unspecified, choosing the envelope sender is left to your MTA."
+"Specify the envelope sender used to send the emails. This is useful if your"
+" default address is not the address that is subscribed to a list. In order "
+"to use the 'From' address, set the value to \"auto\". If you use the "
+"sendmail binary, you must have suitable privileges for the -f parameter. "
+"Default is the value of the `sendemail.envelopeSender` configuration "
+"variable; if that is unspecified, choosing the envelope sender is left to "
+"your MTA."
msgstr ""
#. type: Labeled list
@@ -57511,9 +56735,9 @@ msgstr ""
msgid ""
"If at least one of the specified mechanisms matches the ones advertised by "
"the SMTP server and if it is supported by the utilized SASL library, the "
-"mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--"
-"smtp-auth` is specified, all mechanisms supported by the SASL library can be "
-"used."
+"mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor "
+"`--smtp-auth` is specified, all mechanisms supported by the SASL library can"
+" be used."
msgstr ""
#. type: Labeled list
@@ -57570,8 +56794,8 @@ msgid ""
"Specifies a port different from the default port (SMTP servers typically "
"listen to smtp port 25, but may also listen to submission port 587, or the "
"common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead "
-"of 587) are also accepted. The port can also be set with the `sendemail."
-"smtpServerPort` configuration variable."
+"of 587) are also accepted. The port can also be set with the "
+"`sendemail.smtpServerPort` configuration variable."
msgstr ""
#. type: Labeled list
@@ -57583,15 +56807,15 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:222
msgid ""
-"If set, specifies the outgoing SMTP server option to use. Default value can "
-"be specified by the `sendemail.smtpServerOption` configuration option."
+"If set, specifies the outgoing SMTP server option to use. Default value can"
+" be specified by the `sendemail.smtpServerOption` configuration option."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:226
msgid ""
-"The --smtp-server-option option must be repeated for each option you want to "
-"pass to the server. Likewise, different lines in the configuration files "
+"The --smtp-server-option option must be repeated for each option you want to"
+" pass to the server. Likewise, different lines in the configuration files "
"must be used for each option."
msgstr ""
@@ -57599,7 +56823,7 @@ msgstr ""
#: en/git-send-email.txt:227
#, no-wrap
msgid "--smtp-ssl"
-msgstr ""
+msgstr "--smtp-ssl"
#. type: Plain text
#: en/git-send-email.txt:229
@@ -57610,7 +56834,7 @@ msgstr ""
#: en/git-send-email.txt:230
#, no-wrap
msgid "--smtp-ssl-cert-path"
-msgstr ""
+msgstr "--smtp-ssl-cert-path"
#. type: Plain text
#: en/git-send-email.txt:240
@@ -57620,9 +56844,9 @@ msgid ""
"single file containing one or more PEM format certificates concatenated "
"together: see verify(1) -CAfile and -CApath for more information on these). "
"Set it to an empty string to disable certificate verification. Defaults to "
-"the value of the `sendemail.smtpsslcertpath` configuration variable, if set, "
-"or the backing SSL library's compiled-in default otherwise (which should be "
-"the best choice on most platforms)."
+"the value of the `sendemail.smtpsslcertpath` configuration variable, if set,"
+" or the backing SSL library's compiled-in default otherwise (which should be"
+" the best choice on most platforms)."
msgstr ""
#. type: Labeled list
@@ -57635,8 +56859,8 @@ msgstr ""
#: en/git-send-email.txt:245
msgid ""
"Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a "
-"username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then "
-"authentication is not attempted."
+"username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then"
+" authentication is not attempted."
msgstr ""
#. type: Labeled list
@@ -57668,9 +56892,9 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:259
msgid ""
-"Specify a command to execute once per patch file which should generate patch "
-"file specific \"To:\" entries. Output of this command must be single email "
-"address per line. Default is the value of 'sendemail.tocmd' configuration "
+"Specify a command to execute once per patch file which should generate patch"
+" file specific \"To:\" entries. Output of this command must be single email"
+" address per line. Default is the value of 'sendemail.tocmd' configuration "
"value."
msgstr ""
@@ -57683,9 +56907,9 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:265
msgid ""
-"Specify a command to execute once per patch file which should generate patch "
-"file specific \"Cc:\" entries. Output of this command must be single email "
-"address per line. Default is the value of `sendemail.ccCmd` configuration "
+"Specify a command to execute once per patch file which should generate patch"
+" file specific \"Cc:\" entries. Output of this command must be single email"
+" address per line. Default is the value of `sendemail.ccCmd` configuration "
"value."
msgstr ""
@@ -57693,7 +56917,7 @@ msgstr ""
#: en/git-send-email.txt:266
#, no-wrap
msgid "--[no-]chain-reply-to"
-msgstr ""
+msgstr "--[no-]chain-reply-to"
#. type: Plain text
#: en/git-send-email.txt:273
@@ -57716,43 +56940,42 @@ msgstr ""
#: en/git-send-email.txt:280
#, no-wrap
msgid "--[no-]signed-off-by-cc"
-msgstr ""
+msgstr "--[no-]signed-off-by-cc"
#. type: Plain text
#: en/git-send-email.txt:284
msgid ""
"If this is set, add emails found in Signed-off-by: or Cc: lines to the cc "
-"list. Default is the value of `sendemail.signedoffbycc` configuration value; "
-"if that is unspecified, default to --signed-off-by-cc."
+"list. Default is the value of `sendemail.signedoffbycc` configuration value;"
+" if that is unspecified, default to --signed-off-by-cc."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:285
#, no-wrap
msgid "--[no-]cc-cover"
-msgstr ""
+msgstr "--[no-]cc-cover"
#. type: Plain text
#: en/git-send-email.txt:290
msgid ""
-"If this is set, emails found in Cc: headers in the first patch of the series "
-"(typically the cover letter) are added to the cc list for each email set. "
+"If this is set, emails found in Cc: headers in the first patch of the series"
+" (typically the cover letter) are added to the cc list for each email set. "
"Default is the value of 'sendemail.cccover' configuration value; if that is "
"unspecified, default to --no-cc-cover."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:291
-#, fuzzy, no-wrap
-#| msgid "--no-color"
+#, no-wrap
msgid "--[no-]to-cover"
-msgstr "--no-color"
+msgstr "--[no-]to-cover"
#. type: Plain text
#: en/git-send-email.txt:296
msgid ""
-"If this is set, emails found in To: headers in the first patch of the series "
-"(typically the cover letter) are added to the to list for each email set. "
+"If this is set, emails found in To: headers in the first patch of the series"
+" (typically the cover letter) are added to the to list for each email set. "
"Default is the value of 'sendemail.tocover' configuration value; if that is "
"unspecified, default to --no-to-cover."
msgstr ""
@@ -57789,8 +57012,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:308
msgid ""
-"'bodycc' will avoid including anyone mentioned in Cc lines in the patch body "
-"(commit message) except for self (use 'self' for that)."
+"'bodycc' will avoid including anyone mentioned in Cc lines in the patch body"
+" (commit message) except for self (use 'self' for that)."
msgstr ""
#. type: Plain text
@@ -57831,7 +57054,7 @@ msgstr ""
#: en/git-send-email.txt:319
#, no-wrap
msgid "--[no-]suppress-from"
-msgstr ""
+msgstr "--[no-]suppress-from"
#. type: Plain text
#: en/git-send-email.txt:323
@@ -57845,13 +57068,13 @@ msgstr ""
#: en/git-send-email.txt:324
#, no-wrap
msgid "--[no-]thread"
-msgstr ""
+msgstr "--[no-]thread"
#. type: Plain text
#: en/git-send-email.txt:330
msgid ""
-"If this is set, the In-Reply-To and References headers will be added to each "
-"email sent. Whether each mail refers to the previous email (`deep` "
+"If this is set, the In-Reply-To and References headers will be added to each"
+" email sent. Whether each mail refers to the previous email (`deep` "
"threading per 'git format-patch' wording) or to the first email (`shallow` "
"threading) is governed by \"--[no-]chain-reply-to\"."
msgstr ""
@@ -57860,8 +57083,9 @@ msgstr ""
#: en/git-send-email.txt:335
msgid ""
"If disabled with \"--no-thread\", those headers will not be added (unless "
-"specified with --in-reply-to). Default is the value of the `sendemail."
-"thread` configuration value; if that is unspecified, default to --thread."
+"specified with --in-reply-to). Default is the value of the "
+"`sendemail.thread` configuration value; if that is unspecified, default to "
+"--thread."
msgstr ""
#. type: Plain text
@@ -57911,7 +57135,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:355
msgid ""
-"'compose' will confirm before sending the first message when using --compose."
+"'compose' will confirm before sending the first message when using "
+"--compose."
msgstr ""
#. type: Plain text
@@ -57936,15 +57161,15 @@ msgstr ""
#: en/git-send-email.txt:365
#, no-wrap
msgid "--[no-]format-patch"
-msgstr ""
+msgstr "--[no-]format-patch"
#. type: Plain text
#: en/git-send-email.txt:370
msgid ""
"When an argument may be understood either as a reference or as a file name, "
-"choose to understand it as a format-patch argument (`--format-patch`) or as "
-"a file name (`--no-format-patch`). By default, when such a conflict occurs, "
-"git send-email will fail."
+"choose to understand it as a format-patch argument (`--format-patch`) or as"
+" a file name (`--no-format-patch`). By default, when such a conflict occurs,"
+" git send-email will fail."
msgstr ""
#. type: Plain text
@@ -57958,12 +57183,13 @@ msgstr ""
#: en/git-send-email.txt:375
#, no-wrap
msgid "--[no-]validate"
-msgstr ""
+msgstr "--[no-]validate"
#. type: Plain text
#: en/git-send-email.txt:378
msgid ""
-"Perform sanity checks on patches. Currently, validation means the following:"
+"Perform sanity checks on patches. Currently, validation means the "
+"following:"
msgstr ""
#. type: Plain text
@@ -57974,14 +57200,15 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:382
#, no-wrap
-msgid "is due to SMTP limits as described by http://www.ietf.org/rfc/rfc2821.txt.\n"
+msgid ""
+"is due to SMTP limits as described by http://www.ietf.org/rfc/rfc2821.txt.\n"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:386
msgid ""
-"Default is the value of `sendemail.validate`; if this is not set, default to "
-"`--validate`."
+"Default is the value of `sendemail.validate`; if this is not set, default to"
+" `--validate`."
msgstr ""
#. type: Plain text
@@ -58000,7 +57227,7 @@ msgstr "Configuration"
#: en/git-send-email.txt:394
#, no-wrap
msgid "--dump-aliases"
-msgstr ""
+msgstr "--dump-aliases"
#. type: Plain text
#: en/git-send-email.txt:399
@@ -58080,8 +57307,8 @@ msgstr ""
#: en/git-send-email.txt:434
msgid ""
"If true (default), a single editor instance will be spawned to edit files "
-"you have to edit (patches when `--annotate` is used, and the summary when `--"
-"compose` is used). If false, files will be edited one after the other, "
+"you have to edit (patches when `--annotate` is used, and the summary when "
+"`--compose` is used). If false, files will be edited one after the other, "
"spawning a new editor each time."
msgstr ""
@@ -58120,10 +57347,10 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:458
msgid ""
-"If you have multifactor authentication setup on your gmail account, you will "
-"need to generate an app-specific password for use with 'git send-email'. "
-"Visit https://security.google.com/settings/security/apppasswords to setup an "
-"app-specific password. Once setup, you can store it with the credentials "
+"If you have multifactor authentication setup on your gmail account, you will"
+" need to generate an app-specific password for use with 'git send-email'. "
+"Visit https://security.google.com/settings/security/apppasswords to setup an"
+" app-specific password. Once setup, you can store it with the credentials "
"helper:"
msgstr ""
@@ -58162,20 +57389,19 @@ msgid ""
" Net::SMTP::SSL, MIME::Base64 and Authen::SASL\n"
msgstr ""
-#
#. type: Plain text
#: en/git-send-email.txt:479
#, fuzzy
-#| msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
+#| msgid ""
+#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-send-pack.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-checkout(1)"
+#, no-wrap
msgid "git-send-pack(1)"
-msgstr "git-checkout(1)"
+msgstr "git-send-pack(1)"
#. type: Plain text
#: en/git-send-pack.txt:7
@@ -58195,8 +57421,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:21
msgid ""
-"Usually you would want to use 'git push', which is a higher-level wrapper of "
-"this command, instead. See linkgit:git-push[1]."
+"Usually you would want to use 'git push', which is a higher-level wrapper of"
+" this command, instead. See linkgit:git-push[1]."
msgstr ""
#. type: Plain text
@@ -58214,8 +57440,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:40
msgid ""
-"Instead of explicitly specifying which refs to update, update all heads that "
-"locally exist."
+"Instead of explicitly specifying which refs to update, update all heads that"
+" locally exist."
msgstr ""
#. type: Plain text
@@ -58229,13 +57455,13 @@ msgstr ""
#: en/git-send-pack.txt:68
#, no-wrap
msgid "--atomic"
-msgstr ""
+msgstr "--atomic"
#. type: Plain text
#: en/git-send-pack.txt:72
msgid ""
-"Use an atomic transaction for updating the refs. If any of the refs fails to "
-"update then the entire push will fail without changing any refs."
+"Use an atomic transaction for updating the refs. If any of the refs fails to"
+" update then the entire push will fail without changing any refs."
msgstr ""
#. type: Labeled list
@@ -58258,14 +57484,15 @@ msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:101
-msgid "There are three ways to specify which refs to update on the remote end."
+msgid ""
+"There are three ways to specify which refs to update on the remote end."
msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:105
msgid ""
-"With `--all` flag, all refs that exist locally are transferred to the remote "
-"side. You cannot specify any '<ref>' if you use this flag."
+"With `--all` flag, all refs that exist locally are transferred to the remote"
+" side. You cannot specify any '<ref>' if you use this flag."
msgstr ""
#. type: Plain text
@@ -58279,10 +57506,10 @@ msgstr ""
#: en/git-send-pack.txt:114
msgid ""
"When one or more '<ref>' are specified explicitly (whether on the command "
-"line or via `--stdin`), it can be either a single pattern, or a pair of such "
-"pattern separated by a colon \":\" (this means that a ref name cannot have a "
-"colon in it). A single pattern '<name>' is just a shorthand for '<name>:"
-"<name>'."
+"line or via `--stdin`), it can be either a single pattern, or a pair of such"
+" pattern separated by a colon \":\" (this means that a ref name cannot have "
+"a colon in it). A single pattern '<name>' is just a shorthand for "
+"'<name>:<name>'."
msgstr ""
#. type: Plain text
@@ -58303,10 +57530,9 @@ msgstr ""
#. type: Title =
#: en/git-shell.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-log(1)"
+#, no-wrap
msgid "git-shell(1)"
-msgstr "git-log(1)"
+msgstr "git-shell(1)"
#. type: Plain text
#: en/git-shell.txt:7
@@ -58325,10 +57551,10 @@ msgstr ""
#. type: Plain text
#: en/git-shell.txt:23
msgid ""
-"This is a login shell for SSH accounts to provide restricted Git access. It "
-"permits execution only of server-side Git commands implementing the pull/"
-"push functionality, plus custom commands present in a subdirectory named "
-"`git-shell-commands` in the user's home directory."
+"This is a login shell for SSH accounts to provide restricted Git access. It"
+" permits execution only of server-side Git commands implementing the "
+"pull/push functionality, plus custom commands present in a subdirectory "
+"named `git-shell-commands` in the user's home directory."
msgstr ""
#. type: Plain text
@@ -58407,8 +57633,8 @@ msgstr ""
#. type: Plain text
#: en/git-shell.txt:61
msgid ""
-"Generally this mode is used as an administrative interface to allow users to "
-"list repositories they have access to, create, delete, or rename "
+"Generally this mode is used as an administrative interface to allow users to"
+" list repositories they have access to, create, delete, or rename "
"repositories, or change repository descriptions and permissions."
msgstr ""
@@ -58472,8 +57698,8 @@ msgstr ""
#: en/git-sh-i18n--envsubst.txt:24
msgid ""
"This is not a command the end user would want to run. Ever. This "
-"documentation is meant for people who are studying the plumbing scripts and/"
-"or are writing new ones."
+"documentation is meant for people who are studying the plumbing scripts "
+"and/or are writing new ones."
msgstr ""
#. type: Plain text
@@ -58494,10 +57720,9 @@ msgstr ""
#. type: Title =
#: en/git-sh-i18n.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-init-db(1)"
+#, no-wrap
msgid "git-sh-i18n(1)"
-msgstr "git-init-db(1)"
+msgstr "git-sh-i18n(1)"
#. type: Plain text
#: en/git-sh-i18n.txt:7
@@ -58514,10 +57739,10 @@ msgstr ""
#: en/git-sh-i18n.txt:26
msgid ""
"The 'git sh-i18n scriptlet is designed to be sourced (using `.`) by Git's "
-"porcelain programs implemented in shell script. It provides wrappers for the "
-"GNU `gettext` and `eval_gettext` functions accessible through the `gettext."
-"sh` script, and provides pass-through fallbacks on systems without GNU "
-"gettext."
+"porcelain programs implemented in shell script. It provides wrappers for the"
+" GNU `gettext` and `eval_gettext` functions accessible through the "
+"`gettext.sh` script, and provides pass-through fallbacks on systems without "
+"GNU gettext."
msgstr ""
#. type: Labeled list
@@ -58544,17 +57769,16 @@ msgstr ""
#: en/git-sh-i18n.txt:40
msgid ""
"Currently a dummy fall-through function implemented as a wrapper around "
-"`printf(1)` with variables expanded by the linkgit:git-sh-i18n{litdd}"
-"envsubst[1] helper. Will be replaced by a real gettext implementation in a "
-"later version."
+"`printf(1)` with variables expanded by the linkgit:git-"
+"sh-i18n{litdd}envsubst[1] helper. Will be replaced by a real gettext "
+"implementation in a later version."
msgstr ""
#. type: Title =
#: en/git-shortlog.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-log(1)"
+#, no-wrap
msgid "git-shortlog(1)"
-msgstr "git-log(1)"
+msgstr "git-shortlog(1)"
#. type: Plain text
#: en/git-shortlog.txt:7
@@ -58606,7 +57830,7 @@ msgstr ""
#: en/git-shortlog.txt:39
#, no-wrap
msgid "--email"
-msgstr ""
+msgstr "--email"
#. type: Plain text
#: en/git-shortlog.txt:41
@@ -58635,10 +57859,9 @@ msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:51
-#, fuzzy, no-wrap
-#| msgid "-C <commit>"
+#, no-wrap
msgid "--committer"
-msgstr "-C <commit>"
+msgstr "--committer"
#. type: Plain text
#: en/git-shortlog.txt:53
@@ -58670,15 +57893,14 @@ msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:71
msgid ""
-"Show only commits in the specified revision range. When no <revision range> "
-"is specified, it defaults to `HEAD` (i.e. the whole history leading to the "
+"Show only commits in the specified revision range. When no <revision range>"
+" is specified, it defaults to `HEAD` (i.e. the whole history leading to the "
"current commit). `origin..HEAD` specifies all the commits reachable from "
-"the current commit (i.e. `HEAD`), but not from `origin`. For a complete list "
-"of ways to spell <revision range>, see the \"Specifying Ranges\" section of "
-"linkgit:gitrevisions[7]."
+"the current commit (i.e. `HEAD`), but not from `origin`. For a complete list"
+" of ways to spell <revision range>, see the \"Specifying Ranges\" section of"
+" linkgit:gitrevisions[7]."
msgstr ""
-#
#. type: Plain text
#: en/git-shortlog.txt:75
#, fuzzy
@@ -58705,10 +57927,9 @@ msgstr ""
#. type: Title =
#: en/git-show-branch.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-branch(1)"
+#, no-wrap
msgid "git-show-branch(1)"
-msgstr "git-branch(1)"
+msgstr "git-show-branch(1)"
#. type: Plain text
#: en/git-show-branch.txt:7
@@ -58742,8 +57963,8 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:29
msgid ""
-"It uses `showbranch.default` multi-valued configuration items if no <rev> or "
-"<glob> is given on the command line."
+"It uses `showbranch.default` multi-valued configuration items if no <rev> or"
+" <glob> is given on the command line."
msgstr ""
#. type: Labeled list
@@ -58773,17 +57994,16 @@ msgid ""
"would show all of them."
msgstr ""
-#
#. type: Plain text
#: en/git-show-branch.txt:46
#, fuzzy
-#| msgid "List or delete (if used with -d) the remote-tracking branches."
+#| msgid ""
+#| "List or delete (if used with -d) the remote-tracking branches."
msgid "Show the remote-tracking branches."
msgstr ""
"Auflisten oder L철schen (wenn die '-d' Option gleichzeitig verwendet wird) "
"der Referenzen auf fernen Entwicklungszweige (remote-tracking branches)."
-#
#. type: Plain text
#: en/git-show-branch.txt:50
#, fuzzy
@@ -58795,15 +58015,14 @@ msgstr "Zeige sowohl lokale wie auch remote-tracking Entwicklungszweige an."
#: en/git-show-branch.txt:51
#, no-wrap
msgid "--current"
-msgstr ""
+msgstr "--current"
-#
#. type: Plain text
#: en/git-show-branch.txt:55
#, fuzzy
#| msgid ""
-#| "Note that git pull always merges into the current branch, regardless of "
-#| "what else is given on the command line."
+#| "Note that git pull always merges into the current branch, regardless of what"
+#| " else is given on the command line."
msgid ""
"With this option, the command includes the current branch to the list of "
"revs to be shown when it is not given on the command line."
@@ -58815,22 +58034,21 @@ msgstr ""
#: en/git-show-branch.txt:56 en/rev-list-options.txt:635
#, no-wrap
msgid "--topo-order"
-msgstr ""
+msgstr "--topo-order"
#. type: Plain text
#: en/git-show-branch.txt:61
msgid ""
"By default, the branches and their commits are shown in reverse "
-"chronological order. This option makes them appear in topological order (i."
-"e., descendant commits are shown before their parents)."
+"chronological order. This option makes them appear in topological order "
+"(i.e., descendant commits are shown before their parents)."
msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:62 en/rev-list-options.txt:627
-#, fuzzy, no-wrap
-#| msgid "--update"
+#, no-wrap
msgid "--date-order"
-msgstr "--update"
+msgstr "--date-order"
#. type: Plain text
#: en/git-show-branch.txt:66
@@ -58845,7 +58063,7 @@ msgstr ""
#: en/rev-list-options.txt:466
#, no-wrap
msgid "--sparse"
-msgstr ""
+msgstr "--sparse"
#. type: Plain text
#: en/git-show-branch.txt:71
@@ -58876,10 +58094,9 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:83
-#, fuzzy, no-wrap
-#| msgid "--merged"
+#, no-wrap
msgid "--merge-base"
-msgstr "--merged"
+msgstr "--merge-base"
#. type: Plain text
#: en/git-show-branch.txt:89
@@ -58899,10 +58116,9 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:94
-#, fuzzy, no-wrap
-#| msgid "--no-abbrev"
+#, no-wrap
msgid "--no-name"
-msgstr "--no-abbrev"
+msgstr "--no-name"
#. type: Plain text
#: en/git-show-branch.txt:96
@@ -58911,10 +58127,9 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:97
-#, fuzzy, no-wrap
-#| msgid "--shared"
+#, no-wrap
msgid "--sha1-name"
-msgstr "--shared"
+msgstr "--sha1-name"
#. type: Plain text
#: en/git-show-branch.txt:102
@@ -58928,13 +58143,13 @@ msgstr ""
#: en/git-show-branch.txt:103
#, no-wrap
msgid "--topics"
-msgstr ""
+msgstr "--topics"
#. type: Plain text
#: en/git-show-branch.txt:110
msgid ""
-"Shows only commits that are NOT on the first branch given. This helps track "
-"topic branches by hiding any commit that is already in the main line of "
+"Shows only commits that are NOT on the first branch given. This helps track"
+" topic branches by hiding any commit that is already in the main line of "
"development. When given \"git show-branch --topics master topic1 topic2\", "
"this will show the revisions given by \"git rev-list {caret}master topic1 "
"topic2\""
@@ -58963,13 +58178,12 @@ msgid ""
"default), never, or auto."
msgstr ""
-#
#. type: Plain text
#: en/git-show-branch.txt:128
#, fuzzy
#| msgid ""
-#| "Turn off branch colors, even when the configuration file gives the "
-#| "default to color output."
+#| "Turn off branch colors, even when the configuration file gives the default "
+#| "to color output."
msgid ""
"Turn off colored output, even when the configuration file gives the default "
"to color output. Same as `--color=never`."
@@ -58996,18 +58210,16 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:146
msgid ""
-"Following these N lines, one-line log for each commit is displayed, indented "
-"N places. If a commit is on the I-th branch, the I-th indentation character "
-"shows a `+` sign; otherwise it shows a space. Merge commits are denoted by "
-"a `-` sign. Each commit shows a short name that can be used as an extended "
-"SHA-1 to name that commit."
+"Following these N lines, one-line log for each commit is displayed, indented"
+" N places. If a commit is on the I-th branch, the I-th indentation "
+"character shows a `+` sign; otherwise it shows a space. Merge commits are "
+"denoted by a `-` sign. Each commit shows a short name that can be used as "
+"an extended SHA-1 to name that commit."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:149
-msgid ""
-"The following example shows three branches, \"master\", \"fixes\" and \"mhf"
-"\":"
+msgid "The following example shows three branches, \"master\", \"fixes\" and \"mhf\":"
msgstr ""
#. type: delimited block -
@@ -59041,11 +58253,11 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:174
msgid ""
-"These three branches all forked from a common commit, [master], whose commit "
-"message is \"Add {apostrophe}git show-branch{apostrophe}\". The \"fixes\" "
+"These three branches all forked from a common commit, [master], whose commit"
+" message is \"Add {apostrophe}git show-branch{apostrophe}\". The \"fixes\" "
"branch adds one commit \"Introduce \"reset type\" flag to \"git reset\"\". "
-"The \"mhf\" branch adds many other commits. The current branch is \"master"
-"\"."
+"The \"mhf\" branch adds many other commits. The current branch is "
+"\"master\"."
msgstr ""
#. type: Plain text
@@ -59069,8 +58281,8 @@ msgstr ""
#: en/git-show-branch.txt:193
msgid ""
"With this, `git show-branch` without extra parameters would show only the "
-"primary branches. In addition, if you happen to be on your topic branch, it "
-"is shown as well."
+"primary branches. In addition, if you happen to be on your topic branch, it"
+" is shown as well."
msgstr ""
#. type: delimited block -
@@ -59089,10 +58301,9 @@ msgstr ""
#. type: Title =
#: en/git-show-index.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-clone(1)"
+#, no-wrap
msgid "git-show-index(1)"
-msgstr "git-clone(1)"
+msgstr "git-show-index(1)"
#. type: Plain text
#: en/git-show-index.txt:7
@@ -59108,8 +58319,8 @@ msgstr ""
#. type: Plain text
#: en/git-show-index.txt:20
msgid ""
-"Read the idx file for a Git packfile created with 'git pack-objects' command "
-"from the standard input, and dump its contents."
+"Read the idx file for a Git packfile created with 'git pack-objects' command"
+" from the standard input, and dump its contents."
msgstr ""
#. type: Plain text
@@ -59122,10 +58333,9 @@ msgstr ""
#. type: Title =
#: en/git-show-ref.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-write-tree(1)"
+#, no-wrap
msgid "git-show-ref(1)"
-msgstr "git-write-tree(1)"
+msgstr "git-show-ref(1)"
#. type: Plain text
#: en/git-show-ref.txt:7
@@ -59159,23 +58369,23 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:29
msgid ""
-"The --exclude-existing form is a filter that does the inverse. It reads refs "
-"from stdin, one ref per line, and shows those that don't exist in the local "
-"repository."
+"The --exclude-existing form is a filter that does the inverse. It reads refs"
+" from stdin, one ref per line, and shows those that don't exist in the local"
+" repository."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:32
msgid ""
-"Use of this utility is encouraged in favor of directly accessing files under "
-"the `.git` directory."
+"Use of this utility is encouraged in favor of directly accessing files under"
+" the `.git` directory."
msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:36
#, no-wrap
msgid "--head"
-msgstr ""
+msgstr "--head"
#. type: Plain text
#: en/git-show-ref.txt:39
@@ -59186,21 +58396,21 @@ msgstr ""
#: en/git-show-ref.txt:46
msgid ""
"Limit to \"refs/heads\" and \"refs/tags\", respectively. These options are "
-"not mutually exclusive; when given both, references stored in \"refs/heads\" "
-"and \"refs/tags\" are displayed."
+"not mutually exclusive; when given both, references stored in \"refs/heads\""
+" and \"refs/tags\" are displayed."
msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:48
#, no-wrap
msgid "--dereference"
-msgstr ""
+msgstr "--dereference"
#. type: Plain text
#: en/git-show-ref.txt:52
msgid ""
-"Dereference tags into object IDs as well. They will be shown with \"{caret}"
-"{}\" appended."
+"Dereference tags into object IDs as well. They will be shown with "
+"\"{caret}{}\" appended."
msgstr ""
#. type: Labeled list
@@ -59212,23 +58422,23 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:58
msgid ""
-"Only show the SHA-1 hash, not the reference name. When combined with --"
-"dereference the dereferenced tag will still be shown after the SHA-1."
+"Only show the SHA-1 hash, not the reference name. When combined with "
+"--dereference the dereferenced tag will still be shown after the SHA-1."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:64
msgid ""
"Enable stricter reference checking by requiring an exact ref path. Aside "
-"from returning an error code of 1, it will also print an error message if `--"
-"quiet` was not specified."
+"from returning an error code of 1, it will also print an error message if "
+"`--quiet` was not specified."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:69
msgid ""
-"Abbreviate the object name. When using `--hash`, you do not have to say `--"
-"hash --abbrev`; `--hash=n` would do."
+"Abbreviate the object name. When using `--hash`, you do not have to say "
+"`--hash --abbrev`; `--hash=n` would do."
msgstr ""
#. type: Plain text
@@ -59280,15 +58490,17 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:95
msgid ""
-"Show references matching one or more patterns. Patterns are matched from the "
-"end of the full name, and only complete parts are matched, e.g. 'master' "
-"matches 'refs/heads/master', 'refs/remotes/origin/master', 'refs/tags/jedi/"
-"master' but not 'refs/heads/mymaster' or 'refs/remotes/master/jedi'."
+"Show references matching one or more patterns. Patterns are matched from the"
+" end of the full name, and only complete parts are matched, e.g. 'master' "
+"matches 'refs/heads/master', 'refs/remotes/origin/master', "
+"'refs/tags/jedi/master' but not 'refs/heads/mymaster' or "
+"'refs/remotes/master/jedi'."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:100
-msgid "The output is in the format: '<SHA-1 ID>' '<space>' '<reference name>'."
+msgid ""
+"The output is in the format: '<SHA-1 ID>' '<space>' '<reference name>'."
msgstr ""
#. type: delimited block -
@@ -59327,8 +58539,8 @@ msgstr ""
#: en/git-show-ref.txt:129
msgid ""
"To show all references called \"master\", whether tags or heads or anything "
-"else, and regardless of how deep in the reference naming hierarchy they are, "
-"use:"
+"else, and regardless of how deep in the reference naming hierarchy they are,"
+" use:"
msgstr ""
#. type: delimited block -
@@ -59340,8 +58552,8 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:136
msgid ""
-"This will show \"refs/heads/master\" but also \"refs/remote/other-repo/master"
-"\", if such references exists."
+"This will show \"refs/heads/master\" but also \"refs/remote/other-"
+"repo/master\", if such references exists."
msgstr ""
#. type: Plain text
@@ -59394,15 +58606,15 @@ msgstr ""
#: en/git-show-ref.txt:163
msgid ""
"To show only tags, or only proper branch heads, use \"--tags\" and/or \"--"
-"heads\" respectively (using both means that it shows tags and heads, but not "
-"other random references under the refs/ subdirectory)."
+"heads\" respectively (using both means that it shows tags and heads, but not"
+" other random references under the refs/ subdirectory)."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:166
msgid ""
-"To do automatic tag object dereferencing, use the \"-d\" or \"--dereference"
-"\" flag, so you can do"
+"To do automatic tag object dereferencing, use the \"-d\" or \"--"
+"dereference\" flag, so you can do"
msgstr ""
#. type: delimited block -
@@ -59421,7 +58633,6 @@ msgstr ""
msgid "`.git/refs/*`, `.git/packed-refs`"
msgstr ""
-#
#. type: Plain text
#: en/git-show-ref.txt:183
#, fuzzy
@@ -59437,17 +58648,15 @@ msgstr ""
#. type: Title =
#: en/git-show.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-log(1)"
+#, no-wrap
msgid "git-show(1)"
-msgstr "git-log(1)"
+msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
msgid "git-show - Show various types of objects"
msgstr ""
-#
#. type: Plain text
#: en/git-show.txt:13
#, fuzzy, no-wrap
@@ -59475,7 +58684,8 @@ msgstr ""
#. type: Plain text
#: en/git-show.txt:26
msgid ""
-"For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
+"For trees, it shows the names (equivalent to 'git ls-tree' with --name-"
+"only)."
msgstr ""
#. type: Plain text
@@ -59483,7 +58693,6 @@ msgstr ""
msgid "For plain blobs, it shows the plain contents."
msgstr ""
-#
#. type: Plain text
#: en/git-show.txt:31
#, fuzzy
@@ -59495,9 +58704,9 @@ msgid ""
"The command takes options applicable to the 'git diff-tree' command to "
"control how the changes the commit introduces are shown."
msgstr ""
-"Das Kommando akzeptiert dieselben Optionen wie 'git-rev-list' und 'git-diff-"
-"*' um die Ausgabeformate der Commits und deren Unterschiede zu kontrollieren "
-"und zu limitieren."
+"Das Kommando akzeptiert dieselben Optionen wie 'git-rev-list' und 'git-"
+"diff-*' um die Ausgabeformate der Commits und deren Unterschiede zu "
+"kontrollieren und zu limitieren."
#. type: Plain text
#: en/git-show.txt:33
@@ -59518,8 +58727,8 @@ msgstr ""
#: en/git-show.txt:41
msgid ""
"The names of objects to show. For a more complete list of ways to spell "
-"object names, see \"SPECIFYING REVISIONS\" section in linkgit:"
-"gitrevisions[7]."
+"object names, see \"SPECIFYING REVISIONS\" section in "
+"linkgit:gitrevisions[7]."
msgstr ""
#. type: Labeled list
@@ -59583,10 +58792,9 @@ msgstr ""
#. type: Title =
#: en/git-sh-setup.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-checkout(1)"
+#, no-wrap
msgid "git-sh-setup(1)"
-msgstr "git-checkout(1)"
+msgstr "git-sh-setup(1)"
#. type: Plain text
#: en/git-sh-setup.txt:7
@@ -59619,8 +58827,8 @@ msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:32
msgid ""
-"The scriptlet sets `GIT_DIR` and `GIT_OBJECT_DIRECTORY` shell variables, but "
-"does *not* export them to the environment."
+"The scriptlet sets `GIT_DIR` and `GIT_OBJECT_DIRECTORY` shell variables, but"
+" does *not* export them to the environment."
msgstr ""
#. type: Labeled list
@@ -59655,10 +58863,10 @@ msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:49
msgid ""
-"Set `GIT_REFLOG_ACTION` environment to a given string (typically the name of "
-"the program) unless it is already set. Whenever the script runs a `git` "
-"command that updates refs, a reflog entry is created using the value of this "
-"string to leave the record of what command updated the ref."
+"Set `GIT_REFLOG_ACTION` environment to a given string (typically the name of"
+" the program) unless it is already set. Whenever the script runs a `git` "
+"command that updates refs, a reflog entry is created using the value of this"
+" string to leave the record of what command updated the ref."
msgstr ""
#. type: Labeled list
@@ -59671,8 +58879,8 @@ msgstr ""
#: en/git-sh-setup.txt:54
msgid ""
"runs an editor of user's choice (GIT_EDITOR, core.editor, VISUAL or EDITOR) "
-"on a given file, but error out if no editor is specified and the terminal is "
-"dumb."
+"on a given file, but error out if no editor is specified and the terminal is"
+" dumb."
msgstr ""
#. type: Labeled list
@@ -59769,19 +58977,17 @@ msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:92
msgid ""
-"modifies the first file so only lines in common with the second file remain. "
-"If there is insufficient common material, then the first file is left empty. "
-"The result is suitable as a virtual base input for a 3-way merge."
+"modifies the first file so only lines in common with the second file remain."
+" If there is insufficient common material, then the first file is left "
+"empty. The result is suitable as a virtual base input for a 3-way merge."
msgstr ""
#. type: Title =
#: en/git-stage.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-stage(1)"
-msgstr "git-add(1)"
+msgstr "git-stage(1)"
-#
#. type: Plain text
#: en/git-stage.txt:7
#, fuzzy
@@ -59789,7 +58995,6 @@ msgstr "git-add(1)"
msgid "git-stage - Add file contents to the staging area"
msgstr "git-add - F체ge Dateiinhalte zum Index hinzu."
-#
#. type: Plain text
#: en/git-stage.txt:13
#, fuzzy, no-wrap
@@ -59797,7 +59002,6 @@ msgstr "git-add - F체ge Dateiinhalte zum Index hinzu."
msgid "'git stage' args...\n"
msgstr "'git verify-tag' <Markierung>..."
-#
#. type: Plain text
#: en/git-stage.txt:20
#, fuzzy
@@ -59805,18 +59009,17 @@ msgstr "'git verify-tag' <Markierung>..."
#| "This is a synonym for linkgit:git-fsck[1]. Please refer to the "
#| "documentation of that command."
msgid ""
-"This is a synonym for linkgit:git-add[1]. Please refer to the documentation "
-"of that command."
+"This is a synonym for linkgit:git-add[1]. Please refer to the documentation"
+" of that command."
msgstr ""
"Dies ist ein Synonym f체r linkgit:git-fsck[1]. Bitte lesen Sie die "
"Dokumentation dieses Kommandos."
#. type: Title =
#: en/git-stash.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-stash(1)"
-msgstr "git-add(1)"
+msgstr "git-stash(1)"
#. type: Plain text
#: en/git-stash.txt:7
@@ -59854,12 +59057,12 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:40
msgid ""
-"The modifications stashed away by this command can be listed with `git stash "
-"list`, inspected with `git stash show`, and restored (potentially on top of "
-"a different commit) with `git stash apply`. Calling `git stash` without any "
-"arguments is equivalent to `git stash save`. A stash is by default listed "
-"as \"WIP on 'branchname' ...\", but you can give a more descriptive message "
-"on the command line when you create one."
+"The modifications stashed away by this command can be listed with `git stash"
+" list`, inspected with `git stash show`, and restored (potentially on top of"
+" a different commit) with `git stash apply`. Calling `git stash` without "
+"any arguments is equivalent to `git stash save`. A stash is by default "
+"listed as \"WIP on 'branchname' ...\", but you can give a more descriptive "
+"message on the command line when you create one."
msgstr ""
#. type: Plain text
@@ -59876,13 +59079,17 @@ msgstr ""
#. type: Labeled list
#: en/git-stash.txt:51
#, no-wrap
-msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
+msgid ""
+"save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all]"
+" [-q|--quiet] [<message>]"
msgstr ""
#. type: Labeled list
#: en/git-stash.txt:52
#, no-wrap
-msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+msgid ""
+"push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all]"
+" [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
@@ -59916,8 +59123,8 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:73
msgid ""
-"If the `--keep-index` option is used, all changes already added to the index "
-"are left intact."
+"If the `--keep-index` option is used, all changes already added to the index"
+" are left intact."
msgstr ""
#. type: Plain text
@@ -59934,9 +59141,9 @@ msgstr ""
msgid ""
"With `--patch`, you can interactively select hunks from the diff between "
"HEAD and the working tree to be stashed. The stash entry is constructed "
-"such that its index state is the same as the index state of your repository, "
-"and its worktree contains only the changes you selected interactively. The "
-"selected changes are then rolled back from your worktree. See the "
+"such that its index state is the same as the index state of your repository,"
+" and its worktree contains only the changes you selected interactively. The"
+" selected changes are then rolled back from your worktree. See the "
"``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate "
"the `--patch` mode."
msgstr ""
@@ -59971,7 +59178,6 @@ msgid ""
"stash@{1}: On master: 9cc0589... Add git-stash\n"
msgstr ""
-#
#. type: Plain text
#: en/git-stash.txt:105
#, fuzzy
@@ -59983,9 +59189,9 @@ msgid ""
"The command takes options applicable to the 'git log' command to control "
"what is shown and how. See linkgit:git-log[1]."
msgstr ""
-"Das Kommando akzeptiert dieselben Optionen wie 'git-rev-list' und 'git-diff-"
-"*' um die Ausgabeformate der Commits und deren Unterschiede zu kontrollieren "
-"und zu limitieren."
+"Das Kommando akzeptiert dieselben Optionen wie 'git-rev-list' und 'git-"
+"diff-*' um die Ausgabeformate der Commits und deren Unterschiede zu "
+"kontrollieren und zu limitieren."
#. type: Labeled list
#: en/git-stash.txt:106
@@ -60000,8 +59206,8 @@ msgid ""
"and its original parent. When no `<stash>` is given, shows the latest one. "
"By default, the command shows the diffstat, but it will accept any format "
"known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second "
-"most recent stash in patch form). You can use stash.showStat and/or stash."
-"showPatch config variables to change the default behavior."
+"most recent stash in patch form). You can use stash.showStat and/or "
+"stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
@@ -60013,8 +59219,8 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:122
msgid ""
-"Remove a single stashed state from the stash list and apply it on top of the "
-"current working tree state, i.e., do the inverse operation of `git stash "
+"Remove a single stashed state from the stash list and apply it on top of the"
+" current working tree state, i.e., do the inverse operation of `git stash "
"save`. The working directory must match the index."
msgstr ""
@@ -60022,8 +59228,8 @@ msgstr ""
#: en/git-stash.txt:126
msgid ""
"Applying the state can fail with conflicts; in this case, it is not removed "
-"from the stash list. You need to resolve the conflicts by hand and call `git "
-"stash drop` manually afterwards."
+"from the stash list. You need to resolve the conflicts by hand and call `git"
+" stash drop` manually afterwards."
msgstr ""
#. type: Plain text
@@ -60038,8 +59244,8 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:134
msgid ""
-"When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must "
-"be a reference of the form `stash@{<revision>}`."
+"When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must"
+" be a reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
@@ -60052,8 +59258,8 @@ msgstr ""
#: en/git-stash.txt:140
msgid ""
"Like `pop`, but do not remove the state from the stash list. Unlike `pop`, "
-"`<stash>` may be any commit that looks like a commit created by `stash save` "
-"or `stash create`."
+"`<stash>` may be any commit that looks like a commit created by `stash save`"
+" or `stash create`."
msgstr ""
#. type: Labeled list
@@ -60068,8 +59274,8 @@ msgid ""
"Creates and checks out a new branch named `<branchname>` starting from the "
"commit at which the `<stash>` was originally created, applies the changes "
"recorded in `<stash>` to the new working tree and index. If that succeeds, "
-"and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops "
-"the `<stash>`. When no `<stash>` is given, applies the latest one."
+"and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops"
+" the `<stash>`. When no `<stash>` is given, applies the latest one."
msgstr ""
#. type: Plain text
@@ -60105,8 +59311,8 @@ msgstr ""
#: en/git-stash.txt:167
msgid ""
"Remove a single stashed state from the stash list. When no `<stash>` is "
-"given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must "
-"be a valid stash log reference of the form `stash@{<revision>}`."
+"given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must"
+" be a valid stash log reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
@@ -60119,9 +59325,9 @@ msgstr ""
#: en/git-stash.txt:174
msgid ""
"Create a stash (which is a regular commit object) and return its object "
-"name, without storing it anywhere in the ref namespace. This is intended to "
-"be useful for scripts. It is probably not the command you want to use; see "
-"\"save\" above."
+"name, without storing it anywhere in the ref namespace. This is intended to"
+" be useful for scripts. It is probably not the command you want to use; see"
+" \"save\" above."
msgstr ""
#. type: Labeled list
@@ -60134,8 +59340,8 @@ msgstr ""
#: en/git-stash.txt:181
msgid ""
"Store a given stash created via 'git stash create' (which is a dangling "
-"merge commit) in the stash ref, updating the stash reflog. This is intended "
-"to be useful for scripts. It is probably not the command you want to use; "
+"merge commit) in the stash ref, updating the stash reflog. This is intended"
+" to be useful for scripts. It is probably not the command you want to use; "
"see \"save\" above."
msgstr ""
@@ -60184,8 +59390,8 @@ msgstr ""
#: en/git-stash.txt:214
msgid ""
"However, there are cases in which your local changes do conflict with the "
-"upstream changes, and `git pull` refuses to overwrite your changes. In such "
-"a case, you can stash your changes away, perform a pull, and then unstash, "
+"upstream changes, and `git pull` refuses to overwrite your changes. In such"
+" a case, you can stash your changes away, perform a pull, and then unstash, "
"like this:"
msgstr ""
@@ -60204,9 +59410,9 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:230
msgid ""
-"When you are in the middle of something, your boss comes in and demands that "
-"you fix something immediately. Traditionally, you would make a commit to a "
-"temporary branch to store your changes away, and return to your original "
+"When you are in the middle of something, your boss comes in and demands that"
+" you fix something immediately. Traditionally, you would make a commit to a"
+" temporary branch to store your changes away, and return to your original "
"branch to make the emergency fix, like this:"
msgstr ""
@@ -60295,7 +59501,6 @@ msgid ""
"xargs git log --merges --no-walk --grep=WIP\n"
msgstr ""
-#
#. type: Plain text
#: en/git-stash.txt:292
#, fuzzy
@@ -60311,10 +59516,9 @@ msgstr ""
#. type: Title =
#: en/git-status.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-status(1)"
-msgstr "git-add(1)"
+msgstr "git-status(1)"
#. type: Plain text
#: en/git-status.txt:7
@@ -60375,17 +59579,17 @@ msgstr ""
msgid ""
"In addition to the names of files that have been changed, also show the "
"textual changes that are staged to be committed (i.e., like the output of "
-"`git diff --cached`). If `-v` is specified twice, then also show the changes "
-"in the working tree that have not yet been staged (i.e., like the output of "
-"`git diff`)."
+"`git diff --cached`). If `-v` is specified twice, then also show the changes"
+" in the working tree that have not yet been staged (i.e., like the output of"
+" `git diff`)."
msgstr ""
#. type: Plain text
#: en/git-status.txt:62
msgid ""
"The mode parameter is used to specify the handling of untracked files. It "
-"is optional: it defaults to 'all', and if specified, it must be stuck to the "
-"option (e.g. `-uno`, but not `-u no`)."
+"is optional: it defaults to 'all', and if specified, it must be stuck to the"
+" option (e.g. `-uno`, but not `-u no`)."
msgstr ""
#. type: Plain text
@@ -60405,10 +59609,10 @@ msgstr "'normal' - zeige unverwaltete Dateien und Verzeichnisse\n"
#. type: Plain text
#: en/git-status.txt:78
msgid ""
-"When `-u` option is not used, untracked files and directories are shown (i."
-"e. the same as specifying `normal`), to help you avoid forgetting to add "
-"newly created files. Because it takes extra work to find untracked files in "
-"the filesystem, this mode may take some time in a large working tree. "
+"When `-u` option is not used, untracked files and directories are shown "
+"(i.e. the same as specifying `normal`), to help you avoid forgetting to add "
+"newly created files. Because it takes extra work to find untracked files in"
+" the filesystem, this mode may take some time in a large working tree. "
"Consider enabling untracked cache and split index if supported (see `git "
"update-index --untracked-cache` and `git update-index --split-index`), "
"Otherwise you can use `no` to have `git status` return more quickly without "
@@ -60423,37 +59627,37 @@ msgid ""
"\"none\" will consider the submodule modified when it either contains "
"untracked or modified files or its HEAD differs from the commit recorded in "
"the superproject and can be used to override any settings of the 'ignore' "
-"option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" "
-"is used submodules are not considered dirty when they only contain untracked "
-"content (but they are still scanned for modified content). Using \"dirty\" "
-"ignores all changes to the work tree of submodules, only changes to the "
-"commits stored in the superproject are shown (this was the behavior before "
-"1.7.0). Using \"all\" hides all changes to submodules (and suppresses the "
-"output of submodule summaries when the config option `status."
-"submoduleSummary` is set)."
+"option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\""
+" is used submodules are not considered dirty when they only contain "
+"untracked content (but they are still scanned for modified content). Using "
+"\"dirty\" ignores all changes to the work tree of submodules, only changes "
+"to the commits stored in the superproject are shown (this was the behavior "
+"before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses"
+" the output of submodule summaries when the config option "
+"`status.submoduleSummary` is set)."
msgstr ""
-#
#. type: Plain text
#: en/git-status.txt:99
#, fuzzy
#| msgid "Show untracked files (Default: 'all')."
msgid "Show ignored files as well."
msgstr ""
-"Zeige alle von git nicht verwalteten (untracked) Dateien an (Standard: 'all')"
+"Zeige alle von git nicht verwalteten (untracked) Dateien an (Standard: "
+"'all')"
#. type: Plain text
#: en/git-status.txt:103
msgid ""
-"Terminate entries with NUL, instead of LF. This implies the `--"
-"porcelain=v1` output format if no other format is given."
+"Terminate entries with NUL, instead of LF. This implies the "
+"`--porcelain=v1` output format if no other format is given."
msgstr ""
#. type: Plain text
#: en/git-status.txt:110
msgid ""
-"Display untracked files in columns. See configuration variable column.status "
-"for option syntax.`--column` and `--no-column` without options are "
+"Display untracked files in columns. See configuration variable column.status"
+" for option syntax.`--column` and `--no-column` without options are "
"equivalent to 'always' and 'never' respectively."
msgstr ""
@@ -60470,8 +59674,8 @@ msgstr ""
#: en/git-status.txt:124
msgid ""
"The paths mentioned in the output, unlike many other Git commands, are made "
-"relative to the current directory if you are working in a subdirectory (this "
-"is on purpose, to help cutting and pasting). See the status.relativePaths "
+"relative to the current directory if you are working in a subdirectory (this"
+" is on purpose, to help cutting and pasting). See the status.relativePaths "
"config option below."
msgstr ""
@@ -60496,8 +59700,9 @@ msgstr ""
#: en/git-status.txt:136
msgid ""
"where `PATH1` is the path in the `HEAD`, and the \" `-> PATH2`\" part is "
-"shown only when `PATH1` corresponds to a different path in the index/"
-"worktree (i.e. the file is renamed). The `XY` is a two-letter status code."
+"shown only when `PATH1` corresponds to a different path in the "
+"index/worktree (i.e. the file is renamed). The `XY` is a two-letter status "
+"code."
msgstr ""
#. type: Plain text
@@ -60505,8 +59710,8 @@ msgstr ""
msgid ""
"The fields (including the `->`) are separated from each other by a single "
"space. If a filename contains whitespace or other nonprintable characters, "
-"that field will be quoted in the manner of a C string literal: surrounded by "
-"ASCII double quote (34) characters, and with interior special characters "
+"that field will be quoted in the manner of a C string literal: surrounded by"
+" ASCII double quote (34) characters, and with interior special characters "
"backslash-escaped."
msgstr ""
@@ -60611,9 +59816,9 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:196
msgid ""
-"Version 1 porcelain format is similar to the short format, but is guaranteed "
-"not to change in a backwards-incompatible way between Git versions or based "
-"on user configuration. This makes it ideal for parsing by scripts. The "
+"Version 1 porcelain format is similar to the short format, but is guaranteed"
+" not to change in a backwards-incompatible way between Git versions or based"
+" on user configuration. This makes it ideal for parsing by scripts. The "
"description of the short format above also describes the porcelain format, "
"with a few exceptions:"
msgstr ""
@@ -60621,8 +59826,8 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:199
msgid ""
-"The user's color.status configuration is not respected; color will always be "
-"off."
+"The user's color.status configuration is not respected; color will always be"
+" off."
msgstr ""
#. type: Plain text
@@ -60726,7 +59931,8 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:253
#, no-wrap
-msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
+msgid ""
+" 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr ""
#. type: Plain text
@@ -60847,8 +60053,8 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:328
msgid ""
-"Without the `-z` option, pathnames with \"unusual\" characters are quoted as "
-"explained for the configuration variable `core.quotePath` (see linkgit:git-"
+"Without the `-z` option, pathnames with \"unusual\" characters are quoted as"
+" explained for the configuration variable `core.quotePath` (see linkgit:git-"
"config[1])."
msgstr ""
@@ -60856,17 +60062,16 @@ msgstr ""
#: en/git-status.txt:337
msgid ""
"The command honors `color.status` (or `status.color` -- they mean the same "
-"thing and the latter is kept for backward compatibility) and `color.status."
-"<slot>` configuration variables to colorize its output."
+"thing and the latter is kept for backward compatibility) and "
+"`color.status.<slot>` configuration variables to colorize its output."
msgstr ""
-#
#. type: Plain text
#: en/git-status.txt:341
#, fuzzy
#| msgid ""
-#| "Repository specific configuration file. (The filename is of course "
-#| "relative to the repository root, not the working directory.)"
+#| "Repository specific configuration file. (The filename is of course relative "
+#| "to the repository root, not the working directory.)"
msgid ""
"If the config variable `status.relativePaths` is set to false, then all "
"paths shown are relative to the repository root, not to the current "
@@ -60879,23 +60084,22 @@ msgstr ""
#: en/git-status.txt:352
msgid ""
"If `status.submoduleSummary` is set to a non zero number or true (identical "
-"to -1 or an unlimited number), the submodule summary will be enabled for the "
-"long format and a summary of commits for modified submodules will be shown "
+"to -1 or an unlimited number), the submodule summary will be enabled for the"
+" long format and a summary of commits for modified submodules will be shown "
"(see --summary-limit option of linkgit:git-submodule[1]). Please note that "
"the summary output from the status command will be suppressed for all "
"submodules when `diff.ignoreSubmodules` is set to 'all' or only for those "
-"submodules where `submodule.<name>.ignore=all`. To also view the summary for "
-"ignored submodules you can either use the --ignore-submodules=dirty command "
-"line option or the 'git submodule summary' command, which shows a similar "
+"submodules where `submodule.<name>.ignore=all`. To also view the summary for"
+" ignored submodules you can either use the --ignore-submodules=dirty command"
+" line option or the 'git submodule summary' command, which shows a similar "
"output but does not honor these settings."
msgstr ""
#. type: Title =
#: en/git-stripspace.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-branch(1)"
+#, no-wrap
msgid "git-stripspace(1)"
-msgstr "git-branch(1)"
+msgstr "git-stripspace(1)"
#. type: Plain text
#: en/git-stripspace.txt:7
@@ -60932,11 +60136,11 @@ msgstr ""
msgid "collapse multiple consecutive empty lines into one empty line"
msgstr ""
-#
#. type: Plain text
#: en/git-stripspace.txt:27
#, fuzzy
-#| msgid "git-rm - Remove files from the working tree and from the index"
+#| msgid ""
+#| "git-rm - Remove files from the working tree and from the index"
msgid "remove empty lines from the beginning and end of the input"
msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
@@ -60965,7 +60169,7 @@ msgstr ""
#: en/git-stripspace.txt:39
#, no-wrap
msgid "--strip-comments"
-msgstr ""
+msgstr "--strip-comments"
#. type: Plain text
#: en/git-stripspace.txt:41
@@ -60977,7 +60181,7 @@ msgstr ""
#: en/git-stripspace.txt:43
#, no-wrap
msgid "--comment-lines"
-msgstr ""
+msgstr "--comment-lines"
#. type: Plain text
#: en/git-stripspace.txt:47
@@ -61046,13 +60250,11 @@ msgid ""
"|The end.$\n"
msgstr ""
-#
#. type: Title =
#: en/git-submodule.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-remote(1)"
+#, no-wrap
msgid "git-submodule(1)"
-msgstr "git-remote(1)"
+msgstr "git-submodule(1)"
#. type: Plain text
#: en/git-submodule.txt:7
@@ -61092,9 +60294,9 @@ msgstr ""
#: en/git-submodule.txt:36
msgid ""
"When cloning or pulling a repository containing submodules however, these "
-"will not be checked out by default; the 'init' and 'update' subcommands will "
-"maintain submodules checked out and at appropriate revision in your working "
-"tree."
+"will not be checked out by default; the 'init' and 'update' subcommands will"
+" maintain submodules checked out and at appropriate revision in your working"
+" tree."
msgstr ""
#. type: Plain text
@@ -61103,8 +60305,8 @@ msgid ""
"Submodules are composed from a so-called `gitlink` tree entry in the main "
"repository that refers to a particular commit object within the inner "
"repository that is completely separate. A record in the `.gitmodules` (see "
-"linkgit:gitmodules[5]) file at the root of the source tree assigns a logical "
-"name to the submodule and describes the default URL the submodule shall be "
+"linkgit:gitmodules[5]) file at the root of the source tree assigns a logical"
+" name to the submodule and describes the default URL the submodule shall be "
"cloned from. The logical name can be used for overriding this URL within "
"your local repository configuration (see 'submodule init')."
msgstr ""
@@ -61112,14 +60314,14 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:58
msgid ""
-"Submodules are not to be confused with remotes, which are other repositories "
-"of the same project; submodules are meant for different projects you would "
-"like to make part of your source tree, while the history of the two projects "
-"still stays completely independent and you cannot modify the contents of the "
-"submodule from within the main project. If you want to merge the project "
-"histories and want to treat the aggregated whole as a single project from "
-"then on, you may want to add a remote for the other project and use the "
-"'subtree' merge strategy, instead of treating the other project as a "
+"Submodules are not to be confused with remotes, which are other repositories"
+" of the same project; submodules are meant for different projects you would "
+"like to make part of your source tree, while the history of the two projects"
+" still stays completely independent and you cannot modify the contents of "
+"the submodule from within the main project. If you want to merge the "
+"project histories and want to treat the aggregated whole as a single project"
+" from then on, you may want to add a remote for the other project and use "
+"the 'subtree' merge strategy, instead of treating the other project as a "
"submodule. Directories that come from both projects can be cloned and "
"checked out as a whole if you choose to go that route."
msgstr ""
@@ -61132,7 +60334,9 @@ msgstr ""
#| "\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare]\n"
#| "\t [-o <name>] [-u <upload-pack>] [--reference <repository>]\n"
#| "\t [--depth <depth>] [--] <repository> [<directory>]\n"
-msgid "add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--depth <depth>] [--] <repository> [<path>]"
+msgid ""
+"add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] "
+"[--depth <depth>] [--] <repository> [<path>]"
msgstr ""
"'git clone' [--template=<template_directory>]\n"
"\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare]\n"
@@ -61166,9 +60370,9 @@ msgid ""
"be either an absolute URL, or (if it begins with ./ or ../), the location "
"relative to the superproject's default remote repository (Please note that "
"to specify a repository 'foo.git' which is located right next to a "
-"superproject 'bar.git', you'll have to use '../foo.git' instead of './foo."
-"git' - as one might expect when following the rules for relative URLs - "
-"because the evaluation of relative URLs in Git is identical to that of "
+"superproject 'bar.git', you'll have to use '../foo.git' instead of "
+"'./foo.git' - as one might expect when following the rules for relative URLs"
+" - because the evaluation of relative URLs in Git is identical to that of "
"relative directories)."
msgstr ""
@@ -61189,9 +60393,9 @@ msgid ""
"<path> is the relative location for the cloned submodule to exist in the "
"superproject. If <path> does not exist, then the submodule is created by "
"cloning from the named URL. If <path> does exist and is already a valid Git "
-"repository, then this is added to the changeset without cloning. This second "
-"form is provided to ease creating a new submodule from scratch, and presumes "
-"the user will later push the submodule to the given URL."
+"repository, then this is added to the changeset without cloning. This second"
+" form is provided to ease creating a new submodule from scratch, and "
+"presumes the user will later push the submodule to the given URL."
msgstr ""
#. type: Plain text
@@ -61259,15 +60463,15 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:133
msgid ""
-"Optional <path> arguments limit which submodules will be initialized. If no "
-"path is specified, all submodules are initialized."
+"Optional <path> arguments limit which submodules will be initialized. If no"
+" path is specified, all submodules are initialized."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:141
msgid ""
-"When present, it will also copy the value of `submodule.$name.update`. This "
-"command does not alter existing information in .git/config. You can then "
+"When present, it will also copy the value of `submodule.$name.update`. This"
+" command does not alter existing information in .git/config. You can then "
"customize the submodule clone URLs in .git/config for your local setup and "
"proceed to `git submodule update`; you can also just use `git submodule "
"update --init` without the explicit 'init' step if you do not intend to "
@@ -61292,9 +60496,9 @@ msgid ""
"section from .git/config together with their work tree. Further calls to "
"`git submodule update`, `git submodule foreach` and `git submodule sync` "
"will skip any unregistered submodules until they are initialized again, so "
-"use this command if you don't want to have a local checkout of the submodule "
-"in your working tree anymore. If you really want to remove a submodule from "
-"the repository and commit that use linkgit:git-rm[1] instead."
+"use this command if you don't want to have a local checkout of the submodule"
+" in your working tree anymore. If you really want to remove a submodule from"
+" the repository and commit that use linkgit:git-rm[1] instead."
msgstr ""
#. type: Plain text
@@ -61307,14 +60511,17 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:159
msgid ""
-"If `--force` is specified, the submodule's working tree will be removed even "
-"if it contains local modifications."
+"If `--force` is specified, the submodule's working tree will be removed even"
+" if it contains local modifications."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:160
#, no-wrap
-msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+msgid ""
+"update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] "
+"[-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] "
+"[--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -61324,9 +60531,9 @@ msgid ""
"cloning missing submodules and updating the working tree of the submodules. "
"The \"updating\" can be done in several ways depending on command line "
"options and the value of `submodule.<name>.update` configuration variable. "
-"The command line option takes precedence over the configuration variable. if "
-"neither is given, a checkout is performed. update procedures supported both "
-"from the command line as well as setting `submodule.<name>.update`:"
+"The command line option takes precedence over the configuration variable. if"
+" neither is given, a checkout is performed. update procedures supported "
+"both from the command line as well as setting `submodule.<name>.update`:"
msgstr ""
#. type: Labeled list
@@ -61351,8 +60558,8 @@ msgstr ""
#: en/git-submodule.txt:179
msgid ""
"If `--force` is specified, the submodule will be checked out (using `git "
-"checkout --force` if appropriate), even if the commit specified in the index "
-"of the containing repository already matches the commit checked out in the "
+"checkout --force` if appropriate), even if the commit specified in the index"
+" of the containing repository already matches the commit checked out in the "
"submodule."
msgstr ""
@@ -61387,8 +60594,8 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:188
msgid ""
-"The following procedures are only available via the `submodule.<name>."
-"update` configuration variable:"
+"The following procedures are only available via the "
+"`submodule.<name>.update` configuration variable:"
msgstr ""
#. type: Labeled list
@@ -61428,14 +60635,16 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:203
msgid ""
-"If `--recursive` is specified, this command will recurse into the registered "
-"submodules, and update any nested submodules within."
+"If `--recursive` is specified, this command will recurse into the registered"
+" submodules, and update any nested submodules within."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:204
#, no-wrap
-msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
+msgid ""
+"summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] "
+"[<path>...]"
msgstr ""
#. type: Plain text
@@ -61467,17 +60676,18 @@ msgstr ""
#: en/git-submodule.txt:233
msgid ""
"Evaluates an arbitrary shell command in each checked out submodule. The "
-"command has access to the variables $name, $path, $sha1 and $toplevel: $name "
-"is the name of the relevant submodule section in .gitmodules, $path is the "
+"command has access to the variables $name, $path, $sha1 and $toplevel: $name"
+" is the name of the relevant submodule section in .gitmodules, $path is the "
"name of the submodule directory relative to the superproject, $sha1 is the "
"commit as recorded in the superproject, and $toplevel is the absolute path "
"to the top-level of the superproject. Any submodules defined in the "
"superproject but not checked out are ignored by this command. Unless given "
"`--quiet`, foreach prints the name of each submodule before evaluating the "
-"command. If `--recursive` is given, submodules are traversed recursively (i."
-"e. the given shell command is evaluated in nested submodules as well). A "
-"non-zero return from the command in any submodule causes the processing to "
-"terminate. This can be overridden by adding '|| :' to the end of the command."
+"command. If `--recursive` is given, submodules are traversed recursively "
+"(i.e. the given shell command is evaluated in nested submodules as well). "
+"A non-zero return from the command in any submodule causes the processing to"
+" terminate. This can be overridden by adding '|| :' to the end of the "
+"command."
msgstr ""
#. type: Plain text
@@ -61504,9 +60714,9 @@ msgstr "'git diff' [--options] [--] [<path>...]"
#: en/git-submodule.txt:248
msgid ""
"Synchronizes submodules' remote URL configuration setting to the value "
-"specified in .gitmodules. It will only affect those submodules which already "
-"have a URL entry in .git/config (that is the case when they are initialized "
-"or freshly added). This is useful when submodule URLs change upstream and "
+"specified in .gitmodules. It will only affect those submodules which already"
+" have a URL entry in .git/config (that is the case when they are initialized"
+" or freshly added). This is useful when submodule URLs change upstream and "
"you need to update your local repositories accordingly."
msgstr ""
@@ -61520,8 +60730,8 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:254
msgid ""
-"If `--recursive` is specified, this command will recurse into the registered "
-"submodules, and sync any nested submodules within."
+"If `--recursive` is specified, this command will recurse into the registered"
+" submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
@@ -61543,9 +60753,9 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:266
msgid ""
-"A repository that was cloned independently and later added as a submodule or "
-"old setups have the submodules git directory inside the submodule instead of "
-"embedded into the superprojects git directory."
+"A repository that was cloned independently and later added as a submodule or"
+" old setups have the submodules git directory inside the submodule instead "
+"of embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
@@ -61569,21 +60779,21 @@ msgstr ""
#: en/git-submodule.txt:286
msgid ""
"Branch of repository to add as submodule. The name of the branch is "
-"recorded as `submodule.<name>.branch` in `.gitmodules` for `update --"
-"remote`. A special value of `.` is used to indicate that the name of the "
-"branch in the submodule should be the same name as the current branch in the "
-"current repository."
+"recorded as `submodule.<name>.branch` in `.gitmodules` for `update "
+"--remote`. A special value of `.` is used to indicate that the name of the "
+"branch in the submodule should be the same name as the current branch in the"
+" current repository."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:299
msgid ""
-"This option is only valid for add, deinit and update commands. When running "
-"add, allow adding an otherwise ignored submodule path. When running deinit "
-"the submodule working trees will be removed even if they contain local "
+"This option is only valid for add, deinit and update commands. When running"
+" add, allow adding an otherwise ignored submodule path. When running deinit"
+" the submodule working trees will be removed even if they contain local "
"changes. When running update (only effective with the checkout procedure), "
-"throw away local changes in submodules when switching to a different commit; "
-"and always run a checkout operation in the submodule, even if the commit "
+"throw away local changes in submodules when switching to a different commit;"
+" and always run a checkout operation in the submodule, even if the commit "
"listed in the index of the containing repository matches the commit checked "
"out in the submodule."
msgstr ""
@@ -61598,23 +60808,23 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:305
-#, fuzzy, no-wrap
-#| msgid "-F <file>"
+#, no-wrap
msgid "--files"
-msgstr "-F <file>"
+msgstr "--files"
#. type: Plain text
#: en/git-submodule.txt:309
msgid ""
-"This option is only valid for the summary command. This command compares the "
-"commit in the index with that in the submodule HEAD when this option is used."
+"This option is only valid for the summary command. This command compares the"
+" commit in the index with that in the submodule HEAD when this option is "
+"used."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:311
#, no-wrap
msgid "--summary-limit"
-msgstr ""
+msgstr "--summary-limit"
#. type: Plain text
#: en/git-submodule.txt:317
@@ -61622,24 +60832,22 @@ msgid ""
"This option is only valid for the summary command. Limit the summary size "
"(number of commits shown in total). Giving 0 will disable the summary; a "
"negative number means unlimited (the default). This limit only applies to "
-"modified submodules. The size is always limited to 1 for added/deleted/"
-"typechanged submodules."
+"modified submodules. The size is always limited to 1 for "
+"added/deleted/typechanged submodules."
msgstr ""
-#
#. type: Labeled list
#: en/git-submodule.txt:318
-#, fuzzy, no-wrap
-#| msgid "git-remote(1)"
+#, no-wrap
msgid "--remote"
-msgstr "git-remote(1)"
+msgstr "--remote"
#. type: Plain text
#: en/git-submodule.txt:327
msgid ""
"This option is only valid for the update command. Instead of using the "
-"superproject's recorded SHA-1 to update the submodule, use the status of the "
-"submodule's remote-tracking branch. The remote used is branch's remote "
+"superproject's recorded SHA-1 to update the submodule, use the status of the"
+" submodule's remote-tracking branch. The remote used is branch's remote "
"(`branch.<name>.remote`), defaulting to `origin`. The remote branch used "
"defaults to `master`, but the branch name may be overridden by setting the "
"`submodule.<name>.branch` option in either `.gitmodules` or `.git/config` "
@@ -61649,8 +60857,8 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:333
msgid ""
-"This works for any of the supported update procedures (`--checkout`, `--"
-"rebase`, etc.). The only change is the source of the target SHA-1. For "
+"This works for any of the supported update procedures (`--checkout`, "
+"`--rebase`, etc.). The only change is the source of the target SHA-1. For "
"example, `submodule update --remote --merge` will merge upstream submodule "
"changes into the submodules, while `submodule update --merge` will merge "
"superproject gitlink changes into the submodules."
@@ -61670,20 +60878,20 @@ msgstr ""
msgid ""
"Use this option to integrate changes from the upstream subproject with your "
"submodule's current HEAD. Alternatively, you can run `git pull` from the "
-"submodule, which is equivalent except for the remote branch name: `update --"
-"remote` uses the default upstream repository and `submodule.<name>.branch`, "
-"while `git pull` uses the submodule's `branch.<name>.merge`. Prefer "
-"`submodule.<name>.branch` if you want to distribute the default upstream "
-"branch with the superproject and `branch.<name>.merge` if you want a more "
-"native feel while working in the submodule itself."
+"submodule, which is equivalent except for the remote branch name: `update "
+"--remote` uses the default upstream repository and "
+"`submodule.<name>.branch`, while `git pull` uses the submodule's "
+"`branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to "
+"distribute the default upstream branch with the superproject and "
+"`branch.<name>.merge` if you want a more native feel while working in the "
+"submodule itself."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:350
-#, fuzzy, no-wrap
-#| msgid "--no-track"
+#, no-wrap
msgid "--no-fetch"
-msgstr "--no-track"
+msgstr "--no-fetch"
#. type: Plain text
#: en/git-submodule.txt:353
@@ -61694,70 +60902,69 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:354
-#, fuzzy, no-wrap
-#| msgid "--no-checkout"
+#, no-wrap
msgid "--checkout"
-msgstr "--no-checkout"
+msgstr "--checkout"
#. type: Plain text
#: en/git-submodule.txt:362
msgid ""
"This option is only valid for the update command. Checkout the commit "
"recorded in the superproject on a detached HEAD in the submodule. This is "
-"the default behavior, the main use of this option is to override `submodule."
-"$name.update` when set to a value other than `checkout`. If the key "
-"`submodule.$name.update` is either not explicitly set or set to `checkout`, "
-"this option is implicit."
+"the default behavior, the main use of this option is to override "
+"`submodule.$name.update` when set to a value other than `checkout`. If the "
+"key `submodule.$name.update` is either not explicitly set or set to "
+"`checkout`, this option is implicit."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:372
msgid ""
-"This option is only valid for the update command. Merge the commit recorded "
-"in the superproject into the current branch of the submodule. If this option "
-"is given, the submodule's HEAD will not be detached. If a merge failure "
-"prevents this process, you will have to resolve the resulting conflicts "
-"within the submodule with the usual conflict resolution tools. If the key "
-"`submodule.$name.update` is set to `merge`, this option is implicit."
+"This option is only valid for the update command. Merge the commit recorded"
+" in the superproject into the current branch of the submodule. If this "
+"option is given, the submodule's HEAD will not be detached. If a merge "
+"failure prevents this process, you will have to resolve the resulting "
+"conflicts within the submodule with the usual conflict resolution tools. If"
+" the key `submodule.$name.update` is set to `merge`, this option is "
+"implicit."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:373
#, no-wrap
msgid "--rebase"
-msgstr ""
+msgstr "--rebase"
#. type: Plain text
#: en/git-submodule.txt:381
msgid ""
-"This option is only valid for the update command. Rebase the current branch "
-"onto the commit recorded in the superproject. If this option is given, the "
+"This option is only valid for the update command. Rebase the current branch"
+" onto the commit recorded in the superproject. If this option is given, the "
"submodule's HEAD will not be detached. If a merge failure prevents this "
-"process, you will have to resolve these failures with linkgit:git-"
-"rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this "
-"option is implicit."
+"process, you will have to resolve these failures with linkgit:git-rebase[1]."
+" If the key `submodule.$name.update` is set to `rebase`, this option is "
+"implicit."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:382
-#, fuzzy, no-wrap
-#| msgid "--int"
+#, no-wrap
msgid "--init"
-msgstr "--int"
+msgstr "--init"
#. type: Plain text
#: en/git-submodule.txt:386
msgid ""
-"This option is only valid for the update command. Initialize all submodules "
-"for which \"git submodule init\" has not been called so far before updating."
+"This option is only valid for the update command. Initialize all submodules"
+" for which \"git submodule init\" has not been called so far before "
+"updating."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:387
-#, fuzzy, no-wrap
-#| msgid "-o <name>"
+#, no-wrap
msgid "--name"
-msgstr "-o <name>"
+msgstr "--name"
#. type: Plain text
#: en/git-submodule.txt:391
@@ -61800,31 +61007,30 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:406
-#, fuzzy, no-wrap
-#| msgid "--depth <depth>"
+#, no-wrap
msgid "--depth"
-msgstr "--depth <depth>"
+msgstr "--depth"
#. type: Plain text
#: en/git-submodule.txt:410
msgid ""
"This option is valid for add and update commands. Create a 'shallow' clone "
-"with a history truncated to the specified number of revisions. See linkgit:"
-"git-clone[1]"
+"with a history truncated to the specified number of revisions. See "
+"linkgit:git-clone[1]"
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:411
#, no-wrap
msgid "--[no-]recommend-shallow"
-msgstr ""
+msgstr "--[no-]recommend-shallow"
#. type: Plain text
#: en/git-submodule.txt:416
msgid ""
"This option is only valid for the update command. The initial clone of a "
-"submodule will use the recommended `submodule.<name>.shallow` as provided by "
-"the .gitmodules file by default. To ignore the suggestions use `--no-"
+"submodule will use the recommended `submodule.<name>.shallow` as provided by"
+" the .gitmodules file by default. To ignore the suggestions use `--no-"
"recommend-shallow`."
msgstr ""
@@ -61838,8 +61044,8 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:427
msgid ""
-"Paths to submodule(s). When specified this will restrict the command to only "
-"operate on the submodules found at the specified paths. (This argument is "
+"Paths to submodule(s). When specified this will restrict the command to only"
+" operate on the submodules found at the specified paths. (This argument is "
"required with add)."
msgstr ""
@@ -61849,16 +61055,15 @@ msgid ""
"When initializing submodules, a .gitmodules file in the top-level directory "
"of the containing repository is used to find the url of each submodule. "
"This file should be formatted in the same way as `$GIT_DIR/config`. The key "
-"to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] "
-"for details."
+"to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5]"
+" for details."
msgstr ""
#. type: Title =
#: en/git-svn.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-mv(1)"
+#, no-wrap
msgid "git-svn(1)"
-msgstr "git-mv(1)"
+msgstr "git-svn(1)"
#. type: Plain text
#: en/git-svn.txt:7
@@ -61875,8 +61080,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:18
msgid ""
-"'git svn' is a simple conduit for changesets between Subversion and Git. It "
-"provides a bidirectional flow of changes between a Subversion and a Git "
+"'git svn' is a simple conduit for changesets between Subversion and Git. It"
+" provides a bidirectional flow of changes between a Subversion and a Git "
"repository."
msgstr ""
@@ -61906,9 +61111,9 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:39
msgid ""
-"Initializes an empty Git repository with additional metadata directories for "
-"'git svn'. The Subversion URL may be specified as a command-line argument, "
-"or as full URL arguments to -T/-t/-b. Optionally, the target directory to "
+"Initializes an empty Git repository with additional metadata directories for"
+" 'git svn'. The Subversion URL may be specified as a command-line argument,"
+" or as full URL arguments to -T/-t/-b. Optionally, the target directory to "
"operate on can be specified as a second argument. Normally this command "
"initializes the current directory."
msgstr ""
@@ -61953,40 +61158,40 @@ msgstr ""
#: en/git-svn.txt:47
#, no-wrap
msgid "--stdlayout"
-msgstr ""
+msgstr "--stdlayout"
#. type: Plain text
#: en/git-svn.txt:58
msgid ""
"These are optional command-line options for init. Each of these flags can "
-"point to a relative repository path (--tags=project/tags) or a full url (--"
-"tags=https://foo.org/project/tags). You can specify more than one --tags "
-"and/or --branches options, in case your Subversion repository places tags or "
-"branches under multiple paths. The option --stdlayout is a shorthand way of "
-"setting trunk,tags,branches as the relative paths, which is the Subversion "
-"default. If any of the other options are given as well, they take precedence."
+"point to a relative repository path (--tags=project/tags) or a full url "
+"(--tags=https://foo.org/project/tags). You can specify more than one --tags"
+" and/or --branches options, in case your Subversion repository places tags "
+"or branches under multiple paths. The option --stdlayout is a shorthand way"
+" of setting trunk,tags,branches as the relative paths, which is the "
+"Subversion default. If any of the other options are given as well, they take"
+" precedence."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:58
-#, fuzzy, no-wrap
-#| msgid "--no-merged"
+#, no-wrap
msgid "--no-metadata"
-msgstr "--no-merged"
+msgstr "--no-metadata"
#. type: Plain text
#: en/git-svn.txt:62
msgid ""
"Set the 'noMetadata' option in the [svn-remote] config. This option is not "
-"recommended, please read the 'svn.noMetadata' section of this manpage before "
-"using this option."
+"recommended, please read the 'svn.noMetadata' section of this manpage before"
+" using this option."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:62
#, no-wrap
msgid "--use-svm-props"
-msgstr ""
+msgstr "--use-svm-props"
#. type: Plain text
#: en/git-svn.txt:64
@@ -61997,7 +61202,7 @@ msgstr ""
#: en/git-svn.txt:64
#, no-wrap
msgid "--use-svnsync-props"
-msgstr ""
+msgstr "--use-svnsync-props"
#. type: Plain text
#: en/git-svn.txt:66
@@ -62037,8 +61242,8 @@ msgstr ""
msgid ""
"For transports that SVN handles authentication for (http, https, and plain "
"svn), specify the username. For other transports (e.g. `svn+ssh://`), you "
-"must include the username in the URL, e.g. `svn+ssh://foo@svn.bar.com/"
-"project`"
+"must include the username in the URL, e.g. "
+"`svn+ssh://foo@svn.bar.com/project`"
msgstr ""
#. type: Labeled list
@@ -62067,10 +61272,10 @@ msgstr ""
#: en/git-svn.txt:97
msgid ""
"Before Git v2.0, the default prefix was \"\" (no prefix). This meant that "
-"SVN-tracking refs were put at \"refs/remotes/*\", which is incompatible with "
-"how Git's own remote-tracking refs are organized. If you still want the old "
-"default, you can get it by passing `--prefix \"\"` on the command line (`--"
-"prefix=\"\"` may not work if your Perl's Getopt::Long is < v2.37)."
+"SVN-tracking refs were put at \"refs/remotes/*\", which is incompatible with"
+" how Git's own remote-tracking refs are organized. If you still want the "
+"old default, you can get it by passing `--prefix \"\"` on the command line "
+"(`--prefix=\"\"` may not work if your Perl's Getopt::Long is < v2.37)."
msgstr ""
#. type: Labeled list
@@ -62104,17 +61309,17 @@ msgstr ""
#: en/git-svn.txt:106
#, no-wrap
msgid "--no-minimize-url"
-msgstr ""
+msgstr "--no-minimize-url"
#. type: Plain text
#: en/git-svn.txt:117
msgid ""
-"When tracking multiple directories (using --stdlayout, --branches, or --tags "
-"options), git svn will attempt to connect to the root (or highest allowed "
-"level) of the Subversion repository. This default allows better tracking of "
-"history if entire projects are moved within a repository, but may cause "
-"issues on repositories where read access restrictions are in place. Passing "
-"`--no-minimize-url` will allow git svn to accept URLs as-is without "
+"When tracking multiple directories (using --stdlayout, --branches, or --tags"
+" options), git svn will attempt to connect to the root (or highest allowed "
+"level) of the Subversion repository. This default allows better tracking of"
+" history if entire projects are moved within a repository, but may cause "
+"issues on repositories where read access restrictions are in place. Passing"
+" `--no-minimize-url` will allow git svn to accept URLs as-is without "
"attempting to connect to a higher level directory. This option is off by "
"default when only one URL/branch is tracked (it would do little good)."
msgstr ""
@@ -62136,16 +61341,15 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:126 en/git-svn.txt:227
msgid ""
-"This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\*\\*/."
-"rev_map.*' in the FILES section below for details)."
+"This automatically updates the rev_map if needed (see "
+"'$GIT_DIR/svn/\\*\\*/.rev_map.*' in the FILES section below for details)."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:127
-#, fuzzy, no-wrap
-#| msgid "--local"
+#, no-wrap
msgid "--localtime"
-msgstr "--local"
+msgstr "--localtime"
#. type: Plain text
#: en/git-svn.txt:131
@@ -62159,17 +61363,16 @@ msgstr ""
#: en/git-svn.txt:137
msgid ""
"This doesn't interfere with interoperating with the Subversion repository "
-"you cloned from, but if you wish for your local Git repository to be able to "
-"interoperate with someone else's local Git repository, either don't use this "
-"option or you should both use it in the same local time zone."
+"you cloned from, but if you wish for your local Git repository to be able to"
+" interoperate with someone else's local Git repository, either don't use "
+"this option or you should both use it in the same local time zone."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:138 en/git-svn.txt:505
-#, fuzzy, no-wrap
-#| msgid "--patch"
+#, no-wrap
msgid "--parent"
-msgstr "--patch"
+msgstr "--parent"
#. type: Plain text
#: en/git-svn.txt:140
@@ -62180,8 +61383,8 @@ msgstr ""
#: en/git-svn.txt:147
msgid ""
"This allows one to specify a Perl regular expression that will cause "
-"skipping of all matching paths from checkout from SVN. The `--ignore-paths` "
-"option should match for every 'fetch' (including automatic fetches due to "
+"skipping of all matching paths from checkout from SVN. The `--ignore-paths`"
+" option should match for every 'fetch' (including automatic fetches due to "
"'clone', 'dcommit', 'rebase', etc) on a given repository."
msgstr ""
@@ -62194,8 +61397,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:153
msgid ""
-"If the ignore-paths configuration key is set, and the command-line option is "
-"also given, both regular expressions will be used."
+"If the ignore-paths configuration key is set, and the command-line option is"
+" also given, both regular expressions will be used."
msgstr ""
#. type: Labeled list
@@ -62250,9 +61453,9 @@ msgstr "--log-size"
#: en/git-svn.txt:187
msgid ""
"Fetch <n> log entries per request when scanning Subversion history. The "
-"default is 100. For very large Subversion repositories, larger values may be "
-"needed for 'clone'/'fetch' to complete in reasonable time. But overly large "
-"values may lead to higher memory usage and request timeouts."
+"default is 100. For very large Subversion repositories, larger values may be"
+" needed for 'clone'/'fetch' to complete in reasonable time. But overly large"
+" values may lead to higher memory usage and request timeouts."
msgstr ""
#. type: Labeled list
@@ -62266,9 +61469,9 @@ msgstr ""
msgid ""
"Runs 'init' and 'fetch'. It will automatically create a directory based on "
"the basename of the URL passed to it; or if a second argument is passed; it "
-"will create a directory and work within that. It accepts all arguments that "
-"the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` "
-"and `--parent`. After a repository is cloned, the 'fetch' command will be "
+"will create a directory and work within that. It accepts all arguments that"
+" the 'init' and 'fetch' commands accept; with the exception of `--fetch-all`"
+" and `--parent`. After a repository is cloned, the 'fetch' command will be "
"able to update revisions without affecting the working tree; and the "
"'rebase' command will be able to update the working tree with the latest "
"changes."
@@ -62278,7 +61481,7 @@ msgstr ""
#: en/git-svn.txt:199
#, no-wrap
msgid "--preserve-empty-dirs"
-msgstr ""
+msgstr "--preserve-empty-dirs"
#. type: Plain text
#: en/git-svn.txt:205
@@ -62342,8 +61545,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:232
msgid ""
-"Do not fetch remotely; only run 'git rebase' against the last fetched commit "
-"from the upstream SVN."
+"Do not fetch remotely; only run 'git rebase' against the last fetched commit"
+" from the upstream SVN."
msgstr ""
#. type: Labeled list
@@ -62356,16 +61559,16 @@ msgstr "-C <commit>"
#. type: Plain text
#: en/git-svn.txt:238
msgid ""
-"Commit each diff from the current branch directly to the SVN repository, and "
-"then rebase or reset (depending on whether or not there is a diff between "
+"Commit each diff from the current branch directly to the SVN repository, and"
+" then rebase or reset (depending on whether or not there is a diff between "
"SVN and head). This will create a revision in SVN for each commit in Git."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:242
msgid ""
-"When an optional Git branch name (or a Git commit object name) is specified "
-"as an argument, the subcommand works on the specified branch, not on the "
+"When an optional Git branch name (or a Git commit object name) is specified"
+" as an argument, the subcommand works on the specified branch, not on the "
"current branch."
msgstr ""
@@ -62427,12 +61630,12 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:272
msgid ""
-"Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/"
-"branches/foo:1-10\"`). All svn server versions can store this information "
-"(as a property), and svn clients starting from version 1.5 can make use of "
-"it. To specify merge information from multiple branches, use a single space "
-"character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/"
-"bar:3,5-6,8\"`)"
+"Add the given merge information during the dcommit (e.g. "
+"`--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store "
+"this information (as a property), and svn clients starting from version 1.5 "
+"can make use of it. To specify merge information from multiple branches, use"
+" a single space character between the branches "
+"(`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
msgstr ""
#. type: Plain text
@@ -62444,10 +61647,10 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:280
msgid ""
-"This option will cause git-svn to attempt to automatically populate the svn:"
-"mergeinfo property in the SVN repository when possible. Currently, this can "
-"only be done when dcommitting non-fast-forward merges where all parents but "
-"the first have already been pushed into SVN."
+"This option will cause git-svn to attempt to automatically populate the "
+"svn:mergeinfo property in the SVN repository when possible. Currently, this "
+"can only be done when dcommitting non-fast-forward merges where all parents "
+"but the first have already been pushed into SVN."
msgstr ""
#. type: Plain text
@@ -62472,7 +61675,6 @@ msgstr ""
msgid "'branch'"
msgstr "<branch>"
-#
#. type: Plain text
#: en/git-svn.txt:291
#, fuzzy
@@ -62483,12 +61685,10 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:293
-#, fuzzy, no-wrap
-#| msgid "--message=<msg>"
+#, no-wrap
msgid "--message"
-msgstr "--message=<msg>"
+msgstr "--message"
-#
#. type: Plain text
#: en/git-svn.txt:295
#, fuzzy
@@ -62501,7 +61701,7 @@ msgstr ""
#: en/git-svn.txt:297
#, no-wrap
msgid "--tag"
-msgstr ""
+msgstr "--tag"
#. type: Plain text
#: en/git-svn.txt:300
@@ -62528,9 +61728,9 @@ msgstr ""
msgid ""
"If more than one --branches (or --tags) option was given to the 'init' or "
"'clone' command, you must provide the location of the branch (or tag) you "
-"wish to create in the SVN repository. <path> specifies which path to use to "
-"create the branch or tag and should match the pattern on the left-hand side "
-"of one of the configured branches or tags refspecs. You can see these "
+"wish to create in the SVN repository. <path> specifies which path to use to"
+" create the branch or tag and should match the pattern on the left-hand side"
+" of one of the configured branches or tags refspecs. You can see these "
"refspecs with the commands"
msgstr ""
@@ -62544,15 +61744,15 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:316
msgid ""
-"where <name> is the name of the SVN repository as specified by the -R option "
-"to 'init' (or \"svn\" by default)."
+"where <name> is the name of the SVN repository as specified by the -R option"
+" to 'init' (or \"svn\" by default)."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:317
#, no-wrap
msgid "--username"
-msgstr ""
+msgstr "--username"
#. type: Plain text
#: en/git-svn.txt:320
@@ -62563,10 +61763,9 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:321
-#, fuzzy, no-wrap
-#| msgid "-C <commit>"
+#, no-wrap
msgid "--commit-url"
-msgstr "-C <commit>"
+msgstr "--commit-url"
#. type: Plain text
#: en/git-svn.txt:326
@@ -62585,16 +61784,16 @@ msgstr "% git config --get-all core.gitproxy\n"
#. type: Labeled list
#: en/git-svn.txt:330 en/rev-list-options.txt:786
-#, fuzzy, no-wrap
-#| msgid "--patch"
+#, no-wrap
msgid "--parents"
-msgstr "--patch"
+msgstr "--parents"
#. type: Plain text
#: en/git-svn.txt:334
msgid ""
-"Create parent folders. This parameter is equivalent to the parameter --"
-"parents on svn cp commands and is useful for non-standard repository layouts."
+"Create parent folders. This parameter is equivalent to the parameter "
+"--parents on svn cp commands and is useful for non-standard repository "
+"layouts."
msgstr ""
#. type: Labeled list
@@ -62618,8 +61817,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:342
msgid ""
-"This should make it easy to look up svn log messages when svn users refer to "
-"-r/--revision numbers."
+"This should make it easy to look up svn log messages when svn users refer to"
+" -r/--revision numbers."
msgstr ""
#. type: Plain text
@@ -62641,7 +61840,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:350
-msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
+msgid ""
+"is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
msgstr ""
#. type: Plain text
@@ -62676,9 +61876,8 @@ msgstr ""
#: en/git-svn.txt:364
#, no-wrap
msgid "--show-commit"
-msgstr ""
+msgstr "--show-commit"
-#
#. type: Plain text
#: en/git-svn.txt:366
#, fuzzy
@@ -62688,10 +61887,9 @@ msgstr "Zeigt die Geschichte des Projekts"
#. type: Labeled list
#: en/git-svn.txt:366 en/pretty-options.txt:31
-#, fuzzy, no-wrap
-#| msgid "--only"
+#, no-wrap
msgid "--oneline"
-msgstr "--only"
+msgstr "--oneline"
#. type: Plain text
#: en/git-svn.txt:368
@@ -62701,8 +61899,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:373
msgid ""
-"SVN itself only stores times in UTC and nothing else. The regular svn client "
-"converts the UTC time to the local time (or based on the TZ= environment). "
+"SVN itself only stores times in UTC and nothing else. The regular svn client"
+" converts the UTC time to the local time (or based on the TZ= environment). "
"This command has the same behaviour."
msgstr ""
@@ -62721,8 +61919,8 @@ msgstr ""
#: en/git-svn.txt:383
msgid ""
"Show what revision and author last modified each line of a file. The output "
-"of this mode is format-compatible with the output of `svn blame' by default. "
-"Like the SVN blame command, local uncommitted changes in the working tree "
+"of this mode is format-compatible with the output of `svn blame' by default."
+" Like the SVN blame command, local uncommitted changes in the working tree "
"are ignored; the version of the file in the HEAD revision is annotated. "
"Unknown arguments are passed directly to 'git blame'."
msgstr ""
@@ -62731,7 +61929,7 @@ msgstr ""
#: en/git-svn.txt:384
#, no-wrap
msgid "--git-format"
-msgstr ""
+msgstr "--git-format"
#. type: Plain text
#: en/git-svn.txt:389
@@ -62752,9 +61950,9 @@ msgstr ""
#: en/git-svn.txt:395
msgid ""
"When given an SVN revision number of the form 'rN', returns the "
-"corresponding Git commit hash (this can optionally be followed by a tree-ish "
-"to specify which branch should be searched). When given a tree-ish, returns "
-"the corresponding SVN revision number."
+"corresponding Git commit hash (this can optionally be followed by a tree-ish"
+" to specify which branch should be searched). When given a tree-ish, "
+"returns the corresponding SVN revision number."
msgstr ""
#. type: Labeled list
@@ -62767,7 +61965,7 @@ msgstr ""
#: en/git-svn.txt:397
#, no-wrap
msgid "--before"
-msgstr ""
+msgstr "--before"
#. type: Plain text
#: en/git-svn.txt:401
@@ -62781,7 +61979,7 @@ msgstr ""
#: en/git-svn.txt:403
#, no-wrap
msgid "--after"
-msgstr ""
+msgstr "--after"
#. type: Plain text
#: en/git-svn.txt:407
@@ -62800,8 +61998,8 @@ msgstr ""
#: en/git-svn.txt:416
msgid ""
"You should consider using 'dcommit' instead of this command. Commit "
-"specified commit or tree objects to SVN. This relies on your imported fetch "
-"data being up-to-date. This makes absolutely no attempts to do patching "
+"specified commit or tree objects to SVN. This relies on your imported fetch"
+" data being up-to-date. This makes absolutely no attempts to do patching "
"when committing to SVN, it simply overwrites files with those specified in "
"the tree or commit. All merging is assumed to have taken place "
"independently of 'git svn' functions."
@@ -62862,12 +62060,12 @@ msgstr ""
#: en/git-svn.txt:446
msgid ""
"Commits the diff of two tree-ish arguments from the command-line. This "
-"command does not rely on being inside an `git svn init`-ed repository. This "
-"command takes three arguments, (a) the original tree to diff against, (b) "
+"command does not rely on being inside an `git svn init`-ed repository. This"
+" command takes three arguments, (a) the original tree to diff against, (b) "
"the new tree result, (c) the URL of the target Subversion repository. The "
-"final argument (URL) may be omitted if you are working from a 'git svn'-"
-"aware repository (that has been `init`-ed with 'git svn'). The -r<revision> "
-"option is required for this."
+"final argument (URL) may be omitted if you are working from a 'git "
+"svn'-aware repository (that has been `init`-ed with 'git svn'). The "
+"-r<revision> option is required for this."
msgstr ""
#. type: Labeled list
@@ -62880,8 +62078,8 @@ msgstr ""
#: en/git-svn.txt:452
msgid ""
"Shows information about a file or directory similar to what `svn info' "
-"provides. Does not currently support a -r/--revision argument. Use the --"
-"url option to output only the value of the 'URL:' field."
+"provides. Does not currently support a -r/--revision argument. Use the "
+"--url option to output only the value of the 'URL:' field."
msgstr ""
#. type: Labeled list
@@ -62919,8 +62117,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:466
msgid ""
-"Sets the Subversion property given as the first argument, to the value given "
-"as the second argument for the file given as the third argument."
+"Sets the Subversion property given as the first argument, to the value given"
+" as the second argument for the file given as the third argument."
msgstr ""
#. type: delimited block -
@@ -62952,8 +62150,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:483
msgid ""
-"Compress $GIT_DIR/svn/<refname>/unhandled.log files and remove $GIT_DIR/svn/"
-"<refname>/index files."
+"Compress $GIT_DIR/svn/<refname>/unhandled.log files and remove "
+"$GIT_DIR/svn/<refname>/index files."
msgstr ""
#. type: Labeled list
@@ -62966,8 +62164,8 @@ msgstr ""
#: en/git-svn.txt:494
msgid ""
"Undoes the effects of 'fetch' back to the specified revision. This allows "
-"you to re-'fetch' an SVN revision. Normally the contents of an SVN revision "
-"should never change and 'reset' should not be necessary. However, if SVN "
+"you to re-'fetch' an SVN revision. Normally the contents of an SVN revision"
+" should never change and 'reset' should not be necessary. However, if SVN "
"permissions change, or if you alter your --ignore-paths option, a 'fetch' "
"may fail with \"not found in commit\" (file not previously visible) or "
"\"checksum mismatch\" (missed a modification). If the problem file cannot "
@@ -62978,10 +62176,10 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:499
msgid ""
-"Only the rev_map and refs/remotes/git-svn are changed (see '$GIT_DIR/svn/\\*"
-"\\*/.rev_map.*' in the FILES section below for details). Follow 'reset' "
-"with a 'fetch' and then 'git reset' or 'git rebase' to move local branches "
-"onto the new tree."
+"Only the rev_map and refs/remotes/git-svn are changed (see "
+"'$GIT_DIR/svn/\\*\\*/.rev_map.*' in the FILES section below for details). "
+"Follow 'reset' with a 'fetch' and then 'git reset' or 'git rebase' to move "
+"local branches onto the new tree."
msgstr ""
#. type: Labeled list
@@ -63000,7 +62198,8 @@ msgstr "--remove-section"
#. type: Plain text
#: en/git-svn.txt:504
msgid ""
-"Specify the most recent revision to keep. All later revisions are discarded."
+"Specify the most recent revision to keep. All later revisions are "
+"discarded."
msgstr ""
#. type: Plain text
@@ -63011,8 +62210,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:510
-msgid ""
-"Assume you have local changes in \"master\", but you need to refetch \"r2\"."
+msgid "Assume you have local changes in \"master\", but you need to refetch \"r2\"."
msgstr ""
#. type: delimited block -
@@ -63102,9 +62300,9 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:558
msgid ""
-"This allows revision ranges for partial/cauterized history to be supported. "
-"$NUMBER, $NUMBER1:$NUMBER2 (numeric ranges), $NUMBER:HEAD, and BASE:$NUMBER "
-"are all supported."
+"This allows revision ranges for partial/cauterized history to be supported."
+" $NUMBER, $NUMBER1:$NUMBER2 (numeric ranges), $NUMBER:HEAD, and "
+"BASE:$NUMBER are all supported."
msgstr ""
#. type: Plain text
@@ -63138,7 +62336,7 @@ msgstr ""
#: en/git-svn.txt:571
#, no-wrap
msgid "--rmdir"
-msgstr ""
+msgstr "--rmdir"
#. type: Plain text
#: en/git-svn.txt:573 en/git-svn.txt:586 en/git-svn.txt:597
@@ -63148,10 +62346,10 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:579
msgid ""
-"Remove directories from the SVN tree if there are no files left behind. SVN "
-"can version empty directories, and they are not removed by default if there "
-"are no files left in them. Git cannot version empty directories. Enabling "
-"this flag will make the commit to SVN act like Git."
+"Remove directories from the SVN tree if there are no files left behind. SVN"
+" can version empty directories, and they are not removed by default if there"
+" are no files left in them. Git cannot version empty directories. Enabling"
+" this flag will make the commit to SVN act like Git."
msgstr ""
#. type: Plain text
@@ -63217,8 +62415,8 @@ msgstr ""
#: en/git-svn.txt:618
msgid ""
"If this option is specified and 'git svn' encounters an SVN committer name "
-"that does not exist in the authors-file, 'git svn' will abort operation. The "
-"user will then have to add the appropriate entry. Re-running the previous "
+"that does not exist in the authors-file, 'git svn' will abort operation. The"
+" user will then have to add the appropriate entry. Re-running the previous "
"'git svn' command after the authors-file is modified should continue "
"operation."
msgstr ""
@@ -63238,8 +62436,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:628
msgid ""
-"If this option is specified, for each SVN committer name that does not exist "
-"in the authors file, the given file is executed with the committer name as "
+"If this option is specified, for each SVN committer name that does not exist"
+" in the authors file, the given file is executed with the committer name as "
"the first argument. The program is expected to return a single line of the "
"form \"Name <email>\", which will be treated as if included in the authors "
"file."
@@ -63272,8 +62470,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:647
msgid ""
-"Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot "
-"be used (see 'dcommit')."
+"Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot"
+" be used (see 'dcommit')."
msgstr ""
#. type: Plain text
@@ -63306,10 +62504,9 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:663
-#, fuzzy, no-wrap
-#| msgid "--author=<author>"
+#, no-wrap
msgid "--use-log-author"
-msgstr "--author=<author>"
+msgstr "--use-log-author"
#. type: Plain text
#: en/git-svn.txt:667
@@ -63329,7 +62526,7 @@ msgstr ""
#: en/git-svn.txt:671
#, no-wrap
msgid "--add-author-from"
-msgstr ""
+msgstr "--add-author-from"
#. type: Plain text
#: en/git-svn.txt:677
@@ -63397,18 +62594,17 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:697
-#, fuzzy, no-wrap
-#| msgid "--follow"
+#, no-wrap
msgid "--follow-parent"
-msgstr "--follow"
+msgstr "--follow-parent"
#. type: Plain text
#: en/git-svn.txt:712
msgid ""
"This option is only relevant if we are tracking branches (using one of the "
"repository layout options --trunk, --tags, --branches, --stdlayout). For "
-"each tracked branch, try to find out where its revision was copied from, and "
-"set a suitable parent in the first Git commit for the branch. This is "
+"each tracked branch, try to find out where its revision was copied from, and"
+" set a suitable parent in the first Git commit for the branch. This is "
"especially helpful when we're tracking a directory that has been moved "
"around within the repository. If this feature is disabled, the branches "
"created by 'git svn' will all be linear and not share any history, meaning "
@@ -63459,9 +62655,9 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:731
msgid ""
-"The 'git svn log' command will not work on repositories using this, either. "
-"Using this conflicts with the 'useSvmProps' option for (hopefully) obvious "
-"reasons."
+"The 'git svn log' command will not work on repositories using this, either."
+" Using this conflicts with the 'useSvmProps' option for (hopefully) obvious"
+" reasons."
msgstr ""
#. type: Plain text
@@ -63562,9 +62758,9 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:781
msgid ""
-"Similar to Git's `remote.<name>.pushurl`, this key is designed to be used in "
-"cases where 'url' points to an SVN repository via a read-only transport, to "
-"provide an alternate read/write transport. It is assumed that both keys "
+"Similar to Git's `remote.<name>.pushurl`, this key is designed to be used in"
+" cases where 'url' points to an SVN repository via a read-only transport, to"
+" provide an alternate read/write transport. It is assumed that both keys "
"point to the same repository. Unlike 'commiturl', 'pushurl' is a base path. "
"If either 'commiturl' or 'pushurl' could be used, 'commiturl' takes "
"precedence."
@@ -63582,8 +62778,8 @@ msgid ""
"This disables potentially expensive checks to workaround broken symlinks "
"checked into SVN by broken clients. Set this option to \"false\" if you "
"track a SVN repository with many empty blobs that are not symlinks. This "
-"option may be changed while 'git svn' is running and take effect on the next "
-"revision fetched. If unset, 'git svn' assumes this option to be \"true\"."
+"option may be changed while 'git svn' is running and take effect on the next"
+" revision fetched. If unset, 'git svn' assumes this option to be \"true\"."
msgstr ""
#. type: Labeled list
@@ -63621,9 +62817,9 @@ msgstr ""
#: en/git-svn.txt:809
msgid ""
"Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and "
-"useSvmProps options all affect the metadata generated and used by 'git svn'; "
-"they *must* be set in the configuration file before any history is imported "
-"and these settings should never be changed once they are set."
+"useSvmProps options all affect the metadata generated and used by 'git svn';"
+" they *must* be set in the configuration file before any history is imported"
+" and these settings should never be changed once they are set."
msgstr ""
#. type: Plain text
@@ -63800,9 +62996,9 @@ msgid ""
"'git svn' will read this commit to get the SVN revision the branch was "
"created from. It will then try to find the Git commit that corresponds to "
"this SVN revision, and use that as the parent of the branch. However, it is "
-"possible that there is no suitable Git commit to serve as parent. This will "
-"happen, among other reasons, if the SVN branch is a copy of a revision that "
-"was not fetched by 'git svn' (e.g. because it is an old revision that was "
+"possible that there is no suitable Git commit to serve as parent. This will"
+" happen, among other reasons, if the SVN branch is a copy of a revision that"
+" was not fetched by 'git svn' (e.g. because it is an old revision that was "
"skipped with `--revision`), or if in SVN a directory was copied that is not "
"tracked by 'git svn' (such as a branch that is not tracked at all, or a "
"subdirectory of a tracked branch). In these cases, 'git svn' will still "
@@ -63832,12 +63028,12 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:958
msgid ""
-"An example: in an SVN repository with a standard trunk/tags/branches layout, "
-"a directory trunk/sub is created in r.100. In r.200, trunk/sub is branched "
-"by copying it to branches/. 'git svn clone -s' will then create a branch "
+"An example: in an SVN repository with a standard trunk/tags/branches layout,"
+" a directory trunk/sub is created in r.100. In r.200, trunk/sub is branched"
+" by copying it to branches/. 'git svn clone -s' will then create a branch "
"'sub'. It will also create new Git commits for r.100 through r.199 and use "
-"these as the history of branch 'sub'. Thus there will be two Git commits for "
-"each revision from r.100 to r.199 (one containing trunk/, one containing "
+"these as the history of branch 'sub'. Thus there will be two Git commits for"
+" each revision from r.100 to r.199 (one containing trunk/, one containing "
"trunk/sub/). Finally, it will create a branch 'sub@200' pointing to the new "
"parent commit of branch 'sub' (i.e. the commit for r.200 and trunk/sub/)."
msgstr ""
@@ -63848,18 +63044,18 @@ msgid ""
"For the sake of simplicity and interoperating with Subversion, it is "
"recommended that all 'git svn' users clone, fetch and dcommit directly from "
"the SVN server, and avoid all 'git clone'/'pull'/'merge'/'push' operations "
-"between Git repositories and branches. The recommended method of exchanging "
-"code between Git branches and users is 'git format-patch' and 'git am', or "
+"between Git repositories and branches. The recommended method of exchanging"
+" code between Git branches and users is 'git format-patch' and 'git am', or "
"just 'dcommit'ing to the SVN repository."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:974
msgid ""
-"Running 'git merge' or 'git pull' is NOT recommended on a branch you plan to "
-"'dcommit' from because Subversion users cannot see any merges you've made. "
-"Furthermore, if you merge or pull from a Git branch that is a mirror of an "
-"SVN branch, 'dcommit' may commit to the wrong branch."
+"Running 'git merge' or 'git pull' is NOT recommended on a branch you plan to"
+" 'dcommit' from because Subversion users cannot see any merges you've made."
+" Furthermore, if you merge or pull from a Git branch that is a mirror of an"
+" SVN branch, 'dcommit' may commit to the wrong branch."
msgstr ""
#. type: Plain text
@@ -63880,15 +63076,15 @@ msgstr ""
msgid ""
"You 'must' therefore ensure that the most recent commit of the branch you "
"want to dcommit to is the 'first' parent of the merge. Chaos will ensue "
-"otherwise, especially if the first parent is an older commit on the same SVN "
-"branch."
+"otherwise, especially if the first parent is an older commit on the same SVN"
+" branch."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:989
msgid ""
-"'git clone' does not clone branches under the refs/remotes/ hierarchy or any "
-"'git svn' metadata, or config. So repositories created and managed with "
+"'git clone' does not clone branches under the refs/remotes/ hierarchy or any"
+" 'git svn' metadata, or config. So repositories created and managed with "
"using 'git svn' should use 'rsync' for cloning, if cloning is to be done at "
"all."
msgstr ""
@@ -63897,8 +63093,8 @@ msgstr ""
#: en/git-svn.txt:994
msgid ""
"Since 'dcommit' uses rebase internally, any Git branches you 'git push' to "
-"before 'dcommit' on will require forcing an overwrite of the existing ref on "
-"the remote repository. This is generally considered bad practice, see the "
+"before 'dcommit' on will require forcing an overwrite of the existing ref on"
+" the remote repository. This is generally considered bad practice, see the "
"linkgit:git-push[1] documentation for details."
msgstr ""
@@ -63906,9 +63102,9 @@ msgstr ""
#: en/git-svn.txt:999
msgid ""
"Do not use the --amend option of linkgit:git-commit[1] on a change you've "
-"already dcommitted. It is considered bad practice to --amend commits you've "
-"already pushed to a remote repository for other users, and dcommit with SVN "
-"is analogous to that."
+"already dcommitted. It is considered bad practice to --amend commits you've"
+" already pushed to a remote repository for other users, and dcommit with SVN"
+" is analogous to that."
msgstr ""
#. type: Plain text
@@ -63917,16 +63113,16 @@ msgid ""
"When cloning an SVN repository, if none of the options for describing the "
"repository layout is used (--trunk, --tags, --branches, --stdlayout), 'git "
"svn clone' will create a Git repository with completely linear history, "
-"where branches and tags appear as separate directories in the working copy. "
-"While this is the easiest way to get a copy of a complete repository, for "
-"projects with many branches it will lead to a working copy many times larger "
-"than just the trunk. Thus for projects using the standard directory "
-"structure (trunk/branches/tags), it is recommended to clone with option `--"
-"stdlayout`. If the project uses a non-standard structure, and/or if branches "
-"and tags are not required, it is easiest to only clone one directory "
-"(typically trunk), without giving any repository layout options. If the "
-"full history with branches and tags is required, the options `--trunk` / `--"
-"branches` / `--tags` must be used."
+"where branches and tags appear as separate directories in the working copy."
+" While this is the easiest way to get a copy of a complete repository, for "
+"projects with many branches it will lead to a working copy many times larger"
+" than just the trunk. Thus for projects using the standard directory "
+"structure (trunk/branches/tags), it is recommended to clone with option "
+"`--stdlayout`. If the project uses a non-standard structure, and/or if "
+"branches and tags are not required, it is easiest to only clone one "
+"directory (typically trunk), without giving any repository layout options. "
+"If the full history with branches and tags is required, the options "
+"`--trunk` / `--branches` / `--tags` must be used."
msgstr ""
#. type: Plain text
@@ -63958,8 +63154,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:1037
msgid ""
-"Renamed and copied directories are not detected by Git and hence not tracked "
-"when committing to SVN. I do not plan on adding support for this as it's "
+"Renamed and copied directories are not detected by Git and hence not tracked"
+" when committing to SVN. I do not plan on adding support for this as it's "
"quite difficult and time-consuming to get working for all the possible "
"corner cases (Git doesn't do it, either). Committing renamed and copied "
"files is fully supported if they're similar enough for Git to detect them."
@@ -64107,8 +63303,8 @@ msgstr ""
msgid ""
"Mapping between Subversion revision numbers and Git commit names. In a "
"repository where the noMetadata option is not set, this can be rebuilt from "
-"the git-svn-id: lines that are at the end of every commit (see the 'svn."
-"noMetadata' section above for details)."
+"the git-svn-id: lines that are at the end of every commit (see the "
+"'svn.noMetadata' section above for details)."
msgstr ""
#. type: Plain text
@@ -64118,13 +63314,11 @@ msgid ""
"is missing or not up to date. 'git svn reset' automatically rewinds it."
msgstr ""
-#
#. type: Title =
#: en/git-symbolic-ref.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-remote(1)"
+#, no-wrap
msgid "git-symbolic-ref(1)"
-msgstr "git-remote(1)"
+msgstr "git-symbolic-ref(1)"
#. type: Plain text
#: en/git-symbolic-ref.txt:7
@@ -64143,8 +63337,8 @@ msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:21
msgid ""
-"Given one argument, reads which branch head the given symbolic ref refers to "
-"and outputs its path, relative to the `.git/` directory. Typically you "
+"Given one argument, reads which branch head the given symbolic ref refers to"
+" and outputs its path, relative to the `.git/` directory. Typically you "
"would give `HEAD` as the <name> argument to see which branch your working "
"tree is on."
msgstr ""
@@ -64165,8 +63359,8 @@ msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:31
msgid ""
-"A symbolic ref is a regular file that stores a string that begins with `ref: "
-"refs/`. For example, your `.git/HEAD` is a regular file whose contents is "
+"A symbolic ref is a regular file that stores a string that begins with `ref:"
+" refs/`. For example, your `.git/HEAD` is a regular file whose contents is "
"`ref: refs/heads/master`."
msgstr ""
@@ -64199,12 +63393,12 @@ msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:62
msgid ""
-"In the past, `.git/HEAD` was a symbolic link pointing at `refs/heads/"
-"master`. When we wanted to switch to another branch, we did `ln -sf refs/"
-"heads/newbranch .git/HEAD`, and when we wanted to find out which branch we "
-"are on, we did `readlink .git/HEAD`. But symbolic links are not entirely "
-"portable, so they are now deprecated and symbolic refs (as described above) "
-"are used by default."
+"In the past, `.git/HEAD` was a symbolic link pointing at "
+"`refs/heads/master`. When we wanted to switch to another branch, we did `ln"
+" -sf refs/heads/newbranch .git/HEAD`, and when we wanted to find out which "
+"branch we are on, we did `readlink .git/HEAD`. But symbolic links are not "
+"entirely portable, so they are now deprecated and symbolic refs (as "
+"described above) are used by default."
msgstr ""
#. type: Plain text
@@ -64217,10 +63411,9 @@ msgstr ""
#. type: Title =
#: en/git-tag.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-log(1)"
+#, no-wrap
msgid "git-tag(1)"
-msgstr "git-log(1)"
+msgstr "git-tag(1)"
#. type: Plain text
#: en/git-tag.txt:7
@@ -64255,8 +63448,8 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:32
msgid ""
-"If one of `-a`, `-s`, or `-u <keyid>` is passed, the command creates a 'tag' "
-"object, and requires a tag message. Unless `-m <msg>` or `-F <file>` is "
+"If one of `-a`, `-s`, or `-u <keyid>` is passed, the command creates a 'tag'"
+" object, and requires a tag message. Unless `-m <msg>` or `-F <file>` is "
"given, an editor is started for the user to type in the tag message."
msgstr ""
@@ -64277,9 +63470,9 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:44
msgid ""
-"A GnuPG signed tag object will be created when `-s` or `-u <keyid>` is "
-"used. When `-u <keyid>` is not used, the committer identity for the current "
-"user is used to find the GnuPG key for signing. \tThe configuration variable "
+"A GnuPG signed tag object will be created when `-s` or `-u <keyid>` is used."
+" When `-u <keyid>` is not used, the committer identity for the current user"
+" is used to find the GnuPG key for signing. \tThe configuration variable "
"`gpg.program` is used to specify custom GnuPG binary."
msgstr ""
@@ -64297,7 +63490,8 @@ msgstr ""
msgid ""
"Annotated tags are meant for release while lightweight tags are meant for "
"private or temporary object labels. For this reason, some git commands for "
-"naming objects (like `git describe`) will ignore lightweight tags by default."
+"naming objects (like `git describe`) will ignore lightweight tags by "
+"default."
msgstr ""
#. type: Plain text
@@ -64307,10 +63501,9 @@ msgstr ""
#. type: Labeled list
#: en/git-tag.txt:64
-#, fuzzy, no-wrap
-#| msgid "--signoff"
+#, no-wrap
msgid "--sign"
-msgstr "--signoff"
+msgstr "--sign"
#. type: Plain text
#: en/git-tag.txt:66
@@ -64344,7 +63537,6 @@ msgstr ""
msgid "Delete existing tags with the given names."
msgstr ""
-#
#. type: Plain text
#: en/git-tag.txt:82
#, fuzzy
@@ -64361,8 +63553,8 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:89
msgid ""
-"<num> specifies how many lines from the annotation, if any, are printed when "
-"using -l. The default is not to print any annotation lines. If no number "
+"<num> specifies how many lines from the annotation, if any, are printed when"
+" using -l. The default is not to print any annotation lines. If no number "
"is given to `-n`, only the first line is printed. If the tag is not "
"annotated, the commit message is displayed instead."
msgstr ""
@@ -64380,10 +63572,10 @@ msgstr ""
#: en/git-tag.txt:110
msgid ""
"Sort based on the key given. Prefix `-` to sort in descending order of the "
-"value. You may use the --sort=<key> option multiple times, in which case the "
-"last key becomes the primary key. Also supports \"version:refname\" or \"v:"
-"refname\" (tag names are treated as versions). The \"version:refname\" sort "
-"order can also be affected by the \"versionsort.suffix\" configuration "
+"value. You may use the --sort=<key> option multiple times, in which case the"
+" last key becomes the primary key. Also supports \"version:refname\" or "
+"\"v:refname\" (tag names are treated as versions). The \"version:refname\" "
+"sort order can also be affected by the \"versionsort.suffix\" configuration "
"variable. The keys supported are the same as those in `git for-each-ref`. "
"Sort order defaults to the value configured for the `tag.sort` variable if "
"it exists, or lexicographic order otherwise. See linkgit:git-config[1]."
@@ -64398,8 +63590,8 @@ msgstr ""
#: en/git-tag.txt:120
msgid ""
"Display tag listing in columns. See configuration variable column.tag for "
-"option syntax.`--column` and `--no-column` without options are equivalent to "
-"'always' and 'never' respectively."
+"option syntax.`--column` and `--no-column` without options are equivalent to"
+" 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
@@ -64408,7 +63600,6 @@ msgid ""
"This option is only applicable when listing tags without annotation lines."
msgstr ""
-#
#. type: Plain text
#: en/git-tag.txt:126
#, fuzzy
@@ -64428,11 +63619,10 @@ msgstr ""
#: en/git-tag.txt:137
msgid ""
"Use the given tag message (instead of prompting). If multiple `-m` options "
-"are given, their values are concatenated as separate paragraphs. Implies `-"
-"a` if none of `-a`, `-s`, or `-u <keyid>` is given."
+"are given, their values are concatenated as separate paragraphs. Implies "
+"`-a` if none of `-a`, `-s`, or `-u <keyid>` is given."
msgstr ""
-#
#. type: Plain text
#: en/git-tag.txt:144
#, fuzzy
@@ -64444,24 +63634,23 @@ msgid ""
"the standard input. Implies `-a` if none of `-a`, `-s`, or `-u <keyid>` is "
"given."
msgstr ""
-"Nimm die Eintragungsbemerkung (commit message) der spezifizierten Datei. Mit "
-"'-' wird die Bemerkung von der Standard Eingabe gelesen."
+"Nimm die Eintragungsbemerkung (commit message) der spezifizierten Datei. Mit"
+" '-' wird die Bemerkung von der Standard Eingabe gelesen."
-#
#. type: Plain text
#: en/git-tag.txt:151
#, fuzzy
#| msgid ""
-#| "This option sets how the commit message is cleaned up. The '<mode>' can "
-#| "be one of 'verbatim', 'whitespace', 'strip', and 'default'. The 'default' "
-#| "mode will strip leading and trailing empty lines and #commentary from the "
-#| "commit message only if the message is to be edited. Otherwise only "
-#| "whitespace removed. The 'verbatim' mode does not change message at all, "
-#| "'whitespace' removes just leading/trailing whitespace lines and 'strip' "
-#| "removes both whitespace and commentary."
-msgid ""
-"This option sets how the tag message is cleaned up. The '<mode>' can be one "
-"of 'verbatim', 'whitespace' and 'strip'. The 'strip' mode is default. The "
+#| "This option sets how the commit message is cleaned up. The '<mode>' can be "
+#| "one of 'verbatim', 'whitespace', 'strip', and 'default'. The 'default' mode "
+#| "will strip leading and trailing empty lines and #commentary from the commit "
+#| "message only if the message is to be edited. Otherwise only whitespace "
+#| "removed. The 'verbatim' mode does not change message at all, 'whitespace' "
+#| "removes just leading/trailing whitespace lines and 'strip' removes both "
+#| "whitespace and commentary."
+msgid ""
+"This option sets how the tag message is cleaned up. The '<mode>' can be one"
+" of 'verbatim', 'whitespace' and 'strip'. The 'strip' mode is default. The "
"'verbatim' mode does not change message at all, 'whitespace' removes just "
"leading/trailing whitespace lines and 'strip' removes both whitespace and "
"commentary."
@@ -64478,10 +63667,10 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:158
msgid ""
-"Create a reflog for the tag. To globally enable reflogs for tags, see `core."
-"logAllRefUpdates` in linkgit:git-config[1]. The negated form `--no-create-"
-"reflog` only overrides an earlier `--create-reflog`, but currently does not "
-"negate the setting of `core.logallrefupdates`."
+"Create a reflog for the tag. To globally enable reflogs for tags, see "
+"`core.logAllRefUpdates` in linkgit:git-config[1]. The negated form `--no-"
+"create-reflog` only overrides an earlier `--create-reflog`, but currently "
+"does not negate the setting of `core.logallrefupdates`."
msgstr ""
#. type: Labeled list
@@ -64491,14 +63680,13 @@ msgstr ""
msgid "<tagname>"
msgstr "<Markierung>"
-#
#. type: Plain text
#: en/git-tag.txt:164
#, fuzzy
#| msgid ""
-#| "The name of the branch to create or delete. The new branch name must "
-#| "pass all checks defined by linkgit:git-check-ref-format[1]. Some of "
-#| "these checks may restrict the characters allowed in a branch name."
+#| "The name of the branch to create or delete. The new branch name must pass "
+#| "all checks defined by linkgit:git-check-ref-format[1]. Some of these checks"
+#| " may restrict the characters allowed in a branch name."
msgid ""
"The name of the tag to create, delete, or describe. The new tag name must "
"pass all checks defined by linkgit:git-check-ref-format[1]. Some of these "
@@ -64516,7 +63704,6 @@ msgstr ""
msgid "<commit>"
msgstr "-C <commit>"
-#
#. type: Plain text
#: en/git-tag.txt:169
#, fuzzy
@@ -64555,8 +63742,8 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:187
msgid ""
-"By default, 'git tag' in sign-with-default mode (-s) will use your committer "
-"identity (of the form `Your Name <your@email.address>`) to find a key. If "
+"By default, 'git tag' in sign-with-default mode (-s) will use your committer"
+" identity (of the form `Your Name <your@email.address>`) to find a key. If "
"you want to use a different default key, you can specify it in the "
"repository configuration as follows:"
msgstr ""
@@ -64591,17 +63778,17 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:209
msgid ""
-"But if you have pushed things out (or others could just read your repository "
-"directly), then others will have already seen the old tag. In that case you "
-"can do one of two things:"
+"But if you have pushed things out (or others could just read your repository"
+" directly), then others will have already seen the old tag. In that case you"
+" can do one of two things:"
msgstr ""
#. type: Plain text
#: en/git-tag.txt:216
msgid ""
-"The sane thing. Just admit you screwed up, and use a different name. Others "
-"have already seen one tag-name, and if you keep the same name, you may be in "
-"the situation that two people both have \"version X\", but they actually "
+"The sane thing. Just admit you screwed up, and use a different name. Others"
+" have already seen one tag-name, and if you keep the same name, you may be "
+"in the situation that two people both have \"version X\", but they actually "
"have 'different' \"X\"'s. So just call it \"X.1\" and be done with it."
msgstr ""
@@ -64689,8 +63876,8 @@ msgstr ""
#: en/git-tag.txt:258
msgid ""
"Does this seem a bit complicated? It *should* be. There is no way that it "
-"would be correct to just \"fix\" it automatically. People need to know that "
-"their tags might have been changed."
+"would be correct to just \"fix\" it automatically. People need to know that"
+" their tags might have been changed."
msgstr ""
#. type: Title ~
@@ -64711,8 +63898,8 @@ msgstr ""
#: en/git-tag.txt:273
msgid ""
"On the other hand, if you are fetching because you would want a one-shot "
-"merge from somebody else, you typically do not want to get tags from there. "
-"This happens more often for people near the toplevel but not limited to "
+"merge from somebody else, you typically do not want to get tags from there."
+" This happens more often for people near the toplevel but not limited to "
"them. Mere mortals when pulling from each other do not necessarily want to "
"automatically get private anchor point tags from the other person."
msgstr ""
@@ -64775,13 +63962,13 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:315
msgid ""
-"A one-shot pull is a sign that a commit history is now crossing the boundary "
-"between one circle of people (e.g. \"people who are primarily interested in "
-"the networking part of the kernel\") who may have their own set of tags (e."
-"g. \"this is the third release candidate from the networking group to be "
-"proposed for general consumption with 2.6.21 release\") to another circle of "
-"people (e.g. \"people who integrate various subsystem improvements\"). The "
-"latter are usually not interested in the detailed tags used internally in "
+"A one-shot pull is a sign that a commit history is now crossing the boundary"
+" between one circle of people (e.g. \"people who are primarily interested in"
+" the networking part of the kernel\") who may have their own set of tags "
+"(e.g. \"this is the third release candidate from the networking group to be "
+"proposed for general consumption with 2.6.21 release\") to another circle of"
+" people (e.g. \"people who integrate various subsystem improvements\"). The"
+" latter are usually not interested in the detailed tags used internally in "
"the former group (that is what \"internal\" means). That is why it is "
"desirable not to follow tags automatically in this case."
msgstr ""
@@ -64805,9 +63992,9 @@ msgstr ""
#: en/git-tag.txt:331
msgid ""
"If you have imported some changes from another VCS and would like to add "
-"tags for major releases of your work, it is useful to be able to specify the "
-"date to embed inside of the tag object; such data in the tag object affects, "
-"for example, the ordering of tags in the gitweb interface."
+"tags for major releases of your work, it is useful to be able to specify the"
+" date to embed inside of the tag object; such data in the tag object "
+"affects, for example, the ordering of tags in the gitweb interface."
msgstr ""
#. type: Plain text
@@ -64824,11 +64011,11 @@ msgstr ""
msgid "$ GIT_COMMITTER_DATE=\"2006-10-02 10:31\" git tag -s v1.0.1\n"
msgstr ""
-#
#. type: Plain text
#: en/git-tag.txt:348
#, fuzzy
-#| msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
+#| msgid ""
+#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid "linkgit:git-check-ref-format[1]. linkgit:git-config[1]."
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
@@ -64860,8 +64047,8 @@ msgstr ""
#: en/git.txt:24
msgid ""
"Git is a fast, scalable, distributed revision control system with an "
-"unusually rich command set that provides both high-level operations and full "
-"access to internals."
+"unusually rich command set that provides both high-level operations and full"
+" access to internals."
msgstr ""
#. type: Plain text
@@ -64877,8 +64064,8 @@ msgstr ""
msgid ""
"After you mastered the basic concepts, you can come back to this page to "
"learn what commands Git offers. You can learn more about individual Git "
-"commands with \"git help command\". linkgit:gitcli[7] manual page gives you "
-"an overview of the command-line command syntax."
+"commands with \"git help command\". linkgit:gitcli[7] manual page gives you"
+" an overview of the command-line command syntax."
msgstr ""
#. type: Plain text
@@ -64904,8 +64091,8 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:52
msgid ""
-"release notes for link:RelNotes/2.12.1.txt[2.12.1]. link:RelNotes/2.12.0."
-"txt[2.12]."
+"release notes for link:RelNotes/2.12.1.txt[2.12.1]. "
+"link:RelNotes/2.12.0.txt[2.12]."
msgstr ""
#. type: delimited block =
@@ -64916,8 +64103,8 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:58
msgid ""
-"release notes for link:RelNotes/2.11.1.txt[2.11.1], link:RelNotes/2.11.0."
-"txt[2.11]."
+"release notes for link:RelNotes/2.11.1.txt[2.11.1], "
+"link:RelNotes/2.11.0.txt[2.11]."
msgstr ""
#. type: delimited block =
@@ -64928,8 +64115,8 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:65
msgid ""
-"release notes for link:RelNotes/2.10.2.txt[2.10.2], link:RelNotes/2.10.1."
-"txt[2.10.1], link:RelNotes/2.10.0.txt[2.10]."
+"release notes for link:RelNotes/2.10.2.txt[2.10.2], "
+"link:RelNotes/2.10.1.txt[2.10.1], link:RelNotes/2.10.0.txt[2.10]."
msgstr ""
#. type: delimited block =
@@ -64940,8 +64127,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:73
msgid ""
-"release notes for link:RelNotes/2.9.3.txt[2.9.3], link:RelNotes/2.9.2."
-"txt[2.9.2], link:RelNotes/2.9.1.txt[2.9.1], link:RelNotes/2.9.0.txt[2.9]."
+"release notes for link:RelNotes/2.9.3.txt[2.9.3], "
+"link:RelNotes/2.9.2.txt[2.9.2], link:RelNotes/2.9.1.txt[2.9.1], "
+"link:RelNotes/2.9.0.txt[2.9]."
msgstr ""
#. type: delimited block =
@@ -64952,9 +64140,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:82
msgid ""
-"release notes for link:RelNotes/2.8.4.txt[2.8.4], link:RelNotes/2.8.3."
-"txt[2.8.3], link:RelNotes/2.8.2.txt[2.8.2], link:RelNotes/2.8.1.txt[2.8.1], "
-"link:RelNotes/2.8.0.txt[2.8]."
+"release notes for link:RelNotes/2.8.4.txt[2.8.4], "
+"link:RelNotes/2.8.3.txt[2.8.3], link:RelNotes/2.8.2.txt[2.8.2], "
+"link:RelNotes/2.8.1.txt[2.8.1], link:RelNotes/2.8.0.txt[2.8]."
msgstr ""
#. type: delimited block =
@@ -64965,8 +64153,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:90
msgid ""
-"release notes for link:RelNotes/2.7.3.txt[2.7.3], link:RelNotes/2.7.2."
-"txt[2.7.2], link:RelNotes/2.7.1.txt[2.7.1], link:RelNotes/2.7.0.txt[2.7]."
+"release notes for link:RelNotes/2.7.3.txt[2.7.3], "
+"link:RelNotes/2.7.2.txt[2.7.2], link:RelNotes/2.7.1.txt[2.7.1], "
+"link:RelNotes/2.7.0.txt[2.7]."
msgstr ""
#. type: delimited block =
@@ -64977,10 +64166,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:101
msgid ""
-"release notes for link:RelNotes/2.6.6.txt[2.6.6], link:RelNotes/2.6.5."
-"txt[2.6.5], link:RelNotes/2.6.4.txt[2.6.4], link:RelNotes/2.6.3.txt[2.6.3], "
-"link:RelNotes/2.6.2.txt[2.6.2], link:RelNotes/2.6.1.txt[2.6.1], link:"
-"RelNotes/2.6.0.txt[2.6]."
+"release notes for link:RelNotes/2.6.6.txt[2.6.6], "
+"link:RelNotes/2.6.5.txt[2.6.5], link:RelNotes/2.6.4.txt[2.6.4], "
+"link:RelNotes/2.6.3.txt[2.6.3], link:RelNotes/2.6.2.txt[2.6.2], "
+"link:RelNotes/2.6.1.txt[2.6.1], link:RelNotes/2.6.0.txt[2.6]."
msgstr ""
#. type: delimited block =
@@ -64991,9 +64180,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:111
msgid ""
-"release notes for link:RelNotes/2.5.5.txt[2.5.5], link:RelNotes/2.5.4."
-"txt[2.5.4], link:RelNotes/2.5.3.txt[2.5.3], link:RelNotes/2.5.2.txt[2.5.2], "
-"link:RelNotes/2.5.1.txt[2.5.1], link:RelNotes/2.5.0.txt[2.5]."
+"release notes for link:RelNotes/2.5.5.txt[2.5.5], "
+"link:RelNotes/2.5.4.txt[2.5.4], link:RelNotes/2.5.3.txt[2.5.3], "
+"link:RelNotes/2.5.2.txt[2.5.2], link:RelNotes/2.5.1.txt[2.5.1], "
+"link:RelNotes/2.5.0.txt[2.5]."
msgstr ""
#. type: delimited block =
@@ -65004,12 +64194,13 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:127
msgid ""
-"release notes for link:RelNotes/2.4.11.txt[2.4.11], link:RelNotes/2.4.10."
-"txt[2.4.10], link:RelNotes/2.4.9.txt[2.4.9], link:RelNotes/2.4.8.txt[2.4.8], "
-"link:RelNotes/2.4.7.txt[2.4.7], link:RelNotes/2.4.6.txt[2.4.6], link:"
-"RelNotes/2.4.5.txt[2.4.5], link:RelNotes/2.4.4.txt[2.4.4], link:"
-"RelNotes/2.4.3.txt[2.4.3], link:RelNotes/2.4.2.txt[2.4.2], link:"
-"RelNotes/2.4.1.txt[2.4.1], link:RelNotes/2.4.0.txt[2.4]."
+"release notes for link:RelNotes/2.4.11.txt[2.4.11], "
+"link:RelNotes/2.4.10.txt[2.4.10], link:RelNotes/2.4.9.txt[2.4.9], "
+"link:RelNotes/2.4.8.txt[2.4.8], link:RelNotes/2.4.7.txt[2.4.7], "
+"link:RelNotes/2.4.6.txt[2.4.6], link:RelNotes/2.4.5.txt[2.4.5], "
+"link:RelNotes/2.4.4.txt[2.4.4], link:RelNotes/2.4.3.txt[2.4.3], "
+"link:RelNotes/2.4.2.txt[2.4.2], link:RelNotes/2.4.1.txt[2.4.1], "
+"link:RelNotes/2.4.0.txt[2.4]."
msgstr ""
#. type: delimited block =
@@ -65020,12 +64211,12 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:142
msgid ""
-"release notes for link:RelNotes/2.3.10.txt[2.3.10], link:RelNotes/2.3.9."
-"txt[2.3.9], link:RelNotes/2.3.8.txt[2.3.8], link:RelNotes/2.3.7.txt[2.3.7], "
-"link:RelNotes/2.3.6.txt[2.3.6], link:RelNotes/2.3.5.txt[2.3.5], link:"
-"RelNotes/2.3.4.txt[2.3.4], link:RelNotes/2.3.3.txt[2.3.3], link:"
-"RelNotes/2.3.2.txt[2.3.2], link:RelNotes/2.3.1.txt[2.3.1], link:"
-"RelNotes/2.3.0.txt[2.3]."
+"release notes for link:RelNotes/2.3.10.txt[2.3.10], "
+"link:RelNotes/2.3.9.txt[2.3.9], link:RelNotes/2.3.8.txt[2.3.8], "
+"link:RelNotes/2.3.7.txt[2.3.7], link:RelNotes/2.3.6.txt[2.3.6], "
+"link:RelNotes/2.3.5.txt[2.3.5], link:RelNotes/2.3.4.txt[2.3.4], "
+"link:RelNotes/2.3.3.txt[2.3.3], link:RelNotes/2.3.2.txt[2.3.2], "
+"link:RelNotes/2.3.1.txt[2.3.1], link:RelNotes/2.3.0.txt[2.3]."
msgstr ""
#. type: delimited block =
@@ -65036,8 +64227,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:150
msgid ""
-"release notes for link:RelNotes/2.2.3.txt[2.2.3], link:RelNotes/2.2.2."
-"txt[2.2.2], link:RelNotes/2.2.1.txt[2.2.1], link:RelNotes/2.2.0.txt[2.2]."
+"release notes for link:RelNotes/2.2.3.txt[2.2.3], "
+"link:RelNotes/2.2.2.txt[2.2.2], link:RelNotes/2.2.1.txt[2.2.1], "
+"link:RelNotes/2.2.0.txt[2.2]."
msgstr ""
#. type: delimited block =
@@ -65048,9 +64240,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:159
msgid ""
-"release notes for link:RelNotes/2.1.4.txt[2.1.4], link:RelNotes/2.1.3."
-"txt[2.1.3], link:RelNotes/2.1.2.txt[2.1.2], link:RelNotes/2.1.1.txt[2.1.1], "
-"link:RelNotes/2.1.0.txt[2.1]."
+"release notes for link:RelNotes/2.1.4.txt[2.1.4], "
+"link:RelNotes/2.1.3.txt[2.1.3], link:RelNotes/2.1.2.txt[2.1.2], "
+"link:RelNotes/2.1.1.txt[2.1.1], link:RelNotes/2.1.0.txt[2.1]."
msgstr ""
#. type: delimited block =
@@ -65061,9 +64253,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:169
msgid ""
-"release notes for link:RelNotes/2.0.5.txt[2.0.5], link:RelNotes/2.0.4."
-"txt[2.0.4], link:RelNotes/2.0.3.txt[2.0.3], link:RelNotes/2.0.2.txt[2.0.2], "
-"link:RelNotes/2.0.1.txt[2.0.1], link:RelNotes/2.0.0.txt[2.0.0]."
+"release notes for link:RelNotes/2.0.5.txt[2.0.5], "
+"link:RelNotes/2.0.4.txt[2.0.4], link:RelNotes/2.0.3.txt[2.0.3], "
+"link:RelNotes/2.0.2.txt[2.0.2], link:RelNotes/2.0.1.txt[2.0.1], "
+"link:RelNotes/2.0.0.txt[2.0.0]."
msgstr ""
#. type: delimited block =
@@ -65074,9 +64267,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:179
msgid ""
-"release notes for link:RelNotes/1.9.5.txt[1.9.5], link:RelNotes/1.9.4."
-"txt[1.9.4], link:RelNotes/1.9.3.txt[1.9.3], link:RelNotes/1.9.2.txt[1.9.2], "
-"link:RelNotes/1.9.1.txt[1.9.1], link:RelNotes/1.9.0.txt[1.9.0]."
+"release notes for link:RelNotes/1.9.5.txt[1.9.5], "
+"link:RelNotes/1.9.4.txt[1.9.4], link:RelNotes/1.9.3.txt[1.9.3], "
+"link:RelNotes/1.9.2.txt[1.9.2], link:RelNotes/1.9.1.txt[1.9.1], "
+"link:RelNotes/1.9.0.txt[1.9.0]."
msgstr ""
#. type: delimited block =
@@ -65087,10 +64281,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:190
msgid ""
-"release notes for link:RelNotes/1.8.5.6.txt[1.8.5.6], link:RelNotes/1.8.5.5."
-"txt[1.8.5.5], link:RelNotes/1.8.5.4.txt[1.8.5.4], link:RelNotes/1.8.5.3."
-"txt[1.8.5.3], link:RelNotes/1.8.5.2.txt[1.8.5.2], link:RelNotes/1.8.5.1."
-"txt[1.8.5.1], link:RelNotes/1.8.5.txt[1.8.5]."
+"release notes for link:RelNotes/1.8.5.6.txt[1.8.5.6], "
+"link:RelNotes/1.8.5.5.txt[1.8.5.5], link:RelNotes/1.8.5.4.txt[1.8.5.4], "
+"link:RelNotes/1.8.5.3.txt[1.8.5.3], link:RelNotes/1.8.5.2.txt[1.8.5.2], "
+"link:RelNotes/1.8.5.1.txt[1.8.5.1], link:RelNotes/1.8.5.txt[1.8.5]."
msgstr ""
#. type: delimited block =
@@ -65101,10 +64295,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:200
msgid ""
-"release notes for link:RelNotes/1.8.4.5.txt[1.8.4.5], link:RelNotes/1.8.4.4."
-"txt[1.8.4.4], link:RelNotes/1.8.4.3.txt[1.8.4.3], link:RelNotes/1.8.4.2."
-"txt[1.8.4.2], link:RelNotes/1.8.4.1.txt[1.8.4.1], link:RelNotes/1.8.4."
-"txt[1.8.4]."
+"release notes for link:RelNotes/1.8.4.5.txt[1.8.4.5], "
+"link:RelNotes/1.8.4.4.txt[1.8.4.4], link:RelNotes/1.8.4.3.txt[1.8.4.3], "
+"link:RelNotes/1.8.4.2.txt[1.8.4.2], link:RelNotes/1.8.4.1.txt[1.8.4.1], "
+"link:RelNotes/1.8.4.txt[1.8.4]."
msgstr ""
#. type: delimited block =
@@ -65115,9 +64309,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:209
msgid ""
-"release notes for link:RelNotes/1.8.3.4.txt[1.8.3.4], link:RelNotes/1.8.3.3."
-"txt[1.8.3.3], link:RelNotes/1.8.3.2.txt[1.8.3.2], link:RelNotes/1.8.3.1."
-"txt[1.8.3.1], link:RelNotes/1.8.3.txt[1.8.3]."
+"release notes for link:RelNotes/1.8.3.4.txt[1.8.3.4], "
+"link:RelNotes/1.8.3.3.txt[1.8.3.3], link:RelNotes/1.8.3.2.txt[1.8.3.2], "
+"link:RelNotes/1.8.3.1.txt[1.8.3.1], link:RelNotes/1.8.3.txt[1.8.3]."
msgstr ""
#. type: delimited block =
@@ -65128,9 +64322,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:217
msgid ""
-"release notes for link:RelNotes/1.8.2.3.txt[1.8.2.3], link:RelNotes/1.8.2.2."
-"txt[1.8.2.2], link:RelNotes/1.8.2.1.txt[1.8.2.1], link:RelNotes/1.8.2."
-"txt[1.8.2]."
+"release notes for link:RelNotes/1.8.2.3.txt[1.8.2.3], "
+"link:RelNotes/1.8.2.2.txt[1.8.2.2], link:RelNotes/1.8.2.1.txt[1.8.2.1], "
+"link:RelNotes/1.8.2.txt[1.8.2]."
msgstr ""
#. type: delimited block =
@@ -65141,10 +64335,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:228
msgid ""
-"release notes for link:RelNotes/1.8.1.6.txt[1.8.1.6], link:RelNotes/1.8.1.5."
-"txt[1.8.1.5], link:RelNotes/1.8.1.4.txt[1.8.1.4], link:RelNotes/1.8.1.3."
-"txt[1.8.1.3], link:RelNotes/1.8.1.2.txt[1.8.1.2], link:RelNotes/1.8.1.1."
-"txt[1.8.1.1], link:RelNotes/1.8.1.txt[1.8.1]."
+"release notes for link:RelNotes/1.8.1.6.txt[1.8.1.6], "
+"link:RelNotes/1.8.1.5.txt[1.8.1.5], link:RelNotes/1.8.1.4.txt[1.8.1.4], "
+"link:RelNotes/1.8.1.3.txt[1.8.1.3], link:RelNotes/1.8.1.2.txt[1.8.1.2], "
+"link:RelNotes/1.8.1.1.txt[1.8.1.1], link:RelNotes/1.8.1.txt[1.8.1]."
msgstr ""
#. type: delimited block =
@@ -65155,9 +64349,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:236
msgid ""
-"release notes for link:RelNotes/1.8.0.3.txt[1.8.0.3], link:RelNotes/1.8.0.2."
-"txt[1.8.0.2], link:RelNotes/1.8.0.1.txt[1.8.0.1], link:RelNotes/1.8.0."
-"txt[1.8.0]."
+"release notes for link:RelNotes/1.8.0.3.txt[1.8.0.3], "
+"link:RelNotes/1.8.0.2.txt[1.8.0.2], link:RelNotes/1.8.0.1.txt[1.8.0.1], "
+"link:RelNotes/1.8.0.txt[1.8.0]."
msgstr ""
#. type: delimited block =
@@ -65168,9 +64362,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:245
msgid ""
-"release notes for link:RelNotes/1.7.12.4.txt[1.7.12.4], link:"
-"RelNotes/1.7.12.3.txt[1.7.12.3], link:RelNotes/1.7.12.2.txt[1.7.12.2], link:"
-"RelNotes/1.7.12.1.txt[1.7.12.1], link:RelNotes/1.7.12.txt[1.7.12]."
+"release notes for link:RelNotes/1.7.12.4.txt[1.7.12.4], "
+"link:RelNotes/1.7.12.3.txt[1.7.12.3], link:RelNotes/1.7.12.2.txt[1.7.12.2], "
+"link:RelNotes/1.7.12.1.txt[1.7.12.1], link:RelNotes/1.7.12.txt[1.7.12]."
msgstr ""
#. type: delimited block =
@@ -65181,11 +64375,11 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:257
msgid ""
-"release notes for link:RelNotes/1.7.11.7.txt[1.7.11.7], link:"
-"RelNotes/1.7.11.6.txt[1.7.11.6], link:RelNotes/1.7.11.5.txt[1.7.11.5], link:"
-"RelNotes/1.7.11.4.txt[1.7.11.4], link:RelNotes/1.7.11.3.txt[1.7.11.3], link:"
-"RelNotes/1.7.11.2.txt[1.7.11.2], link:RelNotes/1.7.11.1.txt[1.7.11.1], link:"
-"RelNotes/1.7.11.txt[1.7.11]."
+"release notes for link:RelNotes/1.7.11.7.txt[1.7.11.7], "
+"link:RelNotes/1.7.11.6.txt[1.7.11.6], link:RelNotes/1.7.11.5.txt[1.7.11.5], "
+"link:RelNotes/1.7.11.4.txt[1.7.11.4], link:RelNotes/1.7.11.3.txt[1.7.11.3], "
+"link:RelNotes/1.7.11.2.txt[1.7.11.2], link:RelNotes/1.7.11.1.txt[1.7.11.1], "
+"link:RelNotes/1.7.11.txt[1.7.11]."
msgstr ""
#. type: delimited block =
@@ -65196,10 +64390,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:267
msgid ""
-"release notes for link:RelNotes/1.7.10.5.txt[1.7.10.5], link:"
-"RelNotes/1.7.10.4.txt[1.7.10.4], link:RelNotes/1.7.10.3.txt[1.7.10.3], link:"
-"RelNotes/1.7.10.2.txt[1.7.10.2], link:RelNotes/1.7.10.1.txt[1.7.10.1], link:"
-"RelNotes/1.7.10.txt[1.7.10]."
+"release notes for link:RelNotes/1.7.10.5.txt[1.7.10.5], "
+"link:RelNotes/1.7.10.4.txt[1.7.10.4], link:RelNotes/1.7.10.3.txt[1.7.10.3], "
+"link:RelNotes/1.7.10.2.txt[1.7.10.2], link:RelNotes/1.7.10.1.txt[1.7.10.1], "
+"link:RelNotes/1.7.10.txt[1.7.10]."
msgstr ""
#. type: delimited block =
@@ -65210,11 +64404,11 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:279
msgid ""
-"release notes for link:RelNotes/1.7.9.7.txt[1.7.9.7], link:RelNotes/1.7.9.6."
-"txt[1.7.9.6], link:RelNotes/1.7.9.5.txt[1.7.9.5], link:RelNotes/1.7.9.4."
-"txt[1.7.9.4], link:RelNotes/1.7.9.3.txt[1.7.9.3], link:RelNotes/1.7.9.2."
-"txt[1.7.9.2], link:RelNotes/1.7.9.1.txt[1.7.9.1], link:RelNotes/1.7.9."
-"txt[1.7.9]."
+"release notes for link:RelNotes/1.7.9.7.txt[1.7.9.7], "
+"link:RelNotes/1.7.9.6.txt[1.7.9.6], link:RelNotes/1.7.9.5.txt[1.7.9.5], "
+"link:RelNotes/1.7.9.4.txt[1.7.9.4], link:RelNotes/1.7.9.3.txt[1.7.9.3], "
+"link:RelNotes/1.7.9.2.txt[1.7.9.2], link:RelNotes/1.7.9.1.txt[1.7.9.1], "
+"link:RelNotes/1.7.9.txt[1.7.9]."
msgstr ""
#. type: delimited block =
@@ -65225,10 +64419,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:290
msgid ""
-"release notes for link:RelNotes/1.7.8.6.txt[1.7.8.6], link:RelNotes/1.7.8.5."
-"txt[1.7.8.5], link:RelNotes/1.7.8.4.txt[1.7.8.4], link:RelNotes/1.7.8.3."
-"txt[1.7.8.3], link:RelNotes/1.7.8.2.txt[1.7.8.2], link:RelNotes/1.7.8.1."
-"txt[1.7.8.1], link:RelNotes/1.7.8.txt[1.7.8]."
+"release notes for link:RelNotes/1.7.8.6.txt[1.7.8.6], "
+"link:RelNotes/1.7.8.5.txt[1.7.8.5], link:RelNotes/1.7.8.4.txt[1.7.8.4], "
+"link:RelNotes/1.7.8.3.txt[1.7.8.3], link:RelNotes/1.7.8.2.txt[1.7.8.2], "
+"link:RelNotes/1.7.8.1.txt[1.7.8.1], link:RelNotes/1.7.8.txt[1.7.8]."
msgstr ""
#. type: delimited block =
@@ -65239,11 +64433,11 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:302
msgid ""
-"release notes for link:RelNotes/1.7.7.7.txt[1.7.7.7], link:RelNotes/1.7.7.6."
-"txt[1.7.7.6], link:RelNotes/1.7.7.5.txt[1.7.7.5], link:RelNotes/1.7.7.4."
-"txt[1.7.7.4], link:RelNotes/1.7.7.3.txt[1.7.7.3], link:RelNotes/1.7.7.2."
-"txt[1.7.7.2], link:RelNotes/1.7.7.1.txt[1.7.7.1], link:RelNotes/1.7.7."
-"txt[1.7.7]."
+"release notes for link:RelNotes/1.7.7.7.txt[1.7.7.7], "
+"link:RelNotes/1.7.7.6.txt[1.7.7.6], link:RelNotes/1.7.7.5.txt[1.7.7.5], "
+"link:RelNotes/1.7.7.4.txt[1.7.7.4], link:RelNotes/1.7.7.3.txt[1.7.7.3], "
+"link:RelNotes/1.7.7.2.txt[1.7.7.2], link:RelNotes/1.7.7.1.txt[1.7.7.1], "
+"link:RelNotes/1.7.7.txt[1.7.7]."
msgstr ""
#. type: delimited block =
@@ -65254,10 +64448,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:313
msgid ""
-"release notes for link:RelNotes/1.7.6.6.txt[1.7.6.6], link:RelNotes/1.7.6.5."
-"txt[1.7.6.5], link:RelNotes/1.7.6.4.txt[1.7.6.4], link:RelNotes/1.7.6.3."
-"txt[1.7.6.3], link:RelNotes/1.7.6.2.txt[1.7.6.2], link:RelNotes/1.7.6.1."
-"txt[1.7.6.1], link:RelNotes/1.7.6.txt[1.7.6]."
+"release notes for link:RelNotes/1.7.6.6.txt[1.7.6.6], "
+"link:RelNotes/1.7.6.5.txt[1.7.6.5], link:RelNotes/1.7.6.4.txt[1.7.6.4], "
+"link:RelNotes/1.7.6.3.txt[1.7.6.3], link:RelNotes/1.7.6.2.txt[1.7.6.2], "
+"link:RelNotes/1.7.6.1.txt[1.7.6.1], link:RelNotes/1.7.6.txt[1.7.6]."
msgstr ""
#. type: delimited block =
@@ -65268,9 +64462,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:322
msgid ""
-"release notes for link:RelNotes/1.7.5.4.txt[1.7.5.4], link:RelNotes/1.7.5.3."
-"txt[1.7.5.3], link:RelNotes/1.7.5.2.txt[1.7.5.2], link:RelNotes/1.7.5.1."
-"txt[1.7.5.1], link:RelNotes/1.7.5.txt[1.7.5]."
+"release notes for link:RelNotes/1.7.5.4.txt[1.7.5.4], "
+"link:RelNotes/1.7.5.3.txt[1.7.5.3], link:RelNotes/1.7.5.2.txt[1.7.5.2], "
+"link:RelNotes/1.7.5.1.txt[1.7.5.1], link:RelNotes/1.7.5.txt[1.7.5]."
msgstr ""
#. type: delimited block =
@@ -65281,10 +64475,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:332
msgid ""
-"release notes for link:RelNotes/1.7.4.5.txt[1.7.4.5], link:RelNotes/1.7.4.4."
-"txt[1.7.4.4], link:RelNotes/1.7.4.3.txt[1.7.4.3], link:RelNotes/1.7.4.2."
-"txt[1.7.4.2], link:RelNotes/1.7.4.1.txt[1.7.4.1], link:RelNotes/1.7.4."
-"txt[1.7.4]."
+"release notes for link:RelNotes/1.7.4.5.txt[1.7.4.5], "
+"link:RelNotes/1.7.4.4.txt[1.7.4.4], link:RelNotes/1.7.4.3.txt[1.7.4.3], "
+"link:RelNotes/1.7.4.2.txt[1.7.4.2], link:RelNotes/1.7.4.1.txt[1.7.4.1], "
+"link:RelNotes/1.7.4.txt[1.7.4]."
msgstr ""
#. type: delimited block =
@@ -65295,10 +64489,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:342
msgid ""
-"release notes for link:RelNotes/1.7.3.5.txt[1.7.3.5], link:RelNotes/1.7.3.4."
-"txt[1.7.3.4], link:RelNotes/1.7.3.3.txt[1.7.3.3], link:RelNotes/1.7.3.2."
-"txt[1.7.3.2], link:RelNotes/1.7.3.1.txt[1.7.3.1], link:RelNotes/1.7.3."
-"txt[1.7.3]."
+"release notes for link:RelNotes/1.7.3.5.txt[1.7.3.5], "
+"link:RelNotes/1.7.3.4.txt[1.7.3.4], link:RelNotes/1.7.3.3.txt[1.7.3.3], "
+"link:RelNotes/1.7.3.2.txt[1.7.3.2], link:RelNotes/1.7.3.1.txt[1.7.3.1], "
+"link:RelNotes/1.7.3.txt[1.7.3]."
msgstr ""
#. type: delimited block =
@@ -65309,10 +64503,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:352
msgid ""
-"release notes for link:RelNotes/1.7.2.5.txt[1.7.2.5], link:RelNotes/1.7.2.4."
-"txt[1.7.2.4], link:RelNotes/1.7.2.3.txt[1.7.2.3], link:RelNotes/1.7.2.2."
-"txt[1.7.2.2], link:RelNotes/1.7.2.1.txt[1.7.2.1], link:RelNotes/1.7.2."
-"txt[1.7.2]."
+"release notes for link:RelNotes/1.7.2.5.txt[1.7.2.5], "
+"link:RelNotes/1.7.2.4.txt[1.7.2.4], link:RelNotes/1.7.2.3.txt[1.7.2.3], "
+"link:RelNotes/1.7.2.2.txt[1.7.2.2], link:RelNotes/1.7.2.1.txt[1.7.2.1], "
+"link:RelNotes/1.7.2.txt[1.7.2]."
msgstr ""
#. type: delimited block =
@@ -65323,9 +64517,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:361
msgid ""
-"release notes for link:RelNotes/1.7.1.4.txt[1.7.1.4], link:RelNotes/1.7.1.3."
-"txt[1.7.1.3], link:RelNotes/1.7.1.2.txt[1.7.1.2], link:RelNotes/1.7.1.1."
-"txt[1.7.1.1], link:RelNotes/1.7.1.txt[1.7.1]."
+"release notes for link:RelNotes/1.7.1.4.txt[1.7.1.4], "
+"link:RelNotes/1.7.1.3.txt[1.7.1.3], link:RelNotes/1.7.1.2.txt[1.7.1.2], "
+"link:RelNotes/1.7.1.1.txt[1.7.1.1], link:RelNotes/1.7.1.txt[1.7.1]."
msgstr ""
#. type: delimited block =
@@ -65336,12 +64530,12 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:375
msgid ""
-"release notes for link:RelNotes/1.7.0.9.txt[1.7.0.9], link:RelNotes/1.7.0.8."
-"txt[1.7.0.8], link:RelNotes/1.7.0.7.txt[1.7.0.7], link:RelNotes/1.7.0.6."
-"txt[1.7.0.6], link:RelNotes/1.7.0.5.txt[1.7.0.5], link:RelNotes/1.7.0.4."
-"txt[1.7.0.4], link:RelNotes/1.7.0.3.txt[1.7.0.3], link:RelNotes/1.7.0.2."
-"txt[1.7.0.2], link:RelNotes/1.7.0.1.txt[1.7.0.1], link:RelNotes/1.7.0."
-"txt[1.7.0]."
+"release notes for link:RelNotes/1.7.0.9.txt[1.7.0.9], "
+"link:RelNotes/1.7.0.8.txt[1.7.0.8], link:RelNotes/1.7.0.7.txt[1.7.0.7], "
+"link:RelNotes/1.7.0.6.txt[1.7.0.6], link:RelNotes/1.7.0.5.txt[1.7.0.5], "
+"link:RelNotes/1.7.0.4.txt[1.7.0.4], link:RelNotes/1.7.0.3.txt[1.7.0.3], "
+"link:RelNotes/1.7.0.2.txt[1.7.0.2], link:RelNotes/1.7.0.1.txt[1.7.0.1], "
+"link:RelNotes/1.7.0.txt[1.7.0]."
msgstr ""
#. type: delimited block =
@@ -65352,9 +64546,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:383
msgid ""
-"release notes for link:RelNotes/1.6.6.3.txt[1.6.6.3], link:RelNotes/1.6.6.2."
-"txt[1.6.6.2], link:RelNotes/1.6.6.1.txt[1.6.6.1], link:RelNotes/1.6.6."
-"txt[1.6.6]."
+"release notes for link:RelNotes/1.6.6.3.txt[1.6.6.3], "
+"link:RelNotes/1.6.6.2.txt[1.6.6.2], link:RelNotes/1.6.6.1.txt[1.6.6.1], "
+"link:RelNotes/1.6.6.txt[1.6.6]."
msgstr ""
#. type: delimited block =
@@ -65365,12 +64559,12 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:397
msgid ""
-"release notes for link:RelNotes/1.6.5.9.txt[1.6.5.9], link:RelNotes/1.6.5.8."
-"txt[1.6.5.8], link:RelNotes/1.6.5.7.txt[1.6.5.7], link:RelNotes/1.6.5.6."
-"txt[1.6.5.6], link:RelNotes/1.6.5.5.txt[1.6.5.5], link:RelNotes/1.6.5.4."
-"txt[1.6.5.4], link:RelNotes/1.6.5.3.txt[1.6.5.3], link:RelNotes/1.6.5.2."
-"txt[1.6.5.2], link:RelNotes/1.6.5.1.txt[1.6.5.1], link:RelNotes/1.6.5."
-"txt[1.6.5]."
+"release notes for link:RelNotes/1.6.5.9.txt[1.6.5.9], "
+"link:RelNotes/1.6.5.8.txt[1.6.5.8], link:RelNotes/1.6.5.7.txt[1.6.5.7], "
+"link:RelNotes/1.6.5.6.txt[1.6.5.6], link:RelNotes/1.6.5.5.txt[1.6.5.5], "
+"link:RelNotes/1.6.5.4.txt[1.6.5.4], link:RelNotes/1.6.5.3.txt[1.6.5.3], "
+"link:RelNotes/1.6.5.2.txt[1.6.5.2], link:RelNotes/1.6.5.1.txt[1.6.5.1], "
+"link:RelNotes/1.6.5.txt[1.6.5]."
msgstr ""
#. type: delimited block =
@@ -65381,10 +64575,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:407
msgid ""
-"release notes for link:RelNotes/1.6.4.5.txt[1.6.4.5], link:RelNotes/1.6.4.4."
-"txt[1.6.4.4], link:RelNotes/1.6.4.3.txt[1.6.4.3], link:RelNotes/1.6.4.2."
-"txt[1.6.4.2], link:RelNotes/1.6.4.1.txt[1.6.4.1], link:RelNotes/1.6.4."
-"txt[1.6.4]."
+"release notes for link:RelNotes/1.6.4.5.txt[1.6.4.5], "
+"link:RelNotes/1.6.4.4.txt[1.6.4.4], link:RelNotes/1.6.4.3.txt[1.6.4.3], "
+"link:RelNotes/1.6.4.2.txt[1.6.4.2], link:RelNotes/1.6.4.1.txt[1.6.4.1], "
+"link:RelNotes/1.6.4.txt[1.6.4]."
msgstr ""
#. type: delimited block =
@@ -65395,18 +64589,18 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:416
msgid ""
-"release notes for link:RelNotes/1.6.3.4.txt[1.6.3.4], link:RelNotes/1.6.3.3."
-"txt[1.6.3.3], link:RelNotes/1.6.3.2.txt[1.6.3.2], link:RelNotes/1.6.3.1."
-"txt[1.6.3.1], link:RelNotes/1.6.3.txt[1.6.3]."
+"release notes for link:RelNotes/1.6.3.4.txt[1.6.3.4], "
+"link:RelNotes/1.6.3.3.txt[1.6.3.3], link:RelNotes/1.6.3.2.txt[1.6.3.2], "
+"link:RelNotes/1.6.3.1.txt[1.6.3.1], link:RelNotes/1.6.3.txt[1.6.3]."
msgstr ""
#. type: delimited block =
#: en/git.txt:424
msgid ""
-"release notes for link:RelNotes/1.6.2.5.txt[1.6.2.5], link:RelNotes/1.6.2.4."
-"txt[1.6.2.4], link:RelNotes/1.6.2.3.txt[1.6.2.3], link:RelNotes/1.6.2.2."
-"txt[1.6.2.2], link:RelNotes/1.6.2.1.txt[1.6.2.1], link:RelNotes/1.6.2."
-"txt[1.6.2]."
+"release notes for link:RelNotes/1.6.2.5.txt[1.6.2.5], "
+"link:RelNotes/1.6.2.4.txt[1.6.2.4], link:RelNotes/1.6.2.3.txt[1.6.2.3], "
+"link:RelNotes/1.6.2.2.txt[1.6.2.2], link:RelNotes/1.6.2.1.txt[1.6.2.1], "
+"link:RelNotes/1.6.2.txt[1.6.2]."
msgstr ""
#. type: delimited block =
@@ -65417,9 +64611,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:432
msgid ""
-"release notes for link:RelNotes/1.6.1.3.txt[1.6.1.3], link:RelNotes/1.6.1.2."
-"txt[1.6.1.2], link:RelNotes/1.6.1.1.txt[1.6.1.1], link:RelNotes/1.6.1."
-"txt[1.6.1]."
+"release notes for link:RelNotes/1.6.1.3.txt[1.6.1.3], "
+"link:RelNotes/1.6.1.2.txt[1.6.1.2], link:RelNotes/1.6.1.1.txt[1.6.1.1], "
+"link:RelNotes/1.6.1.txt[1.6.1]."
msgstr ""
#. type: delimited block =
@@ -65430,10 +64624,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:443
msgid ""
-"release notes for link:RelNotes/1.6.0.6.txt[1.6.0.6], link:RelNotes/1.6.0.5."
-"txt[1.6.0.5], link:RelNotes/1.6.0.4.txt[1.6.0.4], link:RelNotes/1.6.0.3."
-"txt[1.6.0.3], link:RelNotes/1.6.0.2.txt[1.6.0.2], link:RelNotes/1.6.0.1."
-"txt[1.6.0.1], link:RelNotes/1.6.0.txt[1.6.0]."
+"release notes for link:RelNotes/1.6.0.6.txt[1.6.0.6], "
+"link:RelNotes/1.6.0.5.txt[1.6.0.5], link:RelNotes/1.6.0.4.txt[1.6.0.4], "
+"link:RelNotes/1.6.0.3.txt[1.6.0.3], link:RelNotes/1.6.0.2.txt[1.6.0.2], "
+"link:RelNotes/1.6.0.1.txt[1.6.0.1], link:RelNotes/1.6.0.txt[1.6.0]."
msgstr ""
#. type: delimited block =
@@ -65444,10 +64638,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:454
msgid ""
-"release notes for link:RelNotes/1.5.6.6.txt[1.5.6.6], link:RelNotes/1.5.6.5."
-"txt[1.5.6.5], link:RelNotes/1.5.6.4.txt[1.5.6.4], link:RelNotes/1.5.6.3."
-"txt[1.5.6.3], link:RelNotes/1.5.6.2.txt[1.5.6.2], link:RelNotes/1.5.6.1."
-"txt[1.5.6.1], link:RelNotes/1.5.6.txt[1.5.6]."
+"release notes for link:RelNotes/1.5.6.6.txt[1.5.6.6], "
+"link:RelNotes/1.5.6.5.txt[1.5.6.5], link:RelNotes/1.5.6.4.txt[1.5.6.4], "
+"link:RelNotes/1.5.6.3.txt[1.5.6.3], link:RelNotes/1.5.6.2.txt[1.5.6.2], "
+"link:RelNotes/1.5.6.1.txt[1.5.6.1], link:RelNotes/1.5.6.txt[1.5.6]."
msgstr ""
#. type: delimited block =
@@ -65458,10 +64652,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:465
msgid ""
-"release notes for link:RelNotes/1.5.5.6.txt[1.5.5.6], link:RelNotes/1.5.5.5."
-"txt[1.5.5.5], link:RelNotes/1.5.5.4.txt[1.5.5.4], link:RelNotes/1.5.5.3."
-"txt[1.5.5.3], link:RelNotes/1.5.5.2.txt[1.5.5.2], link:RelNotes/1.5.5.1."
-"txt[1.5.5.1], link:RelNotes/1.5.5.txt[1.5.5]."
+"release notes for link:RelNotes/1.5.5.6.txt[1.5.5.6], "
+"link:RelNotes/1.5.5.5.txt[1.5.5.5], link:RelNotes/1.5.5.4.txt[1.5.5.4], "
+"link:RelNotes/1.5.5.3.txt[1.5.5.3], link:RelNotes/1.5.5.2.txt[1.5.5.2], "
+"link:RelNotes/1.5.5.1.txt[1.5.5.1], link:RelNotes/1.5.5.txt[1.5.5]."
msgstr ""
#. type: delimited block =
@@ -65472,11 +64666,11 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:477
msgid ""
-"release notes for link:RelNotes/1.5.4.7.txt[1.5.4.7], link:RelNotes/1.5.4.6."
-"txt[1.5.4.6], link:RelNotes/1.5.4.5.txt[1.5.4.5], link:RelNotes/1.5.4.4."
-"txt[1.5.4.4], link:RelNotes/1.5.4.3.txt[1.5.4.3], link:RelNotes/1.5.4.2."
-"txt[1.5.4.2], link:RelNotes/1.5.4.1.txt[1.5.4.1], link:RelNotes/1.5.4."
-"txt[1.5.4]."
+"release notes for link:RelNotes/1.5.4.7.txt[1.5.4.7], "
+"link:RelNotes/1.5.4.6.txt[1.5.4.6], link:RelNotes/1.5.4.5.txt[1.5.4.5], "
+"link:RelNotes/1.5.4.4.txt[1.5.4.4], link:RelNotes/1.5.4.3.txt[1.5.4.3], "
+"link:RelNotes/1.5.4.2.txt[1.5.4.2], link:RelNotes/1.5.4.1.txt[1.5.4.1], "
+"link:RelNotes/1.5.4.txt[1.5.4]."
msgstr ""
#. type: delimited block =
@@ -65487,11 +64681,11 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:490
msgid ""
-"release notes for link:RelNotes/1.5.3.8.txt[1.5.3.8], link:RelNotes/1.5.3.7."
-"txt[1.5.3.7], link:RelNotes/1.5.3.6.txt[1.5.3.6], link:RelNotes/1.5.3.5."
-"txt[1.5.3.5], link:RelNotes/1.5.3.4.txt[1.5.3.4], link:RelNotes/1.5.3.3."
-"txt[1.5.3.3], link:RelNotes/1.5.3.2.txt[1.5.3.2], link:RelNotes/1.5.3.1."
-"txt[1.5.3.1], link:RelNotes/1.5.3.txt[1.5.3]."
+"release notes for link:RelNotes/1.5.3.8.txt[1.5.3.8], "
+"link:RelNotes/1.5.3.7.txt[1.5.3.7], link:RelNotes/1.5.3.6.txt[1.5.3.6], "
+"link:RelNotes/1.5.3.5.txt[1.5.3.5], link:RelNotes/1.5.3.4.txt[1.5.3.4], "
+"link:RelNotes/1.5.3.3.txt[1.5.3.3], link:RelNotes/1.5.3.2.txt[1.5.3.2], "
+"link:RelNotes/1.5.3.1.txt[1.5.3.1], link:RelNotes/1.5.3.txt[1.5.3]."
msgstr ""
#. type: delimited block =
@@ -65502,10 +64696,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:500
msgid ""
-"release notes for link:RelNotes/1.5.2.5.txt[1.5.2.5], link:RelNotes/1.5.2.4."
-"txt[1.5.2.4], link:RelNotes/1.5.2.3.txt[1.5.2.3], link:RelNotes/1.5.2.2."
-"txt[1.5.2.2], link:RelNotes/1.5.2.1.txt[1.5.2.1], link:RelNotes/1.5.2."
-"txt[1.5.2]."
+"release notes for link:RelNotes/1.5.2.5.txt[1.5.2.5], "
+"link:RelNotes/1.5.2.4.txt[1.5.2.4], link:RelNotes/1.5.2.3.txt[1.5.2.3], "
+"link:RelNotes/1.5.2.2.txt[1.5.2.2], link:RelNotes/1.5.2.1.txt[1.5.2.1], "
+"link:RelNotes/1.5.2.txt[1.5.2]."
msgstr ""
#. type: delimited block =
@@ -65516,10 +64710,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:511
msgid ""
-"release notes for link:RelNotes/1.5.1.6.txt[1.5.1.6], link:RelNotes/1.5.1.5."
-"txt[1.5.1.5], link:RelNotes/1.5.1.4.txt[1.5.1.4], link:RelNotes/1.5.1.3."
-"txt[1.5.1.3], link:RelNotes/1.5.1.2.txt[1.5.1.2], link:RelNotes/1.5.1.1."
-"txt[1.5.1.1], link:RelNotes/1.5.1.txt[1.5.1]."
+"release notes for link:RelNotes/1.5.1.6.txt[1.5.1.6], "
+"link:RelNotes/1.5.1.5.txt[1.5.1.5], link:RelNotes/1.5.1.4.txt[1.5.1.4], "
+"link:RelNotes/1.5.1.3.txt[1.5.1.3], link:RelNotes/1.5.1.2.txt[1.5.1.2], "
+"link:RelNotes/1.5.1.1.txt[1.5.1.1], link:RelNotes/1.5.1.txt[1.5.1]."
msgstr ""
#. type: delimited block =
@@ -65530,17 +64724,18 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:522
msgid ""
-"release notes for link:RelNotes/1.5.0.7.txt[1.5.0.7], link:RelNotes/1.5.0.6."
-"txt[1.5.0.6], link:RelNotes/1.5.0.5.txt[1.5.0.5], link:RelNotes/1.5.0.3."
-"txt[1.5.0.3], link:RelNotes/1.5.0.2.txt[1.5.0.2], link:RelNotes/1.5.0.1."
-"txt[1.5.0.1], link:RelNotes/1.5.0.txt[1.5.0]."
+"release notes for link:RelNotes/1.5.0.7.txt[1.5.0.7], "
+"link:RelNotes/1.5.0.6.txt[1.5.0.6], link:RelNotes/1.5.0.5.txt[1.5.0.5], "
+"link:RelNotes/1.5.0.3.txt[1.5.0.3], link:RelNotes/1.5.0.2.txt[1.5.0.2], "
+"link:RelNotes/1.5.0.1.txt[1.5.0.1], link:RelNotes/1.5.0.txt[1.5.0]."
msgstr ""
#. type: delimited block =
#: en/git.txt:527
msgid ""
-"documentation for release link:v1.4.4.4/git.html[1.4.4.4], link:v1.3.3/git."
-"html[1.3.3], link:v1.2.6/git.html[1.2.6], link:v1.0.13/git.html[1.0.13]."
+"documentation for release link:v1.4.4.4/git.html[1.4.4.4], "
+"link:v1.3.3/git.html[1.3.3], link:v1.2.6/git.html[1.2.6], "
+"link:v1.0.13/git.html[1.0.13]."
msgstr ""
#. type: Plain text
@@ -65560,8 +64755,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:547
msgid ""
-"Other options are available to control how the manual page is displayed. See "
-"linkgit:git-help[1] for more information, because `git --help ...` is "
+"Other options are available to control how the manual page is displayed. See"
+" linkgit:git-help[1] for more information, because `git --help ...` is "
"converted internally into `git help ...`."
msgstr ""
@@ -65583,10 +64778,10 @@ msgstr ""
#. type: Plain text
#: en/git.txt:558
msgid ""
-"This option affects options that expect path name like `--git-dir` and `--"
-"work-tree` in that their interpretations of the path names would be made "
-"relative to the working directory caused by the `-C` option. For example the "
-"following invocations are equivalent:"
+"This option affects options that expect path name like `--git-dir` and "
+"`--work-tree` in that their interpretations of the path names would be made "
+"relative to the working directory caused by the `-C` option. For example the"
+" following invocations are equivalent:"
msgstr ""
#. type: Plain text
@@ -65607,18 +64802,18 @@ msgstr "-o <name>"
#. type: Plain text
#: en/git.txt:567
msgid ""
-"Pass a configuration parameter to the command. The value given will override "
-"values from configuration files. The <name> is expected in the same format "
-"as listed by 'git config' (subkeys separated by dots)."
+"Pass a configuration parameter to the command. The value given will override"
+" values from configuration files. The <name> is expected in the same format"
+" as listed by 'git config' (subkeys separated by dots)."
msgstr ""
#. type: Plain text
#: en/git.txt:572
msgid ""
-"Note that omitting the `=` in `git -c foo.bar ...` is allowed and sets `foo."
-"bar` to the boolean true value (just like `[foo]bar` would in a config "
-"file). Including the equals but with an empty value (like `git -c foo."
-"bar= ...`) sets `foo.bar` to the empty string."
+"Note that omitting the `=` in `git -c foo.bar ...` is allowed and sets "
+"`foo.bar` to the boolean true value (just like `[foo]bar` would in a config "
+"file). Including the equals but with an empty value (like `git -c foo.bar= "
+"...`) sets `foo.bar` to the empty string."
msgstr ""
#. type: Labeled list
@@ -65637,10 +64832,9 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:579
-#, fuzzy, no-wrap
-#| msgid "--patch"
+#, no-wrap
msgid "--html-path"
-msgstr "--patch"
+msgstr "--html-path"
#. type: Plain text
#: en/git.txt:582
@@ -65651,10 +64845,9 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:583
-#, fuzzy, no-wrap
-#| msgid "--patch"
+#, no-wrap
msgid "--man-path"
-msgstr "--patch"
+msgstr "--man-path"
#. type: Plain text
#: en/git.txt:586
@@ -65665,10 +64858,9 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:587
-#, fuzzy, no-wrap
-#| msgid "--patch"
+#, no-wrap
msgid "--info-path"
-msgstr "--patch"
+msgstr "--info-path"
#. type: Plain text
#: en/git.txt:590
@@ -65681,7 +64873,7 @@ msgstr ""
#: en/git.txt:592
#, no-wrap
msgid "--paginate"
-msgstr ""
+msgstr "--paginate"
#. type: Plain text
#: en/git.txt:597
@@ -65693,10 +64885,9 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:598
-#, fuzzy, no-wrap
-#| msgid "--no-abbrev"
+#, no-wrap
msgid "--no-pager"
-msgstr "--no-abbrev"
+msgstr "--no-pager"
#. type: Plain text
#: en/git.txt:600
@@ -65756,9 +64947,9 @@ msgstr "--prefix=<Pr채fix>/"
#. type: Plain text
#: en/git.txt:623
msgid ""
-"Currently for internal use only. Set a prefix which gives a path from above "
-"a repository down to its root. One use is to give submodules context about "
-"the superproject that invoked it."
+"Currently for internal use only. Set a prefix which gives a path from above"
+" a repository down to its root. One use is to give submodules context about"
+" the superproject that invoked it."
msgstr ""
#. type: Plain text
@@ -65770,10 +64961,9 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:629
-#, fuzzy, no-wrap
-#| msgid "--replace-all"
+#, no-wrap
msgid "--no-replace-objects"
-msgstr "--replace-all"
+msgstr "--no-replace-objects"
#. type: Plain text
#: en/git.txt:632
@@ -65786,7 +64976,7 @@ msgstr ""
#: en/git.txt:633
#, no-wrap
msgid "--literal-pathspecs"
-msgstr ""
+msgstr "--literal-pathspecs"
#. type: Plain text
#: en/git.txt:637
@@ -65800,7 +64990,7 @@ msgstr ""
#: en/git.txt:638
#, no-wrap
msgid "--glob-pathspecs"
-msgstr ""
+msgstr "--glob-pathspecs"
#. type: Plain text
#: en/git.txt:643
@@ -65814,7 +65004,7 @@ msgstr ""
#: en/git.txt:644
#, no-wrap
msgid "--noglob-pathspecs"
-msgstr ""
+msgstr "--noglob-pathspecs"
#. type: Plain text
#: en/git.txt:649
@@ -65828,7 +65018,7 @@ msgstr ""
#: en/git.txt:650
#, no-wrap
msgid "--icase-pathspecs"
-msgstr ""
+msgstr "--icase-pathspecs"
#. type: Plain text
#: en/git.txt:653
@@ -65860,8 +65050,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:665
msgid ""
-"We separate the porcelain commands into the main commands and some ancillary "
-"user utilities."
+"We separate the porcelain commands into the main commands and some ancillary"
+" user utilities."
msgstr ""
#. type: Title ~
@@ -65910,8 +65100,8 @@ msgstr ""
msgid ""
"Although Git includes its own porcelain layer, its low-level commands are "
"sufficient to support development of alternative porcelains. Developers of "
-"such porcelains might start by reading about linkgit:git-update-index[1] and "
-"linkgit:git-read-tree[1]."
+"such porcelains might start by reading about linkgit:git-update-index[1] and"
+" linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
@@ -66044,8 +65234,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:776
msgid ""
-"Various commands read from the configuration file and adjust their operation "
-"accordingly. See linkgit:git-config[1] for a list and more details about "
+"Various commands read from the configuration file and adjust their operation"
+" accordingly. See linkgit:git-config[1] for a list and more details about "
"the configuration mechanism."
msgstr ""
@@ -66086,7 +65276,8 @@ msgstr ""
msgid ""
"Indicates a tree, commit or tag object name. A command that takes a <tree-"
"ish> argument ultimately wants to operate on a <tree> object but "
-"automatically dereferences <commit> and <tag> objects that point at a <tree>."
+"automatically dereferences <commit> and <tag> objects that point at a "
+"<tree>."
msgstr ""
#. type: Labeled list
@@ -66178,8 +65369,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:841
msgid ""
-"Higher level SCMs may provide and manage additional information in the `"
-"$GIT_DIR`."
+"Higher level SCMs may provide and manage additional information in the "
+"`$GIT_DIR`."
msgstr ""
#. type: Title -
@@ -66222,8 +65413,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:862
msgid ""
-"This environment allows the specification of an alternate index file. If not "
-"specified, the default of `$GIT_DIR/index` is used."
+"This environment allows the specification of an alternate index file. If not"
+" specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
@@ -66251,8 +65442,8 @@ msgstr ""
#: en/git.txt:874
msgid ""
"If the object storage directory is specified via this environment variable "
-"then the sha1 directories are created underneath - otherwise the default `"
-"$GIT_DIR/objects` directory is used."
+"then the sha1 directories are created underneath - otherwise the default "
+"`$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
@@ -66264,10 +65455,11 @@ msgstr ""
#. type: Plain text
#: en/git.txt:881
msgid ""
-"Due to the immutable nature of Git objects, old objects can be archived into "
-"shared, read-only directories. This variable specifies a \":\" separated (on "
-"Windows \";\" separated) list of Git object directories which can be used to "
-"search for Git objects. New objects will not be written to these directories."
+"Due to the immutable nature of Git objects, old objects can be archived into"
+" shared, read-only directories. This variable specifies a \":\" separated "
+"(on Windows \";\" separated) list of Git object directories which can be "
+"used to search for Git objects. New objects will not be written to these "
+"directories."
msgstr ""
#. type: Plain text
@@ -66288,8 +65480,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:893
msgid ""
-"If the `GIT_DIR` environment variable is set then it specifies a path to use "
-"instead of the default `.git` for the base of the repository. The `--git-"
+"If the `GIT_DIR` environment variable is set then it specifies a path to use"
+" instead of the default `.git` for the base of the repository. The `--git-"
"dir` command-line option also sets this value."
msgstr ""
@@ -66303,8 +65495,8 @@ msgstr ""
#: en/git.txt:898
msgid ""
"Set the path to the root of the working tree. This can also be controlled "
-"by the `--work-tree` command-line option and the core.worktree configuration "
-"variable."
+"by the `--work-tree` command-line option and the core.worktree configuration"
+" variable."
msgstr ""
#. type: Labeled list
@@ -66316,8 +65508,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:902
msgid ""
-"Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--"
-"namespace` command-line option also sets this value."
+"Set the Git namespace; see linkgit:gitnamespaces[7] for details. The "
+"`--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
@@ -66333,11 +65525,11 @@ msgid ""
"list of directories that Git should not chdir up into while looking for a "
"repository directory (useful for excluding slow-loading network "
"directories). It will not exclude the current working directory or a "
-"GIT_DIR set on the command line or in the environment. Normally, Git has to "
-"read the entries in this list and resolve any symlink that might be present "
-"in order to compare them with the current directory. However, if even this "
-"access is slow, you can add an empty entry to the list to tell Git that the "
-"subsequent entries are not symlinks and needn't be resolved; e.g., "
+"GIT_DIR set on the command line or in the environment. Normally, Git has to"
+" read the entries in this list and resolve any symlink that might be present"
+" in order to compare them with the current directory. However, if even this"
+" access is slow, you can add an empty entry to the list to tell Git that the"
+" subsequent entries are not symlinks and needn't be resolved; e.g., "
"`GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
@@ -66351,10 +65543,10 @@ msgstr ""
#: en/git.txt:927
msgid ""
"When run in a directory that does not have \".git\" repository directory, "
-"Git tries to find such a directory in the parent directories to find the top "
-"of the working tree, but by default it does not cross filesystem "
-"boundaries. This environment variable can be set to true to tell Git not to "
-"stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will "
+"Git tries to find such a directory in the parent directories to find the top"
+" of the working tree, but by default it does not cross filesystem "
+"boundaries. This environment variable can be set to true to tell Git not to"
+" stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will "
"not affect an explicit repository directory set via `GIT_DIR` or on the "
"command line."
msgstr ""
@@ -66426,7 +65618,6 @@ msgstr ""
msgid "'EMAIL'"
msgstr ""
-#
#. type: Plain text
#: en/git.txt:947
#, fuzzy
@@ -66451,8 +65642,8 @@ msgstr ""
msgid ""
"Only valid setting is \"--unified=??\" or \"-u??\" to set the number of "
"context lines shown when a unified diff is created. This takes precedence "
-"over any \"-U\" or \"--unified\" option value passed on the Git diff command "
-"line."
+"over any \"-U\" or \"--unified\" option value passed on the Git diff command"
+" line."
msgstr ""
#. type: Labeled list
@@ -66465,8 +65656,8 @@ msgstr ""
#: en/git.txt:961
msgid ""
"When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named "
-"by it is called, instead of the diff invocation described above. For a path "
-"that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 "
+"by it is called, instead of the diff invocation described above. For a path"
+" that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 "
"parameters:"
msgstr ""
@@ -66522,18 +65713,18 @@ msgstr ""
#. type: Plain text
#: en/git.txt:976
msgid ""
-"The file parameters can point at the user's working file (e.g. `new-file` in "
-"\"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), "
-"or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` "
-"should not worry about unlinking the temporary file --- it is removed when "
-"`GIT_EXTERNAL_DIFF` exits."
+"The file parameters can point at the user's working file (e.g. `new-file` in"
+" \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is "
+"added), or a temporary file (e.g. `old-file` in the index). "
+"`GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- "
+"it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
#: en/git.txt:979
msgid ""
-"For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, "
-"<path>."
+"For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter,"
+" <path>."
msgstr ""
#. type: Plain text
@@ -66602,8 +65793,8 @@ msgstr ""
#: en/git.txt:1007
msgid ""
"This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by "
-"several Git commands when, on interactive mode, an editor is to be launched. "
-"See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-"
+"several Git commands when, on interactive mode, an editor is to be launched."
+" See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-"
"config[1]."
msgstr ""
@@ -66659,8 +65850,8 @@ msgstr ""
msgid ""
"If this environment variable is set, it overrides Git's autodetection "
"whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, "
-"plink or tortoiseplink. This variable overrides the config setting `ssh."
-"variant` that serves the same purpose."
+"plink or tortoiseplink. This variable overrides the config setting "
+"`ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
@@ -66672,8 +65863,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:1041
msgid ""
-"If this environment variable is set, then Git commands which need to acquire "
-"passwords or passphrases (e.g. for HTTP or IMAP authentication) will call "
+"If this environment variable is set, then Git commands which need to acquire"
+" passwords or passphrases (e.g. for HTTP or IMAP authentication) will call "
"this program with a suitable prompt as command-line argument and read the "
"password from its STDOUT. See also the `core.askPass` option in linkgit:git-"
"config[1]."
@@ -66702,12 +65893,12 @@ msgstr "GIT_CONFIG"
#. type: Plain text
#: en/git.txt:1053
msgid ""
-"Whether to skip reading settings from the system-wide `$(prefix)/etc/"
-"gitconfig` file. This environment variable can be used along with `$HOME` "
-"and `$XDG_CONFIG_HOME` to create a predictable environment for a picky "
-"script, or you can set it temporarily to avoid using a buggy `/etc/"
-"gitconfig` file while waiting for someone with sufficient permissions to fix "
-"it."
+"Whether to skip reading settings from the system-wide "
+"`$(prefix)/etc/gitconfig` file. This environment variable can be used along"
+" with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for"
+" a picky script, or you can set it temporarily to avoid using a buggy "
+"`/etc/gitconfig` file while waiting for someone with sufficient permissions "
+"to fix it."
msgstr ""
#. type: Labeled list
@@ -66755,16 +65946,16 @@ msgstr ""
#: en/git.txt:1077
msgid ""
"If the variable is set to an integer value greater than 2 and lower than 10 "
-"(strictly) then Git will interpret this value as an open file descriptor and "
-"will try to write the trace messages into this file descriptor."
+"(strictly) then Git will interpret this value as an open file descriptor and"
+" will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
#: en/git.txt:1082
msgid ""
"Alternatively, if the variable is set to an absolute path (starting with a "
-"'/' character), Git will interpret this as a file path and will try to write "
-"the trace messages into it."
+"'/' character), Git will interpret this as a file path and will try to write"
+" the trace messages into it."
msgstr ""
#. type: Plain text
@@ -66785,8 +65976,8 @@ msgstr ""
msgid ""
"Enables trace messages for all accesses to any packs. For each access, the "
"pack file name and an offset in the pack is recorded. This may be helpful "
-"for troubleshooting some pack-related performance problems. See `GIT_TRACE` "
-"for available trace output options."
+"for troubleshooting some pack-related performance problems. See `GIT_TRACE`"
+" for available trace output options."
msgstr ""
#. type: Labeled list
@@ -66817,8 +66008,8 @@ msgid ""
"Enables tracing of packfiles sent or received by a given program. Unlike "
"other trace output, this trace is verbatim: no headers, and no quoting of "
"binary data. You almost certainly want to direct into a file (e.g., "
-"`GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal "
-"or mixing it with other trace output."
+"`GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal"
+" or mixing it with other trace output."
msgstr ""
#. type: Plain text
@@ -66864,8 +66055,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:1125
msgid ""
-"Enables trace messages that can help debugging fetching / cloning of shallow "
-"repositories. See `GIT_TRACE` for available trace output options."
+"Enables trace messages that can help debugging fetching / cloning of shallow"
+" repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
@@ -66954,8 +66145,8 @@ msgid ""
"level command that updated the ref), in addition to the old and new values "
"of the ref. A scripted Porcelain command can use set_reflog_action helper "
"function in `git-sh-setup` to set its name to this variable when it is "
-"invoked as the top level command by the end user, to be recorded in the body "
-"of the reflog."
+"invoked as the top level command by the end user, to be recorded in the body"
+" of the reflog."
msgstr ""
#. type: Labeled list
@@ -66969,10 +66160,10 @@ msgstr ""
msgid ""
"If set to `1`, include broken or badly named refs when iterating over lists "
"of refs. In a normal, non-corrupted repository, this does nothing. However, "
-"enabling it may help git to detect and abort some operations in the presence "
-"of broken refs. Git sets this variable automatically when performing "
-"destructive operations like linkgit:git-prune[1]. You should not need to set "
-"it yourself unless you want to be paranoid about making sure an operation "
+"enabling it may help git to detect and abort some operations in the presence"
+" of broken refs. Git sets this variable automatically when performing "
+"destructive operations like linkgit:git-prune[1]. You should not need to set"
+" it yourself unless you want to be paranoid about making sure an operation "
"has touched every ref (e.g., because you are cloning a repository to make a "
"backup)."
msgstr ""
@@ -66986,12 +66177,12 @@ msgstr ""
#. type: Plain text
#: en/git.txt:1184
msgid ""
-"If set to a colon-separated list of protocols, behave as if `protocol.allow` "
-"is set to `never`, and each of the listed protocols has `protocol.<name>."
-"allow` set to `always` (overriding any existing configuration). In other "
-"words, any protocol not mentioned will be disallowed (i.e., this is a "
-"whitelist, not a blacklist). See the description of `protocol.allow` in "
-"linkgit:git-config[1] for more details."
+"If set to a colon-separated list of protocols, behave as if `protocol.allow`"
+" is set to `never`, and each of the listed protocols has "
+"`protocol.<name>.allow` set to `always` (overriding any existing "
+"configuration). In other words, any protocol not mentioned will be "
+"disallowed (i.e., this is a whitelist, not a blacklist). See the description"
+" of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
@@ -67019,9 +66210,9 @@ msgstr ""
#. type: Plain text
#: en/git.txt:1198
msgid ""
-"More detail on the following is available from the link:user-manual.html#git-"
-"concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-"
-"tutorial[7]."
+"More detail on the following is available from the link:user-"
+"manual.html#git-concepts[Git concepts chapter of the user-manual] and "
+"linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
@@ -67039,9 +66230,9 @@ msgstr ""
#: en/git.txt:1210
msgid ""
"The object database contains objects of three main types: blobs, which hold "
-"file data; trees, which point to blobs and other trees to build up directory "
-"hierarchies; and commits, which each reference a single tree and some number "
-"of parent commits."
+"file data; trees, which point to blobs and other trees to build up directory"
+" hierarchies; and commits, which each reference a single tree and some "
+"number of parent commits."
msgstr ""
#. type: Plain text
@@ -67049,8 +66240,8 @@ msgstr ""
msgid ""
"The commit, equivalent to what other systems call a \"changeset\" or "
"\"version\", represents a step in the project's history, and each parent "
-"represents an immediately preceding step. Commits with more than one parent "
-"represent merges of independent lines of development."
+"represents an immediately preceding step. Commits with more than one parent"
+" represent merges of independent lines of development."
msgstr ""
#. type: Plain text
@@ -67074,8 +66265,8 @@ msgstr ""
msgid ""
"Named pointers called refs mark interesting points in history. A ref may "
"contain the SHA-1 name of an object or the name of another ref. Refs with "
-"names beginning `ref/head/` contain the SHA-1 name of the most recent commit "
-"(or \"head\") of a branch under development. SHA-1 names of tags of "
+"names beginning `ref/head/` contain the SHA-1 name of the most recent commit"
+" (or \"head\") of a branch under development. SHA-1 names of tags of "
"interest are stored under `ref/tags/`. A special ref named `HEAD` contains "
"the name of the currently checked-out branch."
msgstr ""
@@ -67083,8 +66274,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:1240
msgid ""
-"The index file is initialized with a list of all paths and, for each path, a "
-"blob object and a set of attributes. The blob object represents the "
+"The index file is initialized with a list of all paths and, for each path, a"
+" blob object and a set of attributes. The blob object represents the "
"contents of the file as of the head of the current branch. The attributes "
"(last modified time, size, etc.) are taken from the corresponding file in "
"the working tree. Subsequent changes to the working tree can be found by "
@@ -67109,8 +66300,9 @@ msgstr ""
#. type: Plain text
#: en/git.txt:1251
msgid ""
-"See the references in the \"description\" section to get started using Git. "
-"The following is probably more detail than necessary for a first-time user."
+"See the references in the \"description\" section to get started using Git."
+" The following is probably more detail than necessary for a first-time "
+"user."
msgstr ""
#. type: Plain text
@@ -67129,7 +66321,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:1260
msgid ""
-"See also the link:howto-index.html[howto] documents for some useful examples."
+"See also the link:howto-index.html[howto] documents for some useful "
+"examples."
msgstr ""
#. type: Plain text
@@ -67156,17 +66349,17 @@ msgstr "Author"
#: en/git.txt:1274
msgid ""
"Git was started by Linus Torvalds, and is currently maintained by Junio C "
-"Hamano. Numerous contributions have come from the Git mailing list <git@vger."
-"kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a "
-"more complete list of contributors."
+"Hamano. Numerous contributions have come from the Git mailing list "
+"<git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary "
+"gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
#: en/git.txt:1278
msgid ""
-"If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] "
-"and linkgit:git-blame[1] can show you the authors for specific parts of the "
-"project."
+"If you have a clone of git.git itself, the output of linkgit:git-shortlog[1]"
+" and linkgit:git-blame[1] can show you the authors for specific parts of the"
+" project."
msgstr ""
#. type: Title -
@@ -67183,7 +66376,6 @@ msgid ""
"subscribed to the list to send a message there."
msgstr ""
-#
#. type: Plain text
#: en/git.txt:1293
#, fuzzy
@@ -67201,10 +66393,9 @@ msgstr ""
#. type: Title =
#: en/git-unpack-file.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-merge-one-file(1)"
+#, no-wrap
msgid "git-unpack-file(1)"
-msgstr "git-merge-one-file(1)"
+msgstr "git-unpack-file(1)"
#. type: Plain text
#: en/git-unpack-file.txt:7
@@ -67233,10 +66424,9 @@ msgstr ""
#. type: Title =
#: en/git-unpack-objects.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-fsck-objects(1)"
+#, no-wrap
msgid "git-unpack-objects(1)"
-msgstr "git-fsck-objects(1)"
+msgstr "git-unpack-objects(1)"
#. type: Plain text
#: en/git-unpack-objects.txt:7
@@ -67252,17 +66442,17 @@ msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:20
msgid ""
-"Read a packed archive (.pack) from the standard input, expanding the objects "
-"contained within and writing them into the repository in \"loose\" (one "
+"Read a packed archive (.pack) from the standard input, expanding the objects"
+" contained within and writing them into the repository in \"loose\" (one "
"object per file) format."
msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:24
msgid ""
-"Objects that already exist in the repository will *not* be unpacked from the "
-"packfile. Therefore, nothing will be unpacked if you use this command on a "
-"packfile that exists within the target repository."
+"Objects that already exist in the repository will *not* be unpacked from the"
+" packfile. Therefore, nothing will be unpacked if you use this command on a"
+" packfile that exists within the target repository."
msgstr ""
#. type: Plain text
@@ -67291,9 +66481,9 @@ msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:43
msgid ""
-"When unpacking a corrupt packfile, the command dies at the first "
-"corruption. This flag tells it to keep going and make the best effort to "
-"recover as many objects as possible."
+"When unpacking a corrupt packfile, the command dies at the first corruption."
+" This flag tells it to keep going and make the best effort to recover as "
+"many objects as possible."
msgstr ""
#. type: Plain text
@@ -67303,16 +66493,15 @@ msgstr ""
#. type: Title =
#: en/git-update-index.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-update-index(1)"
-msgstr "git-add(1)"
+msgstr "git-update-index(1)"
-#
#. type: Plain text
#: en/git-update-index.txt:7
#, fuzzy
-#| msgid "git-rm - Remove files from the working tree and from the index"
+#| msgid ""
+#| "git-rm - Remove files from the working tree and from the index"
msgid ""
"git-update-index - Register file contents in the working tree to the index"
msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
@@ -67368,10 +66557,9 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:47
-#, fuzzy, no-wrap
-#| msgid "--remove-section"
+#, no-wrap
msgid "--remove"
-msgstr "--remove-section"
+msgstr "--remove"
#. type: Plain text
#: en/git-update-index.txt:51
@@ -67383,8 +66571,8 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:55
msgid ""
-"Looks at the current index and checks to see if merges or updates are needed "
-"by checking stat() information."
+"Looks at the current index and checks to see if merges or updates are needed"
+" by checking stat() information."
msgstr ""
#. type: Plain text
@@ -67401,10 +66589,9 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:61
-#, fuzzy, no-wrap
-#| msgid "--ignore-errors"
+#, no-wrap
msgid "--ignore-submodules"
-msgstr "--ignore-errors"
+msgstr "--ignore-submodules"
#. type: Plain text
#: en/git-update-index.txt:64
@@ -67458,7 +66645,7 @@ msgstr ""
#: en/git-update-index.txt:80
#, no-wrap
msgid "--index-info"
-msgstr ""
+msgstr "--index-info"
#. type: Plain text
#: en/git-update-index.txt:82
@@ -67474,35 +66661,34 @@ msgstr ""
#: en/git-update-index.txt:86
#, no-wrap
msgid "--[no-]assume-unchanged"
-msgstr ""
+msgstr "--[no-]assume-unchanged"
#. type: Plain text
#: en/git-update-index.txt:98
msgid ""
-"When this flag is specified, the object names recorded for the paths are not "
-"updated. Instead, this option sets/unsets the \"assume unchanged\" bit for "
-"the paths. When the \"assume unchanged\" bit is on, the user promises not "
+"When this flag is specified, the object names recorded for the paths are not"
+" updated. Instead, this option sets/unsets the \"assume unchanged\" bit for"
+" the paths. When the \"assume unchanged\" bit is on, the user promises not "
"to change the file and allows Git to assume that the working tree file "
"matches what is recorded in the index. If you want to change the working "
-"tree file, you need to unset the bit to tell Git. This is sometimes helpful "
-"when working with a big project on a filesystem that has very slow lstat(2) "
-"system call (e.g. cifs)."
+"tree file, you need to unset the bit to tell Git. This is sometimes helpful"
+" when working with a big project on a filesystem that has very slow lstat(2)"
+" system call (e.g. cifs)."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:103
msgid ""
-"Git will fail (gracefully) in case it needs to modify this file in the index "
-"e.g. when merging in a commit; thus, in case the assumed-untracked file is "
+"Git will fail (gracefully) in case it needs to modify this file in the index"
+" e.g. when merging in a commit; thus, in case the assumed-untracked file is "
"changed upstream, you will need to handle the situation manually."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:104
-#, fuzzy, no-wrap
-#| msgid "--refresh"
+#, no-wrap
msgid "--really-refresh"
-msgstr "--refresh"
+msgstr "--really-refresh"
#. type: Plain text
#: en/git-update-index.txt:107
@@ -67515,14 +66701,14 @@ msgstr ""
#: en/git-update-index.txt:108
#, no-wrap
msgid "--[no-]skip-worktree"
-msgstr ""
+msgstr "--[no-]skip-worktree"
#. type: Plain text
#: en/git-update-index.txt:113
msgid ""
-"When one of these flags is specified, the object name recorded for the paths "
-"are not updated. Instead, these options set and unset the \"skip-worktree\" "
-"bit for the paths. See section \"Skip-worktree bit\" below for more "
+"When one of these flags is specified, the object name recorded for the paths"
+" are not updated. Instead, these options set and unset the \"skip-worktree\""
+" bit for the paths. See section \"Skip-worktree bit\" below for more "
"information."
msgstr ""
@@ -67530,7 +66716,7 @@ msgstr ""
#: en/git-update-index.txt:115
#, no-wrap
msgid "--again"
-msgstr ""
+msgstr "--again"
#. type: Plain text
#: en/git-update-index.txt:118
@@ -67541,10 +66727,9 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:119
-#, fuzzy, no-wrap
-#| msgid "--unset"
+#, no-wrap
msgid "--unresolve"
-msgstr "--unset"
+msgstr "--unresolve"
#. type: Plain text
#: en/git-update-index.txt:122
@@ -67555,10 +66740,9 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:123
-#, fuzzy, no-wrap
-#| msgid "--only"
+#, no-wrap
msgid "--info-only"
-msgstr "--only"
+msgstr "--info-only"
#. type: Plain text
#: en/git-update-index.txt:127
@@ -67569,10 +66753,9 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:128
-#, fuzzy, no-wrap
-#| msgid "--force"
+#, no-wrap
msgid "--force-remove"
-msgstr "--force"
+msgstr "--force-remove"
#. type: Plain text
#: en/git-update-index.txt:131
@@ -67583,10 +66766,9 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:132
-#, fuzzy, no-wrap
-#| msgid "--replace-all"
+#, no-wrap
msgid "--replace"
-msgstr "--replace-all"
+msgstr "--replace"
#. type: Plain text
#: en/git-update-index.txt:139
@@ -67637,45 +66819,43 @@ msgstr ""
#: en/git-update-index.txt:164
#, no-wrap
msgid "--split-index"
-msgstr ""
+msgstr "--split-index"
#. type: Labeled list
#: en/git-update-index.txt:165
#, no-wrap
msgid "--no-split-index"
-msgstr ""
+msgstr "--no-split-index"
#. type: Plain text
#: en/git-update-index.txt:170
msgid ""
"Enable or disable split index mode. If split-index mode is already enabled "
-"and `--split-index` is given again, all changes in $GIT_DIR/index are pushed "
-"back to the shared index file."
+"and `--split-index` is given again, all changes in $GIT_DIR/index are pushed"
+" back to the shared index file."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:176
msgid ""
"These options take effect whatever the value of the `core.splitIndex` "
-"configuration variable (see linkgit:git-config[1]). But a warning is emitted "
-"when the change goes against the configured value, as the configured value "
+"configuration variable (see linkgit:git-config[1]). But a warning is emitted"
+" when the change goes against the configured value, as the configured value "
"will take effect next time the index is read and this will remove the "
"intended effect of the option."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:177
-#, fuzzy, no-wrap
-#| msgid "--untracked-files[=<mode>]"
+#, no-wrap
msgid "--untracked-cache"
-msgstr "--untracked-files[=<mode>]"
+msgstr "--untracked-cache"
#. type: Labeled list
#: en/git-update-index.txt:178
-#, fuzzy, no-wrap
-#| msgid "--no-track"
+#, no-wrap
msgid "--no-untracked-cache"
-msgstr "--no-track"
+msgstr "--no-untracked-cache"
#. type: Plain text
#: en/git-update-index.txt:181
@@ -67688,8 +66868,8 @@ msgstr ""
#: en/git-update-index.txt:187
msgid ""
"These options take effect whatever the value of the `core.untrackedCache` "
-"configuration variable (see linkgit:git-config[1]). But a warning is emitted "
-"when the change goes against the configured value, as the configured value "
+"configuration variable (see linkgit:git-config[1]). But a warning is emitted"
+" when the change goes against the configured value, as the configured value "
"will take effect next time the index is read and this will remove the "
"intended effect of the option."
msgstr ""
@@ -67698,13 +66878,13 @@ msgstr ""
#: en/git-update-index.txt:188
#, no-wrap
msgid "--test-untracked-cache"
-msgstr ""
+msgstr "--test-untracked-cache"
#. type: Plain text
#: en/git-update-index.txt:197
msgid ""
-"Only perform tests on the working directory to make sure untracked cache can "
-"be used. You have to manually enable untracked cache using `--untracked-"
+"Only perform tests on the working directory to make sure untracked cache can"
+" be used. You have to manually enable untracked cache using `--untracked-"
"cache` or `--force-untracked-cache` or the `core.untrackedCache` "
"configuration variable afterwards if you really want to use it. If a test "
"fails the exit code is 1 and a message explains what is not working as "
@@ -67715,13 +66895,13 @@ msgstr ""
#: en/git-update-index.txt:198
#, no-wrap
msgid "--force-untracked-cache"
-msgstr ""
+msgstr "--force-untracked-cache"
#. type: Plain text
#: en/git-update-index.txt:203
msgid ""
-"Same as `--untracked-cache`. Provided for backwards compatibility with older "
-"versions of Git where `--untracked-cache` used to imply `--test-untracked-"
+"Same as `--untracked-cache`. Provided for backwards compatibility with older"
+" versions of Git where `--untracked-cache` used to imply `--test-untracked-"
"cache` but this option would enable the extension unconditionally."
msgstr ""
@@ -67729,8 +66909,8 @@ msgstr ""
#: en/git-update-index.txt:213
msgid ""
"Files to act on. Note that files beginning with '.' are discarded. This "
-"includes `./file` and `dir/./file`. If you don't want this, then use cleaner "
-"names. The same applies to directories ending '/' and paths with '//'"
+"includes `./file` and `dir/./file`. If you don't want this, then use cleaner"
+" names. The same applies to directories ending '/' and paths with '//'"
msgstr ""
#. type: Title -
@@ -67743,17 +66923,17 @@ msgstr "--refresh"
#. type: Plain text
#: en/git-update-index.txt:221
msgid ""
-"`--refresh` does not calculate a new sha1 file or bring the index up-to-date "
-"for mode/content changes. But what it *does* do is to \"re-match\" the stat "
-"information of a file with the index, so that you can refresh the index for "
-"a file that hasn't been changed but where the stat entry is out of date."
+"`--refresh` does not calculate a new sha1 file or bring the index up-to-date"
+" for mode/content changes. But what it *does* do is to \"re-match\" the stat"
+" information of a file with the index, so that you can refresh the index for"
+" a file that hasn't been changed but where the stat entry is out of date."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:224
msgid ""
-"For example, you'd want to do this after doing a 'git read-tree', to link up "
-"the stat index details with the proper files."
+"For example, you'd want to do this after doing a 'git read-tree', to link up"
+" the stat index details with the proper files."
msgstr ""
#. type: Title -
@@ -67833,7 +67013,8 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:265
-msgid "The second format is to stuff 'git ls-tree' output into the index file."
+msgid ""
+"The second format is to stuff 'git ls-tree' output into the index file."
msgstr ""
#. type: Plain text
@@ -67852,8 +67033,8 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:274
msgid ""
-"To place a higher stage entry to the index, the path should first be removed "
-"by feeding a mode=0 entry for the path, and then feeding necessary input "
+"To place a higher stage entry to the index, the path should first be removed"
+" by feeding a mode=0 entry for the path, and then feeding necessary input "
"lines in the third format."
msgstr ""
@@ -67916,12 +67097,12 @@ msgid ""
"`lstat(2)` implementation, so that `st_mtime` information for working tree "
"files can be cheaply checked to see if the file contents have changed from "
"the version recorded in the index file. Unfortunately, some filesystems "
-"have inefficient `lstat(2)`. If your filesystem is one of them, you can set "
-"\"assume unchanged\" bit to paths you have not changed to cause Git not to "
+"have inefficient `lstat(2)`. If your filesystem is one of them, you can set"
+" \"assume unchanged\" bit to paths you have not changed to cause Git not to "
"do this check. Note that setting this bit on a path does not mean Git will "
"check the contents of the file to see if it has changed -- it makes Git to "
-"omit any checking and assume it has *not* changed. When you make changes to "
-"working tree files, you have to explicitly tell Git about it by dropping "
+"omit any checking and assume it has *not* changed. When you make changes to"
+" working tree files, you have to explicitly tell Git about it by dropping "
"\"assume unchanged\" bit, either before or after you modify them."
msgstr ""
@@ -67936,14 +67117,14 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:334
msgid ""
-"The command looks at `core.ignorestat` configuration variable. When this is "
-"true, paths updated with `git update-index paths...` and paths updated with "
-"other Git commands that update both index and working tree (e.g. 'git apply "
-"--index', 'git checkout-index -u', and 'git read-tree -u') are automatically "
-"marked as \"assume unchanged\". Note that \"assume unchanged\" bit is *not* "
-"set if `git update-index --refresh` finds the working tree file matches the "
-"index (use `git update-index --really-refresh` if you want to mark them as "
-"\"assume unchanged\")."
+"The command looks at `core.ignorestat` configuration variable. When this is"
+" true, paths updated with `git update-index paths...` and paths updated with"
+" other Git commands that update both index and working tree (e.g. 'git apply"
+" --index', 'git checkout-index -u', and 'git read-tree -u') are "
+"automatically marked as \"assume unchanged\". Note that \"assume "
+"unchanged\" bit is *not* set if `git update-index --refresh` finds the "
+"working tree file matches the index (use `git update-index --really-refresh`"
+" if you want to mark them as \"assume unchanged\")."
msgstr ""
#. type: Plain text
@@ -68042,8 +67223,8 @@ msgid ""
"To elaborate, \"reading\" means checking for file existence, reading file "
"attributes or file content. The working directory version may be present or "
"absent. If present, its content may match against the index version or not. "
-"Writing is not affected by this bit, content safety is still first priority. "
-"Note that Git _can_ update working directory file, that is marked skip-"
+"Writing is not affected by this bit, content safety is still first priority."
+" Note that Git _can_ update working directory file, that is marked skip-"
"worktree, if it is safe to do so (i.e. working directory version matches "
"index version)"
msgstr ""
@@ -68072,25 +67253,25 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:403
msgid ""
-"In this mode, the index is split into two files, $GIT_DIR/index and $GIT_DIR/"
-"sharedindex.<SHA-1>. Changes are accumulated in $GIT_DIR/index, the split "
-"index, while the shared index file contains all index entries and stays "
-"unchanged."
+"In this mode, the index is split into two files, $GIT_DIR/index and "
+"$GIT_DIR/sharedindex.<SHA-1>. Changes are accumulated in $GIT_DIR/index, the"
+" split index, while the shared index file contains all index entries and "
+"stays unchanged."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:408
msgid ""
-"All changes in the split index are pushed back to the shared index file when "
-"the number of entries in the split index reaches a level specified by the "
+"All changes in the split index are pushed back to the shared index file when"
+" the number of entries in the split index reaches a level specified by the "
"splitIndex.maxPercentChange config variable (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:413
msgid ""
-"Each time a new shared index file is created, the old shared index files are "
-"deleted if their modification time is older than what is specified by the "
+"Each time a new shared index file is created, the old shared index files are"
+" deleted if their modification time is older than what is specified by the "
"splitIndex.sharedIndexExpire config variable (see linkgit:git-config[1])."
msgstr ""
@@ -68098,8 +67279,8 @@ msgstr ""
#: en/git-update-index.txt:417
msgid ""
"To avoid deleting a shared index file that is still used, its modification "
-"time is updated to the current time everytime a new split index based on the "
-"shared index file is either created or read from."
+"time is updated to the current time everytime a new split index based on the"
+" shared index file is either created or read from."
msgstr ""
#. type: Title -
@@ -68128,9 +67309,9 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:435
msgid ""
-"You can test whether the filesystem supports that with the `--test-untracked-"
-"cache` option. The `--untracked-cache` option used to implicitly perform "
-"that test in older versions of Git, but that's no longer the case."
+"You can test whether the filesystem supports that with the `--test-"
+"untracked-cache` option. The `--untracked-cache` option used to implicitly "
+"perform that test in older versions of Git, but that's no longer the case."
msgstr ""
#. type: Plain text
@@ -68139,8 +67320,8 @@ msgid ""
"If you want to enable (or disable) this feature, it is easier to use the "
"`core.untrackedCache` configuration variable (see linkgit:git-config[1]) "
"than using the `--untracked-cache` option to `git update-index` in each "
-"repository, especially if you want to do so across all repositories you use, "
-"because you can set the configuration variable to `true` (or `false`) in "
+"repository, especially if you want to do so across all repositories you use,"
+" because you can set the configuration variable to `true` (or `false`) in "
"your `$HOME/.gitconfig` just once and have it affect all repositories you "
"touch."
msgstr ""
@@ -68170,10 +67351,10 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:465
msgid ""
-"Quite similarly, if `core.symlinks` configuration variable is set to "
-"'false' (see linkgit:git-config[1]), symbolic links are checked out as plain "
-"files, and this command does not modify a recorded file mode from symbolic "
-"link to regular file."
+"Quite similarly, if `core.symlinks` configuration variable is set to 'false'"
+" (see linkgit:git-config[1]), symbolic links are checked out as plain files,"
+" and this command does not modify a recorded file mode from symbolic link to"
+" regular file."
msgstr ""
#. type: Plain text
@@ -68192,38 +67373,35 @@ msgid ""
"files processed) (see linkgit:git-config[1])."
msgstr ""
-#
#. type: Plain text
#: en/git-update-index.txt:477
#, fuzzy
#| msgid ""
#| "The remote configuration is achieved using the `remote.origin.url` and "
-#| "`remote.origin.fetch` configuration variables. (See linkgit:git-"
-#| "config[1])."
+#| "`remote.origin.fetch` configuration variables. (See linkgit:git-config[1])."
msgid ""
"The untracked cache extension can be enabled by the `core.untrackedCache` "
"configuration variable (see linkgit:git-config[1])."
msgstr ""
"The remote configuration is achieved using the `remote.origin.url` and "
-"`remote.origin.fetch` configuration variables. (See linkgit:git-"
-"config[1]). Die Konfiguration entfernter Repositories wird durch die "
+"`remote.origin.fetch` configuration variables. (See linkgit:git-config[1])."
+" Die Konfiguration entfernter Repositories wird durch die "
"Konfigurationsvariablen `remote.origin.url` und `remote.origin.fetch` "
"erreicht. (Siehe linkgit:git-config[1])."
-#
#. type: Plain text
#: en/git-update-index.txt:483
#, fuzzy
-#| msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
+#| msgid ""
+#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-update-ref.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-write-tree(1)"
+#, no-wrap
msgid "git-update-ref(1)"
-msgstr "git-write-tree(1)"
+msgstr "git-update-ref(1)"
#. type: Plain text
#: en/git-update-ref.txt:7
@@ -68233,7 +67411,9 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:12
#, no-wrap
-msgid "'git update-ref' [-m <reason>] (-d <ref> [<oldvalue>] | [--no-deref] [--create-reflog] <ref> <newvalue> [<oldvalue>] | --stdin [-z])\n"
+msgid ""
+"'git update-ref' [-m <reason>] (-d <ref> [<oldvalue>] | [--no-deref] "
+"[--create-reflog] <ref> <newvalue> [<oldvalue>] | --stdin [-z])\n"
msgstr ""
#. type: Plain text
@@ -68268,10 +67448,10 @@ msgstr ""
msgid ""
"More importantly, it allows the update of a ref file to follow these "
"symbolic pointers, whether they are symlinks or these \"regular file "
-"symbolic refs\". It follows *real* symlinks only if they start with \"refs/"
-"\": otherwise it will just try to read them and update them as a regular "
-"file (i.e. it will allow the filesystem to follow them, but will overwrite "
-"such a symlink to somewhere else with a regular filename)."
+"symbolic refs\". It follows *real* symlinks only if they start with "
+"\"refs/\": otherwise it will just try to read them and update them as a "
+"regular file (i.e. it will allow the filesystem to follow them, but will "
+"overwrite such a symlink to somewhere else with a regular filename)."
msgstr ""
#. type: Plain text
@@ -68306,18 +67486,18 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:57
msgid ""
-"both from a symlink following standpoint *and* an error checking "
-"standpoint. The \"refs/\" rule for symlinks means that symlinks that point "
-"to \"outside\" the tree are safe: they'll be followed for reading but not "
-"for writing (so we'll never write through a ref symlink to some other tree, "
-"if you have copied a whole archive by creating a symlink tree)."
+"both from a symlink following standpoint *and* an error checking standpoint."
+" The \"refs/\" rule for symlinks means that symlinks that point to "
+"\"outside\" the tree are safe: they'll be followed for reading but not for "
+"writing (so we'll never write through a ref symlink to some other tree, if "
+"you have copied a whole archive by creating a symlink tree)."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:60
msgid ""
-"With `-d` flag, it deletes the named <ref> after verifying it still contains "
-"<oldvalue>."
+"With `-d` flag, it deletes the named <ref> after verifying it still contains"
+" <oldvalue>."
msgstr ""
#. type: Plain text
@@ -68341,23 +67521,24 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:72
msgid ""
-"With `--create-reflog`, update-ref will create a reflog for each ref even if "
-"one would not ordinarily be created."
+"With `--create-reflog`, update-ref will create a reflog for each ref even if"
+" one would not ordinarily be created."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:77
msgid ""
-"Quote fields containing whitespace as if they were strings in C source code; "
-"i.e., surrounded by double-quotes and with backslash escapes. Use 40 \"0\" "
-"characters or the empty string to specify a zero value. To specify a "
+"Quote fields containing whitespace as if they were strings in C source code;"
+" i.e., surrounded by double-quotes and with backslash escapes. Use 40 \"0\""
+" characters or the empty string to specify a zero value. To specify a "
"missing value, omit the value and its preceding SP entirely."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:80
msgid ""
-"Alternatively, use `-z` to specify in NUL-terminated format, without quoting:"
+"Alternatively, use `-z` to specify in NUL-terminated format, without "
+"quoting:"
msgstr ""
#. type: Plain text
@@ -68381,9 +67562,9 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:93
msgid ""
-"In either format, values can be specified in any form that Git recognizes as "
-"an object name. Commands in any other format or a repeated <ref> produce an "
-"error. Command meanings are:"
+"In either format, values can be specified in any form that Git recognizes as"
+" an object name. Commands in any other format or a repeated <ref> produce "
+"an error. Command meanings are:"
msgstr ""
#. type: Plain text
@@ -68410,8 +67591,8 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:107
msgid ""
-"Delete <ref> after verifying it exists with <oldvalue>, if given. If given, "
-"<oldvalue> may not be zero."
+"Delete <ref> after verifying it exists with <oldvalue>, if given. If given,"
+" <oldvalue> may not be zero."
msgstr ""
#. type: Labeled list
@@ -68424,8 +67605,8 @@ msgstr "--no-verify"
#. type: Plain text
#: en/git-update-ref.txt:111
msgid ""
-"Verify <ref> against <oldvalue> but do not change it. If <oldvalue> zero or "
-"missing, the ref must not exist."
+"Verify <ref> against <oldvalue> but do not change it. If <oldvalue> zero or"
+" missing, the ref must not exist."
msgstr ""
#. type: Labeled list
@@ -68463,8 +67644,8 @@ msgid ""
"under \"refs/heads/\", \"refs/remotes/\", \"refs/notes/\", or the symbolic "
"ref HEAD; or the file \"$GIT_DIR/logs/<ref>\" exists then `git update-ref` "
"will append a line to the log file \"$GIT_DIR/logs/<ref>\" (dereferencing "
-"all symbolic refs before creating the log name) describing the change in ref "
-"value. Log lines are formatted as:"
+"all symbolic refs before creating the log name) describing the change in ref"
+" value. Log lines are formatted as:"
msgstr ""
#. type: Plain text
@@ -68475,8 +67656,8 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:138
msgid ""
-"Where \"oldsha1\" is the 40 character hexadecimal value previously stored in "
-"<ref>, \"newsha1\" is the 40 character hexadecimal value of <newvalue> and "
+"Where \"oldsha1\" is the 40 character hexadecimal value previously stored in"
+" <ref>, \"newsha1\" is the 40 character hexadecimal value of <newvalue> and "
"\"committer\" is the committer's name, email address and date in the "
"standard Git committer ident format."
msgstr ""
@@ -68510,7 +67691,7 @@ msgstr ""
#: en/git-update-server-info.txt:2
#, no-wrap
msgid "git-update-server-info(1)"
-msgstr ""
+msgstr "git-update-server-info(1)"
#. type: Plain text
#: en/git-update-server-info.txt:7
@@ -68541,8 +67722,8 @@ msgstr ""
#. type: Plain text
#: en/git-update-server-info.txt:37
msgid ""
-"Currently the command updates the following files. Please see linkgit:"
-"gitrepository-layout[5] for description of what they are for:"
+"Currently the command updates the following files. Please see "
+"linkgit:gitrepository-layout[5] for description of what they are for:"
msgstr ""
#. type: Plain text
@@ -68557,10 +67738,9 @@ msgstr ""
#. type: Title =
#: en/git-upload-archive.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-repo-config(1)"
+#, no-wrap
msgid "git-upload-archive(1)"
-msgstr "git-repo-config(1)"
+msgstr "git-upload-archive(1)"
#. type: Plain text
#: en/git-upload-archive.txt:7
@@ -68576,8 +67756,8 @@ msgstr ""
#. type: Plain text
#: en/git-upload-archive.txt:18
msgid ""
-"Invoked by 'git archive --remote' and sends a generated archive to the other "
-"end over the Git protocol."
+"Invoked by 'git archive --remote' and sends a generated archive to the other"
+" end over the Git protocol."
msgstr ""
#. type: Plain text
@@ -68608,8 +67788,8 @@ msgstr ""
#. type: Plain text
#: en/git-upload-archive.txt:35
msgid ""
-"Clients may request a commit or tree that is pointed to directly by a ref. E."
-"g., `git archive --remote=origin v1.0`."
+"Clients may request a commit or tree that is pointed to directly by a ref. "
+"E.g., `git archive --remote=origin v1.0`."
msgstr ""
#. type: Plain text
@@ -68623,8 +67803,8 @@ msgstr ""
#: en/git-upload-archive.txt:43
msgid ""
"Clients may _not_ use other sha1 expressions, even if the end result is "
-"reachable. E.g., neither a relative commit like `master^` nor a literal sha1 "
-"like `abcd1234` is allowed, even if the result is reachable from the refs."
+"reachable. E.g., neither a relative commit like `master^` nor a literal sha1"
+" like `abcd1234` is allowed, even if the result is reachable from the refs."
msgstr ""
#. type: Plain text
@@ -68640,8 +67820,8 @@ msgstr ""
#: en/git-upload-archive.txt:54
msgid ""
"If the config option `uploadArchive.allowUnreachable` is true, these rules "
-"are ignored, and clients may use arbitrary sha1 expressions. This is useful "
-"if you do not care about the privacy of unreachable objects, or if your "
+"are ignored, and clients may use arbitrary sha1 expressions. This is useful"
+" if you do not care about the privacy of unreachable objects, or if your "
"object database is already publicly available for access via non-smart-http."
msgstr ""
@@ -68652,10 +67832,9 @@ msgstr ""
#. type: Title =
#: en/git-upload-pack.txt:2
-#, fuzzy, no-wrap
-#| msgid "-u <upload-pack>"
+#, no-wrap
msgid "git-upload-pack(1)"
-msgstr "-u <upload-pack>"
+msgstr "git-upload-pack(1)"
#. type: Plain text
#: en/git-upload-pack.txt:7
@@ -68700,7 +67879,7 @@ msgstr "OPTIONS"
#: en/git-upload-pack.txt:28
#, no-wrap
msgid "--[no-]strict"
-msgstr ""
+msgstr "--[no-]strict"
#. type: Plain text
#: en/git-upload-pack.txt:30
@@ -68716,7 +67895,7 @@ msgstr ""
#: en/git-upload-pack.txt:34
#, no-wrap
msgid "--stateless-rpc"
-msgstr ""
+msgstr "--stateless-rpc"
#. type: Plain text
#: en/git-upload-pack.txt:38
@@ -68730,7 +67909,7 @@ msgstr ""
#: en/git-upload-pack.txt:39
#, no-wrap
msgid "--advertise-refs"
-msgstr ""
+msgstr "--advertise-refs"
#. type: Plain text
#: en/git-upload-pack.txt:43
@@ -68745,7 +67924,6 @@ msgstr ""
msgid "The repository to sync from."
msgstr ""
-#
#. type: Plain text
#: en/git-upload-pack.txt:50
#, fuzzy
@@ -68755,10 +67933,9 @@ msgstr "linkgit:git-add[1]"
#. type: Title =
#: en/git-var.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-mv(1)"
+#, no-wrap
msgid "git-var(1)"
-msgstr "git-mv(1)"
+msgstr "git-var(1)"
#. type: Plain text
#: en/git-var.txt:7
@@ -68781,8 +67958,8 @@ msgstr ""
msgid ""
"Cause the logical variables to be listed. In addition, all the variables of "
"the Git configuration file .git/config are listed as well. (However, the "
-"configuration variables listing functionality is deprecated in favor of `git "
-"config -l`.)"
+"configuration variables listing functionality is deprecated in favor of `git"
+" config -l`.)"
msgstr ""
#. type: delimited block -
@@ -68831,17 +68008,18 @@ msgstr ""
#: en/git-var.txt:48
msgid ""
"Text editor for use by Git commands. The value is meant to be interpreted "
-"by the shell when it is used. Examples: `~/bin/vi`, `"
-"$SOME_ENVIRONMENT_VARIABLE`, `\"C:\\Program Files\\Vim\\gvim.exe\" --"
-"nofork`. The order of preference is the `$GIT_EDITOR` environment variable, "
-"then `core.editor` configuration, then `$VISUAL`, then `$EDITOR`, and then "
-"the default chosen at compile time, which is usually 'vi'."
+"by the shell when it is used. Examples: `~/bin/vi`, "
+"`$SOME_ENVIRONMENT_VARIABLE`, `\"C:\\Program Files\\Vim\\gvim.exe\" "
+"--nofork`. The order of preference is the `$GIT_EDITOR` environment "
+"variable, then `core.editor` configuration, then `$VISUAL`, then `$EDITOR`, "
+"and then the default chosen at compile time, which is usually 'vi'."
msgstr ""
#. type: Plain text
#: en/git-var.txt:50
#, no-wrap
-msgid " The build you are using chose '{git-default-editor}' as the default.\n"
+msgid ""
+" The build you are using chose '{git-default-editor}' as the default.\n"
msgstr ""
#. type: Labeled list
@@ -68853,25 +68031,24 @@ msgstr ""
#. type: Plain text
#: en/git-var.txt:60
#, no-wrap
-msgid " The build you are using chose '{git-default-pager}' as the default.\n"
+msgid ""
+" The build you are using chose '{git-default-pager}' as the default.\n"
msgstr ""
-#
#. type: Plain text
#: en/git-var.txt:67
#, fuzzy
-#| msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
+#| msgid ""
+#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid "linkgit:git-commit-tree[1] linkgit:git-tag[1] linkgit:git-config[1]"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-verify-commit.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-verify-tag(1)"
+#, no-wrap
msgid "git-verify-commit(1)"
-msgstr "git-verify-tag(1)"
+msgstr "git-verify-commit(1)"
-#
#. type: Plain text
#: en/git-verify-commit.txt:7
#, fuzzy
@@ -68879,7 +68056,6 @@ msgstr "git-verify-tag(1)"
msgid "git-verify-commit - Check the GPG signature of commits"
msgstr "git-verify-tag - Die GPG-Signaturen von Markierungs 체berpr체fen"
-#
#. type: Plain text
#: en/git-verify-commit.txt:12
#, fuzzy, no-wrap
@@ -68887,7 +68063,6 @@ msgstr "git-verify-tag - Die GPG-Signaturen von Markierungs 체berpr체fen"
msgid "'git verify-commit' <commit>...\n"
msgstr "'git verify-tag' <Markierung>..."
-#
#. type: Plain text
#: en/git-verify-commit.txt:16
#, fuzzy
@@ -68907,7 +68082,6 @@ msgstr ""
msgid "Print the contents of the commit object before validating it."
msgstr ""
-#
#. type: Plain text
#: en/git-verify-commit.txt:29
#, fuzzy
@@ -68917,10 +68091,9 @@ msgstr "SHA1 eines git-Markierungobjektes."
#. type: Title =
#: en/git-verify-pack.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-verify-tag(1)"
+#, no-wrap
msgid "git-verify-pack(1)"
-msgstr "git-verify-tag(1)"
+msgstr "git-verify-pack(1)"
#. type: Plain text
#: en/git-verify-pack.txt:7
@@ -68960,10 +68133,9 @@ msgstr ""
#. type: Labeled list
#: en/git-verify-pack.txt:32
-#, fuzzy, no-wrap
-#| msgid "--only"
+#, no-wrap
msgid "--stat-only"
-msgstr "--only"
+msgstr "--stat-only"
#. type: Plain text
#: en/git-verify-pack.txt:35
@@ -69011,13 +68183,11 @@ msgstr ""
msgid "git-verify-tag(1)"
msgstr "git-verify-tag(1)"
-#
#. type: Plain text
#: en/git-verify-tag.txt:7
msgid "git-verify-tag - Check the GPG signature of tags"
msgstr "git-verify-tag - Die GPG-Signaturen von Markierungs 체berpr체fen"
-#
#. type: Plain text
#: en/git-verify-tag.txt:12
#, fuzzy, no-wrap
@@ -69025,7 +68195,6 @@ msgstr "git-verify-tag - Die GPG-Signaturen von Markierungs 체berpr체fen"
msgid "'git verify-tag' [--format=<format>] <tag>...\n"
msgstr "'git verify-tag' <Markierung>..."
-#
#. type: Plain text
#: en/git-verify-tag.txt:16
#, fuzzy
@@ -69045,7 +68214,6 @@ msgstr ""
msgid "<tag>..."
msgstr "<Markierung>"
-#
#. type: Plain text
#: en/git-verify-tag.txt:29
#, fuzzy
@@ -69234,8 +68402,8 @@ msgstr ""
#: en/git-web--browse.txt:67
msgid ""
"The web browser can be specified using a configuration variable passed with "
-"the -c (or --config) command-line option, or the `web.browser` configuration "
-"variable if the former is not used."
+"the -c (or --config) command-line option, or the `web.browser` configuration"
+" variable if the former is not used."
msgstr ""
#. type: Plain text
@@ -69253,8 +68421,8 @@ msgid ""
"When the browser, specified by options or configuration variables, is not "
"among the supported ones, then the corresponding `browser.<tool>.cmd` "
"configuration variable will be looked up. If this variable exists then 'git "
-"web{litdd}browse' will treat the specified tool as a custom command and will "
-"use a shell eval to run the command with the URLs passed as arguments."
+"web{litdd}browse' will treat the specified tool as a custom command and will"
+" use a shell eval to run the command with the URLs passed as arguments."
msgstr ""
#. type: Plain text
@@ -69268,8 +68436,8 @@ msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:97
msgid ""
-"For consistency, we also try such a trick if 'browser.konqueror.path' is set "
-"to something like 'A_PATH_TO/konqueror'. That means we will try to launch "
+"For consistency, we also try such a trick if 'browser.konqueror.path' is set"
+" to something like 'A_PATH_TO/konqueror'. That means we will try to launch "
"'A_PATH_TO/kfmclient' instead."
msgstr ""
@@ -69298,8 +68466,8 @@ msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:114
msgid ""
-"Note that these configuration variables should probably be set using the `--"
-"global` flag, for example like this:"
+"Note that these configuration variables should probably be set using the "
+"`--global` flag, for example like this:"
msgstr ""
#. type: delimited block -
@@ -69311,17 +68479,15 @@ msgstr "% git config --get-all core.gitproxy\n"
#. type: Title =
#: en/git-whatchanged.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-clone(1)"
+#, no-wrap
msgid "git-whatchanged(1)"
-msgstr "git-clone(1)"
+msgstr "git-whatchanged(1)"
#. type: Plain text
#: en/git-whatchanged.txt:7
msgid "git-whatchanged - Show logs with difference each commit introduces"
msgstr ""
-#
#. type: Plain text
#: en/git-whatchanged.txt:13
#, fuzzy, no-wrap
@@ -69345,8 +68511,8 @@ msgstr ""
#. type: Plain text
#: en/git-whatchanged.txt:26
msgid ""
-"The command is kept primarily for historical reasons; fingers of many people "
-"who learned Git long before `git log` was invented by reading Linux kernel "
+"The command is kept primarily for historical reasons; fingers of many people"
+" who learned Git long before `git log` was invented by reading Linux kernel "
"mailing list are trained to type it."
msgstr ""
@@ -69357,7 +68523,6 @@ msgstr ""
msgid "`git whatchanged -p v2.6.12.. include/scsi drivers/scsi`"
msgstr "git log v2.6.12.. include/scsi drivers/scsi"
-#
#. type: Plain text
#: en/git-whatchanged.txt:34
#, fuzzy
@@ -69365,8 +68530,8 @@ msgstr "git log v2.6.12.. include/scsi drivers/scsi"
#| "Show all commits since version 'v2.6.12' that changed any file in the "
#| "include/scsi or drivers/scsi subdirectories"
msgid ""
-"Show as patches the commits since version 'v2.6.12' that changed any file in "
-"the include/scsi or drivers/scsi subdirectories"
+"Show as patches the commits since version 'v2.6.12' that changed any file in"
+" the include/scsi or drivers/scsi subdirectories"
msgstr ""
"Zeigt alle Commits seit der Version 'v2.6.12', die Dateien in den "
"Verzeichnissen include/scsi oder drivers/scsi ge채ndert haben, an."
@@ -69378,7 +68543,6 @@ msgstr ""
msgid "`git whatchanged --since=\"2 weeks ago\" -- gitk`"
msgstr "git log --since=\"2 weeks ago\" \\-- gitk"
-#
#. type: Plain text
#: en/git-whatchanged.txt:40
msgid ""
@@ -69391,10 +68555,9 @@ msgstr ""
#. type: Title =
#: en/git-worktree.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-write-tree(1)"
+#, no-wrap
msgid "git-worktree(1)"
-msgstr "git-write-tree(1)"
+msgstr "git-worktree(1)"
#. type: Plain text
#: en/git-worktree.txt:7
@@ -69412,11 +68575,11 @@ msgid ""
"'git worktree unlock' <worktree>\n"
msgstr ""
-#
#. type: Plain text
#: en/git-worktree.txt:22
#, fuzzy
-#| msgid "Changes in the working tree not yet staged for the next commit."
+#| msgid ""
+#| "Changes in the working tree not yet staged for the next commit."
msgid "Manage multiple working trees attached to the same repository."
msgstr ""
"횆nderungen im Arbeitsbereich, die noch nicht im Index f체r die n채chste "
@@ -69438,10 +68601,10 @@ msgstr ""
msgid ""
"When you are done with a linked working tree you can simply delete it. The "
"working tree's administrative files in the repository (see \"DETAILS\" "
-"below) will eventually be removed automatically (see `gc."
-"worktreePruneExpire` in linkgit:git-config[1]), or you can run `git worktree "
-"prune` in the main or any linked working tree to clean up any stale "
-"administrative files."
+"below) will eventually be removed automatically (see "
+"`gc.worktreePruneExpire` in linkgit:git-config[1]), or you can run `git "
+"worktree prune` in the main or any linked working tree to clean up any stale"
+" administrative files."
msgstr ""
#. type: Plain text
@@ -69472,24 +68635,24 @@ msgstr ""
msgid ""
"Create `<path>` and checkout `<branch>` into it. The new working directory "
"is linked to the current repository, sharing everything except working "
-"directory specific files such as HEAD, index, etc. `-` may also be specified "
-"as `<branch>`; it is synonymous with `@{-1}`."
+"directory specific files such as HEAD, index, etc. `-` may also be specified"
+" as `<branch>`; it is synonymous with `@{-1}`."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:58
msgid ""
"If `<branch>` is omitted and neither `-b` nor `-B` nor `--detach` used, "
-"then, as a convenience, a new branch based at HEAD is created automatically, "
-"as if `-b $(basename <path>)` was specified."
+"then, as a convenience, a new branch based at HEAD is created automatically,"
+" as if `-b $(basename <path>)` was specified."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:65
msgid ""
"List details of each worktree. The main worktree is listed first, followed "
-"by each of the linked worktrees. The output details include if the worktree "
-"is bare, the revision currently checked out, and the branch currently "
+"by each of the linked worktrees. The output details include if the worktree"
+" is bare, the revision currently checked out, and the branch currently "
"checked out (or 'detached HEAD' if none)."
msgstr ""
@@ -69549,8 +68712,8 @@ msgstr "<newbranch>"
#. type: Plain text
#: en/git-worktree.txt:99
msgid ""
-"With `add`, create a new branch named `<new-branch>` starting at `<branch>`, "
-"and check out `<new-branch>` into the new working tree. If `<branch>` is "
+"With `add`, create a new branch named `<new-branch>` starting at `<branch>`,"
+" and check out `<new-branch>` into the new working tree. If `<branch>` is "
"omitted, it defaults to HEAD. By default, `-b` refuses to create a new "
"branch if it already exists. `-B` overrides this safeguard, resetting `<new-"
"branch>` to `<branch>`."
@@ -69565,10 +68728,9 @@ msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:104
-#, fuzzy, no-wrap
-#| msgid "--no-checkout"
+#, no-wrap
msgid "--[no-]checkout"
-msgstr "--no-checkout"
+msgstr "--[no-]checkout"
#. type: Plain text
#: en/git-worktree.txt:109
@@ -69581,15 +68743,16 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:114
-msgid "With `prune`, do not remove anything; just report what it would remove."
+msgid ""
+"With `prune`, do not remove anything; just report what it would remove."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:119
msgid ""
"With `list`, output in an easy-to-parse format for scripts. This format "
-"will remain stable across Git versions and regardless of user "
-"configuration. See below for details."
+"will remain stable across Git versions and regardless of user configuration."
+" See below for details."
msgstr ""
#. type: Plain text
@@ -69628,9 +68791,9 @@ msgstr ""
#: en/git-worktree.txt:138
msgid ""
"If the last path components in the working tree's path is unique among "
-"working trees, it can be used to identify worktrees. For example if you only "
-"have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi"
-"\" or \"def/ghi\" is enough to point to the former working tree."
+"working trees, it can be used to identify worktrees. For example if you only"
+" have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then "
+"\"ghi\" or \"def/ghi\" is enough to point to the former working tree."
msgstr ""
#. type: Title -
@@ -69647,9 +68810,9 @@ msgid ""
"the base name of the linked working tree's path, possibly appended with a "
"number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the "
"command `git worktree add /path/other/test-next next` creates the linked "
-"working tree in `/path/other/test-next` and also creates a `$GIT_DIR/"
-"worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-"
-"next` is already taken)."
+"working tree in `/path/other/test-next` and also creates a "
+"`$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1`"
+" if `test-next` is already taken)."
msgstr ""
#. type: Plain text
@@ -69657,9 +68820,9 @@ msgstr ""
msgid ""
"Within a linked working tree, $GIT_DIR is set to point to this private "
"directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and "
-"$GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e."
-"g. `/path/main/.git`). These settings are made in a `.git` file located at "
-"the top directory of the linked working tree."
+"$GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR "
+"(e.g. `/path/main/.git`). These settings are made in a `.git` file located "
+"at the top directory of the linked working tree."
msgstr ""
#. type: Plain text
@@ -69667,11 +68830,12 @@ msgstr ""
msgid ""
"Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or "
"$GIT_COMMON_DIR depending on the path. For example, in the linked working "
-"tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-"
-"next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) "
-"while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and "
-"returns `/path/main/.git/refs/heads/master`, since refs are shared across "
-"all working trees."
+"tree `git rev-parse --git-path HEAD` returns "
+"`/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-"
+"next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path "
+"refs/heads/master` uses $GIT_COMMON_DIR and returns "
+"`/path/main/.git/refs/heads/master`, since refs are shared across all "
+"working trees."
msgstr ""
#. type: Plain text
@@ -69687,23 +68851,24 @@ msgstr ""
#: en/git-worktree.txt:176
msgid ""
"If you move a linked working tree, you need to update the 'gitdir' file in "
-"the entry's directory. For example, if a linked working tree is moved to `/"
-"newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/"
-"test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to "
-"reference `/newpath/test-next` instead."
+"the entry's directory. For example, if a linked working tree is moved to "
+"`/newpath/test-next` and its `.git` file points to "
+"`/path/main/.git/worktrees/test-next`, then update "
+"`/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-"
+"next` instead."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:187
msgid ""
-"To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful "
-"in some situations, such as when the entry's working tree is stored on a "
+"To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful"
+" in some situations, such as when the entry's working tree is stored on a "
"portable device), use the `git worktree lock` command, which adds a file "
"named 'locked' to the entry's directory. The file contains the reason in "
-"plain text. For example, if a linked working tree's `.git` file points to `/"
-"path/main/.git/worktrees/test-next` then a file named `/path/main/.git/"
-"worktrees/test-next/locked` will prevent the `test-next` entry from being "
-"pruned. See linkgit:gitrepository-layout[5] for details."
+"plain text. For example, if a linked working tree's `.git` file points to "
+"`/path/main/.git/worktrees/test-next` then a file named "
+"`/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` "
+"entry from being pruned. See linkgit:gitrepository-layout[5] for details."
msgstr ""
#. type: Title -
@@ -69738,8 +68903,8 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:207
msgid ""
-"The porcelain format has a line per attribute. Attributes are listed with a "
-"label and value separated by a single space. Boolean attributes (like "
+"The porcelain format has a line per attribute. Attributes are listed with a"
+" label and value separated by a single space. Boolean attributes (like "
"'bare' and 'detached') are listed as a label only, and are only present if "
"and only if the value is true. An empty line indicates the end of a "
"worktree. For example:"
@@ -69776,13 +68941,13 @@ msgstr ""
#: en/git-worktree.txt:233
msgid ""
"You are in the middle of a refactoring session and your boss comes in and "
-"demands that you fix something immediately. You might typically use linkgit:"
-"git-stash[1] to store your changes away temporarily, however, your working "
-"tree is in such a state of disarray (with new, moved, and removed files, and "
-"other bits and pieces strewn around) that you don't want to risk disturbing "
-"any of it. Instead, you create a temporary linked working tree to make the "
-"emergency fix, remove it when done, and then resume your earlier refactoring "
-"session."
+"demands that you fix something immediately. You might typically use "
+"linkgit:git-stash[1] to store your changes away temporarily, however, your "
+"working tree is in such a state of disarray (with new, moved, and removed "
+"files, and other bits and pieces strewn around) that you don't want to risk "
+"disturbing any of it. Instead, you create a temporary linked working tree to"
+" make the emergency fix, remove it when done, and then resume your earlier "
+"refactoring session."
msgstr ""
#. type: delimited block -
@@ -69832,13 +68997,11 @@ msgstr ""
msgid "git-write-tree(1)"
msgstr "git-write-tree(1)"
-#
#. type: Plain text
#: en/git-write-tree.txt:7
msgid "git-write-tree - Create a tree object from the current index"
msgstr "git-write-tree - Erstelle ein Baumobjekt des aktuellen Index'"
-#
#. type: Plain text
#: en/git-write-tree.txt:13
#, fuzzy, no-wrap
@@ -69853,26 +69016,24 @@ msgid ""
"object is printed to standard output."
msgstr ""
-#
#. type: Plain text
#: en/git-write-tree.txt:20
msgid "The index must be in a fully merged state."
msgstr "Der Index muss daf체r in einem vollst채ndig vereinigten Status sein."
-#
#. type: Plain text
#: en/git-write-tree.txt:26
#, fuzzy
#| msgid ""
-#| "Conceptually, 'git-write-tree' sync()s the current index contents into a "
-#| "set of tree files. In order to have that match what is actually in your "
-#| "directory right now, you need to have done a 'git-update-index' phase "
-#| "before you did the 'git-write-tree'."
+#| "Conceptually, 'git-write-tree' sync()s the current index contents into a set"
+#| " of tree files. In order to have that match what is actually in your "
+#| "directory right now, you need to have done a 'git-update-index' phase before"
+#| " you did the 'git-write-tree'."
msgid ""
-"Conceptually, 'git write-tree' sync()s the current index contents into a set "
-"of tree files. In order to have that match what is actually in your "
-"directory right now, you need to have done a 'git update-index' phase before "
-"you did the 'git write-tree'."
+"Conceptually, 'git write-tree' sync()s the current index contents into a set"
+" of tree files. In order to have that match what is actually in your "
+"directory right now, you need to have done a 'git update-index' phase before"
+" you did the 'git write-tree'."
msgstr ""
"'git-write-tree' sync()t den aktuellen Indexinhalt in eine Sammlung von "
"Baumobjektdateien. Um eine 횥bereinstimmung mit dem momentanen eigentlichen "
@@ -69885,7 +69046,6 @@ msgstr ""
msgid "--missing-ok"
msgstr "--missing-ok"
-#
#. type: Plain text
#: en/git-write-tree.txt:34
#, fuzzy
@@ -69900,12 +69060,11 @@ msgstr ""
"Verzeichnis referenzierten Objekte sich in der Objektdatenbank befinden. "
"Diese Option deaktiviert diese 횥berpr체fung."
-#
#. type: Plain text
#: en/git-write-tree.txt:39
msgid ""
-"Writes a tree object that represents a subdirectory `<prefix>`. This can be "
-"used to write the tree object for a subproject that is in the named "
+"Writes a tree object that represents a subdirectory `<prefix>`. This can be"
+" used to write the tree object for a subproject that is in the named "
"subdirectory."
msgstr ""
"Erzeugt ein Baumobjekt, welches das Unterverzeichnis `<Pr채fix>` darstellt. "
@@ -69937,10 +69096,10 @@ msgstr ""
#. type: Plain text
#: en/i18n.txt:23
msgid ""
-"Note that Git at the core level treats path names simply as sequences of non-"
-"NUL bytes, there are no path name encoding conversions (except on Mac and "
-"Windows). Therefore, using non-ASCII path names will mostly work even on "
-"platforms and file systems that use legacy extended ASCII encodings. "
+"Note that Git at the core level treats path names simply as sequences of "
+"non-NUL bytes, there are no path name encoding conversions (except on Mac "
+"and Windows). Therefore, using non-ASCII path names will mostly work even on"
+" platforms and file systems that use legacy extended ASCII encodings. "
"However, repositories created on such systems will not work properly on "
"UTF-8-based systems (e.g. Linux, Mac, Windows) and vice versa. "
"Additionally, many Git-based tools simply assume path names to be UTF-8 and "
@@ -69950,20 +69109,20 @@ msgstr ""
#. type: Plain text
#: en/i18n.txt:29
msgid ""
-"Commit log messages are typically encoded in UTF-8, but other extended ASCII "
-"encodings are also supported. This includes ISO-8859-x, CP125x and many "
-"others, but _not_ UTF-16/32, EBCDIC and CJK multi-byte encodings (GBK, Shift-"
-"JIS, Big5, EUC-x, CP9xx etc.)."
+"Commit log messages are typically encoded in UTF-8, but other extended ASCII"
+" encodings are also supported. This includes ISO-8859-x, CP125x and many "
+"others, but _not_ UTF-16/32, EBCDIC and CJK multi-byte encodings (GBK, "
+"Shift-JIS, Big5, EUC-x, CP9xx etc.)."
msgstr ""
#. type: Plain text
#: en/i18n.txt:36
msgid ""
"Although we encourage that the commit log messages are encoded in UTF-8, "
-"both the core and Git Porcelain are designed not to force UTF-8 on "
-"projects. If all participants of a particular project find it more "
-"convenient to use legacy encodings, Git does not forbid it. However, there "
-"are a few things to keep in mind."
+"both the core and Git Porcelain are designed not to force UTF-8 on projects."
+" If all participants of a particular project find it more convenient to use"
+" legacy encodings, Git does not forbid it. However, there are a few things "
+"to keep in mind."
msgstr ""
#. type: Plain text
@@ -69986,19 +69145,19 @@ msgstr ""
#. type: Plain text
#: en/i18n.txt:52
msgid ""
-"Commit objects created with the above setting record the value of `i18n."
-"commitencoding` in its `encoding` header. This is to help other people who "
-"look at them later. Lack of this header implies that the commit log message "
-"is encoded in UTF-8."
+"Commit objects created with the above setting record the value of "
+"`i18n.commitencoding` in its `encoding` header. This is to help other "
+"people who look at them later. Lack of this header implies that the commit "
+"log message is encoded in UTF-8."
msgstr ""
#. type: Plain text
#: en/i18n.txt:58
msgid ""
-"'git log', 'git show', 'git blame' and friends look at the `encoding` header "
-"of a commit object, and try to re-code the log message into UTF-8 unless "
-"otherwise specified. You can specify the desired output encoding with `i18n."
-"logoutputencoding` in `.git/config` file, like this:"
+"'git log', 'git show', 'git blame' and friends look at the `encoding` header"
+" of a commit object, and try to re-code the log message into UTF-8 unless "
+"otherwise specified. You can specify the desired output encoding with "
+"`i18n.logoutputencoding` in `.git/config` file, like this:"
msgstr ""
#. type: delimited block -
@@ -70012,16 +69171,16 @@ msgstr ""
#. type: Plain text
#: en/i18n.txt:66
msgid ""
-"If you do not have this configuration variable, the value of `i18n."
-"commitencoding` is used instead."
+"If you do not have this configuration variable, the value of "
+"`i18n.commitencoding` is used instead."
msgstr ""
#. type: Plain text
#: en/i18n.txt:70
msgid ""
-"Note that we deliberately chose not to re-code the commit log message when a "
-"commit is made to force UTF-8 at the commit object level, because re-coding "
-"to UTF-8 is not necessarily a reversible operation."
+"Note that we deliberately chose not to re-code the commit log message when a"
+" commit is made to force UTF-8 at the commit object level, because re-coding"
+" to UTF-8 is not necessarily a reversible operation."
msgstr ""
#. type: Plain text
@@ -70037,8 +69196,8 @@ msgstr ""
#. type: Plain text
#: en/line-range-format.txt:7
msgid ""
-"If <start> or <end> is a number, it specifies an absolute line number (lines "
-"count from 1)."
+"If <start> or <end> is a number, it specifies an absolute line number (lines"
+" count from 1)."
msgstr ""
#. type: Plain text
@@ -70049,11 +69208,11 @@ msgstr ""
#. type: Plain text
#: en/line-range-format.txt:17
msgid ""
-"This form will use the first line matching the given POSIX regex. If <start> "
-"is a regex, it will search from the end of the previous `-L` range, if any, "
-"otherwise from the start of file. If <start> is ``^/regex/'', it will "
-"search from the start of file. If <end> is a regex, it will search starting "
-"at the line given by <start>."
+"This form will use the first line matching the given POSIX regex. If <start>"
+" is a regex, it will search from the end of the previous `-L` range, if any,"
+" otherwise from the start of file. If <start> is ``^/regex/'', it will "
+"search from the start of file. If <end> is a regex, it will search starting"
+" at the line given by <start>."
msgstr ""
#. type: Plain text
@@ -70083,8 +69242,8 @@ msgstr ""
msgid ""
"If the file `.mailmap` exists at the toplevel of the repository, or at the "
"location pointed to by the mailmap.file or mailmap.blob configuration "
-"options, it is used to map author and committer names and email addresses to "
-"canonical real names and email addresses."
+"options, it is used to map author and committer names and email addresses to"
+" canonical real names and email addresses."
msgstr ""
#. type: Plain text
@@ -70146,8 +69305,8 @@ msgstr ""
#. type: Plain text
#: en/mailmap.txt:32
msgid ""
-"Example 1: Your history contains commits by two authors, Jane and Joe, whose "
-"names appear in the repository under several forms:"
+"Example 1: Your history contains commits by two authors, Jane and Joe, whose"
+" names appear in the repository under several forms:"
msgstr ""
#. type: delimited block -
@@ -70185,7 +69344,8 @@ msgstr ""
#. type: Plain text
#: en/mailmap.txt:55
-msgid "Example 2: Your repository contains commits from the following authors:"
+msgid ""
+"Example 2: Your repository contains commits from the following authors:"
msgstr ""
#. type: delimited block -
@@ -70250,12 +69410,12 @@ msgstr ""
#: en/merge-config.txt:18
msgid ""
"If merge is called without any commit argument, merge the upstream branches "
-"configured for the current branch by using their last observed values stored "
-"in their remote-tracking branches. The values of the `branch.<current "
-"branch>.merge` that name the branches at the remote named by `branch."
-"<current branch>.remote` are consulted, and then they are mapped via `remote."
-"<remote>.fetch` to their corresponding remote-tracking branches, and the "
-"tips of these tracking branches are merged."
+"configured for the current branch by using their last observed values stored"
+" in their remote-tracking branches. The values of the `branch.<current "
+"branch>.merge` that name the branches at the remote named by "
+"`branch.<current branch>.remote` are consulted, and then they are mapped via"
+" `remote.<remote>.fetch` to their corresponding remote-tracking branches, "
+"and the tips of these tracking branches are merged."
msgstr ""
#. type: Labeled list
@@ -70273,8 +69433,8 @@ msgid ""
"branch is fast-forwarded. When set to `false`, this variable tells Git to "
"create an extra merge commit in such a case (equivalent to giving the `--no-"
"ff` option from the command line). When set to `only`, only such fast-"
-"forward merges are allowed (equivalent to giving the `--ff-only` option from "
-"the command line)."
+"forward merges are allowed (equivalent to giving the `--ff-only` option from"
+" the command line)."
msgstr ""
#. type: Labeled list
@@ -70347,9 +69507,9 @@ msgstr ""
msgid ""
"Controls the amount of output shown by the recursive merge strategy. Level "
"0 outputs nothing except a final error message if conflicts were detected. "
-"Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level "
-"5 and above outputs debugging information. The default is level 2. Can be "
-"overridden by the `GIT_MERGE_VERBOSITY` environment variable."
+"Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level"
+" 5 and above outputs debugging information. The default is level 2. Can be"
+" overridden by the `GIT_MERGE_VERBOSITY` environment variable."
msgstr ""
#. type: Labeled list
@@ -70394,16 +69554,16 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:5
msgid ""
-"Perform the merge and commit the result. This option can be used to override "
-"--no-commit."
+"Perform the merge and commit the result. This option can be used to override"
+" --no-commit."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:9
msgid ""
"With --no-commit perform the merge but pretend the merge failed and do not "
-"autocommit, to give the user a chance to inspect and further tweak the merge "
-"result before committing."
+"autocommit, to give the user a chance to inspect and further tweak the merge"
+" result before committing."
msgstr ""
#. type: Plain text
@@ -70427,8 +69587,8 @@ msgstr ""
#: en/merge-options.txt:29
msgid ""
"Older scripts may depend on the historical behaviour of not allowing the "
-"user to edit the merge log message. They will see an editor opened when they "
-"run `git merge`. To make it easier to adjust such scripts to the updated "
+"user to edit the merge log message. They will see an editor opened when they"
+" run `git merge`. To make it easier to adjust such scripts to the updated "
"behaviour, the environment variable `GIT_MERGE_AUTOEDIT` can be set to `no` "
"at the beginning of them."
msgstr ""
@@ -70444,29 +69604,29 @@ msgstr ""
#: en/merge-options.txt:39
msgid ""
"Create a merge commit even when the merge resolves as a fast-forward. This "
-"is the default behaviour when merging an annotated (and possibly signed) tag."
+"is the default behaviour when merging an annotated (and possibly signed) "
+"tag."
msgstr ""
#. type: Labeled list
#: en/merge-options.txt:40
-#, fuzzy, no-wrap
-#| msgid "--only"
+#, no-wrap
msgid "--ff-only"
-msgstr "--only"
+msgstr "--ff-only"
#. type: Plain text
#: en/merge-options.txt:44
msgid ""
-"Refuse to merge and exit with a non-zero status unless the current `HEAD` is "
-"already up-to-date or the merge can be resolved as a fast-forward."
+"Refuse to merge and exit with a non-zero status unless the current `HEAD` is"
+" already up-to-date or the merge can be resolved as a fast-forward."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:50
msgid ""
"In addition to branch names, populate the log message with one-line "
-"descriptions from at most <n> actual commits that are being merged. See also "
-"linkgit:git-fmt-merge-msg[1]."
+"descriptions from at most <n> actual commits that are being merged. See also"
+" linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
@@ -70492,19 +69652,19 @@ msgstr ""
#: en/merge-options.txt:64
#, no-wrap
msgid "--squash"
-msgstr ""
+msgstr "--squash"
#. type: Labeled list
#: en/merge-options.txt:65
#, no-wrap
msgid "--no-squash"
-msgstr ""
+msgstr "--no-squash"
#. type: Plain text
#: en/merge-options.txt:73
msgid ""
-"Produce the working tree and index state as if a real merge happened (except "
-"for the merge information), but do not actually make a commit, move the "
+"Produce the working tree and index state as if a real merge happened (except"
+" for the merge information), but do not actually make a commit, move the "
"`HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` "
"command to create a merge commit). This allows you to create a single "
"commit on top of the current branch whose effect is the same as merging "
@@ -70514,15 +69674,15 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:76
msgid ""
-"With --no-squash perform the merge and commit the result. This option can be "
-"used to override --squash."
+"With --no-squash perform the merge and commit the result. This option can be"
+" used to override --squash."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:84
msgid ""
-"Use the given merge strategy; can be supplied more than once to specify them "
-"in the order they should be tried. If there is no `-s` option, a built-in "
+"Use the given merge strategy; can be supplied more than once to specify them"
+" in the order they should be tried. If there is no `-s` option, a built-in "
"list of strategies is used instead ('git merge-recursive' when merging a "
"single head, 'git merge-octopus' otherwise)."
msgstr ""
@@ -70542,30 +69702,28 @@ msgstr ""
#: en/merge-options.txt:90
#, no-wrap
msgid "--verify-signatures"
-msgstr ""
+msgstr "--verify-signatures"
#. type: Labeled list
#: en/merge-options.txt:91
-#, fuzzy, no-wrap
-#| msgid "--no-verify"
+#, no-wrap
msgid "--no-verify-signatures"
-msgstr "--no-verify"
+msgstr "--no-verify-signatures"
#. type: Plain text
#: en/merge-options.txt:97
msgid ""
"Verify that the tip commit of the side branch being merged is signed with a "
-"valid key, i.e. a key that has a valid uid: in the default trust model, this "
-"means the signing key has been signed by a trusted key. If the tip commit "
+"valid key, i.e. a key that has a valid uid: in the default trust model, this"
+" means the signing key has been signed by a trusted key. If the tip commit "
"of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
#: en/merge-options.txt:99
-#, fuzzy, no-wrap
-#| msgid "--no-abbrev"
+#, no-wrap
msgid "--no-summary"
-msgstr "--no-abbrev"
+msgstr "--no-summary"
#. type: Plain text
#: en/merge-options.txt:102
@@ -70591,15 +69749,15 @@ msgstr ""
#: en/merge-options.txt:121
#, no-wrap
msgid "--allow-unrelated-histories"
-msgstr ""
+msgstr "--allow-unrelated-histories"
#. type: Plain text
#: en/merge-options.txt:127
msgid ""
-"By default, `git merge` command refuses to merge histories that do not share "
-"a common ancestor. This option can be used to override this safety when "
-"merging histories of two projects that started their lives independently. As "
-"that is a very rare occasion, no configuration variable to enable this by "
+"By default, `git merge` command refuses to merge histories that do not share"
+" a common ancestor. This option can be used to override this safety when "
+"merging histories of two projects that started their lives independently. As"
+" that is a very rare occasion, no configuration variable to enable this by "
"default exists and will not be added."
msgstr ""
@@ -70612,10 +69770,10 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:8
msgid ""
-"The merge mechanism (`git merge` and `git pull` commands) allows the backend "
-"'merge strategies' to be chosen with `-s` option. Some strategies can also "
-"take their own options, which can be passed by giving `-X<option>` arguments "
-"to `git merge` and/or `git pull`."
+"The merge mechanism (`git merge` and `git pull` commands) allows the backend"
+" 'merge strategies' to be chosen with `-s` option. Some strategies can also"
+" take their own options, which can be passed by giving `-X<option>` "
+"arguments to `git merge` and/or `git pull`."
msgstr ""
#. type: Labeled list
@@ -70644,8 +69802,8 @@ msgstr ""
msgid ""
"This can only resolve two heads using a 3-way merge algorithm. When there "
"is more than one common ancestor that can be used for 3-way merge, it "
-"creates a merged tree of the common ancestors and uses that as the reference "
-"tree for the 3-way merge. This has been reported to result in fewer merge "
+"creates a merged tree of the common ancestors and uses that as the reference"
+" tree for the 3-way merge. This has been reported to result in fewer merge "
"conflicts without causing mismerges by tests done on actual merge commits "
"taken from Linux 2.6 kernel development history. Additionally this can "
"detect and handle merges involving renames. This is the default merge "
@@ -70666,8 +69824,8 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:36
msgid ""
-"This option forces conflicting hunks to be auto-resolved cleanly by favoring "
-"'our' version. Changes from the other tree that do not conflict with our "
+"This option forces conflicting hunks to be auto-resolved cleanly by favoring"
+" 'our' version. Changes from the other tree that do not conflict with our "
"side are reflected to the merge result. For a binary file, the entire "
"contents are taken from our side."
msgstr ""
@@ -70677,7 +69835,8 @@ msgstr ""
msgid ""
"This should not be confused with the 'ours' merge strategy, which does not "
"even look at what the other tree contains at all. It discards everything "
-"the other tree did, declaring 'our' history contains all that happened in it."
+"the other tree did, declaring 'our' history contains all that happened in "
+"it."
msgstr ""
#. type: Labeled list
@@ -70716,8 +69875,8 @@ msgstr ""
#: en/merge-strategies.txt:56
msgid ""
"Tells 'merge-recursive' to use a different diff algorithm, which can help "
-"avoid mismerges that occur due to unimportant matching lines (such as braces "
-"from distinct functions). See also linkgit:git-diff[1] `--diff-algorithm`."
+"avoid mismerges that occur due to unimportant matching lines (such as braces"
+" from distinct functions). See also linkgit:git-diff[1] `--diff-algorithm`."
msgstr ""
#. type: Labeled list
@@ -70743,8 +69902,8 @@ msgstr ""
msgid ""
"Treats lines with the indicated type of whitespace change as unchanged for "
"the sake of a three-way merge. Whitespace changes mixed with other changes "
-"to a line are not ignored. See also linkgit:git-diff[1] `-b`, `-w`, and `--"
-"ignore-space-at-eol`."
+"to a line are not ignored. See also linkgit:git-diff[1] `-b`, `-w`, and "
+"`--ignore-space-at-eol`."
msgstr ""
#. type: Plain text
@@ -70817,8 +69976,8 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:92
msgid ""
-"Turn on rename detection, optionally setting the similarity threshold. This "
-"is the default. See also linkgit:git-diff[1] `--find-renames`."
+"Turn on rename detection, optionally setting the similarity threshold. This"
+" is the default. See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
#. type: Labeled list
@@ -70868,8 +70027,8 @@ msgid ""
"This resolves any number of heads, but the resulting tree of the merge is "
"always that of the current branch head, effectively ignoring all changes "
"from all other branches. It is meant to be used to supersede old "
-"development history of side branches. Note that this is different from the -"
-"Xours option to the 'recursive' merge strategy."
+"development history of side branches. Note that this is different from the "
+"-Xours option to the 'recursive' merge strategy."
msgstr ""
#. type: Labeled list
@@ -70961,93 +70120,98 @@ msgstr "diff"
#. type: Plain text
#: en/mergetools-merge.txt:12
+msgid "guiffy"
+msgstr ""
+
+#. type: Plain text
+#: en/mergetools-merge.txt:13
#, fuzzy
#| msgid "diff"
msgid "gvimdiff"
msgstr "diff"
#. type: Plain text
-#: en/mergetools-merge.txt:13
+#: en/mergetools-merge.txt:14
#, fuzzy
#| msgid "diff"
msgid "gvimdiff2"
msgstr "diff"
#. type: Plain text
-#: en/mergetools-merge.txt:14
+#: en/mergetools-merge.txt:15
#, fuzzy
#| msgid "diff"
msgid "gvimdiff3"
msgstr "diff"
#. type: Plain text
-#: en/mergetools-merge.txt:15
+#: en/mergetools-merge.txt:16
#, fuzzy
#| msgid "diff"
msgid "kdiff3"
msgstr "diff"
#. type: Plain text
-#: en/mergetools-merge.txt:16
+#: en/mergetools-merge.txt:17
msgid "meld"
msgstr ""
#. type: Plain text
-#: en/mergetools-merge.txt:17
+#: en/mergetools-merge.txt:18
#, fuzzy
#| msgid "diff"
msgid "opendiff"
msgstr "diff"
#. type: Plain text
-#: en/mergetools-merge.txt:18
+#: en/mergetools-merge.txt:19
#, fuzzy
#| msgid "--merged"
msgid "p4merge"
msgstr "--merged"
#. type: Plain text
-#: en/mergetools-merge.txt:19
+#: en/mergetools-merge.txt:20
#, fuzzy
#| msgid "diff"
msgid "tkdiff"
msgstr "diff"
#. type: Plain text
-#: en/mergetools-merge.txt:20
+#: en/mergetools-merge.txt:21
msgid "tortoisemerge"
msgstr ""
#. type: Plain text
-#: en/mergetools-merge.txt:21
+#: en/mergetools-merge.txt:22
#, fuzzy
#| msgid "diff"
msgid "vimdiff"
msgstr "diff"
#. type: Plain text
-#: en/mergetools-merge.txt:22
+#: en/mergetools-merge.txt:23
#, fuzzy
#| msgid "diff"
msgid "vimdiff2"
msgstr "diff"
#. type: Plain text
-#: en/mergetools-merge.txt:23
+#: en/mergetools-merge.txt:24
#, fuzzy
#| msgid "diff"
msgid "vimdiff3"
msgstr "diff"
#. type: Plain text
-#: en/mergetools-merge.txt:24
+#: en/mergetools-merge.txt:25
#, fuzzy
#| msgid "--no-merged"
msgid "winmerge"
msgstr "--no-merged"
#. type: Plain text
-#: en/mergetools-merge.txt:24
+#: en/mergetools-merge.txt:25
#, fuzzy
#| msgid "diff"
msgid "xxdiff"
@@ -71062,10 +70226,10 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:13
msgid ""
-"If the commit is a merge, and if the pretty-format is not 'oneline', 'email' "
-"or 'raw', an additional line is inserted before the 'Author:' line. This "
-"line begins with \"Merge: \" and the sha1s of ancestral commits are printed, "
-"separated by spaces. Note that the listed commits may not necessarily be "
+"If the commit is a merge, and if the pretty-format is not 'oneline', 'email'"
+" or 'raw', an additional line is inserted before the 'Author:' line. This "
+"line begins with \"Merge: \" and the sha1s of ancestral commits are printed,"
+" separated by spaces. Note that the listed commits may not necessarily be "
"the list of the *direct* parent commits if you have limited your view of "
"history: for example, if you are only interested in changes related to a "
"certain directory or file."
@@ -71074,8 +70238,8 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:20
msgid ""
-"There are several built-in formats, and you can define additional formats by "
-"setting a pretty.<name> config option to either another format name, or a "
+"There are several built-in formats, and you can define additional formats by"
+" setting a pretty.<name> config option to either another format name, or a "
"'format:' string, as described below (see linkgit:git-config[1]). Here are "
"the details of the built-in formats:"
msgstr ""
@@ -71132,7 +70296,6 @@ msgid ""
"Date: <author date>\n"
msgstr ""
-#
#. type: Plain text
#: en/pretty-formats.txt:43 en/pretty-formats.txt:53 en/pretty-formats.txt:65
#: en/pretty-formats.txt:74
@@ -71195,8 +70358,8 @@ msgstr ""
#: en/pretty-formats.txt:86
msgid ""
"The 'raw' format shows the entire commit exactly as stored in the commit "
-"object. Notably, the SHA-1s are displayed in full, regardless of whether --"
-"abbrev or --no-abbrev are used, and 'parents' information show the true "
+"object. Notably, the SHA-1s are displayed in full, regardless of whether "
+"--abbrev or --no-abbrev are used, and 'parents' information show the true "
"parent commits, without taking grafts or history simplification into "
"account. Note that this format affects the way commits are displayed, but "
"not the way the diff is shown e.g. with `git log --raw`. To get full object "
@@ -71423,10 +70586,10 @@ msgstr ""
#: en/pretty-formats.txt:154
msgid ""
"'%G?': 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"
+"\"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: Plain text
@@ -71512,8 +70675,8 @@ msgid ""
"\"CONFIGURATION FILE\" section of linkgit:git-config[1]; adding `auto,` at "
"the beginning will emit color only when colors are 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). `auto` alone (i.e. `"
-"%C(auto)`) will turn on auto coloring on the next placeholders until the "
+"settings of the former if we are going to a terminal). `auto` alone (i.e. "
+"`%C(auto)`) will turn on auto coloring on the next placeholders until the "
"color is switched again."
msgstr ""
@@ -71579,8 +70742,8 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:204
msgid ""
-"'%><(<N>)', '%><|(<N>)': similar to '% <(<N>)', '%<|(<N>)' respectively, but "
-"padding both sides (i.e. the text is centered) -%(trailers): display the "
+"'%><(<N>)', '%><|(<N>)': similar to '% <(<N>)', '%<|(<N>)' respectively, but"
+" padding both sides (i.e. the text is centered) -%(trailers): display the "
"trailers of the body as interpreted by linkgit:git-interpret-trailers[1]"
msgstr ""
@@ -71588,10 +70751,10 @@ msgstr ""
#: en/pretty-formats.txt:211
msgid ""
"Some placeholders may depend on other options given to the revision "
-"traversal engine. For example, the `%g*` reflog options will insert an empty "
-"string unless we are traversing reflog entries (e.g., by `git log -g`). The `"
-"%d` and `%D` placeholders will use the \"short\" decoration format if `--"
-"decorate` was not already provided on the command line."
+"traversal engine. For example, the `%g*` reflog options will insert an empty"
+" string unless we are traversing reflog entries (e.g., by `git log -g`). The"
+" `%d` and `%D` placeholders will use the \"short\" decoration format if "
+"`--decorate` was not already provided on the command line."
msgstr ""
#. type: Plain text
@@ -71606,16 +70769,16 @@ msgstr ""
#: en/pretty-formats.txt:219
msgid ""
"If you add a `-` (minus sign) after '%' of a placeholder, line-feeds that "
-"immediately precede the expansion are deleted if and only if the placeholder "
-"expands to an empty string."
+"immediately precede the expansion are deleted if and only if the placeholder"
+" expands to an empty string."
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:223
msgid ""
"If you add a ` ` (space) after '%' of a placeholder, a space is inserted "
-"immediately before the expansion if and only if the placeholder expands to a "
-"non-empty string."
+"immediately before the expansion if and only if the placeholder expands to a"
+" non-empty string."
msgstr ""
#. type: Plain text
@@ -71629,8 +70792,8 @@ msgstr "Output format"
#: en/pretty-formats.txt:233
msgid ""
"The 'tformat:' format works exactly like 'format:', except that it provides "
-"\"terminator\" semantics instead of \"separator\" semantics. In other words, "
-"each commit has the message terminator character (usually a newline) "
+"\"terminator\" semantics instead of \"separator\" semantics. In other words,"
+" each commit has the message terminator character (usually a newline) "
"appended, rather than a separator placed between entries. This means that "
"the final entry of a single-line format will be properly terminated with a "
"new line, just as the \"oneline\" format does. For example:"
@@ -71703,10 +70866,9 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:17
-#, fuzzy, no-wrap
-#| msgid "--no-abbrev"
+#, no-wrap
msgid "--abbrev-commit"
-msgstr "--no-abbrev"
+msgstr "--abbrev-commit"
#. type: Plain text
#: en/pretty-options.txt:22
@@ -71725,17 +70887,16 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:26
-#, fuzzy, no-wrap
-#| msgid "--no-abbrev"
+#, no-wrap
msgid "--no-abbrev-commit"
-msgstr "--no-abbrev"
+msgstr "--no-abbrev-commit"
#. type: Plain text
#: en/pretty-options.txt:30
msgid ""
-"Show the full 40-byte hexadecimal commit object name. This negates `--abbrev-"
-"commit` and those options which imply it such as \"--oneline\". It also "
-"overrides the `log.abbrevCommit` variable."
+"Show the full 40-byte hexadecimal commit object name. This negates "
+"`--abbrev-commit` and those options which imply it such as \"--oneline\". It"
+" also overrides the `log.abbrevCommit` variable."
msgstr ""
#. type: Plain text
@@ -71750,8 +70911,8 @@ msgid ""
"The commit objects record the encoding used for the log message in their "
"encoding header; this option can be used to tell the command to re-code the "
"commit log message in the encoding preferred by the user. For non plumbing "
-"commands this defaults to UTF-8. Note that if an object claims to be encoded "
-"in `X` and we are outputting in `X`, we will output the object verbatim; "
+"commands this defaults to UTF-8. Note that if an object claims to be encoded"
+" in `X` and we are outputting in `X`, we will output the object verbatim; "
"this means that invalid sequences in the original commit may be copied to "
"the output."
msgstr ""
@@ -71766,13 +70927,13 @@ msgstr ""
#: en/pretty-options.txt:46
#, no-wrap
msgid "--expand-tabs"
-msgstr ""
+msgstr "--expand-tabs"
#. type: Labeled list
#: en/pretty-options.txt:47
#, no-wrap
msgid "--no-expand-tabs"
-msgstr ""
+msgstr "--no-expand-tabs"
#. type: Plain text
#: en/pretty-options.txt:54
@@ -71780,8 +70941,8 @@ msgid ""
"Perform a tab expansion (replace each tab with enough spaces to fill to the "
"next display column that is multiple of '<n>') in the log message before "
"showing it in the output. `--expand-tabs` is a short-hand for `--expand-"
-"tabs=8`, and `--no-expand-tabs` is a short-hand for `--expand-tabs=0`, which "
-"disables tab expansion."
+"tabs=8`, and `--no-expand-tabs` is a short-hand for `--expand-tabs=0`, which"
+" disables tab expansion."
msgstr ""
#. type: Plain text
@@ -71802,50 +70963,49 @@ msgstr ""
msgid ""
"Show the notes (see linkgit:git-notes[1]) that annotate the commit, when "
"showing the commit log message. This is the default for `git log`, `git "
-"show` and `git whatchanged` commands when there is no `--pretty`, `--"
-"format`, or `--oneline` option given on the command line."
+"show` and `git whatchanged` commands when there is no `--pretty`, "
+"`--format`, or `--oneline` option given on the command line."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:70
msgid ""
-"By default, the notes shown are from the notes refs listed in the `core."
-"notesRef` and `notes.displayRef` variables (or corresponding environment "
-"overrides). See linkgit:git-config[1] for more details."
+"By default, the notes shown are from the notes refs listed in the "
+"`core.notesRef` and `notes.displayRef` variables (or corresponding "
+"environment overrides). See linkgit:git-config[1] for more details."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:75
msgid ""
"With an optional '<treeish>' argument, use the treeish to find the notes to "
-"display. The treeish can specify the full refname when it begins with `refs/"
-"notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` "
-"is prefixed to form a full name of the ref."
+"display. The treeish can specify the full refname when it begins with "
+"`refs/notes/`; when it begins with `notes/`, `refs/` and otherwise "
+"`refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:80
msgid ""
"Multiple --notes options can be combined to control which notes are being "
-"displayed. Examples: \"--notes=foo\" will show only notes from \"refs/notes/"
-"foo\"; \"--notes=foo --notes\" will show both notes from \"refs/notes/foo\" "
-"and from the default notes ref(s)."
+"displayed. Examples: \"--notes=foo\" will show only notes from "
+"\"refs/notes/foo\"; \"--notes=foo --notes\" will show both notes from "
+"\"refs/notes/foo\" and from the default notes ref(s)."
msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:81
-#, fuzzy, no-wrap
-#| msgid "--no-checkout"
+#, no-wrap
msgid "--no-notes"
-msgstr "--no-checkout"
+msgstr "--no-notes"
#. type: Plain text
#: en/pretty-options.txt:87
msgid ""
-"Do not show notes. This negates the above `--notes` option, by resetting the "
-"list of notes refs from which notes are shown. Options are parsed in the "
-"order given on the command line, so e.g. \"--notes --notes=foo --no-notes --"
-"notes=bar\" will only show notes from \"refs/notes/bar\"."
+"Do not show notes. This negates the above `--notes` option, by resetting the"
+" list of notes refs from which notes are shown. Options are parsed in the "
+"order given on the command line, so e.g. \"--notes --notes=foo --no-notes "
+"--notes=bar\" will only show notes from \"refs/notes/bar\"."
msgstr ""
#. type: Labeled list
@@ -71858,7 +71018,7 @@ msgstr ""
#: en/pretty-options.txt:89
#, no-wrap
msgid "--[no-]standard-notes"
-msgstr ""
+msgstr "--[no-]standard-notes"
#. type: Plain text
#: en/pretty-options.txt:92
@@ -71871,7 +71031,7 @@ msgstr ""
#: en/pretty-options.txt:94
#, no-wrap
msgid "--show-signature"
-msgstr ""
+msgstr "--show-signature"
#. type: Plain text
#: en/pretty-options.txt:96
@@ -71884,8 +71044,8 @@ msgstr ""
#: en/pull-fetch-param.txt:6
msgid ""
"The \"remote\" repository that is the source of a fetch or pull operation. "
-"This parameter can be either a URL (see the section <<URLS,GIT URLS>> below) "
-"or the name of a remote (see the section <<REMOTES,REMOTES>> below)."
+"This parameter can be either a URL (see the section <<URLS,GIT URLS>> below)"
+" or the name of a remote (see the section <<REMOTES,REMOTES>> below)."
msgstr ""
#. type: Labeled list
@@ -71894,21 +71054,19 @@ msgstr ""
msgid "<group>"
msgstr ""
-#
#. type: Plain text
#: en/pull-fetch-param.txt:12
#, fuzzy
#| msgid ""
#| "The remote configuration is achieved using the `remote.origin.url` and "
-#| "`remote.origin.fetch` configuration variables. (See linkgit:git-"
-#| "config[1])."
+#| "`remote.origin.fetch` configuration variables. (See linkgit:git-config[1])."
msgid ""
"A name referring to a list of repositories as the value of remotes.<group> "
"in the configuration file. (See linkgit:git-config[1])."
msgstr ""
"The remote configuration is achieved using the `remote.origin.url` and "
-"`remote.origin.fetch` configuration variables. (See linkgit:git-"
-"config[1]). Die Konfiguration entfernter Repositories wird durch die "
+"`remote.origin.fetch` configuration variables. (See linkgit:git-config[1])."
+" Die Konfiguration entfernter Repositories wird durch die "
"Konfigurationsvariablen `remote.origin.url` und `remote.origin.fetch` "
"erreicht. (Siehe linkgit:git-config[1])."
@@ -71932,7 +71090,6 @@ msgstr ""
msgid "\t(see <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> below).\n"
msgstr ""
-#
#. type: Plain text
#: en/pull-fetch-param.txt:23
#, fuzzy, no-wrap
@@ -71943,24 +71100,24 @@ msgstr "linkgit:git-add[1]"
#. type: Plain text
#: en/pull-fetch-param.txt:29
msgid ""
-"The format of a <refspec> parameter is an optional plus `+`, followed by the "
-"source ref <src>, followed by a colon `:`, followed by the destination ref "
+"The format of a <refspec> parameter is an optional plus `+`, followed by the"
+" source ref <src>, followed by a colon `:`, followed by the destination ref "
"<dst>. The colon can be omitted when <dst> is empty."
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:32
msgid ""
-"`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`; it requests "
-"fetching everything up to the given tag."
+"`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`; it requests"
+" fetching everything up to the given tag."
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:39
msgid ""
"The remote ref that matches <src> is fetched, and if <dst> is not empty "
-"string, the local ref that matches it is fast-forwarded using <src>. If the "
-"optional plus `+` is used, the local ref is updated even if it does not "
+"string, the local ref that matches it is fast-forwarded using <src>. If the"
+" optional plus `+` is used, the local ref is updated even if it does not "
"result in a fast-forward update."
msgstr ""
@@ -71985,8 +71142,8 @@ msgid ""
"in your configuration for a <repository> and running a 'git pull' command "
"without any explicit <refspec> parameters. <refspec>s listed explicitly on "
"the command line are always merged into the current branch after fetching. "
-"In other words, if you list more than one remote ref, 'git pull' will create "
-"an Octopus merge. On the other hand, if you do not list any explicit "
+"In other words, if you list more than one remote ref, 'git pull' will create"
+" an Octopus merge. On the other hand, if you do not list any explicit "
"<refspec> parameter on the command line, 'git pull' will fetch all the "
"<refspec>s it finds in the `remote.<repository>.fetch` configuration and "
"merge only the first <refspec> found into the current branch. This is "
@@ -72050,10 +71207,10 @@ msgstr ""
#: en/revisions.txt:29
msgid ""
"A symbolic ref name. E.g. 'master' typically means the commit object "
-"referenced by 'refs/heads/master'. If you happen to have both 'heads/"
-"master' and 'tags/master', you can explicitly say 'heads/master' to tell Git "
-"which one you mean. When ambiguous, a '<refname>' is disambiguated by "
-"taking the first match in the following rules:"
+"referenced by 'refs/heads/master'. If you happen to have both "
+"'heads/master' and 'tags/master', you can explicitly say 'heads/master' to "
+"tell Git which one you mean. When ambiguous, a '<refname>' is disambiguated"
+" by taking the first match in the following rules:"
msgstr ""
#. type: Plain text
@@ -72092,12 +71249,12 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:55
msgid ""
-"`HEAD` names the commit on which you based the changes in the working tree. "
-"`FETCH_HEAD` records the branch which you fetched from a remote repository "
-"with your last `git fetch` invocation. `ORIG_HEAD` is created by commands "
-"that move your `HEAD` in a drastic way, to record the position of the `HEAD` "
-"before their operation, so that you can easily change the tip of the branch "
-"back to the state before you ran them. `MERGE_HEAD` records the commit(s) "
+"`HEAD` names the commit on which you based the changes in the working tree."
+" `FETCH_HEAD` records the branch which you fetched from a remote repository"
+" with your last `git fetch` invocation. `ORIG_HEAD` is created by commands "
+"that move your `HEAD` in a drastic way, to record the position of the `HEAD`"
+" before their operation, so that you can easily change the tip of the branch"
+" back to the state before you ran them. `MERGE_HEAD` records the commit(s) "
"which you are merging into your branch when you run `git merge`. "
"`CHERRY_PICK_HEAD` records the commit which you are cherry-picking when you "
"run `git cherry-pick`."
@@ -72106,10 +71263,10 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:60
msgid ""
-"Note that any of the 'refs/*' cases above may come either from the '$GIT_DIR/"
-"refs' directory or from the '$GIT_DIR/packed-refs' file. While the ref name "
-"encoding is unspecified, UTF-8 is preferred as some output processing may "
-"assume ref names in UTF-8."
+"Note that any of the 'refs/*' cases above may come either from the "
+"'$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file. While "
+"the ref name encoding is unspecified, UTF-8 is preferred as some output "
+"processing may assume ref names in UTF-8."
msgstr ""
#. type: Labeled list
@@ -72126,20 +71283,21 @@ msgstr ""
#. type: Labeled list
#: en/revisions.txt:64
#, no-wrap
-msgid "'<refname>@{<date>}', e.g. 'master@\\{yesterday\\}', 'HEAD@{5 minutes ago}'"
+msgid ""
+"'<refname>@{<date>}', e.g. 'master@\\{yesterday\\}', 'HEAD@{5 minutes ago}'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:75
msgid ""
"A ref followed by the suffix '@' with a date specification enclosed in a "
-"brace pair (e.g. '\\{yesterday\\}', '{1 month 2 weeks 3 days 1 hour 1 second "
-"ago}' or '{1979-02-26 18:30:00}') specifies the value of the ref at a prior "
-"point in time. This suffix may only be used immediately following a ref "
+"brace pair (e.g. '\\{yesterday\\}', '{1 month 2 weeks 3 days 1 hour 1 second"
+" ago}' or '{1979-02-26 18:30:00}') specifies the value of the ref at a prior"
+" point in time. This suffix may only be used immediately following a ref "
"name and the ref must have an existing log ('$GIT_DIR/logs/<ref>'). Note "
-"that this looks up the state of your *local* ref at a given time; e.g., what "
-"was in your local 'master' branch last week. If you want to look at commits "
-"made during certain times, see `--since` and `--until`."
+"that this looks up the state of your *local* ref at a given time; e.g., what"
+" was in your local 'master' branch last week. If you want to look at commits"
+" made during certain times, see `--since` and `--until`."
msgstr ""
#. type: Labeled list
@@ -72151,8 +71309,8 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:84
msgid ""
-"A ref followed by the suffix '@' with an ordinal specification enclosed in a "
-"brace pair (e.g. '\\{1\\}', '\\{15\\}') specifies the n-th prior value of "
+"A ref followed by the suffix '@' with an ordinal specification enclosed in a"
+" brace pair (e.g. '\\{1\\}', '\\{15\\}') specifies the n-th prior value of "
"that ref. For example 'master@\\{1\\}' is the immediate prior value of "
"'master' while 'master@\\{5\\}' is the 5th prior value of 'master'. This "
"suffix may only be used immediately following a ref name and the ref must "
@@ -72169,8 +71327,8 @@ msgstr ""
#: en/revisions.txt:89
msgid ""
"You can use the '@' construct with an empty ref part to get at a reflog "
-"entry of the current branch. For example, if you are on branch 'blabla' then "
-"'@\\{1\\}' means the same as 'blabla@\\{1\\}'."
+"entry of the current branch. For example, if you are on branch 'blabla' then"
+" '@\\{1\\}' means the same as 'blabla@\\{1\\}'."
msgstr ""
#. type: Labeled list
@@ -72182,8 +71340,8 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:93
msgid ""
-"The construct '@{-<n>}' means the <n>th branch/commit checked out before the "
-"current one."
+"The construct '@{-<n>}' means the <n>th branch/commit checked out before the"
+" current one."
msgstr ""
#. type: Labeled list
@@ -72195,10 +71353,11 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:100
msgid ""
-"The suffix '@\\{upstream\\}' to a branchname (short form '<branchname>@\\{u"
-"\\}') refers to the branch that the branch specified by branchname is set "
-"to build on top of (configured with `branch.<name>.remote` and `branch."
-"<name>.merge`). A missing branchname defaults to the current one."
+"The suffix '@\\{upstream\\}' to a branchname (short form "
+"'<branchname>@\\{u\\}') refers to the branch that the branch specified by "
+"branchname is set to build on top of (configured with `branch.<name>.remote`"
+" and `branch.<name>.merge`). A missing branchname defaults to the current "
+"one."
msgstr ""
#. type: Labeled list
@@ -72210,9 +71369,9 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:107
msgid ""
-"The suffix '@\\{push}' reports the branch \"where we would push to\" if `git "
-"push` were run while `branchname` was checked out (or the current `HEAD` if "
-"no branchname is specified). Since our push destination is in a remote "
+"The suffix '@\\{push}' reports the branch \"where we would push to\" if `git"
+" push` were run while `branchname` was checked out (or the current `HEAD` if"
+" no branchname is specified). Since our push destination is in a remote "
"repository, of course, we report the local tracking branch that corresponds "
"to that branch (i.e., something in 'refs/remotes/')."
msgstr ""
@@ -72250,9 +71409,9 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:125
msgid ""
-"Note in the example that we set up a triangular workflow, where we pull from "
-"one location and push to another. In a non-triangular workflow, '@\\{push}' "
-"is the same as '@\\{upstream}', and there is no need for it."
+"Note in the example that we set up a triangular workflow, where we pull from"
+" one location and push to another. In a non-triangular workflow, '@\\{push}'"
+" is the same as '@\\{upstream}', and there is no need for it."
msgstr ""
#. type: Labeled list
@@ -72265,8 +71424,8 @@ msgstr ""
#: en/revisions.txt:133
msgid ""
"A suffix '{caret}' to a revision parameter means the first parent of that "
-"commit object. '{caret}<n>' means the <n>th parent (i.e. '<rev>{caret}' is "
-"equivalent to '<rev>{caret}1'). As a special rule, '<rev>{caret}0' means "
+"commit object. '{caret}<n>' means the <n>th parent (i.e. '<rev>{caret}' is"
+" equivalent to '<rev>{caret}1'). As a special rule, '<rev>{caret}0' means "
"the commit itself and is used when '<rev>' is the object name of a tag "
"object that refers to a commit object."
msgstr ""
@@ -72282,9 +71441,10 @@ msgstr ""
msgid ""
"A suffix '{tilde}<n>' to a revision parameter means the commit object that "
"is the <n>th generation ancestor of the named commit object, following only "
-"the first parents. I.e. '<rev>{tilde}3' is equivalent to '<rev>{caret}"
-"{caret}{caret}' which is equivalent to '<rev>{caret}1{caret}1{caret}1'. See "
-"below for an illustration of the usage of this form."
+"the first parents. I.e. '<rev>{tilde}3' is equivalent to "
+"'<rev>{caret}{caret}{caret}' which is equivalent to "
+"'<rev>{caret}1{caret}1{caret}1'. See below for an illustration of the usage"
+" of this form."
msgstr ""
#. type: Labeled list
@@ -72299,17 +71459,18 @@ msgid ""
"A suffix '{caret}' followed by an object type name enclosed in brace pair "
"means dereference the object at '<rev>' recursively until an object of type "
"'<type>' is found or the object cannot be dereferenced anymore (in which "
-"case, barf). For example, if '<rev>' is a commit-ish, '<rev>{caret}\\{commit"
-"\\}' describes the corresponding commit object. Similarly, if '<rev>' is a "
-"tree-ish, '<rev>{caret}\\{tree\\}' describes the corresponding tree object. "
-"'<rev>{caret}0' is a short-hand for '<rev>{caret}\\{commit\\}'."
+"case, barf). For example, if '<rev>' is a commit-ish, "
+"'<rev>{caret}\\{commit\\}' describes the corresponding commit object. "
+"Similarly, if '<rev>' is a tree-ish, '<rev>{caret}\\{tree\\}' describes the "
+"corresponding tree object. '<rev>{caret}0' is a short-hand for "
+"'<rev>{caret}\\{commit\\}'."
msgstr ""
#. type: Plain text
#: en/revisions.txt:158
msgid ""
-"'rev{caret}\\{object\\}' can be used to make sure 'rev' names an object that "
-"exists, without requiring 'rev' to be a tag, and without dereferencing "
+"'rev{caret}\\{object\\}' can be used to make sure 'rev' names an object that"
+" exists, without requiring 'rev' to be a tag, and without dereferencing "
"'rev'; because a tag is already an object, it does not have to be "
"dereferenced even once to get to an object."
msgstr ""
@@ -72330,8 +71491,8 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:167
msgid ""
-"A suffix '{caret}' followed by an empty brace pair means the object could be "
-"a tag, and dereference the tag recursively until a non-tag object is found."
+"A suffix '{caret}' followed by an empty brace pair means the object could be"
+" a tag, and dereference the tag recursively until a non-tag object is found."
msgstr ""
#. type: Labeled list
@@ -72345,8 +71506,8 @@ msgstr ""
msgid ""
"A suffix '{caret}' to a revision parameter, followed by a brace pair that "
"contains a text led by a slash, is the same as the ':/fix nasty bug' syntax "
-"below except that it returns the youngest matching commit which is reachable "
-"from the '<rev>' before '{caret}'."
+"below except that it returns the youngest matching commit which is reachable"
+" from the '<rev>' before '{caret}'."
msgstr ""
#. type: Labeled list
@@ -72364,8 +71525,8 @@ msgid ""
"expression can match any part of the commit message. To match messages "
"starting with a string, one can use e.g. ':/^foo'. The special sequence "
"':/!' is reserved for modifiers to what is matched. ':/!-foo' performs a "
-"negative match, while ':/!!foo' matches a literal '!' character, followed by "
-"'foo'. Any other sequence beginning with ':/!' is reserved for now."
+"negative match, while ':/!!foo' matches a literal '!' character, followed by"
+" 'foo'. Any other sequence beginning with ':/!' is reserved for now."
msgstr ""
#. type: Labeled list
@@ -72380,11 +71541,11 @@ msgid ""
"A suffix ':' followed by a path names the blob or tree at the given path in "
"the tree-ish object named by the part before the colon. ':path' (with an "
"empty part before the colon) is a special case of the syntax described "
-"next: content recorded in the index at the given path. A path starting with "
-"'./' or '../' is relative to the current working directory. The given path "
-"will be converted to be relative to the working tree's root directory. This "
-"is most useful to address a blob or tree from a commit or tree that has the "
-"same tree structure as the working tree."
+"next: content recorded in the index at the given path. A path starting with"
+" './' or '../' is relative to the current working directory. The given path"
+" will be converted to be relative to the working tree's root directory. "
+"This is most useful to address a blob or tree from a commit or tree that has"
+" the same tree structure as the working tree."
msgstr ""
#. type: Labeled list
@@ -72454,8 +71615,8 @@ msgstr ""
#: en/revisions.txt:246
msgid ""
"For these commands, specifying a single revision, using the notation "
-"described in the previous section, means the set of commits `reachable` from "
-"the given commit."
+"described in the previous section, means the set of commits `reachable` from"
+" the given commit."
msgstr ""
#. type: Plain text
@@ -72481,8 +71642,8 @@ msgstr ""
#: en/revisions.txt:259
msgid ""
"To exclude commits reachable from a commit, a prefix '{caret}' notation is "
-"used. E.g. '{caret}r1 r2' means commits reachable from 'r2' but exclude the "
-"ones reachable from 'r1' (i.e. 'r1' and its ancestors)."
+"used. E.g. '{caret}r1 r2' means commits reachable from 'r2' but exclude the"
+" ones reachable from 'r1' (i.e. 'r1' and its ancestors)."
msgstr ""
#. type: Title ~
@@ -72518,19 +71679,19 @@ msgstr ""
msgid ""
"A similar notation 'r1\\...r2' is called symmetric difference of 'r1' and "
"'r2' and is defined as 'r1 r2 --not $(git merge-base --all r1 r2)'. It is "
-"the set of commits that are reachable from either one of 'r1' (left side) or "
-"'r2' (right side) but not from both."
+"the set of commits that are reachable from either one of 'r1' (left side) or"
+" 'r2' (right side) but not from both."
msgstr ""
#. type: Plain text
#: en/revisions.txt:283
msgid ""
-"In these two shorthand notations, you can omit one end and let it default to "
-"HEAD. For example, 'origin..' is a shorthand for 'origin..HEAD' and asks "
-"\"What did I do since I forked from the origin branch?\" Similarly, '.."
-"origin' is a shorthand for 'HEAD..origin' and asks \"What did the origin do "
-"since I forked from them?\" Note that '..' would mean 'HEAD..HEAD' which is "
-"an empty range that is both reachable and unreachable from HEAD."
+"In these two shorthand notations, you can omit one end and let it default to"
+" HEAD. For example, 'origin..' is a shorthand for 'origin..HEAD' and asks "
+"\"What did I do since I forked from the origin branch?\" Similarly, "
+"'..origin' is a shorthand for 'HEAD..origin' and asks \"What did the origin "
+"do since I forked from them?\" Note that '..' would mean 'HEAD..HEAD' which "
+"is an empty range that is both reachable and unreachable from HEAD."
msgstr ""
#. type: Title ~
@@ -72564,8 +71725,8 @@ msgid ""
"The '<rev>{caret}-{<n>}' notation includes '<rev>' but excludes the <n>th "
"parent (i.e. a shorthand for '<rev>{caret}<n>..<rev>'), with '<n>' = 1 if "
"not given. This is typically useful for merge commits where you can just "
-"pass '<commit>{caret}-' to get all the commits in the branch that was merged "
-"in merge commit '<commit>' (including '<commit>' itself)."
+"pass '<commit>{caret}-' to get all the commits in the branch that was merged"
+" in merge commit '<commit>' (including '<commit>' itself)."
msgstr ""
#. type: Plain text
@@ -72591,7 +71752,8 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:311
msgid ""
-"Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
+"Include commits that are reachable from <rev> (i.e. <rev> and its "
+"ancestors)."
msgstr ""
#. type: Labeled list
@@ -72603,7 +71765,8 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:315
msgid ""
-"Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
+"Exclude commits that are reachable from <rev> (i.e. <rev> and its "
+"ancestors)."
msgstr ""
#. type: Labeled list
@@ -72616,8 +71779,8 @@ msgstr ""
#: en/revisions.txt:320
msgid ""
"Include commits that are reachable from <rev2> but exclude those that are "
-"reachable from <rev1>. When either <rev1> or <rev2> is omitted, it defaults "
-"to `HEAD`."
+"reachable from <rev1>. When either <rev1> or <rev2> is omitted, it defaults"
+" to `HEAD`."
msgstr ""
#. type: Labeled list
@@ -72643,8 +71806,8 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:330
msgid ""
-"A suffix '{caret}' followed by an at sign is the same as listing all parents "
-"of '<rev>' (meaning, include anything reachable from its parents, but not "
+"A suffix '{caret}' followed by an at sign is the same as listing all parents"
+" of '<rev>' (meaning, include anything reachable from its parents, but not "
"the commit itself)."
msgstr ""
@@ -72725,10 +71888,10 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:12
msgid ""
-"Using more options generally further limits the output (e.g. `--"
-"since=<date1>` limits to commits newer than `<date1>`, and using it with `--"
-"grep=<pattern>` further limits to commits whose log message has a line that "
-"matches `<pattern>`), unless otherwise noted."
+"Using more options generally further limits the output (e.g. "
+"`--since=<date1>` limits to commits newer than `<date1>`, and using it with "
+"`--grep=<pattern>` further limits to commits whose log message has a line "
+"that matches `<pattern>`), unless otherwise noted."
msgstr ""
#. type: Plain text
@@ -72757,7 +71920,6 @@ msgstr "--origin <name>"
msgid "--max-count=<number>"
msgstr ""
-#
#. type: Plain text
#: en/rev-list-options.txt:22
#, fuzzy
@@ -72788,7 +71950,6 @@ msgstr ""
msgid "--after=<date>"
msgstr ""
-#
#. type: Plain text
#: en/rev-list-options.txt:29
#, fuzzy
@@ -72809,7 +71970,6 @@ msgstr "--update"
msgid "--before=<date>"
msgstr ""
-#
#. type: Plain text
#: en/rev-list-options.txt:33
#, fuzzy
@@ -72853,9 +72013,9 @@ msgstr ""
#: en/rev-list-options.txt:47
msgid ""
"Limit the commits output to ones with author/committer header lines that "
-"match the specified pattern (regular expression). With more than one `--"
-"author=<pattern>`, commits whose author matches any of the given patterns "
-"are chosen (similarly for multiple `--committer=<pattern>`)."
+"match the specified pattern (regular expression). With more than one "
+"`--author=<pattern>`, commits whose author matches any of the given patterns"
+" are chosen (similarly for multiple `--committer=<pattern>`)."
msgstr ""
#. type: Labeled list
@@ -72882,8 +72042,8 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:61
msgid ""
-"Limit the commits output to ones with log message that matches the specified "
-"pattern (regular expression). With more than one `--grep=<pattern>`, "
+"Limit the commits output to ones with log message that matches the specified"
+" pattern (regular expression). With more than one `--grep=<pattern>`, "
"commits whose message matches any of the given patterns are chosen (but see "
"`--all-match`)."
msgstr ""
@@ -72904,10 +72064,9 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:71
-#, fuzzy, no-wrap
-#| msgid "--interactive"
+#, no-wrap
msgid "--invert-grep"
-msgstr "--interactive"
+msgstr "--invert-grep"
#. type: Plain text
#: en/rev-list-options.txt:74
@@ -72920,12 +72079,13 @@ msgstr ""
#: en/rev-list-options.txt:76
#, no-wrap
msgid "--regexp-ignore-case"
-msgstr ""
+msgstr "--regexp-ignore-case"
#. type: Plain text
#: en/rev-list-options.txt:79
msgid ""
-"Match the regular expression limiting patterns without regard to letter case."
+"Match the regular expression limiting patterns without regard to letter "
+"case."
msgstr ""
#. type: Plain text
@@ -72938,8 +72098,8 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:88
msgid ""
-"Consider the limiting patterns to be extended regular expressions instead of "
-"the default basic regular expressions."
+"Consider the limiting patterns to be extended regular expressions instead of"
+" the default basic regular expressions."
msgstr ""
#. type: Plain text
@@ -72958,10 +72118,9 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:98
-#, fuzzy, no-wrap
-#| msgid "--remove-section"
+#, no-wrap
msgid "--remove-empty"
-msgstr "--remove-section"
+msgstr "--remove-empty"
#. type: Plain text
#: en/rev-list-options.txt:100
@@ -72970,10 +72129,9 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:101
-#, fuzzy, no-wrap
-#| msgid "--merged"
+#, no-wrap
msgid "--merges"
-msgstr "--merged"
+msgstr "--merges"
#. type: Plain text
#: en/rev-list-options.txt:103
@@ -72983,10 +72141,9 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:104
-#, fuzzy, no-wrap
-#| msgid "--no-merged"
+#, no-wrap
msgid "--no-merges"
-msgstr "--no-merged"
+msgstr "--no-merges"
#. type: Plain text
#: en/rev-list-options.txt:107
@@ -73009,23 +72166,21 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:110
-#, fuzzy, no-wrap
-#| msgid "--no-hardlinks"
+#, no-wrap
msgid "--no-min-parents"
-msgstr "--no-hardlinks"
+msgstr "--no-min-parents"
#. type: Labeled list
#: en/rev-list-options.txt:111
-#, fuzzy, no-wrap
-#| msgid "--no-hardlinks"
+#, no-wrap
msgid "--no-max-parents"
-msgstr "--no-hardlinks"
+msgstr "--no-max-parents"
#. type: Plain text
#: en/rev-list-options.txt:116
msgid ""
-"Show only commits which have at least (or at most) that many parent commits. "
-"In particular, `--max-parents=1` is the same as `--no-merges`, `--min-"
+"Show only commits which have at least (or at most) that many parent commits."
+" In particular, `--max-parents=1` is the same as `--no-merges`, `--min-"
"parents=2` is the same as `--merges`. `--max-parents=0` gives all root "
"commits and `--min-parents=3` all octopus merges."
msgstr ""
@@ -73041,12 +72196,12 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:130
msgid ""
-"Follow only the first parent commit upon seeing a merge commit. This option "
-"can give a better overview when viewing the evolution of a particular topic "
-"branch, because merges into a topic branch tend to be only about adjusting "
+"Follow only the first parent commit upon seeing a merge commit. This option"
+" can give a better overview when viewing the evolution of a particular topic"
+" branch, because merges into a topic branch tend to be only about adjusting "
"to updated upstream from time to time, and this option allows you to ignore "
-"the individual commits brought in to your history by such a merge. Cannot be "
-"combined with --bisect."
+"the individual commits brought in to your history by such a merge. Cannot be"
+" combined with --bisect."
msgstr ""
#. type: Plain text
@@ -73072,10 +72227,10 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:144
msgid ""
-"Pretend as if all the refs in `refs/heads` are listed on the command line as "
-"'<commit>'. If '<pattern>' is given, limit branches to ones matching given "
-"shell glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the "
-"end is implied."
+"Pretend as if all the refs in `refs/heads` are listed on the command line as"
+" '<commit>'. If '<pattern>' is given, limit branches to ones matching given "
+"shell glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the"
+" end is implied."
msgstr ""
#. type: Labeled list
@@ -73088,8 +72243,8 @@ msgstr ""
#: en/rev-list-options.txt:150
msgid ""
"Pretend as if all the refs in `refs/tags` are listed on the command line as "
-"'<commit>'. If '<pattern>' is given, limit tags to ones matching given shell "
-"glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end "
+"'<commit>'. If '<pattern>' is given, limit tags to ones matching given shell"
+" glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end "
"is implied."
msgstr ""
@@ -73104,8 +72259,8 @@ msgstr ""
msgid ""
"Pretend as if all the refs in `refs/remotes` are listed on the command line "
"as '<commit>'. If '<pattern>' is given, limit remote-tracking branches to "
-"ones matching given shell glob. If pattern lacks '?', '{asterisk}', or '[', "
-"'/{asterisk}' at the end is implied."
+"ones matching given shell glob. If pattern lacks '?', '{asterisk}', or '[',"
+" '/{asterisk}' at the end is implied."
msgstr ""
#. type: Labeled list
@@ -73119,15 +72274,15 @@ msgstr ""
msgid ""
"Pretend as if all the refs matching shell glob '<glob-pattern>' are listed "
"on the command line as '<commit>'. Leading 'refs/', is automatically "
-"prepended if missing. If pattern lacks '?', '{asterisk}', or '[', '/"
-"{asterisk}' at the end is implied."
+"prepended if missing. If pattern lacks '?', '{asterisk}', or '[', "
+"'/{asterisk}' at the end is implied."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:178
#, no-wrap
msgid "--reflog"
-msgstr ""
+msgstr "--reflog"
#. type: Plain text
#: en/rev-list-options.txt:181
@@ -73139,15 +72294,15 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:185
msgid ""
-"Upon seeing an invalid object name in the input, pretend as if the bad input "
-"was not given."
+"Upon seeing an invalid object name in the input, pretend as if the bad input"
+" was not given."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:187 en/rev-list-options.txt:569
#, no-wrap
msgid "--bisect"
-msgstr ""
+msgstr "--bisect"
#. type: Plain text
#: en/rev-list-options.txt:192
@@ -73160,9 +72315,9 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:199
msgid ""
-"In addition to the '<commit>' listed on the command line, read them from the "
-"standard input. If a `--` separator is seen, stop reading commits and start "
-"reading paths to limit the result."
+"In addition to the '<commit>' listed on the command line, read them from the"
+" standard input. If a `--` separator is seen, stop reading commits and start"
+" reading paths to limit the result."
msgstr ""
#. type: Plain text
@@ -73170,34 +72325,35 @@ msgstr ""
msgid ""
"Don't print anything to standard output. This form is primarily meant to "
"allow the caller to test the exit status to see if a range of objects is "
-"fully connected (or not). It is faster than redirecting stdout to `/dev/"
-"null` as the output does not have to be formatted."
+"fully connected (or not). It is faster than redirecting stdout to "
+"`/dev/null` as the output does not have to be formatted."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:209
#, no-wrap
msgid "--cherry-mark"
-msgstr ""
+msgstr "--cherry-mark"
#. type: Plain text
#: en/rev-list-options.txt:212
msgid ""
-"Like `--cherry-pick` (see below) but mark equivalent commits with `=` rather "
-"than omitting them, and inequivalent ones with `+`."
+"Like `--cherry-pick` (see below) but mark equivalent commits with `=` rather"
+" than omitting them, and inequivalent ones with `+`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:213
#, no-wrap
msgid "--cherry-pick"
-msgstr ""
+msgstr "--cherry-pick"
#. type: Plain text
#: en/rev-list-options.txt:217
msgid ""
"Omit any commit that introduces the same change as another commit on the "
-"``other side'' when the set of commits are limited with symmetric difference."
+"``other side'' when the set of commits are limited with symmetric "
+"difference."
msgstr ""
#. type: Plain text
@@ -73213,17 +72369,15 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:226
-#, fuzzy, no-wrap
-#| msgid "--only"
+#, no-wrap
msgid "--left-only"
-msgstr "--only"
+msgstr "--left-only"
#. type: Labeled list
#: en/rev-list-options.txt:227
-#, fuzzy, no-wrap
-#| msgid "--only"
+#, no-wrap
msgid "--right-only"
-msgstr "--only"
+msgstr "--right-only"
#. type: Plain text
#: en/rev-list-options.txt:231
@@ -73235,32 +72389,32 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:237
msgid ""
-"For example, `--cherry-pick --right-only A...B` omits those commits from `B` "
-"which are in `A` or are patch-equivalent to a commit in `A`. In other words, "
-"this lists the `+` commits from `git cherry A B`. More precisely, `--cherry-"
-"pick --right-only --no-merges` gives the exact list."
+"For example, `--cherry-pick --right-only A...B` omits those commits from `B`"
+" which are in `A` or are patch-equivalent to a commit in `A`. In other "
+"words, this lists the `+` commits from `git cherry A B`. More precisely, "
+"`--cherry-pick --right-only --no-merges` gives the exact list."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:238
#, no-wrap
msgid "--cherry"
-msgstr ""
+msgstr "--cherry"
#. type: Plain text
#: en/rev-list-options.txt:244
msgid ""
"A synonym for `--right-only --cherry-mark --no-merges`; useful to limit the "
"output to the commits on our side and mark those that have been applied to "
-"the other side of a forked history with `git log --cherry upstream..."
-"mybranch`, similar to `git cherry upstream mybranch`."
+"the other side of a forked history with `git log --cherry "
+"upstream...mybranch`, similar to `git cherry upstream mybranch`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:246
#, no-wrap
msgid "--walk-reflogs"
-msgstr ""
+msgstr "--walk-reflogs"
#. type: Plain text
#: en/rev-list-options.txt:252
@@ -73311,22 +72465,22 @@ msgstr ""
#: en/rev-list-options.txt:277
msgid ""
"Under `--pretty=oneline`, the commit message is prefixed with this "
-"information on the same line. This option cannot be combined with `--"
-"reverse`. See also linkgit:git-reflog[1]."
+"information on the same line. This option cannot be combined with "
+"`--reverse`. See also linkgit:git-reflog[1]."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:281
msgid ""
-"After a failed merge, show refs that touch files having a conflict and don't "
-"exist on all heads to merge."
+"After a failed merge, show refs that touch files having a conflict and don't"
+" exist on all heads to merge."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:282
#, no-wrap
msgid "--boundary"
-msgstr ""
+msgstr "--boundary"
#. type: Plain text
#: en/rev-list-options.txt:285
@@ -73338,14 +72492,14 @@ msgstr ""
#: en/rev-list-options.txt:287
#, no-wrap
msgid "--use-bitmap-index"
-msgstr ""
+msgstr "--use-bitmap-index"
#. type: Plain text
#: en/rev-list-options.txt:292
msgid ""
"Try to speed up the traversal using the pack bitmap index (if one is "
-"available). Note that when traversing with `--objects`, trees and blobs will "
-"not have their associated path printed."
+"available). Note that when traversing with `--objects`, trees and blobs will"
+" not have their associated path printed."
msgstr ""
#. type: Labeled list
@@ -73397,7 +72551,7 @@ msgstr ""
#: en/rev-list-options.txt:313
#, no-wrap
msgid "--simplify-by-decoration"
-msgstr ""
+msgstr "--simplify-by-decoration"
#. type: Plain text
#: en/rev-list-options.txt:315
@@ -73423,17 +72577,16 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:325
msgid ""
-"Simplifies the history to the simplest history explaining the final state of "
-"the tree. Simplest because it prunes some side branches if the end result is "
-"the same (i.e. merging branches with the same content)"
+"Simplifies the history to the simplest history explaining the final state of"
+" the tree. Simplest because it prunes some side branches if the end result "
+"is the same (i.e. merging branches with the same content)"
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:326
-#, fuzzy, no-wrap
-#| msgid "--full-diff"
+#, no-wrap
msgid "--full-history"
-msgstr "--full-diff"
+msgstr "--full-history"
#. type: Plain text
#: en/rev-list-options.txt:328
@@ -73444,7 +72597,7 @@ msgstr ""
#: en/rev-list-options.txt:329 en/rev-list-options.txt:462
#, no-wrap
msgid "--dense"
-msgstr ""
+msgstr "--dense"
#. type: Plain text
#: en/rev-list-options.txt:332
@@ -73461,21 +72614,21 @@ msgstr ""
#: en/rev-list-options.txt:336 en/rev-list-options.txt:473
#, no-wrap
msgid "--simplify-merges"
-msgstr ""
+msgstr "--simplify-merges"
#. type: Plain text
#: en/rev-list-options.txt:340
msgid ""
"Additional option to `--full-history` to remove some needless merges from "
-"the resulting history, as there are no selected commits contributing to this "
-"merge."
+"the resulting history, as there are no selected commits contributing to this"
+" merge."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:341 en/rev-list-options.txt:520
#, no-wrap
msgid "--ancestry-path"
-msgstr ""
+msgstr "--ancestry-path"
#. type: Plain text
#: en/rev-list-options.txt:347
@@ -73521,16 +72674,16 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:366
msgid ""
-"The horizontal line of history A---Q is taken to be the first parent of each "
-"merge. The commits are:"
+"The horizontal line of history A---Q is taken to be the first parent of each"
+" merge. The commits are:"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:370
msgid ""
-"`I` is the initial commit, in which `foo` exists with contents ``asdf'', and "
-"a file `quux` exists with contents ``quux''. Initial commits are compared to "
-"an empty tree, so `I` is !TREESAME."
+"`I` is the initial commit, in which `foo` exists with contents ``asdf'', and"
+" a file `quux` exists with contents ``quux''. Initial commits are compared "
+"to an empty tree, so `I` is !TREESAME."
msgstr ""
#. type: Plain text
@@ -73548,8 +72701,8 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:378
msgid ""
-"`C` does not change `foo`, but its merge `N` changes it to ``foobar'', so it "
-"is not TREESAME to any parent."
+"`C` does not change `foo`, but its merge `N` changes it to ``foobar'', so it"
+" is not TREESAME to any parent."
msgstr ""
#. type: Plain text
@@ -73585,10 +72738,10 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:401
msgid ""
-"Commits are included if they are not TREESAME to any parent (though this can "
-"be changed, see `--sparse` below). If the commit was a merge, and it was "
-"TREESAME to one parent, follow only that parent. (Even if there are several "
-"TREESAME parents, follow only one of them.) Otherwise, follow all parents."
+"Commits are included if they are not TREESAME to any parent (though this can"
+" be changed, see `--sparse` below). If the commit was a merge, and it was "
+"TREESAME to one parent, follow only that parent. (Even if there are several"
+" TREESAME parents, follow only one of them.) Otherwise, follow all parents."
msgstr ""
#. type: Plain text
@@ -73609,8 +72762,8 @@ msgstr ""
#: en/rev-list-options.txt:414
msgid ""
"Note how the rule to only follow the TREESAME parent, if one is available, "
-"removed `B` from consideration entirely. `C` was considered via `N`, but is "
-"TREESAME. Root commits are compared to an empty tree, so `I` is !TREESAME."
+"removed `B` from consideration entirely. `C` was considered via `N`, but is"
+" TREESAME. Root commits are compared to an empty tree, so `I` is !TREESAME."
msgstr ""
#. type: Plain text
@@ -73666,8 +72819,8 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:441
msgid ""
-"Ordinary commits are only included if they are !TREESAME (though this can be "
-"changed, see `--sparse` below)."
+"Ordinary commits are only included if they are !TREESAME (though this can be"
+" changed, see `--sparse` below)."
msgstr ""
#. type: Plain text
@@ -73814,8 +72967,8 @@ msgstr ""
#: en/rev-list-options.txt:525
msgid ""
"Limit the displayed commits to those directly on the ancestry chain between "
-"the ``from'' and ``to'' commits in the given commit range. I.e. only display "
-"commits that are ancestor of the ``to'' commit and descendants of the "
+"the ``from'' and ``to'' commits in the given commit range. I.e. only display"
+" commits that are ancestor of the ``to'' commit and descendants of the "
"``from'' commit."
msgstr ""
@@ -73888,10 +73041,10 @@ msgstr ""
#: en/rev-list-options.txt:576
msgid ""
"Limit output to the one commit object which is roughly halfway between "
-"included and excluded commits. Note that the bad bisection ref `refs/bisect/"
-"bad` is added to the included commits (if it exists) and the good bisection "
-"refs `refs/bisect/good-*` are added to the excluded commits (if they exist). "
-"Thus, supposing there are no refs in `refs/bisect/`, if"
+"included and excluded commits. Note that the bad bisection ref "
+"`refs/bisect/bad` is added to the included commits (if it exists) and the "
+"good bisection refs `refs/bisect/good-*` are added to the excluded commits "
+"(if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
@@ -73926,7 +73079,7 @@ msgstr ""
#: en/rev-list-options.txt:593
#, no-wrap
msgid "--bisect-vars"
-msgstr ""
+msgstr "--bisect-vars"
#. type: Plain text
#: en/rev-list-options.txt:604
@@ -73934,9 +73087,9 @@ msgid ""
"This calculates the same as `--bisect`, except that refs in `refs/bisect/` "
"are not used, and except that this outputs text ready to be eval'ed by the "
"shell. These lines will assign the name of the midpoint revision to the "
-"variable `bisect_rev`, and the expected number of commits to be tested after "
-"`bisect_rev` is tested to `bisect_nr`, the expected number of commits to be "
-"tested if `bisect_rev` turns out to be good to `bisect_good`, the expected "
+"variable `bisect_rev`, and the expected number of commits to be tested after"
+" `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be"
+" tested if `bisect_rev` turns out to be good to `bisect_good`, the expected "
"number of commits to be tested if `bisect_rev` turns out to be bad to "
"`bisect_bad`, and the number of commits we are bisecting right now to "
"`bisect_all`."
@@ -73944,10 +73097,9 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:605
-#, fuzzy, no-wrap
-#| msgid "--unset-all"
+#, no-wrap
msgid "--bisect-all"
-msgstr "--unset-all"
+msgstr "--bisect-all"
#. type: Plain text
#: en/rev-list-options.txt:611
@@ -73961,17 +73113,17 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:615
msgid ""
-"This is useful because it makes it easy to choose a good commit to test when "
-"you want to avoid to test some of them for some reason (they may not compile "
-"for example)."
+"This is useful because it makes it easy to choose a good commit to test when"
+" you want to avoid to test some of them for some reason (they may not "
+"compile for example)."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:619
msgid ""
"This option can be used along with `--bisect-vars`, in this case, after all "
-"the sorted commit objects, there will be the same text as if `--bisect-vars` "
-"had been used alone."
+"the sorted commit objects, there will be the same text as if `--bisect-vars`"
+" had been used alone."
msgstr ""
#. type: Title ~
@@ -73994,10 +73146,9 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:631
-#, fuzzy, no-wrap
-#| msgid "--author=<author>"
+#, no-wrap
msgid "--author-date-order"
-msgstr "--author=<author>"
+msgstr "--author-date-order"
#. type: Plain text
#: en/rev-list-options.txt:634
@@ -74031,23 +73182,23 @@ msgstr ""
#: en/rev-list-options.txt:653
msgid ""
"where the numbers denote the order of commit timestamps, `git rev-list` and "
-"friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 "
-"4 3 2 1."
+"friends with `--date-order` show the commits in the timestamp order: 8 7 6 5"
+" 4 3 2 1."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:658
msgid ""
"With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); "
-"some older commits are shown before newer ones in order to avoid showing the "
-"commits from two parallel development track mixed together."
+"some older commits are shown before newer ones in order to avoid showing the"
+" commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:663
msgid ""
-"Output the commits chosen to be shown (see Commit Limiting section above) in "
-"reverse order. Cannot be combined with `--walk-reflogs`."
+"Output the commits chosen to be shown (see Commit Limiting section above) in"
+" reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
@@ -74063,16 +73214,15 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:670
-#, fuzzy, no-wrap
-#| msgid "git-fsck-objects(1)"
+#, no-wrap
msgid "--objects"
-msgstr "git-fsck-objects(1)"
+msgstr "--objects"
#. type: Plain text
#: en/rev-list-options.txt:675
msgid ""
-"Print the object IDs of any object referenced by the listed commits. `--"
-"objects foo ^bar` thus means ``send me all object IDs which I need to "
+"Print the object IDs of any object referenced by the listed commits. "
+"`--objects foo ^bar` thus means ``send me all object IDs which I need to "
"download if I have the commit object _bar_ but not _foo_''."
msgstr ""
@@ -74080,7 +73230,7 @@ msgstr ""
#: en/rev-list-options.txt:676
#, no-wrap
msgid "--objects-edge"
-msgstr ""
+msgstr "--objects-edge"
#. type: Plain text
#: en/rev-list-options.txt:682
@@ -74095,13 +73245,13 @@ msgstr ""
#: en/rev-list-options.txt:683
#, no-wrap
msgid "--objects-edge-aggressive"
-msgstr ""
+msgstr "--objects-edge-aggressive"
#. type: Plain text
#: en/rev-list-options.txt:687
msgid ""
-"Similar to `--objects-edge`, but it tries harder to find excluded commits at "
-"the cost of increased time. This is used instead of `--objects-edge` to "
+"Similar to `--objects-edge`, but it tries harder to find excluded commits at"
+" the cost of increased time. This is used instead of `--objects-edge` to "
"build ``thin'' packs for shallow repositories."
msgstr ""
@@ -74109,7 +73259,7 @@ msgstr ""
#: en/rev-list-options.txt:688
#, no-wrap
msgid "--indexed-objects"
-msgstr ""
+msgstr "--indexed-objects"
#. type: Plain text
#: en/rev-list-options.txt:692
@@ -74137,15 +73287,15 @@ msgid ""
"no effect if a range is specified. If the argument `unsorted` is given, the "
"commits are shown in the order they were given on the command line. "
"Otherwise (if `sorted` or no argument was given), the commits are shown in "
-"reverse chronological order by commit time. Cannot be combined with `--"
-"graph`."
+"reverse chronological order by commit time. Cannot be combined with "
+"`--graph`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:707
#, no-wrap
msgid "--do-walk"
-msgstr ""
+msgstr "--do-walk"
#. type: Plain text
#: en/rev-list-options.txt:709
@@ -74168,10 +73318,9 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:721
-#, fuzzy, no-wrap
-#| msgid "--replace-all"
+#, no-wrap
msgid "--relative-date"
-msgstr "--replace-all"
+msgstr "--relative-date"
#. type: Plain text
#: en/rev-list-options.txt:723
@@ -74245,17 +73394,18 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:753
msgid ""
-"`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
+"`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` "
+"format."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:762
msgid ""
"`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 "
-"UTC), followed by a space, and then the timezone as an offset from UTC (a `"
-"+` or `-` with four digits; the first two are hours, and the second two are "
-"minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z"
-"\")`). Note that the `-local` option does not affect the seconds-since-"
+"UTC), followed by a space, and then the timezone as an offset from UTC (a "
+"`+` or `-` with four digits; the first two are hours, and the second two are"
+" minutes). I.e., as if the timestamp were formatted with `strftime(\"%s "
+"%z\")`). Note that the `-local` option does not affect the seconds-since-"
"epoch value (which is always measured in UTC), but does switch the "
"accompanying timezone value."
msgstr ""
@@ -74263,8 +73413,8 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:766
msgid ""
-"`--date=unix` shows the date as a Unix epoch timestamp (seconds since "
-"1970). As with `--raw`, this is always in UTC and therefore `-local` has no "
+"`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970)."
+" As with `--raw`, this is always in UTC and therefore `-local` has no "
"effect."
msgstr ""
@@ -74299,7 +73449,7 @@ msgstr ""
#: en/rev-list-options.txt:781
#, no-wrap
msgid "--header"
-msgstr ""
+msgstr "--header"
#. type: Plain text
#: en/rev-list-options.txt:784
@@ -74319,7 +73469,7 @@ msgstr ""
#: en/rev-list-options.txt:790
#, no-wrap
msgid "--children"
-msgstr ""
+msgstr "--children"
#. type: Plain text
#: en/rev-list-options.txt:793
@@ -74332,7 +73482,7 @@ msgstr ""
#: en/rev-list-options.txt:795
#, no-wrap
msgid "--timestamp"
-msgstr ""
+msgstr "--timestamp"
#. type: Plain text
#: en/rev-list-options.txt:797
@@ -74343,15 +73493,15 @@ msgstr ""
#: en/rev-list-options.txt:799
#, no-wrap
msgid "--left-right"
-msgstr ""
+msgstr "--left-right"
#. type: Plain text
#: en/rev-list-options.txt:804
msgid ""
"Mark which side of a symmetric difference a commit is reachable from. "
"Commits from the left side are prefixed with `<` and those from the right "
-"with `>`. If combined with `--boundary`, those commits are prefixed with `-"
-"`."
+"with `>`. If combined with `--boundary`, those commits are prefixed with "
+"`-`."
msgstr ""
#. type: Plain text
@@ -74397,13 +73547,13 @@ msgstr ""
#: en/rev-list-options.txt:828
#, no-wrap
msgid "--graph"
-msgstr ""
+msgstr "--graph"
#. type: Plain text
#: en/rev-list-options.txt:834
msgid ""
-"Draw a text-based graphical representation of the commit history on the left "
-"hand side of the output. This may cause extra lines to be printed in "
+"Draw a text-based graphical representation of the commit history on the left"
+" hand side of the output. This may cause extra lines to be printed in "
"between commits, in order for the graph history to be drawn properly. "
"Cannot be combined with `--no-walk`."
msgstr ""
@@ -74432,18 +73582,18 @@ msgid ""
"When --graph is not used, all history branches are flattened which can make "
"it hard to see that the two consecutive commits do not belong to a linear "
"branch. This option puts a barrier in between them in that case. If "
-"`<barrier>` is specified, it is the string that will be shown instead of the "
-"default one."
+"`<barrier>` is specified, it is the string that will be shown instead of the"
+" default one."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:856
msgid ""
-"Print a number stating how many commits would have been listed, and suppress "
-"all other output. When used together with `--left-right`, instead print the "
-"counts for left and right commits, separated by a tab. When used together "
-"with `--cherry-mark`, omit patch equivalent commits from these counts and "
-"print the count for equivalent commits separated by a tab."
+"Print a number stating how many commits would have been listed, and suppress"
+" all other output. When used together with `--left-right`, instead print "
+"the counts for left and right commits, separated by a tab. When used "
+"together with `--cherry-mark`, omit patch equivalent commits from these "
+"counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
@@ -74465,15 +73615,15 @@ msgstr ""
msgid ""
"With this option, diff output for a merge commit shows the differences from "
"each of the parents to the merge result simultaneously instead of showing "
-"pairwise diff between a parent and the result one at a time. Furthermore, it "
-"lists only files which were modified from all parents."
+"pairwise diff between a parent and the result one at a time. Furthermore, it"
+" lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:878
msgid ""
-"This flag implies the `-c` option and further compresses the patch output by "
-"omitting uninteresting hunks whose contents in the parents have only two "
+"This flag implies the `-c` option and further compresses the patch output by"
+" omitting uninteresting hunks whose contents in the parents have only two "
"variants and the merge result picks one of them without modification."
msgstr ""
@@ -74483,8 +73633,8 @@ msgid ""
"This flag makes the merge commits show the full diff like regular commits; "
"for each merge parent, a separate log entry and diff is generated. An "
"exception is that only diff against the first parent is shown when `--first-"
-"parent` option is given; in that case, the output represents the changes the "
-"merge brought _into_ the then-current branch."
+"parent` option is given; in that case, the output represents the changes the"
+" merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
@@ -74500,9 +73650,9 @@ msgstr ""
#. type: Plain text
#: en/sequencer.txt:5
msgid ""
-"Continue the operation in progress using the information in '.git/"
-"sequencer'. Can be used to continue after resolving conflicts in a failed "
-"cherry-pick or revert."
+"Continue the operation in progress using the information in "
+"'.git/sequencer'. Can be used to continue after resolving conflicts in a "
+"failed cherry-pick or revert."
msgstr ""
#. type: Plain text
@@ -74524,9 +73674,9 @@ msgid ""
"stealing data from the other repository that was not intended to be shared. "
"If you have private data that you need to protect from a malicious peer, "
"your best option is to store it in another repository. This applies to both "
-"clients and servers. In particular, namespaces on a server are not effective "
-"for read access control; you should only grant read access to a namespace to "
-"clients that you would trust with read access to the entire repository."
+"clients and servers. In particular, namespaces on a server are not effective"
+" for read access control; you should only grant read access to a namespace "
+"to clients that you would trust with read access to the entire repository."
msgstr ""
#. type: Plain text
@@ -74541,8 +73691,8 @@ msgid ""
"are not explicitly intended to be shared but can be used to optimize the "
"transfer if the peer also has them. The attacker chooses an object ID X to "
"steal and sends a ref to X, but isn't required to send the content of X "
-"because the victim already has it. Now the victim believes that the attacker "
-"has X, and it sends the content of X back to the attacker later. (This "
+"because the victim already has it. Now the victim believes that the attacker"
+" has X, and it sends the content of X back to the attacker later. (This "
"attack is most straightforward for a client to perform on a server, by "
"creating a ref to X in the namespace the client has access to and then "
"fetching it. The most likely way for a server to perform it on a client is "
@@ -74595,7 +73745,6 @@ msgid ""
"because they each contain a refspec which git will use by default."
msgstr ""
-#
#. type: Title ~
#: en/urls-remotes.txt:17
#, fuzzy, no-wrap
@@ -74610,8 +73759,8 @@ msgid ""
"configured using linkgit:git-remote[1], linkgit:git-config[1] or even by a "
"manual edit to the `$GIT_DIR/config` file. The URL of this remote will be "
"used to access the repository. The refspec of this remote will be used by "
-"default when you do not provide a refspec on the command line. The entry in "
-"the config file would appear like this:"
+"default when you do not provide a refspec on the command line. The entry in"
+" the config file would appear like this:"
msgstr ""
#. type: delimited block -
@@ -74641,8 +73790,8 @@ msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:47
msgid ""
-"You can choose to provide the name of a file in `$GIT_DIR/remotes`. The URL "
-"in this file will be used to access the repository. The refspec in this "
+"You can choose to provide the name of a file in `$GIT_DIR/remotes`. The URL"
+" in this file will be used to access the repository. The refspec in this "
"file will be used as default when you do not provide a refspec on the "
"command line. This file should have the following format:"
msgstr ""
@@ -74736,9 +73885,9 @@ msgstr ""
#. type: Plain text
#: en/urls.txt:12
msgid ""
-"Git supports ssh, git, http, and https protocols (in addition, ftp, and ftps "
-"can be used for fetching, but this is inefficient and deprecated; do not use "
-"it)."
+"Git supports ssh, git, http, and https protocols (in addition, ftp, and ftps"
+" can be used for fetching, but this is inefficient and deprecated; do not "
+"use it)."
msgstr ""
#. type: Plain text
@@ -74801,8 +73950,7 @@ msgstr ""
#. type: Plain text
#: en/urls.txt:36
msgid ""
-"ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/~{startsb}"
-"user{endsb}/path/to/repo.git/"
+"ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/"
msgstr ""
#. type: Plain text
@@ -74864,8 +74012,8 @@ msgstr ""
#: en/urls.txt:66
msgid ""
"where <address> may be a path, a server and path, or an arbitrary URL-like "
-"string recognized by the specific remote helper being invoked. See linkgit:"
-"gitremote-helpers[1] for details."
+"string recognized by the specific remote helper being invoked. See "
+"linkgit:gitremote-helpers[1] for details."
msgstr ""
#. type: Plain text
@@ -74903,8 +74051,8 @@ msgstr ""
#: en/urls.txt:87
msgid ""
"a URL like \"work:repo.git\" or like \"host.xz:/path/to/repo.git\" will be "
-"rewritten in any context that takes a URL to be \"git://git.host.xz/repo.git"
-"\"."
+"rewritten in any context that takes a URL to be "
+"\"git://git.host.xz/repo.git\"."
msgstr ""
#. type: Plain text
@@ -74938,81 +74086,74 @@ msgid ""
"the original URL."
msgstr ""
-#
#~ msgid ""
-#~ "This command adds the current content of new or modified files to the "
-#~ "index, thus staging that content for inclusion in the next commit."
+#~ "This command adds the current content of new or modified files to the index,"
+#~ " thus staging that content for inclusion in the next commit."
#~ msgstr ""
-#~ "Dieser Befehl f체gt den aktuellen Inhalt neuer oder ver채nderter Dateien "
-#~ "zum Index hinzu, und stellt diese 횆nderungen somit f체r die n채chste "
-#~ "Eintragung (commit) bereit."
+#~ "Dieser Befehl f체gt den aktuellen Inhalt neuer oder ver채nderter Dateien zum "
+#~ "Index hinzu, und stellt diese 횆nderungen somit f체r die n채chste Eintragung "
+#~ "(commit) bereit."
-#
#~ msgid ""
-#~ "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add "
-#~ "all matching files. Also a leading directory name (e.g. `dir` to add "
-#~ "`dir/file1` and `dir/file2`) can be given to add all files in the "
-#~ "directory, recursively."
+#~ "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add all "
+#~ "matching files. Also a leading directory name (e.g. `dir` to add "
+#~ "`dir/file1` and `dir/file2`) can be given to add all files in the directory,"
+#~ " recursively."
#~ msgstr ""
#~ "Dateien aus denen Inhalte hinzugef체gt werden sollen. Dateisuchkriterien "
#~ "(z.B. '*.c')\tk철nnen verwendet werden um alle passenden Dateien "
-#~ "hinzuzuf체gen. Es kann auch ein Pfadname angegeben werden, um rekursiv "
-#~ "alle in diesem Pfad befindlichen Dateien hinzuzuf체gen (z.B. 'dir' f체r "
+#~ "hinzuzuf체gen. Es kann auch ein Pfadname angegeben werden, um rekursiv alle "
+#~ "in diesem Pfad befindlichen Dateien hinzuzuf체gen (z.B. 'dir' f체r "
#~ "'dir/datei1' und 'dir/datei2')."
-#
#~ msgid ""
-#~ "Similar to Interactive mode but the initial command loop is bypassed and "
-#~ "the 'patch' subcommand is invoked using each of the specified "
-#~ "filepatterns before exiting."
+#~ "Similar to Interactive mode but the initial command loop is bypassed and the"
+#~ " 'patch' subcommand is invoked using each of the specified filepatterns "
+#~ "before exiting."
#~ msgstr ""
#~ "횆hnlich dem Interativen Modus, nur wird die initiale Befehlsschleife "
#~ "umgangen und vor dem Verlassen, der 'patch' Subbefehl mit jedem der "
#~ "angegebenen filepattern aufgerufen."
-#
#~ msgid ""
-#~ "Update only files that git already knows about, staging modified content "
-#~ "for commit and marking deleted files for removal. This is similar to what "
-#~ "\"git commit -a\" does in preparation for making a commit, except that "
-#~ "the update is limited to paths specified on the command line. If no paths "
-#~ "are specified, all tracked files in the current directory and its "
-#~ "subdirectories are updated."
+#~ "Update only files that git already knows about, staging modified content for"
+#~ " commit and marking deleted files for removal. This is similar to what \"git"
+#~ " commit -a\" does in preparation for making a commit, except that the update"
+#~ " is limited to paths specified on the command line. If no paths are "
+#~ "specified, all tracked files in the current directory and its subdirectories"
+#~ " are updated."
#~ msgstr ""
#~ "Aktualisiere nur jene Dateien, die git bereits kennt, stelle ver채nderte "
-#~ "Inhalte zur Eintragung (commit) zur Verf체gung, und markiere gel철sche "
-#~ "Dateien zur Entfernung. Das ist 채hnlich zu dem was \"git commit -a\" bei "
-#~ "der Vorbereitung zur Eintragung (commit) durchf체hrt, mit der Ausnahme, "
-#~ "da횩 '--update' auf die in der Befehlszeile angegebenen Pfade beschr채nkt "
-#~ "ist. Sind keine Pfade angegeben, werden alle verfolgten Dateien in allen "
+#~ "Inhalte zur Eintragung (commit) zur Verf체gung, und markiere gel철sche Dateien"
+#~ " zur Entfernung. Das ist 채hnlich zu dem was \"git commit -a\" bei der "
+#~ "Vorbereitung zur Eintragung (commit) durchf체hrt, mit der Ausnahme, da횩 '--"
+#~ "update' auf die in der Befehlszeile angegebenen Pfade beschr채nkt ist. Sind "
+#~ "keine Pfade angegeben, werden alle verfolgten Dateien in allen "
#~ "Verzeichnissen und ihren Unterverzeichnissen aktualisiert."
-#
#~ msgid ""
#~ "Update files that git already knows about (same as '\\--update') and add "
#~ "all untracked files that are not ignored by '.gitignore' mechanism."
#~ msgstr ""
#~ "Aktualisiere Dateien die git bereits kennt (gleich wie bei '\\--update'), "
-#~ "und f체ge alle noch nicht verfolgten Dateien die nicht mittels des '."
-#~ "gitignore' Mechanismus ignoriert werden hinzu."
+#~ "und f체ge alle noch nicht verfolgten Dateien die nicht mittels des "
+#~ "'.gitignore' Mechanismus ignoriert werden hinzu."
#~ msgid "Bugs"
#~ msgstr "Bugs"
-#
#~ msgid ""
-#~ "The interactive mode does not work with files whose names contain "
-#~ "characters that need C-quoting. `core.quotepath` configuration can be "
-#~ "used to work this limitation around to some degree, but backslash, double-"
-#~ "quote and control characters will still have problems."
+#~ "The interactive mode does not work with files whose names contain characters"
+#~ " that need C-quoting. `core.quotepath` configuration can be used to work "
+#~ "this limitation around to some degree, but backslash, double-quote and "
+#~ "control characters will still have problems."
#~ msgstr ""
-#~ "Der Interaktive Modus hat Probleme beim Verarbeiten von Dateien deren "
-#~ "Namen Zeichen enthalten die in C speziell behandelt werden m체ssen. Eine "
-#~ "spezielle 'core.quotepath' Einstellung kann teilweise zur Umgehung dieses "
-#~ "Problems verwendet werden, aber '\\', '\"', und Kontrollzeichen sind "
-#~ "weiterhin problematisch."
+#~ "Der Interaktive Modus hat Probleme beim Verarbeiten von Dateien deren Namen "
+#~ "Zeichen enthalten die in C speziell behandelt werden m체ssen. Eine spezielle"
+#~ " 'core.quotepath' Einstellung kann teilweise zur Umgehung dieses Problems "
+#~ "verwendet werden, aber '\\', '\"', und Kontrollzeichen sind weiterhin "
+#~ "problematisch."
-#
#, fuzzy
#~ msgid "Written by Linus Torvalds <torvalds@osdl.org>"
#~ msgstr ""
@@ -75031,7 +74172,6 @@ msgstr ""
#~ "#-#-#-#-# git-write-tree-de.po (PACKAGE VERSION) #-#-#-#-#\n"
#~ "Geschrieben von Linus Torvalds <torvalds@osdl.org>"
-#
#, fuzzy
#~ msgid "Documentation"
#~ msgstr ""
@@ -75065,7 +74205,8 @@ msgstr ""
#~ "Dokumentation"
#, fuzzy
-#~ msgid "Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.\n"
+#~ msgid ""
+#~ "Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.\n"
#~ msgstr ""
#~ "#-#-#-#-# git-add-de.po (PACKAGE VERSION) #-#-#-#-#\n"
#~ "Dokumentiert durch Junio C Hamano und der git-list <git@vger.kernel.org>.\n"
@@ -75090,25 +74231,23 @@ msgstr ""
#~ "GIT\n"
#~ "---\n"
-#
#~ msgid ""
-#~ "With no arguments, existing branches are listed, the current branch will "
-#~ "be highlighted with an asterisk. Option `-r` causes the remote-tracking "
+#~ "With no arguments, existing branches are listed, the current branch will be "
+#~ "highlighted with an asterisk. Option `-r` causes the remote-tracking "
#~ "branches to be listed, and option `-a` shows both."
#~ msgstr ""
#~ "Wird der Befehl ohne Argumente aufgerufen, wird eine Liste der im "
-#~ "Projektarchiv existierenden Entwicklungszweige (branches) ausgegeben, "
-#~ "wobei der aktuelle Entwicklungszweig mit einem Sternchen ('*') "
-#~ "hervorgehoben wird. die Option '-r' bewirkt, da횩 beobachtete "
-#~ "Entwicklungszweige eines fernen Projektarchivs (remote tracking "
-#~ "branches) angezeigt werden, bei '-a' werden beide Arten aufgelistet."
+#~ "Projektarchiv existierenden Entwicklungszweige (branches) ausgegeben, wobei "
+#~ "der aktuelle Entwicklungszweig mit einem Sternchen ('*') hervorgehoben "
+#~ "wird. die Option '-r' bewirkt, da횩 beobachtete Entwicklungszweige eines "
+#~ "fernen Projektarchivs (remote tracking branches) angezeigt werden, bei '-a'"
+#~ " werden beide Arten aufgelistet."
-#
#~ msgid ""
#~ "In its second form, a new branch named <branchname> will be created. It "
-#~ "will start out with a head equal to the one given as <start-point>. If "
-#~ "no <start-point> is given, the branch will be created with a head equal "
-#~ "to that of the currently checked out branch."
+#~ "will start out with a head equal to the one given as <start-point>. If no "
+#~ "<start-point> is given, the branch will be created with a head equal to that"
+#~ " of the currently checked out branch."
#~ msgstr ""
#~ "Beim zweiten Beispiel wird ein Entwicklungszweig (branch) mit dem Namen "
#~ "<branchname> erzeugt. Dieser startet ab der mit <start-point> angegebenen "
@@ -75116,22 +74255,19 @@ msgstr ""
#~ "erzeugte Entwicklungszweig mit der letzten Version des aktuellen "
#~ "Entwicklungszweigs."
-#
#~ msgid "Delete a branch. The branch must be fully merged in HEAD."
#~ msgstr ""
#~ "L철sche einen Entwicklungszweig. Dieser mu횩 komplett mit dem HEAD "
#~ "zusammengef체hrt (merged) worden sein."
-#
#~ msgid "Delete a branch irrespective of its merged status."
#~ msgstr ""
-#~ "L철sche einen Entwicklungszweig unabh채ngig davon ob er schon "
-#~ "zusammengef체hrt (merged) wurde."
+#~ "L철sche einen Entwicklungszweig unabh채ngig davon ob er schon zusammengef체hrt "
+#~ "(merged) wurde."
-#
#~ msgid ""
-#~ "Create the branch's reflog. This activates recording of all changes made "
-#~ "to the branch ref, enabling use of date based sha1 expressions such as "
+#~ "Create the branch's reflog. This activates recording of all changes made to"
+#~ " the branch ref, enabling use of date based sha1 expressions such as "
#~ "\"<branchname>@\\{yesterday}\"."
#~ msgstr ""
#~ "Erzeuge einen reflog f체r den Entwicklungszweig. Dies aktiviert die "
@@ -75139,34 +74275,29 @@ msgstr ""
#~ "datumsbasierten sha1 Ausdr체cken wie \"<branchname>@\\{yesterday}\" "
#~ "erm철glicht wird."
-#
#~ msgid ""
-#~ "Force the creation of a new branch even if it means deleting a branch "
-#~ "that already exists with the same name."
+#~ "Force the creation of a new branch even if it means deleting a branch that "
+#~ "already exists with the same name."
#~ msgstr ""
#~ "Erzwinge das Erzeugen eines neuen Entwicklungszweigs, auch wenn das die "
#~ "L철schung eines bereits bestehenden Entwicklungszweiges mit dem gleichen "
#~ "Namen bedeutet."
-#
#~ msgid "Move/rename a branch even if the new branchname already exists."
#~ msgstr ""
#~ "Verschiebe/Umbenenne einen Entwicklungszweig, auch wenn der neue Name "
#~ "bereits existiert."
-#
#~ msgid "Only list branches which are fully contained by HEAD."
#~ msgstr ""
#~ "Zeige nur jene Entwicklungszweige (branches) an, die vollst채ndig in den "
#~ "aktuellen Enwicklungszweig (HEAD) zusammengef체hrt (merged) wurden."
-#
#~ msgid "Do not list branches which are fully contained by HEAD."
#~ msgstr ""
#~ "Zeige keine Entwicklungszweige (branches) an die in den aktuellen "
#~ "Enwicklungszweig (HEAD) zusammengef체hrt (merged) wurden."
-#
#~ msgid ""
#~ "Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano "
#~ "<gitster@pobox.com>"
@@ -75181,45 +74312,39 @@ msgstr ""
#~ "'git checkout' [-q] [-f] [[--track | --no-track] -b <new_branch> [-l]] [-m] [<branch>]\n"
#~ "'git checkout' [<tree-ish>] [--] <paths>...\n"
-#
#~ msgid ""
-#~ "When <paths> are not given, this command switches branches by updating "
-#~ "the index and working tree to reflect the specified branch, <branch>, and "
-#~ "updating HEAD to be <branch> or, if specified, <new_branch>. Using -b "
-#~ "will cause <new_branch> to be created; in this case you can use the --"
-#~ "track or --no-track options, which will be passed to `git branch`."
+#~ "When <paths> are not given, this command switches branches by updating the "
+#~ "index and working tree to reflect the specified branch, <branch>, and "
+#~ "updating HEAD to be <branch> or, if specified, <new_branch>. Using -b will "
+#~ "cause <new_branch> to be created; in this case you can use the --track or "
+#~ "--no-track options, which will be passed to `git branch`."
#~ msgstr ""
-#~ "Wenn <paths> nicht angegeben werden, dann wechselt dieser Befehl den "
-#~ "aktiven Entwicklungszweig (branch) durch Aktualisierung des Index und des "
+#~ "Wenn <paths> nicht angegeben werden, dann wechselt dieser Befehl den aktiven"
+#~ " Entwicklungszweig (branch) durch Aktualisierung des Index und des "
#~ "Arbeitsbereichs. Weiters wird HEAD auf <branch> (oder wenn angegeben "
#~ "<newbranch>) gelegt. Verwendet man die '-b' Option wird ein neuer "
#~ "Entwicklungszweig angelegt, wobei dann die Optionen '--track' bzw '--no-"
-#~ "track' angegeben werden k철nnen, die an den 'git branch' Befehl "
-#~ "durchgereicht werden."
+#~ "track' angegeben werden k철nnen, die an den 'git branch' Befehl durchgereicht"
+#~ " werden."
-#
#~ msgid ""
#~ "Create a new branch named <new_branch> and start it at <branch>. The new "
-#~ "branch name must pass all checks defined by linkgit:git-check-ref-"
-#~ "format[1]. Some of these checks may restrict the characters allowed in a "
-#~ "branch name."
+#~ "branch name must pass all checks defined by linkgit:git-check-ref-format[1]."
+#~ " Some of these checks may restrict the characters allowed in a branch name."
#~ msgstr ""
#~ "Create a new branch named <new_branch> and start it at <branch>. The new "
-#~ "branch name must pass all checks defined by linkgit:git-check-ref-"
-#~ "format[1]. Some of these checks may restrict the characters allowed in a "
-#~ "branch name."
+#~ "branch name must pass all checks defined by linkgit:git-check-ref-format[1]."
+#~ " Some of these checks may restrict the characters allowed in a branch name."
-#
#~ msgid ""
#~ "Create the new branch's reflog. This activates recording of all changes "
-#~ "made to the branch ref, enabling use of date based sha1 expressions such "
-#~ "as \"<branchname>@\\{yesterday}\"."
+#~ "made to the branch ref, enabling use of date based sha1 expressions such as "
+#~ "\"<branchname>@\\{yesterday}\"."
#~ msgstr ""
#~ "Create the new branch's reflog. This activates recording of all changes "
-#~ "made to the branch ref, enabling use of date based sha1 expressions such "
-#~ "as \"<branchname>@\\{yesterday}\"."
+#~ "made to the branch ref, enabling use of date based sha1 expressions such as "
+#~ "\"<branchname>@\\{yesterday}\"."
-#
#~ msgid ""
#~ "When this parameter names a non-branch (but still a valid commit object), "
#~ "your HEAD becomes 'detached'."
@@ -75227,20 +74352,18 @@ msgstr ""
#~ "When this parameter names a non-branch (but still a valid commit object), "
#~ "your HEAD becomes 'detached'."
-#
#~ msgid ""
-#~ "It is sometimes useful to be able to 'checkout' a commit that is not at "
-#~ "the tip of one of your branches. The most obvious example is to check "
-#~ "out the commit at a tagged official release point, like this:"
+#~ "It is sometimes useful to be able to 'checkout' a commit that is not at the "
+#~ "tip of one of your branches. The most obvious example is to check out the "
+#~ "commit at a tagged official release point, like this:"
#~ msgstr ""
-#~ "It is sometimes useful to be able to 'checkout' a commit that is not at "
-#~ "the tip of one of your branches. The most obvious example is to check "
-#~ "out the commit at a tagged official release point, like this:"
+#~ "It is sometimes useful to be able to 'checkout' a commit that is not at the "
+#~ "tip of one of your branches. The most obvious example is to check out the "
+#~ "commit at a tagged official release point, like this:"
#~ msgid "$ git checkout v2.6.18\n"
#~ msgstr "$ git checkout v2.6.18\n"
-#
#~ msgid ""
#~ "Earlier versions of git did not allow this and asked you to create a "
#~ "temporary branch using `-b` option, but starting from version 1.5.0, the "
@@ -75252,35 +74375,32 @@ msgstr ""
#~ "above command 'detaches' your HEAD from the current branch and directly "
#~ "point at the commit named by the tag (`v2.6.18` in the above example)."
-#
#~ msgid ""
-#~ "You can use usual git commands while in this state. You can use `git "
-#~ "reset --hard $othercommit` to further move around, for example. You can "
-#~ "make changes and create a new commit on top of a detached HEAD. You can "
-#~ "even create a merge by using `git merge $othercommit`."
+#~ "You can use usual git commands while in this state. You can use `git reset "
+#~ "--hard $othercommit` to further move around, for example. You can make "
+#~ "changes and create a new commit on top of a detached HEAD. You can even "
+#~ "create a merge by using `git merge $othercommit`."
#~ msgstr ""
-#~ "You can use usual git commands while in this state. You can use `git "
-#~ "reset --hard $othercommit` to further move around, for example. You can "
-#~ "make changes and create a new commit on top of a detached HEAD. You can "
-#~ "even create a merge by using `git merge $othercommit`."
+#~ "You can use usual git commands while in this state. You can use `git reset "
+#~ "--hard $othercommit` to further move around, for example. You can make "
+#~ "changes and create a new commit on top of a detached HEAD. You can even "
+#~ "create a merge by using `git merge $othercommit`."
-#
#~ msgid ""
#~ "The state you are in while your HEAD is detached is not recorded by any "
-#~ "branch (which is natural --- you are not on any branch). What this means "
-#~ "is that you can discard your temporary commits and merges by switching "
-#~ "back to an existing branch (e.g. `git checkout master`), and a later `git "
-#~ "prune` or `git gc` would garbage-collect them. If you did this by "
-#~ "mistake, you can ask the reflog for HEAD where you were, e.g."
+#~ "branch (which is natural --- you are not on any branch). What this means is"
+#~ " that you can discard your temporary commits and merges by switching back to"
+#~ " an existing branch (e.g. `git checkout master`), and a later `git prune` or"
+#~ " `git gc` would garbage-collect them. If you did this by mistake, you can "
+#~ "ask the reflog for HEAD where you were, e.g."
#~ msgstr ""
#~ "The state you are in while your HEAD is detached is not recorded by any "
-#~ "branch (which is natural --- you are not on any branch). What this means "
-#~ "is that you can discard your temporary commits and merges by switching "
-#~ "back to an existing branch (e.g. `git checkout master`), and a later `git "
-#~ "prune` or `git gc` would garbage-collect them. If you did this by "
-#~ "mistake, you can ask the reflog for HEAD where you were, e.g."
+#~ "branch (which is natural --- you are not on any branch). What this means is"
+#~ " that you can discard your temporary commits and merges by switching back to"
+#~ " an existing branch (e.g. `git checkout master`), and a later `git prune` or"
+#~ " `git gc` would garbage-collect them. If you did this by mistake, you can "
+#~ "ask the reflog for HEAD where you were, e.g."
-#
#~ msgid "Written by Shawn O. Pearce <spearce@spearce.org>."
#~ msgstr "Geschrieben von Shawn O. Pearce <spearce@spearce.org>."
@@ -75290,34 +74410,34 @@ msgstr ""
#~ msgid "*NOTE*: see NOTE to --shared option.\n"
#~ msgstr "*NOTE*: siehe NOTE zur --shared Option.\n"
-#
#~ msgid ""
#~ "Specify the directory from which templates will be used; if unset the "
-#~ "templates are taken from the installation defined default, typically `/"
-#~ "usr/share/git-core/templates`."
+#~ "templates are taken from the installation defined default, typically "
+#~ "`/usr/share/git-core/templates`."
#~ msgstr ""
-#~ "Gibt das Verzeichnis f체r die zu verwendenden Vorlagen (templates) an. "
-#~ "Wird die Option nicht angegeben, werden standardm채횩ig die Vorlagen von `/"
-#~ "usr/share/git-core/templates` verwendet."
+#~ "Gibt das Verzeichnis f체r die zu verwendenden Vorlagen (templates) an. Wird "
+#~ "die Option nicht angegeben, werden standardm채횩ig die Vorlagen von "
+#~ "`/usr/share/git-core/templates` verwendet."
-#
#~ msgid ""
-#~ "Create a 'shallow' clone with a history truncated to the specified number "
-#~ "of revisions. A shallow repository has a number of limitations (you "
-#~ "cannot clone or fetch from it, nor push from nor into it), but is "
-#~ "adequate if you are only interested in the recent history of a large "
-#~ "project with a long history, and would want to send in fixes as patches."
+#~ "Create a 'shallow' clone with a history truncated to the specified number of"
+#~ " revisions. A shallow repository has a number of limitations (you cannot "
+#~ "clone or fetch from it, nor push from nor into it), but is adequate if you "
+#~ "are only interested in the recent history of a large project with a long "
+#~ "history, and would want to send in fixes as patches."
#~ msgstr ""
#~ "Erzeugt einen 'oberfl채chlichen' Klone des des Projektarchivs, welcher auf "
#~ "die angegebene Anzahl von Versionen gek체rzt ist. Ein derart erzeugtes "
#~ "Projektarchiv hat mehrere Einschr채nkungen (man kann es weder klonen oder "
-#~ "davon 'fetchen', auch kann man 'git pull' weder vom Projektarchiv weg, "
-#~ "noch auf es hin ausf체hren), ist aber ausreichend wenn man lediglich die "
-#~ "altuellsten 횆nderungen eines Projekts mit einer langen Historie ben철tigt "
-#~ "und Verbesserungen nur mit 'patches' eingesendet werden."
+#~ "davon 'fetchen', auch kann man 'git pull' weder vom Projektarchiv weg, noch "
+#~ "auf es hin ausf체hren), ist aber ausreichend wenn man lediglich die "
+#~ "altuellsten 횆nderungen eines Projekts mit einer langen Historie ben철tigt und"
+#~ " Verbesserungen nur mit 'patches' eingesendet werden."
#~ msgid "Create a repository on the kernel.org machine that borrows from Linus"
-#~ msgstr "Erzeuge auf dem Rechner kernel.org ein Projektarchiv das Objekte von Linus borgt"
+#~ msgstr ""
+#~ "Erzeuge auf dem Rechner kernel.org ein Projektarchiv das Objekte von Linus "
+#~ "borgt"
#~ msgid ""
#~ "$ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \\\n"
@@ -75326,15 +74446,13 @@ msgstr ""
#~ "$ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \\\n"
#~ " /pub/scm/.../me/subsys-2.6.git\n"
-#
#~ msgid ""
#~ "Override the author name used in the commit. Use `A U Thor "
#~ "<author@example.com>` format."
#~ msgstr ""
-#~ "횥berschreibe den Namen des in der Eintragung verwendeten Authors. "
-#~ "Benutze das `A U Thor <author@example.com>` Format."
+#~ "횥berschreibe den Namen des in der Eintragung verwendeten Authors. Benutze "
+#~ "das `A U Thor <author@example.com>` Format."
-#
#~ msgid ""
#~ "Use the contents of the given file as the initial version of the commit "
#~ "message. The editor is invoked and you can make subsequent changes. If a "
@@ -75343,56 +74461,49 @@ msgstr ""
#~ msgstr ""
#~ "Verwende den Inhalt der angegebenen Datei als initiale Version der "
#~ "Eintragungsbemerkung. Der Editor wird aufgerufen um weitere 횆nderungen "
-#~ "vornehmen zu k철nnen. Wird eine Bemerkung mittels der Optionen '-m' oder '-"
-#~ "F' angegeben, so hat die '-t' Option keine Auswirkung. Diese Angabe "
+#~ "vornehmen zu k철nnen. Wird eine Bemerkung mittels der Optionen '-m' oder '-F'"
+#~ " angegeben, so hat die '-t' Option keine Auswirkung. Diese Angabe "
#~ "체berschreibt die 'commit.template' Konfigurationsvariable."
-#
#~ msgid ""
#~ "Used to amend the tip of the current branch. Prepare the tree object you "
#~ "would want to replace the latest commit as usual (this includes the usual "
#~ "-i/-o and explicit paths), and the commit log editor is seeded with the "
#~ "commit message from the tip of the current branch. The commit you create "
-#~ "replaces the current tip -- if it was a merge, it will have the parents "
-#~ "of the current tip as parents -- so the current top commit is discarded."
+#~ "replaces the current tip -- if it was a merge, it will have the parents of "
+#~ "the current tip as parents -- so the current top commit is discarded."
#~ msgstr ""
-#~ "횆ndere (ersetzend) die letzte Eintragung (commit) im Projektarchiv (tip "
-#~ "of branch). Der Arbeitsbaum im Index kann vorher wie gew철hnlich mit 'git "
-#~ "add', etc bearbeitet werden (das beinhaltet auch -i/-o und explizite "
-#~ "Pfadangaben). Der Editor wird mit der Eintragungsbemerkung (commit "
-#~ "message) der letzten Version im Projektarchiv vorbef체llt. Die so erzeugte "
-#~ "Eintragung (commit) ersetzt die letze Eintragung im Projektarchiv, welche "
-#~ "damit im Projektarchiv ausgel철scht wird. Handelte es sich um eine "
-#~ "Zusammenf체hrung (merge), erh채lt die Eintragung die selben Eltern wie die "
-#~ "ersetzte Eintragung."
+#~ "횆ndere (ersetzend) die letzte Eintragung (commit) im Projektarchiv (tip of "
+#~ "branch). Der Arbeitsbaum im Index kann vorher wie gew철hnlich mit 'git add', "
+#~ "etc bearbeitet werden (das beinhaltet auch -i/-o und explizite Pfadangaben)."
+#~ " Der Editor wird mit der Eintragungsbemerkung (commit message) der letzten "
+#~ "Version im Projektarchiv vorbef체llt. Die so erzeugte Eintragung (commit) "
+#~ "ersetzt die letze Eintragung im Projektarchiv, welche damit im Projektarchiv"
+#~ " ausgel철scht wird. Handelte es sich um eine Zusammenf체hrung (merge), erh채lt "
+#~ "die Eintragung die selben Eltern wie die ersetzte Eintragung."
-#
#~ msgid ""
#~ "The file-option can be one of '--system', '--global' or '--file' which "
-#~ "specify where the values will be read from or written to. The default is "
-#~ "to assume the config file of the current repository, .git/config unless "
+#~ "specify where the values will be read from or written to. The default is to"
+#~ " assume the config file of the current repository, .git/config unless "
#~ "defined otherwise with GIT_DIR and GIT_CONFIG (see <<FILES>>)."
#~ msgstr ""
#~ "Die Datei-Option kann eine von '--system', '--global' oder '--file' sein, "
#~ "welche angibt, an welchem Ort die Werte ausgelesen oder hineingeschrieben "
-#~ "ewrden. Der Standard ist, die sich im aktuellen Repository befindliche ."
-#~ "git/config, wenn nicht anders mit GIT_DIR und GIT_CONFIG definiert, zu "
+#~ "ewrden. Der Standard ist, die sich im aktuellen Repository befindliche "
+#~ ".git/config, wenn nicht anders mit GIT_DIR und GIT_CONFIG definiert, zu "
#~ "verwenden (Siehe auch <<FILES>>)."
-#
#~ msgid "This command will fail if:"
#~ msgstr "Dieser Befehl schl채gt fehl wenn:"
-#
#~ msgid "Can not write to the config file,"
#~ msgstr "Die Konfigurationsdatei nicht geschrieben werden kann,"
-#
#~ msgid "you use '--global' option without $HOME being properly set."
#~ msgstr ""
#~ "Wenn Sie die Option '--global' verwenden, ohne dass $HOME gesetzt ist."
-#
#~ msgid ""
#~ "Like get, but does not fail if the number of values for the key is not "
#~ "exactly one."
@@ -75400,42 +74511,38 @@ msgstr ""
#~ "Wie --get, aber schl채gt nicht fehl, wenn die Zahl der Werte f체r den "
#~ "Schl체ssel nicht exakt eins ist."
-#
#~ msgid ""
#~ "Like --get-all, but interprets the name as a regular expression. Also "
#~ "outputs the key names."
#~ msgstr ""
-#~ "Wie --get-all, aber interpretiert den Namen als einen regul채ren "
-#~ "Ausdruck. Zeigt auch die Schl체sselnamen an."
+#~ "Wie --get-all, aber interpretiert den Namen als einen regul채ren Ausdruck. "
+#~ "Zeigt auch die Schl체sselnamen an."
-#
#~ msgid "Written by Johannes Schindelin <Johannes.Schindelin@gmx.de>"
#~ msgstr "Geschrieben von Johannes Schindelin <Johannes.Schindelin@gmx.de>"
-#~ msgid "Documentation by Johannes Schindelin, Petr Baudis and the git-list <git@vger.kernel.org>.\n"
+#~ msgid ""
+#~ "Documentation by Johannes Schindelin, Petr Baudis and the git-list "
+#~ "<git@vger.kernel.org>.\n"
#~ msgstr ""
#~ "Dokumentation von Johannes Schindelin, Petr Baudis und der git-Mailingliste <git@vger.kernel.org>.\n"
#~ "TODO: Abkl채ren, ob einf체gen:\n"
#~ "횥bersetzt von Fabio Scotoni <fabio@esse.ch>\n"
-#
#~ msgid ""
-#~ "If exactly two paths are given, and at least one is untracked, compare "
-#~ "the two files / directories. This behavior can be forced by --no-index."
+#~ "If exactly two paths are given, and at least one is untracked, compare the "
+#~ "two files / directories. This behavior can be forced by --no-index."
#~ msgstr ""
-#~ "Werden exakt zwei Dateipfade angegeben und wird zumindest einer davon "
-#~ "noch nicht mit git verwaltet, dann werden diese beiten Dateien/"
-#~ "Verzeichnisse verglichen. Dieses Verhalten kann auch mit --no-index "
-#~ "erzwungen werden."
+#~ "Werden exakt zwei Dateipfade angegeben und wird zumindest einer davon noch "
+#~ "nicht mit git verwaltet, dann werden diese beiten Dateien/Verzeichnisse "
+#~ "verglichen. Dieses Verhalten kann auch mit --no-index erzwungen werden."
#~ msgid "gitglossary(7)"
#~ msgstr "gitglossary(7)"
-#
#~ msgid "gitglossary - A GIT Glossary"
#~ msgstr "gitglossary - Ein GIT-Glossar"
-#
#, fuzzy
#~ msgid "Part of the linkgit:git[1] suite."
#~ msgstr ""
@@ -75447,33 +74554,33 @@ msgstr ""
#~ msgid "<since>..<until>"
#~ msgstr "<von>..<bis>"
-#
#~ msgid ""
#~ "Show only commits between the named two commits. When either <since> or "
#~ "<until> is omitted, it defaults to `HEAD`, i.e. the tip of the current "
-#~ "branch. For a more complete list of ways to spell <since> and <until>, "
-#~ "see \"SPECIFYING REVISIONS\" section in linkgit:git-rev-parse[1]."
+#~ "branch. For a more complete list of ways to spell <since> and <until>, see "
+#~ "\"SPECIFYING REVISIONS\" section in linkgit:git-rev-parse[1]."
#~ msgstr ""
#~ "Stellt nur Commits zwischen den angegebenen Commits dar. Wird <von> oder "
-#~ "<bis> weggelassen, entspricht dies der Angabe von `HEAD`. Eine "
-#~ "detaillierte Liste, wie <von> und <bis> angegeben werden k철nnen, findet "
-#~ "sich unter \"REVISIONEN SPEZIFIZIEREN\" in linkgit::git-rev-parse[1]."
+#~ "<bis> weggelassen, entspricht dies der Angabe von `HEAD`. Eine detaillierte "
+#~ "Liste, wie <von> und <bis> angegeben werden k철nnen, findet sich unter "
+#~ "\"REVISIONEN SPEZIFIZIEREN\" in linkgit::git-rev-parse[1]."
-#
#~ msgid ""
#~ "Before the log message print out its size in bytes. Intended mainly for "
-#~ "porcelain tools consumption. If git is unable to produce a valid value "
-#~ "size is set to zero. Note that only message is considered, if also a "
-#~ "diff is shown its size is not included."
+#~ "porcelain tools consumption. If git is unable to produce a valid value size "
+#~ "is set to zero. Note that only message is considered, if also a diff is "
+#~ "shown its size is not included."
#~ msgstr ""
-#~ "Zeigt die L채nge der Commit-Nachricht in Bytes, bevor sie dargestellt "
-#~ "wird, an. Diese Option ist f체r eine maschinelle Verarbeitung der Ausgabe "
-#~ "gedacht. Wenn git keine g체ltige Gr철횩e errechnen kann, wird 0 angegeben. "
-#~ "Bei der Berechnung wird nur die Nachrichtenl채nge ber체cksichtigt. Die "
-#~ "dargestellten 횆nderungen werden nicht ber체cksichtigt."
+#~ "Zeigt die L채nge der Commit-Nachricht in Bytes, bevor sie dargestellt wird, "
+#~ "an. Diese Option ist f체r eine maschinelle Verarbeitung der Ausgabe gedacht. "
+#~ "Wenn git keine g체ltige Gr철횩e errechnen kann, wird 0 angegeben. Bei der "
+#~ "Berechnung wird nur die Nachrichtenl채nge ber체cksichtigt. Die dargestellten "
+#~ "횆nderungen werden nicht ber체cksichtigt."
#, fuzzy
-#~ msgid "Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.\n"
+#~ msgid ""
+#~ "Documentation by David Greaves, Junio C Hamano and the git-list "
+#~ "<git@vger.kernel.org>.\n"
#~ msgstr ""
#~ "#-#-#-#-# git-log-de.po (PACKAGE VERSION) #-#-#-#-#\n"
#~ "Dokumentation hinzugef체gt David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.\n"
@@ -75487,7 +74594,6 @@ msgstr ""
#~ "git-Mailingliste <git@vger.kernel.org>.\n"
#~ "횥bersetzt von Fabio Scotoni und der git-Mailingliste.\n"
-#
#~ msgid ""
#~ "Written by Linus Torvalds <torvalds@osdl.org>, Junio C Hamano "
#~ "<gitster@pobox.com> and Petr Baudis <pasky@suse.cz>."
@@ -75495,21 +74601,19 @@ msgstr ""
#~ "Geschrieben von Linus Torvalds <torvalds@osdl.org>, Junio C Hamano "
#~ "<gitster@pobox.com> und Petr Baudis <pasky@suse.cz>."
-#
#~ msgid "This script is used to move or rename a file, directory or symlink."
#~ msgstr ""
#~ "Dieses Script wird verwendet, um eine Datei, ein Verzeichnis oder einen "
#~ "Symlink zu verschieben."
-#
#~ msgid ""
#~ "Written by Linus Torvalds <torvalds@osdl.org> Rewritten by Ryan Anderson "
#~ "<ryan@michonline.com> Move functionality added by Josef Weidendorfer "
#~ "<Josef.Weidendorfer@gmx.de>"
#~ msgstr ""
-#~ "Geschrieben von Linus Torvalds <torvalds@osdl.org> Neugeschrieben von "
-#~ "Ryan Anderson <ryan@michonline.com> Verschiebefunktion hinzugef체gt von "
-#~ "Josef Weidendorfer <Josef.Weidendorfer@gmx.de>"
+#~ "Geschrieben von Linus Torvalds <torvalds@osdl.org> Neugeschrieben von Ryan "
+#~ "Anderson <ryan@michonline.com> Verschiebefunktion hinzugef체gt von Josef "
+#~ "Weidendorfer <Josef.Weidendorfer@gmx.de>"
#~ msgid ""
#~ "'git remote' [-v | --verbose]\n"
@@ -75561,25 +74665,22 @@ msgstr ""
#~ "$ git checkout -b nfs linux-nfs/master\n"
#~ "...\n"
-#
#~ msgid "Written by Junio Hamano"
#~ msgstr "Geschrieben von Junio Hamano"
-#~ msgid "Documentation by J. Bruce Fields and the git-list <git@vger.kernel.org>.\n"
+#~ msgid ""
+#~ "Documentation by J. Bruce Fields and the git-list <git@vger.kernel.org>.\n"
#~ msgstr ""
#~ "Documentation by J. Bruce Fields and the git-list <git@vger.kernel.org>.\n"
#~ "Dokumentation von J. Bruce Fields und der Git-Mailingliste <git@vger.kernel.org>.\n"
-#
#~ msgid "git-repo-config - Get and set repository or global options"
#~ msgstr ""
#~ "git-repo-config - Repositoryeigene/Globale Optionen auslesen und setzen"
-#
#~ msgid "'git repo-config' ..."
#~ msgstr "'git repo-config' ..."
-#
#~ msgid ""
#~ "This is a synonym for linkgit:git-config[1]. Please refer to the "
#~ "documentation of that command."
@@ -75590,67 +74691,59 @@ msgstr ""
#~ msgid "gittutorial(7)"
#~ msgstr "gittutorial(7)"
-#
#~ msgid ""
#~ "gittutorial - A tutorial introduction to git (for version 1.5.1 or newer)"
#~ msgstr ""
#~ "gittutorial - Eine einf체hrende Anleitung zu git (f체r Version 1.5.1 oder "
#~ "h철her)"
-#
#~ msgid "git *"
#~ msgstr "git *"
-#
#~ msgid ""
-#~ "This tutorial explains how to import a new project into git, make changes "
-#~ "to it, and share changes with other developers."
+#~ "This tutorial explains how to import a new project into git, make changes to"
+#~ " it, and share changes with other developers."
#~ msgstr ""
#~ "Diese Anleitung erkl채rt, wie man ein neues Projekt nach git importiert, "
#~ "횆nderungen daran vornimmt und diese mit anderen Entwicklern teilt."
-#
#~ msgid ""
-#~ "If you are instead primarily interested in using git to fetch a project, "
-#~ "for example, to test the latest version, you may prefer to start with the "
-#~ "first two chapters of link:user-manual.html[The Git User's Manual]."
+#~ "If you are instead primarily interested in using git to fetch a project, for"
+#~ " example, to test the latest version, you may prefer to start with the first"
+#~ " two chapters of link:user-manual.html[The Git User's Manual]."
#~ msgstr ""
#~ "Wenn Sie haupts채chlich daran interessiert sind, git zu verwenden, um ein "
#~ "Projekt herunterzuladen, beispielsweise um die neuste Version zu testen, "
#~ "k철nnten Sie es vorziehen, mit den ersten zwei Kapiteln des link:user-"
#~ "manual.html[Gitbenutzerhandbuches] zu beginnen."
-#
#~ msgid ""
#~ "First, note that you can get documentation for a command such as `git log "
#~ "--graph` with:"
#~ msgstr ""
-#~ "Zun채chst sollten Sie wissen, dass sie die Dokumentation f체r ein Kommando "
-#~ "wie `git log --graph` beziehen k철nnen mit:"
+#~ "Zun채chst sollten Sie wissen, dass sie die Dokumentation f체r ein Kommando wie"
+#~ " `git log --graph` beziehen k철nnen mit:"
#~ msgid "$ man git-log\n"
#~ msgstr "$ man git-log\n"
-#
#~ msgid ""
#~ "It is a good idea to introduce yourself to git with your name and public "
#~ "email address before doing any operation. The easiest way to do so is:"
#~ msgstr ""
-#~ "Es ist eine gute Idee, sich selbt mit Namen und 철ffentlicher E-Mail "
-#~ "Adresse git vorzustellen, bevor irgendwelche Handlungen vorgenommen "
-#~ "werden. Der einfachste Weg, dies zu tun ist:"
+#~ "Es ist eine gute Idee, sich selbt mit Namen und 철ffentlicher E-Mail Adresse "
+#~ "git vorzustellen, bevor irgendwelche Handlungen vorgenommen werden. Der "
+#~ "einfachste Weg, dies zu tun ist:"
#~ msgid "Importing a new project"
#~ msgstr "Ein neues neues Projekt importieren"
-#
#~ msgid ""
#~ "Assume you have a tarball project.tar.gz with your initial work. You can "
#~ "place it under git revision control as follows."
#~ msgstr ""
#~ "Angenommen, Sie haben einen Tarball projekt.tar.gz mit Ihrer 채nf채nglichen "
-#~ "Arbeit, k철nnen Sie es folgendermassen unter git-Revisionskontrolle "
-#~ "stellen."
+#~ "Arbeit, k철nnen Sie es folgendermassen unter git-Revisionskontrolle stellen."
#~ msgid ""
#~ "$ tar xzf project.tar.gz\n"
@@ -75661,19 +74754,16 @@ msgstr ""
#~ "$ cd projekt\n"
#~ "$ git init\n"
-#
#~ msgid "Git will reply"
#~ msgstr "Git wird so antworten:"
-#
#~ msgid ""
-#~ "You've now initialized the working directory--you may notice a new "
-#~ "directory created, named \".git\"."
+#~ "You've now initialized the working directory--you may notice a new directory"
+#~ " created, named \".git\"."
#~ msgstr ""
#~ "Sie haben nun das momentane Verzeichnis initialisiert -- Sie sollten ein "
#~ "neuerstelltes Verzeichnis namens \".git\" bemerken k철nnen."
-#
#~ msgid ""
#~ "Next, tell git to take a snapshot of the contents of all files under the "
#~ "current directory (note the '.'), with 'git-add':"
@@ -75682,48 +74772,43 @@ msgstr ""
#~ "Schnappschuss des Inhaltes aller Dateien im momentanen Verzeichnis "
#~ "anzufertigen."
-#
#~ msgid ""
-#~ "This snapshot is now stored in a temporary staging area which git calls "
-#~ "the \"index\". You can permanently store the contents of the index in "
-#~ "the repository with 'git-commit':"
+#~ "This snapshot is now stored in a temporary staging area which git calls the "
+#~ "\"index\". You can permanently store the contents of the index in the "
+#~ "repository with 'git-commit':"
#~ msgstr ""
-#~ "Dieser Schnappschuss wird nun in einem tempor채ren Sammelpunkt, welcher "
-#~ "git den \"Index\" nennt, abgelegt. Sie k철nnen den Inhalt des Indexes "
-#~ "permanent im Repository via 'git-commit' ablegen:"
+#~ "Dieser Schnappschuss wird nun in einem tempor채ren Sammelpunkt, welcher git "
+#~ "den \"Index\" nennt, abgelegt. Sie k철nnen den Inhalt des Indexes permanent "
+#~ "im Repository via 'git-commit' ablegen:"
-#
#~ msgid ""
#~ "This will prompt you for a commit message. You've now stored the first "
#~ "version of your project in git."
#~ msgstr ""
-#~ "Dies wird Sie nach einer \"Commit-Nachricht\", also einer Nachricht 체ber "
-#~ "den Commit, fragen. Sie haben nun die erste Version Ihres Projektes in "
-#~ "git abgelegt."
+#~ "Dies wird Sie nach einer \"Commit-Nachricht\", also einer Nachricht 체ber den"
+#~ " Commit, fragen. Sie haben nun die erste Version Ihres Projektes in git "
+#~ "abgelegt."
-#
#~ msgid "Modify some files, then add their updated contents to the index:"
#~ msgstr ""
#~ "Ver채ndern Sie einige Dateien und f체gen Sie den aktualisierten Inhalt dem "
#~ "Index hinzu:"
-#
#~ msgid ""
#~ "You are now ready to commit. You can see what is about to be committed "
#~ "using 'git-diff' with the --cached option:"
#~ msgstr ""
-#~ "Sie k철nnen nun wieder einen Commit ausf체hren. Sie k철nnen mit 'git-diff' "
-#~ "und der --cached option 체berpr체fen, was genau bei diesemm Commit "
-#~ "ausgef체hrt wird:"
+#~ "Sie k철nnen nun wieder einen Commit ausf체hren. Sie k철nnen mit 'git-diff' und "
+#~ "der --cached option 체berpr체fen, was genau bei diesemm Commit ausgef체hrt "
+#~ "wird:"
-#
#~ msgid ""
-#~ "(Without --cached, 'git-diff' will show you any changes that you've made "
-#~ "but not yet added to the index.) You can also get a brief summary of the "
+#~ "(Without --cached, 'git-diff' will show you any changes that you've made but"
+#~ " not yet added to the index.) You can also get a brief summary of the "
#~ "situation with 'git-status':"
#~ msgstr ""
-#~ "(Ohne --cached zeigt 'git-diff' alle 횆nderungen, die Sie durchgef체hrt, "
-#~ "aber noch nicht zum Index hinzugef체gt haben.) Sie k철nnen auch eine kurze "
+#~ "(Ohne --cached zeigt 'git-diff' alle 횆nderungen, die Sie durchgef체hrt, aber "
+#~ "noch nicht zum Index hinzugef체gt haben.) Sie k철nnen auch eine kurze "
#~ "Zusammenfassung der momentanen Situation mit 'git-status' erhalten:"
#~ msgid ""
@@ -75747,90 +74832,80 @@ msgstr ""
#~ "#\tmodified: file3\n"
#~ "#\n"
-#
#~ msgid ""
#~ "If you need to make any further adjustments, do so now, and then add any "
#~ "newly modified content to the index. Finally, commit your changes with:"
#~ msgstr ""
#~ "Wenn Sie weitere Anpassungen vornehmen m체ssen, tun Sie dies und f체gen Sie "
-#~ "dann alle neu ver채nderten Dateien dem Index hinzu. Schliesslich f체hren "
-#~ "Sie einen Commit mit Ihren 횆nderungen aus via:"
+#~ "dann alle neu ver채nderten Dateien dem Index hinzu. Schliesslich f체hren Sie "
+#~ "einen Commit mit Ihren 횆nderungen aus via:"
-#
#~ msgid ""
#~ "This will again prompt you for a message describing the change, and then "
#~ "record a new version of the project."
#~ msgstr ""
#~ "This will again prompt you for a message describing the change, and then "
#~ "record a new version of the project. Dies wird Sie erneut nach einer "
-#~ "Commit-Nachricht fragen, die die 횆nderung erkl채rt und dann eine neue "
-#~ "Version des Projektes erfassen."
+#~ "Commit-Nachricht fragen, die die 횆nderung erkl채rt und dann eine neue Version"
+#~ " des Projektes erfassen."
-#
#~ msgid "Alternatively, instead of running 'git-add' beforehand, you can use"
#~ msgstr "Anstatt 'git-add' zuvor auszuf체hren, k철nnen Sie auch"
-#
#~ msgid ""
-#~ "which will automatically notice any modified (but not new) files, add "
-#~ "them to the index, and commit, all in one step."
+#~ "which will automatically notice any modified (but not new) files, add them "
+#~ "to the index, and commit, all in one step."
#~ msgstr ""
-#~ "benutzen, was automatisch alle ver채nderten (aber nicht alle neuen) "
-#~ "Dateien heraussucht, dem Index hinzuf체gt und einen Commit ausf체hrt. Alles "
-#~ "in einem Schritt."
+#~ "benutzen, was automatisch alle ver채nderten (aber nicht alle neuen) Dateien "
+#~ "heraussucht, dem Index hinzuf체gt und einen Commit ausf체hrt. Alles in einem "
+#~ "Schritt."
-#
#~ msgid ""
#~ "A note on commit messages: Though not required, it's a good idea to begin "
#~ "the commit message with a single short (less than 50 character) line "
#~ "summarizing the change, followed by a blank line and then a more thorough "
-#~ "description. Tools that turn commits into email, for example, use the "
-#~ "first line on the Subject: line and the rest of the commit in the body."
+#~ "description. Tools that turn commits into email, for example, use the first"
+#~ " line on the Subject: line and the rest of the commit in the body."
#~ msgstr ""
#~ "Eine Anmerkung zu den Commit-Nachrichten: Obwohl sie nicht erforderlich "
#~ "sind, ist es eine gute Idee, die Commit-Nachricht mit einer einzelnen, "
-#~ "kurzen (weniger als 50 Zeichen lang), zusammenfassenden Zeile zu "
-#~ "beginnen, gefolgt von einer leeren Linie und dann einer gr체ndlicheren "
-#~ "Erkl채rung. Werkzeuge, beispielsweise, die Commits zu einer E-Mail "
-#~ "umwandeln, verwenden die erste Zeile als Zeile f체r den Subject:-Header "
-#~ "und den Rest der Commit-Nachricht als Inhalt der E-Mail."
+#~ "kurzen (weniger als 50 Zeichen lang), zusammenfassenden Zeile zu beginnen, "
+#~ "gefolgt von einer leeren Linie und dann einer gr체ndlicheren Erkl채rung. "
+#~ "Werkzeuge, beispielsweise, die Commits zu einer E-Mail umwandeln, verwenden "
+#~ "die erste Zeile als Zeile f체r den Subject:-Header und den Rest der Commit-"
+#~ "Nachricht als Inhalt der E-Mail."
#~ msgid "Git tracks content not files"
#~ msgstr "Git verfolgt den Inhalt, nicht Dateien"
-#
#~ msgid ""
-#~ "Many revision control systems provide an `add` command that tells the "
-#~ "system to start tracking changes to a new file. Git's `add` command does "
+#~ "Many revision control systems provide an `add` command that tells the system"
+#~ " to start tracking changes to a new file. Git's `add` command does "
#~ "something simpler and more powerful: 'git-add' is used both for new and "
#~ "newly modified files, and in both cases it takes a snapshot of the given "
-#~ "files and stages that content in the index, ready for inclusion in the "
-#~ "next commit."
+#~ "files and stages that content in the index, ready for inclusion in the next "
+#~ "commit."
#~ msgstr ""
#~ "Viele Revisionskontrollsysteme stellen ein Kommando `add` bereit, welches "
-#~ "dem System mitteilt, des solle mit der Verfolgung der 횆nderungen einer "
-#~ "Datei beginnen. Das Kommando `add` in git macht etwas einfacheres und "
+#~ "dem System mitteilt, des solle mit der Verfolgung der 횆nderungen einer Datei"
+#~ " beginnen. Das Kommando `add` in git macht etwas einfacheres und "
#~ "m채chtigeres: 'git-add' wird f체r beides verwendet, neue und ver채nderte "
-#~ "Dateien und in beiden F채llen nimmt git einen Schnappschuss der Dateien "
-#~ "und stellt den Inhalt dem Index bereit, fertig, um im n채chsten Commit "
-#~ "dabei zu sein."
+#~ "Dateien und in beiden F채llen nimmt git einen Schnappschuss der Dateien und "
+#~ "stellt den Inhalt dem Index bereit, fertig, um im n채chsten Commit dabei zu "
+#~ "sein."
#~ msgid "Viewing project history"
#~ msgstr "Die Projektgeschichte betrachten"
-#
#~ msgid "At any point you can view the history of your changes using"
#~ msgstr "Sie k철nnen jederzeit die Geschichte Ihres Projektes mit"
-#
#~ msgid "If you also want to see complete diffs at each step, use"
#~ msgstr ""
-#~ "Wenn Sie ebenfalls komplette Diffs f체r jeden Schritt sehen m철chten, "
-#~ "k철nnen Sie diesen Befehl benutzen:"
+#~ "Wenn Sie ebenfalls komplette Diffs f체r jeden Schritt sehen m철chten, k철nnen "
+#~ "Sie diesen Befehl benutzen:"
-#
-#~ msgid ""
-#~ "Often the overview of the change is useful to get a feel of each step"
+#~ msgid "Often the overview of the change is useful to get a feel of each step"
#~ msgstr ""
#~ "Oft ist eine 횥bersicht der 횆nderungen hilfreich um ein Gef체hl jedes "
#~ "Schrittes zu erhalten."
@@ -75841,10 +74916,9 @@ msgstr ""
#~ msgid "Managing branches"
#~ msgstr "Entwicklungszweige verwalten"
-#
#~ msgid ""
-#~ "A single git repository can maintain multiple branches of development. "
-#~ "To create a new branch named \"experimental\", use"
+#~ "A single git repository can maintain multiple branches of development. To "
+#~ "create a new branch named \"experimental\", use"
#~ msgstr ""
#~ "Ein einzelnes git-Repository kann mehrere Entwicklungszweige (Branches) "
#~ "verwalten. Um einen neuen Zweig mit Namen \"experimentell\" zu erstellen, "
@@ -75853,11 +74927,9 @@ msgstr ""
#~ msgid "$ git branch experimental\n"
#~ msgstr "$ git branch experimental\n"
-#
#~ msgid "If you now run"
#~ msgstr "Wenn Sie nun"
-#
#~ msgid "you'll get a list of all existing branches:"
#~ msgstr "ausf체hren, erhalten Sie eine Liste aller vorhandenen Zweige:"
@@ -75868,64 +74940,56 @@ msgstr ""
#~ " experimentell\n"
#~ "* master\n"
-#
#~ msgid ""
-#~ "The \"experimental\" branch is the one you just created, and the \"master"
-#~ "\" branch is a default branch that was created for you automatically. "
-#~ "The asterisk marks the branch you are currently on; type"
+#~ "The \"experimental\" branch is the one you just created, and the \"master\" "
+#~ "branch is a default branch that was created for you automatically. The "
+#~ "asterisk marks the branch you are currently on; type"
#~ msgstr ""
-#~ "Der Zweig \"experimentell\" ist derjenige, den Sie gerade erstellt haben "
-#~ "und der Zweig \"master\" ist der Standardzweig der standardm채ssig f체r Sie "
-#~ "erstellt wurde. Der Stern bezeichnet den Zweig, auf welchem Sie sich "
-#~ "gerade befinden; verwenden Sie"
+#~ "Der Zweig \"experimentell\" ist derjenige, den Sie gerade erstellt haben und"
+#~ " der Zweig \"master\" ist der Standardzweig der standardm채ssig f체r Sie "
+#~ "erstellt wurde. Der Stern bezeichnet den Zweig, auf welchem Sie sich gerade "
+#~ "befinden; verwenden Sie"
-#
#~ msgid ""
-#~ "to switch to the experimental branch. Now edit a file, commit the "
-#~ "change, and switch back to the master branch:"
+#~ "to switch to the experimental branch. Now edit a file, commit the change, "
+#~ "and switch back to the master branch:"
#~ msgstr ""
#~ "um in den Zweig \"experimentell\" zu wechseln. Nun bearbeiten Sie eine "
#~ "Datei, f체hren einen Commit aus und wechseln zur체ck zum Zweig \"master\":"
-#
#~ msgid ""
#~ "Check that the change you made is no longer visible, since it was made on "
#~ "the experimental branch and you're back on the master branch."
#~ msgstr ""
#~ "횥berpr체fen Sie, dass die von Ihnen vorgenommene 횆nderung nicht mehr "
-#~ "sichetbar ist, da sie eigentlich auf dem Zweig \"experimentell\" "
-#~ "ausgef체hrt wurde und sie sich nun im Zweig \"master\" befinden."
+#~ "sichetbar ist, da sie eigentlich auf dem Zweig \"experimentell\" ausgef체hrt "
+#~ "wurde und sie sich nun im Zweig \"master\" befinden."
-#
#~ msgid "You can make a different change on the master branch:"
#~ msgstr "Sie k철nnen eine andere 횆nderung im Zweig \"master\" vornehmen:"
-#
#~ msgid ""
-#~ "at this point the two branches have diverged, with different changes made "
-#~ "in each. To merge the changes made in experimental into master, run"
+#~ "at this point the two branches have diverged, with different changes made in"
+#~ " each. To merge the changes made in experimental into master, run"
#~ msgstr ""
-#~ "Nun weichen die Zweige von einander ab, mit jeweils anderen 횆nderungen. "
-#~ "Um die 횆nderungen im Zweig \"experimental\" und denjenigen im Zweig "
-#~ "\"master\" zusammenzuf체hren (mergen), benutzen Sie"
+#~ "Nun weichen die Zweige von einander ab, mit jeweils anderen 횆nderungen. Um "
+#~ "die 횆nderungen im Zweig \"experimental\" und denjenigen im Zweig \"master\" "
+#~ "zusammenzuf체hren (mergen), benutzen Sie"
-#
#~ msgid ""
-#~ "If the changes don't conflict, you're done. If there are conflicts, "
-#~ "markers will be left in the problematic files showing the conflict;"
+#~ "If the changes don't conflict, you're done. If there are conflicts, markers"
+#~ " will be left in the problematic files showing the conflict;"
#~ msgstr ""
-#~ "Wenn die 횆nderungen nicht miteinander im Konflikt stehen, sind Sie "
-#~ "fertig. Wenn Konflikte vorhanden sind werden Markierungen in den "
-#~ "problematischen Dateien gelassen, die den Konflikt erl채utern;"
+#~ "Wenn die 횆nderungen nicht miteinander im Konflikt stehen, sind Sie fertig. "
+#~ "Wenn Konflikte vorhanden sind werden Markierungen in den problematischen "
+#~ "Dateien gelassen, die den Konflikt erl채utern;"
-#
#~ msgid ""
#~ "will show this. Once you've edited the files to resolve the conflicts,"
#~ msgstr ""
-#~ "zeigt jene an. Sobald Sie die Dateien angepasst haben, um die Konflikte "
-#~ "zu l철sen, verwenden Sie:"
+#~ "zeigt jene an. Sobald Sie die Dateien angepasst haben, um die Konflikte zu "
+#~ "l철sen, verwenden Sie:"
-#
#~ msgid "will commit the result of the merge. Finally,"
#~ msgstr ""
#~ "Dies wird einen Commit mit den Resultaten der Zusammenf체hrung (Merge) "
@@ -75934,31 +74998,26 @@ msgstr ""
#~ msgid "$ gitk\n"
#~ msgstr "$ gitk\n"
-#
#~ msgid "will show a nice graphical representation of the resulting history."
#~ msgstr ""
-#~ "eine h체bsche graphische Repr채sentation der daraus resultierenden "
-#~ "Geschichte."
+#~ "eine h체bsche graphische Repr채sentation der daraus resultierenden Geschichte."
-#
#~ msgid "At this point you could delete the experimental branch with"
#~ msgstr "Nun k철nnten Sie den Zweig \"experimentell\" so l철schen:"
#~ msgid "$ git branch -d experimental\n"
#~ msgstr "$ git branch -d experimentell\n"
-#
#~ msgid ""
-#~ "This command ensures that the changes in the experimental branch are "
-#~ "already in the current branch."
+#~ "This command ensures that the changes in the experimental branch are already"
+#~ " in the current branch."
#~ msgstr ""
-#~ "Dieser Befehl versichert sich zun채chst, dass alle vorgenommenen "
-#~ "횆nderungen im Zweig \"experimentell\" bereits im aktuellen Zweig sind."
+#~ "Dieser Befehl versichert sich zun채chst, dass alle vorgenommenen 횆nderungen "
+#~ "im Zweig \"experimentell\" bereits im aktuellen Zweig sind."
-#
#~ msgid ""
-#~ "If you develop on a branch crazy-idea, then regret it, you can always "
-#~ "delete the branch with"
+#~ "If you develop on a branch crazy-idea, then regret it, you can always delete"
+#~ " the branch with"
#~ msgstr ""
#~ "Wenn Sie auf einem Zweig \"verrueckte-idee\" entwickeln und es sp채ter "
#~ "bereuen, k철nnen Sie den Zweig jederzeit mittels"
@@ -75966,7 +75025,6 @@ msgstr ""
#~ msgid "$ git branch -D crazy-idea\n"
#~ msgstr "$ git branch -D crazy-idea\n"
-#
#~ msgid ""
#~ "Branches are cheap and easy, so this is a good way to try something out."
#~ msgstr ""
@@ -75976,33 +75034,29 @@ msgstr ""
#~ msgid "Using git for collaboration"
#~ msgstr "Git f체r Zusammenarbeit verwenden"
-#
#~ msgid ""
-#~ "Suppose that Alice has started a new project with a git repository in /"
-#~ "home/alice/project, and that Bob, who has a home directory on the same "
+#~ "Suppose that Alice has started a new project with a git repository in "
+#~ "/home/alice/project, and that Bob, who has a home directory on the same "
#~ "machine, wants to contribute."
#~ msgstr ""
-#~ "Angenommen, dass Alice ein neues Projekt mit einem git-Repository in /"
-#~ "home/alice/projekt begonnen hat und dass Bob, welcher ebenfalls ein "
+#~ "Angenommen, dass Alice ein neues Projekt mit einem git-Repository in "
+#~ "/home/alice/projekt begonnen hat und dass Bob, welcher ebenfalls ein "
#~ "Homeverzeichnis auf der selben Maschine besitzt, bei diesem Projekt "
#~ "mitwirken will."
-#
#~ msgid "Bob begins with:"
#~ msgstr "Bob beginnt mit:"
-#
#~ msgid ""
#~ "This creates a new directory \"myrepo\" containing a clone of Alice's "
#~ "repository. The clone is on an equal footing with the original project, "
#~ "possessing its own copy of the original project's history."
#~ msgstr ""
-#~ "Dies erstellt ein neues Repository \"meinrepo\", welcher einen \"Klon\" "
-#~ "von Alice' Repository darstellt. Der Klon steht auf der selben Grundlage "
-#~ "wie das Originalprojekt, besitzt aber seine eigene Kopie der originalen "
+#~ "Dies erstellt ein neues Repository \"meinrepo\", welcher einen \"Klon\" von "
+#~ "Alice' Repository darstellt. Der Klon steht auf der selben Grundlage wie das"
+#~ " Originalprojekt, besitzt aber seine eigene Kopie der originalen "
#~ "Projektgeschichte."
-#
#~ msgid "Bob then makes some changes and commits them:"
#~ msgstr "Bob nimmt einige 횆nderungen vor und f체hrt Commits aus:"
@@ -76015,10 +75069,9 @@ msgstr ""
#~ "bob$ git commit -a\n"
#~ "(So oft wiederholen wie n철tig)\n"
-#
#~ msgid ""
-#~ "When he's ready, he tells Alice to pull changes from the repository at /"
-#~ "home/bob/myrepo. She does this with:"
+#~ "When he's ready, he tells Alice to pull changes from the repository at "
+#~ "/home/bob/myrepo. She does this with:"
#~ msgstr ""
#~ "Wenn er fertig ist, sagt er Alice, dass sie die 횆nderungen seines "
#~ "Repositorys in /home/bob/meinrepo ziehen (pullen) solle."
@@ -76030,59 +75083,54 @@ msgstr ""
#~ "alice$ cd /home/alice/projekt\n"
#~ "alice$ git pull /home/bob/meinrepo master\n"
-#
#~ msgid ""
#~ "This merges the changes from Bob's \"master\" branch into Alice's current "
#~ "branch. If Alice has made her own changes in the meantime, then she may "
-#~ "need to manually fix any conflicts. (Note that the \"master\" argument "
-#~ "in the above command is actually unnecessary, as it is the default.)"
+#~ "need to manually fix any conflicts. (Note that the \"master\" argument in "
+#~ "the above command is actually unnecessary, as it is the default.)"
#~ msgstr ""
#~ "Dies f체hrt die 횆nderungen von Bobs \"master\"-Zweig und Alice' aktuellem "
#~ "Zweig zusammen. Falls Alice eigene 횆nderungen in der Zwischenzeit "
-#~ "vorgenommen hat, muss sie eventuell Konflikte von Hand l철sen (Beachten "
-#~ "Sie, dass das Argument \"master\" im oberen Kommando eigentlich unn철tig "
-#~ "ist, da dies die Standardeinstellung ist)."
+#~ "vorgenommen hat, muss sie eventuell Konflikte von Hand l철sen (Beachten Sie, "
+#~ "dass das Argument \"master\" im oberen Kommando eigentlich unn철tig ist, da "
+#~ "dies die Standardeinstellung ist)."
-#
#~ msgid ""
-#~ "The \"pull\" command thus performs two operations: it fetches changes "
-#~ "from a remote branch, then merges them into the current branch."
+#~ "The \"pull\" command thus performs two operations: it fetches changes from a"
+#~ " remote branch, then merges them into the current branch."
#~ msgstr ""
#~ "Das \"pull\"-Kommando f체hrt also zwei Operationen durch: Es holt die "
#~ "횆nderungen eines fernen Zweiges und f체hrt sie mit dem momentanen Zweig "
#~ "zusammen."
-#
#~ msgid ""
#~ "Note that in general, Alice would want her local changes committed before "
-#~ "initiating this \"pull\". If Bob's work conflicts with what Alice did "
-#~ "since their histories forked, Alice will use her working tree and the "
-#~ "index to resolve conflicts, and existing local changes will interfere "
-#~ "with the conflict resolution process (git will still perform the fetch "
-#~ "but will refuse to merge --- Alice will have to get rid of her local "
-#~ "changes in some way and pull again when this happens)."
+#~ "initiating this \"pull\". If Bob's work conflicts with what Alice did since"
+#~ " their histories forked, Alice will use her working tree and the index to "
+#~ "resolve conflicts, and existing local changes will interfere with the "
+#~ "conflict resolution process (git will still perform the fetch but will "
+#~ "refuse to merge --- Alice will have to get rid of her local changes in some "
+#~ "way and pull again when this happens)."
#~ msgstr ""
#~ "Beachten Sie, dass Alice im Normalfall einen Commit mit ihren lokalen "
#~ "횆nderungen durchf체hren wollen w체rde, bevor sie den \"pull\" einleitet. "
#~ "Falls Bobs Arbeit mit dem, was Alice, seit sich die Geschichte gespalten "
-#~ "hat, im Konflikt steht, w체rde Alice ihren Arbeitsverzeichnisbaum "
-#~ "verwenden und den Index f체r den Aufl철sungsprozess (git w체rde die "
-#~ "횆nderungen dennoch beziehen aber sie nicht zusammenf체hren --- Alice muss "
-#~ "ihre lokalen 횆nderungen entfernen und erneut einen Pull ausf체hren, falls "
-#~ "dies geschieht)."
+#~ "hat, im Konflikt steht, w체rde Alice ihren Arbeitsverzeichnisbaum verwenden "
+#~ "und den Index f체r den Aufl철sungsprozess (git w체rde die 횆nderungen dennoch "
+#~ "beziehen aber sie nicht zusammenf체hren --- Alice muss ihre lokalen "
+#~ "횆nderungen entfernen und erneut einen Pull ausf체hren, falls dies geschieht)."
-#
#~ msgid ""
#~ "Alice can peek at what Bob did without merging first, using the \"fetch\" "
-#~ "command; this allows Alice to inspect what Bob did, using a special "
-#~ "symbol \"FETCH_HEAD\", in order to determine if he has anything worth "
-#~ "pulling, like this:"
+#~ "command; this allows Alice to inspect what Bob did, using a special symbol "
+#~ "\"FETCH_HEAD\", in order to determine if he has anything worth pulling, like"
+#~ " this:"
#~ msgstr ""
#~ "Alice kann zun채chst betrachten, was Bob genau getan hat, ohne einen Merge "
#~ "durchzuf체hren, mittels des \"fetch\"(holen, anfordern)-Kommandos; dieses "
#~ "erlaubt Alice zu inspizieren, das Bob getan hat, mittels eines speziellen "
-#~ "Symbols \"FETCH_HEAD\". Um zu entscheiden ob er etwas besitzt, f체r das "
-#~ "es sich lohnen w체rde, zu ziehen, kann sie dies wie folgt tun:"
+#~ "Symbols \"FETCH_HEAD\". Um zu entscheiden ob er etwas besitzt, f체r das es "
+#~ "sich lohnen w체rde, zu ziehen, kann sie dies wie folgt tun:"
#~ msgid ""
#~ "alice$ git fetch /home/bob/myrepo master\n"
@@ -76091,57 +75139,51 @@ msgstr ""
#~ "alice$ git fetch /home/bob/meinrepo master\n"
#~ "alice$ git log -p ..FETCH_HEAD\n"
-#
#~ msgid "This operation is safe even if Alice has uncommitted local changes."
#~ msgstr ""
#~ "Diese Operation ist sicher, selbst wenn Alice noch keinen Commit mit den "
#~ "lokalen 횆nderungen durchgef체hrt hat."
-#
#~ msgid ""
-#~ "After inspecting what Bob did, if there is nothing urgent, Alice may "
-#~ "decide to continue working without pulling from Bob. If Bob's history "
-#~ "does have something Alice would immediately need, Alice may choose to "
-#~ "stash her work-in-progress first, do a \"pull\", and then finally unstash "
-#~ "her work-in-progress on top of the resulting history."
+#~ "After inspecting what Bob did, if there is nothing urgent, Alice may decide "
+#~ "to continue working without pulling from Bob. If Bob's history does have "
+#~ "something Alice would immediately need, Alice may choose to stash her work-"
+#~ "in-progress first, do a \"pull\", and then finally unstash her work-in-"
+#~ "progress on top of the resulting history."
#~ msgstr ""
#~ "Nachdem sie unter die Lupe genommen hat, was Bob tat, wenn dort nichts "
#~ "drinliches vorliegt, kann sie sich dazu entschliessen, weiterzuarbeiten, "
-#~ "ohne die 횆nderungen von Bob zu beziehen. Falls die Geschichte von Bob "
-#~ "etwas besitzt, das Alice sofort ben철tigt, kann Alice den Weg w채hlen, "
-#~ "einen Commit mit ihrem Work-in-progress auszuf체hren, einen Pull "
-#~ "durchf체hren und schliesslich weiterzuarbeiten mit den 횆nderungen der "
-#~ "daraus resultierenden Geschichte."
+#~ "ohne die 횆nderungen von Bob zu beziehen. Falls die Geschichte von Bob etwas "
+#~ "besitzt, das Alice sofort ben철tigt, kann Alice den Weg w채hlen, einen Commit "
+#~ "mit ihrem Work-in-progress auszuf체hren, einen Pull durchf체hren und "
+#~ "schliesslich weiterzuarbeiten mit den 횆nderungen der daraus resultierenden "
+#~ "Geschichte."
-#
#~ msgid ""
#~ "When you are working in a small closely knit group, it is not unusual to "
-#~ "interact with the same repository over and over again. By defining "
-#~ "'remote' repository shorthand, you can make it easier:"
+#~ "interact with the same repository over and over again. By defining 'remote'"
+#~ " repository shorthand, you can make it easier:"
#~ msgstr ""
#~ "Wenn Sie in einer kleinen, eng verbundenen Gruppe arbeiten, ist es nicht "
-#~ "un체blich mit dem selben Repository immer und immer wieder zu "
-#~ "interagieren. Durch das definieren von 'remote' (fernen) Repositories im "
-#~ "Vorraus, k철nnen Sie es einfacher machen:"
+#~ "un체blich mit dem selben Repository immer und immer wieder zu interagieren. "
+#~ "Durch das definieren von 'remote' (fernen) Repositories im Vorraus, k철nnen "
+#~ "Sie es einfacher machen:"
#~ msgid "alice$ git remote add bob /home/bob/myrepo\n"
#~ msgstr "alice$ git remote add bob /home/bob/meinrepo\n"
-#
#~ msgid ""
-#~ "With this, Alice can perform the first part of the \"pull\" operation "
-#~ "alone using the 'git-fetch' command without merging them with her own "
-#~ "branch, using:"
+#~ "With this, Alice can perform the first part of the \"pull\" operation alone "
+#~ "using the 'git-fetch' command without merging them with her own branch, "
+#~ "using:"
#~ msgstr ""
-#~ "Damit kann Alice den ersten Teil der Pull-Operation allein mit dem "
-#~ "Kommando 'git-fetch' ohne Zusammenf체hrung mit ihrem eigenen Zweig "
-#~ "ausf체hren durch:"
+#~ "Damit kann Alice den ersten Teil der Pull-Operation allein mit dem Kommando "
+#~ "'git-fetch' ohne Zusammenf체hrung mit ihrem eigenen Zweig ausf체hren durch:"
-#
#~ msgid ""
#~ "Unlike the longhand form, when Alice fetches from Bob using a remote "
-#~ "repository shorthand set up with 'git-remote', what was fetched is stored "
-#~ "in a remote tracking branch, in this case `bob/master`. So after this:"
+#~ "repository shorthand set up with 'git-remote', what was fetched is stored in"
+#~ " a remote tracking branch, in this case `bob/master`. So after this:"
#~ msgstr ""
#~ "Im Gegensatz zur langen Form, wenn Alice von Bob mittels eines fernen "
#~ "Repositorys, welche mit 'git-remote' definiert wurden, die 횆nderungen "
@@ -76151,23 +75193,20 @@ msgstr ""
#~ msgid "alice$ git log -p master..bob/master\n"
#~ msgstr "alice$ git log -p master..bob/master\n"
-#
#~ msgid ""
-#~ "shows a list of all the changes that Bob made since he branched from "
-#~ "Alice's master branch."
+#~ "shows a list of all the changes that Bob made since he branched from Alice's"
+#~ " master branch."
#~ msgstr ""
#~ "Dies zeigt eine Liste aller 횆nderungen die Bob, seit er einen getrennten "
#~ "Zweig von Alice' \"master\"-Zweig erstellt hat, durchgef체hrt hat."
-#
#~ msgid ""
-#~ "After examining those changes, Alice could merge the changes into her "
-#~ "master branch:"
+#~ "After examining those changes, Alice could merge the changes into her master"
+#~ " branch:"
#~ msgstr ""
#~ "Nach dem begutachten dieser 횆nderungen, Alice kann die beiden Zweige "
#~ "zusammenf체hren."
-#
#~ msgid ""
#~ "This `merge` can also be done by 'pulling from her own remote tracking "
#~ "branch', like this:"
@@ -76178,23 +75217,21 @@ msgstr ""
#~ msgid "alice$ git pull . remotes/bob/master\n"
#~ msgstr "alice$ git pull . remotes/bob/master\n"
-#
#~ msgid "Later, Bob can update his repo with Alice's latest changes using"
#~ msgstr "Sp채ter kann Bob sein Repository mit jenem von Alice abgleichen mit"
#~ msgid "bob$ git pull\n"
#~ msgstr "bob$ git pull\n"
-#
#~ msgid ""
-#~ "Note that he doesn't need to give the path to Alice's repository; when "
-#~ "Bob cloned Alice's repository, git stored the location of her repository "
-#~ "in the repository configuration, and that location is used for pulls:"
+#~ "Note that he doesn't need to give the path to Alice's repository; when Bob "
+#~ "cloned Alice's repository, git stored the location of her repository in the "
+#~ "repository configuration, and that location is used for pulls:"
#~ msgstr ""
-#~ "Beachten Sie, dass er den Pfad zu Alice' Repository angeben muss; wenn "
-#~ "Bob das Repoistory von Alice geklont hat, legt git den Ort ihres "
-#~ "Repositorys in der Konfiguration des Repositorys ab und dieser Ort wird "
-#~ "f체r das Ziehen verwendet:"
+#~ "Beachten Sie, dass er den Pfad zu Alice' Repository angeben muss; wenn Bob "
+#~ "das Repoistory von Alice geklont hat, legt git den Ort ihres Repositorys in "
+#~ "der Konfiguration des Repositorys ab und dieser Ort wird f체r das Ziehen "
+#~ "verwendet:"
#~ msgid ""
#~ "bob$ git config --get remote.origin.url\n"
@@ -76203,68 +75240,60 @@ msgstr ""
#~ "bob$ git config --get remote.origin.url\n"
#~ "/home/alice/projekt\n"
-#
#~ msgid ""
#~ "(The complete configuration created by 'git-clone' is visible using `git "
-#~ "config -l`, and the linkgit:git-config[1] man page explains the meaning "
-#~ "of each option.)"
+#~ "config -l`, and the linkgit:git-config[1] man page explains the meaning of "
+#~ "each option.)"
#~ msgstr ""
-#~ "(Die komplette Konfiguration, welche durch 'git-clone' erstellt wurde "
-#~ "kann mittels `git config -l` eingesehen werden und die linkgit:git-"
-#~ "config[1] man page erkl채rt die Bedeutung jeder Option.)"
+#~ "(Die komplette Konfiguration, welche durch 'git-clone' erstellt wurde kann "
+#~ "mittels `git config -l` eingesehen werden und die linkgit:git-config[1] man "
+#~ "page erkl채rt die Bedeutung jeder Option.)"
-#
#~ msgid ""
#~ "Git also keeps a pristine copy of Alice's master branch under the name "
#~ "\"origin/master\":"
#~ msgstr ""
-#~ "Git beh채lt ausserdem eine unverf채lschte Kopie von Alice' \"master\"-"
-#~ "Zweiges unter dem Namen \"origin/master\":"
+#~ "Git beh채lt ausserdem eine unverf채lschte Kopie von Alice' \"master\"-Zweiges "
+#~ "unter dem Namen \"origin/master\":"
-#
#~ msgid ""
#~ "If Bob later decides to work from a different host, he can still perform "
#~ "clones and pulls using the ssh protocol:"
#~ msgstr ""
-#~ "Falls Bob sich sp채ter dazu entscheidet, von einem anderen Host zu "
-#~ "arbeiten, kann er immer noch klonen und ziehen durch das SSH-Protokoll:"
+#~ "Falls Bob sich sp채ter dazu entscheidet, von einem anderen Host zu arbeiten, "
+#~ "kann er immer noch klonen und ziehen durch das SSH-Protokoll:"
#~ msgid "bob$ git clone alice.org:/home/alice/project myrepo\n"
#~ msgstr "bob$ git clone alice.org:/home/alice/projekt meinrepo\n"
-#
#~ msgid ""
#~ "Alternatively, git has a native protocol, or can use rsync or http; see "
#~ "linkgit:git-pull[1] for details."
#~ msgstr ""
-#~ "Alternativ besitzt git auch ein natives Protokoll, oder er kann rsync "
-#~ "oder HTTP verwenden; siehe linkgit:git-pull[1] f체r Genaueres."
+#~ "Alternativ besitzt git auch ein natives Protokoll, oder er kann rsync oder "
+#~ "HTTP verwenden; siehe linkgit:git-pull[1] f체r Genaueres."
-#
#~ msgid ""
#~ "Git can also be used in a CVS-like mode, with a central repository that "
#~ "various users push changes to; see linkgit:git-push[1] and linkgit:gitcvs-"
#~ "migration[7]."
#~ msgstr ""
#~ "Git kann auch in einem CVS-채hnlichen Modus verwendet werden, mit einem "
-#~ "zentralen Repository, in welches verschiedene Benutzer 횆nderungen "
-#~ "versenden (push); siehe linkgit:git-push[1] und linkgit:gitcvs-"
-#~ "migration[7]."
+#~ "zentralen Repository, in welches verschiedene Benutzer 횆nderungen versenden "
+#~ "(push); siehe linkgit:git-push[1] und linkgit:gitcvs-migration[7]."
#~ msgid "Exploring history"
#~ msgstr "Die Geschichte erkunden"
-#
#~ msgid ""
#~ "Git history is represented as a series of interrelated commits. We have "
-#~ "already seen that the 'git-log' command can list those commits. Note "
-#~ "that first line of each git log entry also gives a name for the commit:"
+#~ "already seen that the 'git-log' command can list those commits. Note that "
+#~ "first line of each git log entry also gives a name for the commit:"
#~ msgstr ""
#~ "Die Git-Geschichte wird als eine Serie von untereinander miteinander in "
-#~ "Beziehung stehenden Commits repres채ntiert. Sie haben bereits gesehen, "
-#~ "dass das 'git-log' Kommando diese Commits auflisten kann. Beachten Sie, "
-#~ "dass die erste Zeile jedes Git-Logeintrages auch den Namen des Commits "
-#~ "ausgibt:"
+#~ "Beziehung stehenden Commits repres채ntiert. Sie haben bereits gesehen, dass "
+#~ "das 'git-log' Kommando diese Commits auflisten kann. Beachten Sie, dass die"
+#~ " erste Zeile jedes Git-Logeintrages auch den Namen des Commits ausgibt:"
#~ msgid ""
#~ "$ git log\n"
@@ -76278,26 +75307,25 @@ msgstr ""
#~ "Date: Tue May 16 17:18:22 2006 -0700\n"
#~ msgid " merge-base: Clarify the comments on post processing.\n"
-#~ msgstr " merge-base: Die Kommentare 체ber das Post-processing klarer gestaltet.\n"
+#~ msgstr ""
+#~ " merge-base: Die Kommentare 체ber das Post-processing klarer gestaltet.\n"
-#
#~ msgid ""
#~ "We can give this name to 'git-show' to see the details about this commit."
#~ msgstr ""
-#~ "Sie k철nnen diesen Namen 'git-show' 체bergeben, um Details 체ber den Commit "
-#~ "zu erfahren."
+#~ "Sie k철nnen diesen Namen 'git-show' 체bergeben, um Details 체ber den Commit zu "
+#~ "erfahren."
#~ msgid "$ git show c82a22c39cbc32576f64f5c6b3f24b99ea8149c7\n"
#~ msgstr "$ git show c82a22c39cbc32576f64f5c6b3f24b99ea8149c7\n"
-#
#~ msgid ""
-#~ "But there are other ways to refer to commits. You can use any initial "
-#~ "part of the name that is long enough to uniquely identify the commit:"
+#~ "But there are other ways to refer to commits. You can use any initial part "
+#~ "of the name that is long enough to uniquely identify the commit:"
#~ msgstr ""
-#~ "Aber es gibt noch andere Wege, um auf Commits zu referenzieren. Sie "
-#~ "k철nnen irgendeinen anf채nglichen Teil des Commits nehmen, der lange genug "
-#~ "ist, um den Commit zu identifizieren:"
+#~ "Aber es gibt noch andere Wege, um auf Commits zu referenzieren. Sie k철nnen "
+#~ "irgendeinen anf채nglichen Teil des Commits nehmen, der lange genug ist, um "
+#~ "den Commit zu identifizieren:"
#~ msgid ""
#~ "$ git show c82a22c39c\t# the first few characters of the name are\n"
@@ -76310,13 +75338,12 @@ msgstr ""
#~ "$ git show HEAD\t\t# die Spitze des aktuellen Zweiges\n"
#~ "$ git show experimentell\t# die Spitze des \"experimentell\"-Zweiges\n"
-#
#~ msgid ""
-#~ "Every commit usually has one \"parent\" commit which points to the "
-#~ "previous state of the project:"
+#~ "Every commit usually has one \"parent\" commit which points to the previous "
+#~ "state of the project:"
#~ msgstr ""
-#~ "Jeder Commit hat normalerweise einen \"Eltern\" (parent)-Commit, welcher "
-#~ "auf den vorherigen Status des Projekts zeigt:"
+#~ "Jeder Commit hat normalerweise einen \"Eltern\" (parent)-Commit, welcher auf"
+#~ " den vorherigen Status des Projekts zeigt:"
#~ msgid ""
#~ "$ git show HEAD^ # to see the parent of HEAD\n"
@@ -76327,7 +75354,6 @@ msgstr ""
#~ "$ git show HEAD^^ # um den Grosseltern-Commit von HEAD zu sehen\n"
#~ "$ git show HEAD~4 # um den Urgrosseltern-Commit von HEAD zu sehen\n"
-#
#~ msgid "Note that merge commits may have more than one parent:"
#~ msgstr ""
#~ "Beachten Sie, dass zusammengef체hrte Commits mehr als einen Eltern-Commit "
@@ -76340,14 +75366,12 @@ msgstr ""
#~ "$ git show HEAD^1 # Den ersten Eltern-Commit von HEAD (das Selbe wie HEAD^) einsehen\n"
#~ "$ git show HEAD^2 # Den zweiten Eltern-Commit von HEAD einsehen\n"
-#
#~ msgid "You can also give commits names of your own; after running"
#~ msgstr "Sie k철nnen auch selbst Commits namen geben; nach"
#~ msgid "$ git tag v2.5 1b2e1d63ff\n"
#~ msgstr "$ git tag v2.5 1b2e1d63ff\n"
-#
#~ msgid ""
#~ "you can refer to 1b2e1d63ff by the name \"v2.5\". If you intend to share "
#~ "this name with other people (for example, to identify a release version), "
@@ -76356,11 +75380,9 @@ msgstr ""
#~ msgstr ""
#~ "K철nnen Sie auf 1b2e1d63ff mit dem Namen \"v2.5\" referenzieren. Falls Sie "
#~ "diesen Namen mit anderen teilen m철chten (zum Beispiel, um eine "
-#~ "Releaseversion zu identifizieren), sollten Sie ein \"tag\"-Objekt "
-#~ "erstellen und es eventuell noch signieren; siehe linkgit:git-tag[1] f체r "
-#~ "Details."
+#~ "Releaseversion zu identifizieren), sollten Sie ein \"tag\"-Objekt erstellen "
+#~ "und es eventuell noch signieren; siehe linkgit:git-tag[1] f체r Details."
-#
#~ msgid ""
#~ "Any git command that needs to know a commit can take any of these names. "
#~ "For example:"
@@ -76381,27 +75403,25 @@ msgstr ""
#~ "$ git reset --hard HEAD^ # Den aktuellen Zweig und das aktuelle Arbeitsverzeichnis\n"
#~ "\t\t\t # zur체cksetzen auf seinen Status in HEAD^\n"
-#
#~ msgid ""
-#~ "Be careful with that last command: in addition to losing any changes in "
-#~ "the working directory, it will also remove all later commits from this "
-#~ "branch. If this branch is the only branch containing those commits, they "
-#~ "will be lost. Also, don't use 'git-reset' on a publicly-visible branch "
-#~ "that other developers pull from, as it will force needless merges on "
-#~ "other developers to clean up the history. If you need to undo changes "
-#~ "that you have pushed, use 'git-revert' instead."
+#~ "Be careful with that last command: in addition to losing any changes in the "
+#~ "working directory, it will also remove all later commits from this branch. "
+#~ "If this branch is the only branch containing those commits, they will be "
+#~ "lost. Also, don't use 'git-reset' on a publicly-visible branch that other "
+#~ "developers pull from, as it will force needless merges on other developers "
+#~ "to clean up the history. If you need to undo changes that you have pushed, "
+#~ "use 'git-revert' instead."
#~ msgstr ""
-#~ "Seien Sie vorsichtig mit dem vorherigen Kommando: Zus채tzlich zum "
-#~ "verlieren aller 횆nderungen im aktuellen Arbeitsverzeichnis, werden auch "
-#~ "noch alle sp채teren Commits dieses Zweigs gel철scht. Wenn dieser Zweig der "
-#~ "einzige ist welcher diese Commits enth채lt, gehen diese verloren. "
-#~ "Ausserdem, benutzen Sie 'git-reset' nicht auf einem 철ffentlich "
-#~ "einsehbaren Zweig von der andere Entwickler ziehen, da es sinnlose "
-#~ "Zusammenf체hrungen erzwingt und die Geschichte ges채ubert werden muss. "
-#~ "Falls Sie irgendwelche 횆nderungen r체ckg채ngig machen m체ssen, die Sie "
-#~ "versendet haben, sollten Sie stattdessen 'git-revert' benutzen."
+#~ "Seien Sie vorsichtig mit dem vorherigen Kommando: Zus채tzlich zum verlieren "
+#~ "aller 횆nderungen im aktuellen Arbeitsverzeichnis, werden auch noch alle "
+#~ "sp채teren Commits dieses Zweigs gel철scht. Wenn dieser Zweig der einzige ist "
+#~ "welcher diese Commits enth채lt, gehen diese verloren. Ausserdem, benutzen "
+#~ "Sie 'git-reset' nicht auf einem 철ffentlich einsehbaren Zweig von der andere "
+#~ "Entwickler ziehen, da es sinnlose Zusammenf체hrungen erzwingt und die "
+#~ "Geschichte ges채ubert werden muss. Falls Sie irgendwelche 횆nderungen "
+#~ "r체ckg채ngig machen m체ssen, die Sie versendet haben, sollten Sie stattdessen "
+#~ "'git-revert' benutzen."
-#
#~ msgid ""
#~ "The 'git-grep' command can search for strings in any version of your "
#~ "project, so"
@@ -76412,27 +75432,23 @@ msgstr ""
#~ msgid "$ git grep \"hello\" v2.5\n"
#~ msgstr "$ git grep \"hallo\" v2.5\n"
-#
#~ msgid "searches for all occurrences of \"hello\" in v2.5."
#~ msgstr "nach allen Vorkommnissen von \"hallo\" in v2.5."
#~ msgid "$ git grep \"hello\"\n"
#~ msgstr "$ git grep \"hello\"\n"
-#
#~ msgid "is a quick way to search just the files that are tracked by git."
#~ msgstr ""
#~ "ist also ein einfacher Weg, nur die Dateien zu durchsuchen, die git "
#~ "verwaltet."
-#
#~ msgid ""
#~ "Many git commands also take sets of commits, which can be specified in a "
#~ "number of ways. Here are some examples with 'git-log':"
#~ msgstr ""
-#~ "Viele git-Befehle k철nnen auch mehrere Commits als Argumente annehmen, "
-#~ "welche verschieden ausgedr체ckt werden k철nnen. Hier einige Beispiele mit "
-#~ "'git-log':"
+#~ "Viele git-Befehle k철nnen auch mehrere Commits als Argumente annehmen, welche"
+#~ " verschieden ausgedr체ckt werden k철nnen. Hier einige Beispiele mit 'git-log':"
#~ msgid ""
#~ "$ git log v2.5..v2.6 # commits between v2.5 and v2.6\n"
@@ -76447,7 +75463,6 @@ msgstr ""
#~ "$ git log v2.5.. Makefile # Commits seit v2.5 in welchen\n"
#~ "\t\t\t\t# Makefile bearbeitet wurde\n"
-#
#~ msgid ""
#~ "You can also give 'git-log' a \"range\" of commits where the first is not "
#~ "necessarily an ancestor of the second; for example, if the tips of the "
@@ -76456,8 +75471,8 @@ msgstr ""
#~ msgstr ""
#~ "Sie k철nnen 'git-log' auch einen \"Bereich\" (range) von Commits angeben, "
#~ "wovon der Erste nicht unbeding ein Vorfahre des Zweiten sein muss; zum "
-#~ "Beispiel, wenn die Spitzen der Zweige \"stabil\" und \"experimentell\" "
-#~ "sich getrennt haben von einem gemeinsamen Commit, dann zeigt"
+#~ "Beispiel, wenn die Spitzen der Zweige \"stabil\" und \"experimentell\" sich "
+#~ "getrennt haben von einem gemeinsamen Commit, dann zeigt"
#~ msgid "$ git log stable..experimental\n"
#~ msgstr "$ git log stabil..experimentell\n"
@@ -76465,7 +75480,6 @@ msgstr ""
#~ msgid "$ git log experimental..stable\n"
#~ msgstr "$ git log experimentell..stabil\n"
-#
#~ msgid ""
#~ "will show the list of commits made on the stable branch but not the "
#~ "experimental branch."
@@ -76473,45 +75487,39 @@ msgstr ""
#~ "die Commits an, die im Zweig \"stabil\" aber nicht im Zweig "
#~ "\"experimentell\" vorgenommen wurden."
-#
#~ msgid ""
#~ "The 'git-log' command has a weakness: it must present commits in a list. "
-#~ "When the history has lines of development that diverged and then merged "
-#~ "back together, the order in which 'git-log' presents those commits is "
+#~ "When the history has lines of development that diverged and then merged back"
+#~ " together, the order in which 'git-log' presents those commits is "
#~ "meaningless."
#~ msgstr ""
#~ "Das 'git-log'-Kommando hat eine Schw채che: Es muss Commits in einer Liste "
-#~ "anzeigen. Wenn die Geschichte Entwicklungszweige enth채lt, die sich "
-#~ "getrennt und wieder zusammengef체hrt haben, ist die Reihenfolge, in "
-#~ "welcher 'git-log' die Commits anzeigt, bedeutungslos."
+#~ "anzeigen. Wenn die Geschichte Entwicklungszweige enth채lt, die sich getrennt "
+#~ "und wieder zusammengef체hrt haben, ist die Reihenfolge, in welcher 'git-log' "
+#~ "die Commits anzeigt, bedeutungslos."
-#
#~ msgid ""
-#~ "Most projects with multiple contributors (such as the linux kernel, or "
-#~ "git itself) have frequent merges, and 'gitk' does a better job of "
-#~ "visualizing their history. For example,"
+#~ "Most projects with multiple contributors (such as the linux kernel, or git "
+#~ "itself) have frequent merges, and 'gitk' does a better job of visualizing "
+#~ "their history. For example,"
#~ msgstr ""
-#~ "Die meisten Projekte mit mehreren Mitwirkenden (wie der Linuxkernel oder "
-#~ "git selbst) haben h채ufige Zusammenf체hrungen. 'gitk' funktioniert in "
-#~ "diesem Falle besser, um die Projektgeschichte zu visualisieren. "
-#~ "Beispielsweise"
+#~ "Die meisten Projekte mit mehreren Mitwirkenden (wie der Linuxkernel oder git"
+#~ " selbst) haben h채ufige Zusammenf체hrungen. 'gitk' funktioniert in diesem "
+#~ "Falle besser, um die Projektgeschichte zu visualisieren. Beispielsweise"
#~ msgid "$ gitk --since=\"2 weeks ago\" drivers/\n"
#~ msgstr "$ gitk --since=\"2 weeks ago\" treiber/\n"
-#
#~ msgid ""
#~ "allows you to browse any commits from the last 2 weeks of commits that "
#~ "modified files under the \"drivers\" directory. (Note: you can adjust "
-#~ "gitk's fonts by holding down the control key while pressing \"-\" or \"+"
-#~ "\".)"
+#~ "gitk's fonts by holding down the control key while pressing \"-\" or \"+\".)"
#~ msgstr ""
-#~ "erlaubt Ihnen, die Commits der letzten zwei Wochen im \"treiber\"-"
-#~ "Verzeichnis durchzusehen (Hinweis: Sie k철nnen die Schriften von gitk "
-#~ "anpassen, indem Sie die Strg- oder die Control-Taste gedr체ckt halten und "
-#~ "\"+\" oder \"-\" dr체cken)."
+#~ "erlaubt Ihnen, die Commits der letzten zwei Wochen im "
+#~ "\"treiber\"-Verzeichnis durchzusehen (Hinweis: Sie k철nnen die Schriften von "
+#~ "gitk anpassen, indem Sie die Strg- oder die Control-Taste gedr체ckt halten "
+#~ "und \"+\" oder \"-\" dr체cken)."
-#
#~ msgid ""
#~ "Finally, most commands that take filenames will optionally allow you to "
#~ "precede any filename by a commit, to specify a particular version of the "
@@ -76524,7 +75532,6 @@ msgstr ""
#~ msgid "$ git diff v2.5:Makefile HEAD:Makefile.in\n"
#~ msgstr "$ git diff v2.5:Makefile HEAD:Makefile.in\n"
-#
#~ msgid "You can also use 'git-show' to see any such file:"
#~ msgstr ""
#~ "Sie k철nnen auch 'git-show' verwenden, um eine solche Datei einzusehen:"
@@ -76535,92 +75542,79 @@ msgstr ""
#~ msgid "Next Steps"
#~ msgstr "N채chste Schritte"
-#
#~ msgid ""
-#~ "This tutorial should be enough to perform basic distributed revision "
-#~ "control for your projects. However, to fully understand the depth and "
-#~ "power of git you need to understand two simple ideas on which it is based:"
+#~ "This tutorial should be enough to perform basic distributed revision control"
+#~ " for your projects. However, to fully understand the depth and power of git"
+#~ " you need to understand two simple ideas on which it is based:"
#~ msgstr ""
-#~ "Diese Anleitung sollte f체r grundlegende verteilte Revisionskontrolle "
-#~ "Ihrer Projekte reichen. Um jedoch die Tiefe und Macht von git komplett zu "
+#~ "Diese Anleitung sollte f체r grundlegende verteilte Revisionskontrolle Ihrer "
+#~ "Projekte reichen. Um jedoch die Tiefe und Macht von git komplett zu "
#~ "verstehen, m체ssen Sie zwei einfache Ideen verstehen, auf welchen git "
#~ "basiert:"
-#
#~ msgid ""
-#~ "The object database is the rather elegant system used to store the "
-#~ "history of your project--files, directories, and commits."
+#~ "The object database is the rather elegant system used to store the history "
+#~ "of your project--files, directories, and commits."
#~ msgstr ""
-#~ "Die Objektdatenbank ist die eher elegante Methode, um die Geschichte "
-#~ "ihrer Projektdateien, -verzeichnisse und -commits abzulegen"
+#~ "Die Objektdatenbank ist die eher elegante Methode, um die Geschichte ihrer "
+#~ "Projektdateien, -verzeichnisse und -commits abzulegen"
-#
#~ msgid ""
-#~ "The index file is a cache of the state of a directory tree, used to "
-#~ "create commits, check out working directories, and hold the various trees "
-#~ "involved in a merge."
+#~ "The index file is a cache of the state of a directory tree, used to create "
+#~ "commits, check out working directories, and hold the various trees involved "
+#~ "in a merge."
#~ msgstr ""
-#~ "Die Indexdatei ist ein Zwischenspeicher des Status eines "
-#~ "Verzeichnisbaumes, der verwendet wird, um Bereitstellungen zu erzeugen, "
-#~ "Arbeitsverzeichnisse umzustellen und die verschiedenen in einer "
-#~ "Zusammenf체hrung involvierten B채ume zu behalten."
+#~ "Die Indexdatei ist ein Zwischenspeicher des Status eines Verzeichnisbaumes, "
+#~ "der verwendet wird, um Bereitstellungen zu erzeugen, Arbeitsverzeichnisse "
+#~ "umzustellen und die verschiedenen in einer Zusammenf체hrung involvierten "
+#~ "B채ume zu behalten."
-#
#~ msgid ""
-#~ "Part two of this tutorial explains the object database, the index file, "
-#~ "and a few other odds and ends that you'll need to make the most of git. "
-#~ "You can find it at linkgit:gittutorial-2[7]."
+#~ "Part two of this tutorial explains the object database, the index file, and "
+#~ "a few other odds and ends that you'll need to make the most of git. You can "
+#~ "find it at linkgit:gittutorial-2[7]."
#~ msgstr ""
-#~ "Teil zwei dieser Anleitung erkl채rt die Objektdatenbank, die "
-#~ "Bereitstellung und einige andere Kleinigkeiten die Sie ben철tigen um das "
-#~ "meiste aus git herauszuholen. Es befindet sich unter linkgit:"
-#~ "gittutorial-2[7]."
+#~ "Teil zwei dieser Anleitung erkl채rt die Objektdatenbank, die Bereitstellung "
+#~ "und einige andere Kleinigkeiten die Sie ben철tigen um das meiste aus git "
+#~ "herauszuholen. Es befindet sich unter linkgit:gittutorial-2[7]."
-#
#~ msgid ""
-#~ "If you don't want to continue with that right away, a few other "
-#~ "digressions that may be interesting at this point are:"
+#~ "If you don't want to continue with that right away, a few other digressions "
+#~ "that may be interesting at this point are:"
#~ msgstr ""
#~ "Falls Sie nicht gleich damit weiterfahren wollen, einige dieser Exkurse "
#~ "k철nnen nun interessant sein:"
-#
#~ msgid ""
-#~ "linkgit:git-format-patch[1], linkgit:git-am[1]: These convert series of "
-#~ "git commits into emailed patches, and vice versa, useful for projects "
-#~ "such as the linux kernel which rely heavily on emailed patches."
+#~ "linkgit:git-format-patch[1], linkgit:git-am[1]: These convert series of git "
+#~ "commits into emailed patches, and vice versa, useful for projects such as "
+#~ "the linux kernel which rely heavily on emailed patches."
#~ msgstr ""
-#~ "linkgit:git-format-patch[1], linkgit:git-am[1]: Diese wandeln eine Serie "
-#~ "von Giteintragungen in als E-Mail versandte Patches um und umgekehrt. "
-#~ "N체tzlich f체r Projekte wie den Linuxkernel, welcher stark auf per E-Mail "
-#~ "versandten Patches basiert."
+#~ "linkgit:git-format-patch[1], linkgit:git-am[1]: Diese wandeln eine Serie von"
+#~ " Giteintragungen in als E-Mail versandte Patches um und umgekehrt. N체tzlich "
+#~ "f체r Projekte wie den Linuxkernel, welcher stark auf per E-Mail versandten "
+#~ "Patches basiert."
-#
#~ msgid ""
-#~ "linkgit:git-bisect[1]: When there is a regression in your project, one "
-#~ "way to track down the bug is by searching through the history to find the "
-#~ "exact commit that's to blame. Git bisect can help you perform a binary "
-#~ "search for that commit. It is smart enough to perform a close-to-optimal "
-#~ "search even in the case of complex non-linear history with lots of merged "
-#~ "branches."
+#~ "linkgit:git-bisect[1]: When there is a regression in your project, one way "
+#~ "to track down the bug is by searching through the history to find the exact "
+#~ "commit that's to blame. Git bisect can help you perform a binary search for"
+#~ " that commit. It is smart enough to perform a close-to-optimal search even "
+#~ "in the case of complex non-linear history with lots of merged branches."
#~ msgstr ""
-#~ "linkgit:git-bisect[1]: Falls sich ein R체ckschritt im Projekt befindet, "
-#~ "ein Weg, das Problem zu finden, ist das Suchen in der Geschichte um die "
-#~ "exakte Eintragung zu finden, welche daran schuld ist. Git bisect kann "
-#~ "Ihnen helfen, eine Bin채rsuche nach diesem Commit zu starten. Es ist "
-#~ "clever genug, um eine fast-optimale Suche auszuf체hren, selbst im Falle "
-#~ "einer komplexen, nicht-linearen Geschichte mit vielen zusammengef체hrten "
-#~ "Zweigen."
+#~ "linkgit:git-bisect[1]: Falls sich ein R체ckschritt im Projekt befindet, ein "
+#~ "Weg, das Problem zu finden, ist das Suchen in der Geschichte um die exakte "
+#~ "Eintragung zu finden, welche daran schuld ist. Git bisect kann Ihnen helfen,"
+#~ " eine Bin채rsuche nach diesem Commit zu starten. Es ist clever genug, um "
+#~ "eine fast-optimale Suche auszuf체hren, selbst im Falle einer komplexen, "
+#~ "nicht-linearen Geschichte mit vielen zusammengef체hrten Zweigen."
-#
#~ msgid "link:everyday.html[Everyday GIT with 20 Commands Or So]"
#~ msgstr "link:everyday.html[T채gliches GIT mit 20 Befehlen oder so]"
-#
#~ msgid "linkgit:gitcvs-migration[7]: Git for CVS users."
#~ msgstr "linkgit:gitcvs-migration[7]: Git f체r CVS-Benutzer."
-#
#~ msgid ""
#~ "linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:gitcore-"
#~ "tutorial[7], linkgit:gitglossary[7], link:everyday.html[Everyday git], "
@@ -76630,7 +75624,6 @@ msgstr ""
#~ "tutorial[7], linkgit:gitglossary[7], link:everyday.html[T채gliches git], "
#~ "link:user-manual.html[The Git User's Manual]"
-#
#~ msgid ""
#~ "Written by Jan Harkes <jaharkes@cs.cmu.edu> and Eric W. Biederman "
#~ "<ebiederm@xmission.com>"
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index b9dbd97c11e02564c6e1acb683c371ea9a942f0a..619afe6025fd9f183cf24264c3da0756b2184e41 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
-"POT-Creation-Date: 2019-01-03 23:03+0100\n"
-"PO-Revision-Date: 2019-01-04 21:37+0100\n"
+"POT-Creation-Date: 2019-01-04 23:29+0100\n"
+"PO-Revision-Date: 2019-01-06 21:24+0100\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"
@@ -21,7 +21,7 @@ msgstr ""
#: en/git-status.txt:31 en/git-submodule.txt:279
#, no-wrap
msgid "-b"
-msgstr ""
+msgstr "-b"
#. type: Plain text
#: en/blame-options.txt:4
@@ -35,7 +35,7 @@ msgstr ""
#: en/git-fsck.txt:38 en/git-rebase.txt:415
#, no-wrap
msgid "--root"
-msgstr ""
+msgstr "--root"
#. type: Plain text
#: en/blame-options.txt:8
@@ -48,7 +48,7 @@ msgstr ""
#: en/blame-options.txt:9
#, no-wrap
msgid "--show-stats"
-msgstr ""
+msgstr "--show-stats"
#. type: Plain text
#: en/blame-options.txt:11
@@ -77,8 +77,8 @@ msgstr ""
#. type: Plain text
#: en/blame-options.txt:19
msgid ""
-"<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans from "
-"<start> to end of file. ``-L ,<end>'' spans from start of file to <end>."
+"<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans from"
+" <start> to end of file. ``-L ,<end>'' spans from start of file to <end>."
msgstr ""
#. type: Labeled list
@@ -88,7 +88,7 @@ msgstr ""
#: en/git-repack.txt:61 en/git-svn.txt:228 en/git-var.txt:20
#, no-wrap
msgid "-l"
-msgstr ""
+msgstr "-l"
#. type: Plain text
#: en/blame-options.txt:24
@@ -102,7 +102,7 @@ msgstr ""
#: en/git-ls-tree.txt:47 en/git-svn.txt:296 en/rev-list-options.txt:890
#, no-wrap
msgid "-t"
-msgstr ""
+msgstr "-t"
#. type: Plain text
#: en/blame-options.txt:27
@@ -130,11 +130,11 @@ msgstr ""
#. type: Plain text
#: en/blame-options.txt:38
msgid ""
-"Walk history forward instead of backward. Instead of showing the revision in "
-"which a line appeared, this shows the last revision in which a line has "
-"existed. This requires a range of revision like START..END where the path to "
-"blame exists in START. `git blame --reverse START` is taken as `git blame --"
-"reverse START..HEAD` for convenience."
+"Walk history forward instead of backward. Instead of showing the revision in"
+" which a line appeared, this shows the last revision in which a line has "
+"existed. This requires a range of revision like START..END where the path to"
+" blame exists in START. `git blame --reverse START` is taken as `git blame "
+"--reverse START..HEAD` for convenience."
msgstr ""
#. type: Labeled list
@@ -164,7 +164,7 @@ msgstr ""
#: en/blame-options.txt:43
#, no-wrap
msgid "--line-porcelain"
-msgstr ""
+msgstr "--line-porcelain"
#. type: Plain text
#: en/blame-options.txt:47
@@ -177,7 +177,7 @@ msgstr ""
#: en/blame-options.txt:48 en/git-pack-objects.txt:123 en/git-svn.txt:357
#, no-wrap
msgid "--incremental"
-msgstr ""
+msgstr "--incremental"
#. type: Plain text
#: en/blame-options.txt:51
@@ -235,7 +235,7 @@ msgstr ""
#: en/blame-options.txt:73 en/git-checkout.txt:110 en/git-fsck.txt:92
#, no-wrap
msgid "--[no-]progress"
-msgstr ""
+msgstr "--[no-]progress"
#. type: Plain text
#: en/blame-options.txt:79
@@ -258,8 +258,8 @@ msgid ""
"Detect moved or copied lines within a file. When a commit moves or copies a "
"block of lines (e.g. the original file has A and then B, and the commit "
"changes it to B and then A), the traditional 'blame' algorithm notices only "
-"half of the movement and typically blames the lines that were moved up (i.e. "
-"B) to the parent and assigns blame to the lines that were moved down (i.e. "
+"half of the movement and typically blames the lines that were moved up (i.e."
+" B) to the parent and assigns blame to the lines that were moved down (i.e. "
"A) to the child commit. With this option, both groups of lines are blamed "
"on the parent by running extra passes of inspection."
msgstr ""
@@ -281,10 +281,10 @@ msgstr ""
#. type: Plain text
#: en/blame-options.txt:105
msgid ""
-"In addition to `-M`, detect lines moved or copied from other files that were "
-"modified in the same commit. This is useful when you reorganize your "
-"program and move code around across files. When this option is given twice, "
-"the command additionally looks for copies from other files in the commit "
+"In addition to `-M`, detect lines moved or copied from other files that were"
+" modified in the same commit. This is useful when you reorganize your "
+"program and move code around across files. When this option is given twice,"
+" the command additionally looks for copies from other files in the commit "
"that creates the file. When this option is given three times, the command "
"additionally looks for copies from other files in any commit."
msgstr ""
@@ -304,7 +304,7 @@ msgstr ""
#: en/git-cvsserver.txt:48 en/git-grep.txt:141 en/git-ls-remote.txt:24
#, no-wrap
msgid "-h"
-msgstr ""
+msgstr "-h"
#. type: Plain text
#: en/blame-options.txt:114
@@ -315,7 +315,7 @@ msgstr ""
#: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:234
#, no-wrap
msgid "linkgit:git-annotate[1]"
-msgstr ""
+msgstr "linkgit:git-annotate[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:3
@@ -326,7 +326,7 @@ msgstr ""
#: en/cmds-ancillaryinterrogators.txt:4 en/git-annotate.txt:31
#, no-wrap
msgid "linkgit:git-blame[1]"
-msgstr ""
+msgstr "linkgit:git-blame[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:6
@@ -335,10 +335,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-cherry[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-cherry[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:9
@@ -347,10 +346,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:10
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-count-objects[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:12
@@ -359,10 +357,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:13
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-difftool[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-difftool[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:15
@@ -371,10 +368,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:16
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-fsck[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-fsck[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
@@ -383,10 +379,9 @@ msgstr "V챕rifie la connectivit챕 et la validit챕 des objets en base de donn챕es
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:19
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-get-tar-commit-id[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-get-tar-commit-id[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:21
@@ -395,10 +390,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:22
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-help[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-help[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:24
@@ -407,10 +401,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:25
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-instaweb[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:27
@@ -419,10 +412,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:28
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-merge-tree[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:30
@@ -431,10 +423,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:31
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-rerere[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-rerere[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:33
@@ -443,10 +434,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:34
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "linkgit:git-rev-parse[1]"
-msgstr "git-add(1)"
+msgstr "linkgit:git-rev-parse[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:36
@@ -455,10 +445,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:37
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-show-branch[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-show-branch[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:39
@@ -467,10 +456,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:40
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-verify-commit[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-verify-commit[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:42
@@ -479,10 +467,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:43
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-verify-tag[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-verify-tag[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:45
@@ -491,10 +478,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:46
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "linkgit:git-whatchanged[1]"
-msgstr "git-add(1)"
+msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:48
@@ -516,7 +502,7 @@ msgstr ""
#: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:142
#, no-wrap
msgid "linkgit:git-config[1]"
-msgstr ""
+msgstr "linkgit:git-config[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:3
@@ -527,7 +513,7 @@ msgstr ""
#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1472
#, no-wrap
msgid "linkgit:git-fast-export[1]"
-msgstr ""
+msgstr "linkgit:git-fast-export[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:6
@@ -538,7 +524,7 @@ msgstr ""
#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:215
#, no-wrap
msgid "linkgit:git-fast-import[1]"
-msgstr ""
+msgstr "linkgit:git-fast-import[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:9
@@ -547,10 +533,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:10
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-filter-branch[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-filter-branch[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:12
@@ -561,7 +546,7 @@ msgstr ""
#: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:139
#, no-wrap
msgid "linkgit:git-mergetool[1]"
-msgstr ""
+msgstr "linkgit:git-mergetool[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:15
@@ -570,10 +555,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:16
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-pack-refs[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-pack-refs[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:18
@@ -582,10 +566,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:19
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-prune[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-prune[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:21
@@ -594,10 +577,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:22
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-reflog[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-reflog[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:24
@@ -606,10 +588,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:25
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-remote[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-remote[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:27
@@ -620,10 +601,9 @@ msgstr "git-commit - Enregistrer les modifications dans le d챕p척t"
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:28
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-repack[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-repack[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:30
@@ -632,10 +612,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:31
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-replace[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-replace[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:33
@@ -644,10 +623,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:1
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-archimport[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-archimport[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:3
@@ -656,10 +634,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:4
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-cvsexportcommit[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-cvsexportcommit[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:6
@@ -668,10 +645,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:7
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-cvsimport[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-cvsimport[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:9
@@ -680,10 +656,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:10
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-cvsserver[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-cvsserver[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:12
@@ -692,10 +667,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:13
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "linkgit:git-imap-send[1]"
-msgstr "git-add(1)"
+msgstr "linkgit:git-imap-send[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:15
@@ -704,10 +678,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:16
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-p4[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-p4[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:18
@@ -718,10 +691,9 @@ msgstr "git-commit - Enregistrer les modifications dans le d챕p척t"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:19
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-quiltimport[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-quiltimport[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:21
@@ -730,10 +702,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:22
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-request-pull[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-request-pull[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:24
@@ -742,10 +713,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:25
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-send-email[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-send-email[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:27
@@ -754,10 +724,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:28
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-svn[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-svn[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:30
@@ -768,9 +737,8 @@ msgstr ""
#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:185
#, no-wrap
msgid "linkgit:git-add[1]"
-msgstr ""
+msgstr "linkgit:git-add[1]"
-#
#. type: Plain text
#: en/cmds-mainporcelain.txt:3
#, fuzzy
@@ -780,10 +748,9 @@ msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:4
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-am[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-am[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:6
@@ -792,10 +759,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:7
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-archive[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-archive[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:9
@@ -804,10 +770,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:10
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-bisect[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-bisect[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:12
@@ -816,10 +781,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:13
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "linkgit:git-branch[1]"
-msgstr "git-add(1)"
+msgstr "linkgit:git-branch[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:15
@@ -828,10 +792,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:16
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "linkgit:git-bundle[1]"
-msgstr "git-add(1)"
+msgstr "linkgit:git-bundle[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:18
@@ -840,10 +803,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:19
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-checkout[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-checkout[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:21
@@ -854,7 +816,7 @@ msgstr ""
#: en/cmds-mainporcelain.txt:22 en/git-revert.txt:126
#, no-wrap
msgid "linkgit:git-cherry-pick[1]"
-msgstr ""
+msgstr "linkgit:git-cherry-pick[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:24
@@ -863,10 +825,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:25
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-citool[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-citool[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:27
@@ -875,17 +836,16 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:28
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-clean[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-clean[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:30
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid "Remove untracked files from the working tree."
msgstr ""
"en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et "
@@ -893,10 +853,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:31
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-clone[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-clone[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:33
@@ -905,10 +864,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:34
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-commit[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-commit[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:36
@@ -919,10 +877,9 @@ msgstr "git-commit - Enregistrer les modifications dans le d챕p척t"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:37
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-describe[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-describe[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:39
@@ -933,7 +890,7 @@ msgstr ""
#: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:136
#, no-wrap
msgid "linkgit:git-diff[1]"
-msgstr ""
+msgstr "linkgit:git-diff[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:42
@@ -944,7 +901,7 @@ msgstr ""
#: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129
#, no-wrap
msgid "linkgit:git-fetch[1]"
-msgstr ""
+msgstr "linkgit:git-fetch[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:45
@@ -955,10 +912,9 @@ msgstr "git-commit - Enregistrer les modifications dans le d챕p척t"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:46
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-format-patch[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-format-patch[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:48
@@ -967,10 +923,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:49
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-gc[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-gc[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:51
@@ -979,10 +934,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:52
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-grep[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-grep[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:54
@@ -991,10 +945,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:55
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-gui[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-gui[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:57
@@ -1003,10 +956,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:58
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-init[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-init[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:60
@@ -1015,10 +967,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:61
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-log[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-log[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:63
@@ -1029,7 +980,7 @@ msgstr ""
#: en/cmds-mainporcelain.txt:64 en/git-fmt-merge-msg.txt:75
#, no-wrap
msgid "linkgit:git-merge[1]"
-msgstr ""
+msgstr "linkgit:git-merge[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:66
@@ -1038,10 +989,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:67
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-mv[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-mv[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:69
@@ -1050,10 +1000,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:70
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-notes[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-notes[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:72
@@ -1064,7 +1013,7 @@ msgstr ""
#: en/cmds-mainporcelain.txt:73 en/git-fetch.txt:209
#, no-wrap
msgid "linkgit:git-pull[1]"
-msgstr ""
+msgstr "linkgit:git-pull[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:75
@@ -1073,10 +1022,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:76
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-push[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-push[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:78
@@ -1087,7 +1035,7 @@ msgstr ""
#: en/cmds-mainporcelain.txt:79 en/git-svn.txt:1133
#, no-wrap
msgid "linkgit:git-rebase[1]"
-msgstr ""
+msgstr "linkgit:git-rebase[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:81
@@ -1096,10 +1044,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:82
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-reset[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-reset[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:84
@@ -1110,7 +1057,7 @@ msgstr ""
#: en/cmds-mainporcelain.txt:85 en/git-cherry-pick.txt:230
#, no-wrap
msgid "linkgit:git-revert[1]"
-msgstr ""
+msgstr "linkgit:git-revert[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:87
@@ -1119,17 +1066,16 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:88
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-rm[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-rm[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:90
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid "Remove files from the working tree and from the index."
msgstr ""
"en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et "
@@ -1137,10 +1083,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:91
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-shortlog[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-shortlog[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:93
@@ -1149,10 +1094,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:94
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-show[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-show[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:96
@@ -1161,10 +1105,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:97
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-stash[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-stash[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:99
@@ -1173,10 +1116,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:100
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-status[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-status[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:102
@@ -1185,10 +1127,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "linkgit:git-submodule[1]"
-msgstr "git-add(1)"
+msgstr "linkgit:git-submodule[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:105
@@ -1197,10 +1138,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:106
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-tag[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-tag[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:108
@@ -1209,10 +1149,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:109
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-worktree[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-worktree[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:111
@@ -1232,10 +1171,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:1
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-cat-file[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-cat-file[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:3
@@ -1244,17 +1182,16 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:4
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-diff-files[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-diff-files[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:6
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid "Compares files in the working tree and the index."
msgstr ""
"en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et "
@@ -1262,17 +1199,16 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:7
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-diff-index[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-diff-index[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:9
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid "Compare a tree to the working tree or index."
msgstr ""
"en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et "
@@ -1280,10 +1216,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:10
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-diff-tree[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-diff-tree[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:12
@@ -1292,10 +1227,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:13
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-for-each-ref[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-for-each-ref[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:15
@@ -1304,10 +1238,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:16
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-ls-files[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-ls-files[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:18
@@ -1316,10 +1249,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:19
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-ls-remote[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-ls-remote[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:21
@@ -1328,10 +1260,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:22
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-ls-tree[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-ls-tree[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:24
@@ -1340,10 +1271,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:25
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-merge-base[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-merge-base[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:27
@@ -1352,10 +1282,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:28
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-name-rev[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-name-rev[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:30
@@ -1364,10 +1293,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:31
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-pack-redundant[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-pack-redundant[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:33
@@ -1376,10 +1304,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:34
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-rev-list[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-rev-list[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:36
@@ -1388,10 +1315,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:37
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-show-index[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-show-index[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:39
@@ -1402,7 +1328,7 @@ msgstr ""
#: en/cmds-plumbinginterrogators.txt:40 en/git-for-each-ref.txt:341
#, no-wrap
msgid "linkgit:git-show-ref[1]"
-msgstr ""
+msgstr "linkgit:git-show-ref[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:42
@@ -1411,10 +1337,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:43
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-unpack-file[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-unpack-file[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:45
@@ -1423,10 +1348,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:46
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-var[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-var[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:48
@@ -1435,10 +1359,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:49
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-verify-pack[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-verify-pack[1]"
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:51
@@ -1447,12 +1370,10 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:1
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-apply[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-apply[1]"
-#
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:3
#, fuzzy
@@ -1462,17 +1383,16 @@ msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:4
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-checkout-index[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-checkout-index[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:6
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid "Copy files from the index to the working tree."
msgstr ""
"en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et "
@@ -1480,10 +1400,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:7
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-commit-tree[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-commit-tree[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:9
@@ -1492,10 +1411,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:10
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-hash-object[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-hash-object[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:12
@@ -1504,10 +1422,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:13
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-index-pack[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-index-pack[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:15
@@ -1516,10 +1433,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:16
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-merge-file[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-merge-file[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:18
@@ -1528,10 +1444,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:19
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-merge-index[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-merge-index[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:21
@@ -1540,10 +1455,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:22
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-mktag[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-mktag[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:24
@@ -1552,10 +1466,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:25
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-mktree[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-mktree[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:27
@@ -1564,10 +1477,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:28
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-pack-objects[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-pack-objects[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:30
@@ -1576,10 +1488,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:31
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-prune-packed[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-prune-packed[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:33
@@ -1588,12 +1499,10 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:34
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-read-tree[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-read-tree[1]"
-#
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:36
#, fuzzy
@@ -1603,10 +1512,9 @@ msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:37
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "linkgit:git-symbolic-ref[1]"
-msgstr "git-add(1)"
+msgstr "linkgit:git-symbolic-ref[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:39
@@ -1615,10 +1523,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:40
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-unpack-objects[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-unpack-objects[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:42
@@ -1627,12 +1534,10 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:43
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "linkgit:git-update-index[1]"
-msgstr "git-add(1)"
+msgstr "linkgit:git-update-index[1]"
-#
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:45
#, fuzzy
@@ -1642,10 +1547,9 @@ msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:46
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-update-ref[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-update-ref[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:48
@@ -1656,7 +1560,7 @@ msgstr ""
#: en/cmds-plumbingmanipulators.txt:49 en/git-commit-tree.txt:115
#, no-wrap
msgid "linkgit:git-write-tree[1]"
-msgstr ""
+msgstr "linkgit:git-write-tree[1]"
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:51
@@ -1665,10 +1569,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:1
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-check-attr[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-check-attr[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:3
@@ -1677,10 +1580,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:4
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-check-ignore[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-check-ignore[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:6
@@ -1689,10 +1591,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:7
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-check-mailmap[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-check-mailmap[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:9
@@ -1701,10 +1602,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:10
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-check-ref-format[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-check-ref-format[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:12
@@ -1713,10 +1613,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:13
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-column[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-column[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:15
@@ -1725,10 +1624,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:16
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-credential[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-credential[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:18
@@ -1737,10 +1635,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:19
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-credential-cache[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-credential-cache[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:21
@@ -1749,10 +1646,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:22
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-credential-store[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-credential-store[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:24
@@ -1761,10 +1657,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:25
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-fmt-merge-msg[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-fmt-merge-msg[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:27
@@ -1773,10 +1668,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:28
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-interpret-trailers[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-interpret-trailers[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:30
@@ -1785,10 +1679,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:31
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-mailinfo[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-mailinfo[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:33
@@ -1797,10 +1690,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:34
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-mailsplit[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-mailsplit[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:36
@@ -1809,10 +1701,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:37
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-merge-one-file[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-merge-one-file[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:39
@@ -1823,7 +1714,7 @@ msgstr ""
#: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142
#, no-wrap
msgid "linkgit:git-patch-id[1]"
-msgstr ""
+msgstr "linkgit:git-patch-id[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:42
@@ -1832,10 +1723,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:43
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-sh-i18n[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-sh-i18n[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:45
@@ -1844,10 +1734,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:46
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-sh-setup[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-sh-setup[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:48
@@ -1856,10 +1745,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:49
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-stripspace[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-stripspace[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:51
@@ -1868,10 +1756,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:1
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-http-fetch[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-http-fetch[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:3
@@ -1882,10 +1769,9 @@ msgstr "git-commit - Enregistrer les modifications dans le d챕p척t"
#. type: Labeled list
#: en/cmds-synchelpers.txt:4
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-http-push[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-http-push[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:6
@@ -1896,10 +1782,9 @@ msgstr "git-commit - Enregistrer les modifications dans le d챕p척t"
#. type: Labeled list
#: en/cmds-synchelpers.txt:7
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-parse-remote[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-parse-remote[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:9
@@ -1908,10 +1793,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:10
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-receive-pack[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-receive-pack[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:12
@@ -1922,10 +1806,9 @@ msgstr "git-commit - Enregistrer les modifications dans le d챕p척t"
#. type: Labeled list
#: en/cmds-synchelpers.txt:13
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-shell[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-shell[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:15
@@ -1934,10 +1817,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:16
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-upload-archive[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-upload-archive[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:18
@@ -1946,10 +1828,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:19
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-upload-pack[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-upload-pack[1]"
#. type: Plain text
#: en/cmds-synchelpers.txt:21
@@ -1958,10 +1839,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:1
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-daemon[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-daemon[1]"
#. type: Plain text
#: en/cmds-synchingrepositories.txt:3
@@ -1970,10 +1850,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:4
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-fetch-pack[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-fetch-pack[1]"
#. type: Plain text
#: en/cmds-synchingrepositories.txt:6
@@ -1984,10 +1863,9 @@ msgstr "git-commit - Enregistrer les modifications dans le d챕p척t"
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:7
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-http-backend[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-http-backend[1]"
#. type: Plain text
#: en/cmds-synchingrepositories.txt:9
@@ -1996,10 +1874,9 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:10
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-send-pack[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-send-pack[1]"
#. type: Plain text
#: en/cmds-synchingrepositories.txt:12
@@ -2010,10 +1887,9 @@ msgstr "git-commit - Enregistrer les modifications dans le d챕p척t"
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:13
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "linkgit:git-update-server-info[1]"
-msgstr "git-commit(1)"
+msgstr "linkgit:git-update-server-info[1]"
#. type: Plain text
#: en/cmds-synchingrepositories.txt:15
@@ -2031,9 +1907,9 @@ msgstr "ENVIRONNEMENT ET VARIABLES DE CONFIGURATION"
#: en/config.txt:10
msgid ""
"The Git configuration file contains a number of variables that affect the "
-"Git commands' behavior. The `.git/config` file in each repository is used to "
-"store the configuration for that repository, and `$HOME/.gitconfig` is used "
-"to store a per-user configuration as fallback values for the `.git/config` "
+"Git commands' behavior. The `.git/config` file in each repository is used to"
+" store the configuration for that repository, and `$HOME/.gitconfig` is used"
+" to store a per-user configuration as fallback values for the `.git/config` "
"file. The file `/etc/gitconfig` can be used to store a system-wide default "
"configuration."
msgstr ""
@@ -2044,10 +1920,10 @@ msgid ""
"The configuration variables are used by both the Git plumbing and the "
"porcelains. The variables are divided into sections, wherein the fully "
"qualified variable name of the variable itself is the last dot-separated "
-"segment and the section name is everything before the last dot. The variable "
-"names are case-insensitive, allow only alphanumeric characters and `-`, and "
-"must start with an alphabetic character. Some variables may appear multiple "
-"times; we say then that the variable is multivalued."
+"segment and the section name is everything before the last dot. The variable"
+" names are case-insensitive, allow only alphanumeric characters and `-`, and"
+" must start with an alphabetic character. Some variables may appear "
+"multiple times; we say then that the variable is multivalued."
msgstr ""
#. type: Title ~
@@ -2067,20 +1943,20 @@ msgstr ""
#. type: Plain text
#: en/config.txt:33
msgid ""
-"The file consists of sections and variables. A section begins with the name "
-"of the section in square brackets and continues until the next section "
+"The file consists of sections and variables. A section begins with the name"
+" of the section in square brackets and continues until the next section "
"begins. Section names are case-insensitive. Only alphanumeric characters, "
-"`-` and `.` are allowed in section names. Each variable must belong to some "
-"section, which means that there must be a section header before the first "
+"`-` and `.` are allowed in section names. Each variable must belong to some"
+" section, which means that there must be a section header before the first "
"setting of a variable."
msgstr ""
#. type: Plain text
#: en/config.txt:37
msgid ""
-"Sections can be further divided into subsections. To begin a subsection put "
-"its name in double quotes, separated by space from the section name, in the "
-"section header, like in the example below:"
+"Sections can be further divided into subsections. To begin a subsection put"
+" its name in double quotes, separated by space from the section name, in the"
+" section header, like in the example below:"
msgstr ""
#. type: delimited block -
@@ -2093,11 +1969,11 @@ msgstr ""
#: en/config.txt:49
msgid ""
"Subsection names are case sensitive and can contain any characters except "
-"newline (doublequote `\"` and backslash can be included by escaping them as `"
-"\\\"` and `\\\\`, respectively). Section headers cannot span multiple "
-"lines. Variables may belong directly to a section or to a given "
-"subsection. You can have `[section]` if you have `[section \"subsection"
-"\"]`, but you don't need to."
+"newline (doublequote `\"` and backslash can be included by escaping them as "
+"`\\\"` and `\\\\`, respectively). Section headers cannot span multiple "
+"lines. Variables may belong directly to a section or to a given subsection."
+" You can have `[section]` if you have `[section \"subsection\"]`, but you "
+"don't need to."
msgstr ""
#. type: Plain text
@@ -2112,11 +1988,11 @@ msgstr ""
#. type: Plain text
#: en/config.txt:61
msgid ""
-"All the other lines (and the remainder of the line after the section header) "
-"are recognized as setting variables, in the form 'name = value' (or just "
-"'name', which is a short-hand to say that the variable is the boolean \"true"
-"\"). The variable names are case-insensitive, allow only alphanumeric "
-"characters and `-`, and must start with an alphabetic character."
+"All the other lines (and the remainder of the line after the section header)"
+" are recognized as setting variables, in the form 'name = value' (or just "
+"'name', which is a short-hand to say that the variable is the boolean "
+"\"true\"). The variable names are case-insensitive, allow only alphanumeric"
+" characters and `-`, and must start with an alphabetic character."
msgstr ""
#. type: Plain text
@@ -2140,10 +2016,10 @@ msgstr ""
#. type: Plain text
#: en/config.txt:77
msgid ""
-"The following escape sequences (beside `\\\"` and `\\\\`) are recognized: `"
-"\\n` for newline character (NL), `\\t` for horizontal tabulation (HT, TAB) "
-"and `\\b` for backspace (BS). Other char escape sequences (including octal "
-"escape sequences) are invalid."
+"The following escape sequences (beside `\\\"` and `\\\\`) are recognized: "
+"`\\n` for newline character (NL), `\\t` for horizontal tabulation (HT, TAB)"
+" and `\\b` for backspace (BS). Other char escape sequences (including "
+"octal escape sequences) are invalid."
msgstr ""
#. type: Title ~
@@ -2155,20 +2031,20 @@ msgstr ""
#. type: Plain text
#: en/config.txt:86
msgid ""
-"You can include a config file from another by setting the special `include."
-"path` variable to the name of the file to be included. The variable takes a "
-"pathname as its value, and is subject to tilde expansion. `include.path` can "
-"be given multiple times."
+"You can include a config file from another by setting the special "
+"`include.path` variable to the name of the file to be included. The variable"
+" takes a pathname as its value, and is subject to tilde expansion. "
+"`include.path` can be given multiple times."
msgstr ""
#. type: Plain text
#: en/config.txt:92
msgid ""
-"The included file is expanded immediately, as if its contents had been found "
-"at the location of the include directive. If the value of the `include.path` "
-"variable is a relative path, the path is considered to be relative to the "
-"configuration file in which the include directive was found. See below for "
-"examples."
+"The included file is expanded immediately, as if its contents had been found"
+" at the location of the include directive. If the value of the "
+"`include.path` variable is a relative path, the path is considered to be "
+"relative to the configuration file in which the include directive was found."
+" See below for examples."
msgstr ""
#. type: Title ~
@@ -2213,8 +2089,8 @@ msgstr ""
msgid ""
"The .git location may be auto-discovered, or come from `$GIT_DIR` "
"environment variable. If the repository is auto discovered via a .git file "
-"(e.g. from submodules, or a linked worktree), the .git location would be the "
-"final location where the .git directory is, not where the"
+"(e.g. from submodules, or a linked worktree), the .git location would be the"
+" final location where the .git directory is, not where the"
msgstr ""
#. type: Block title
@@ -2226,16 +2102,16 @@ msgstr ""
#. type: Plain text
#: en/config.txt:120
msgid ""
-"The pattern can contain standard globbing wildcards and two additional ones, "
-"`**/` and `/**`, that can match multiple path components. Please refer to "
+"The pattern can contain standard globbing wildcards and two additional ones,"
+" `**/` and `/**`, that can match multiple path components. Please refer to "
"linkgit:gitignore[5] for details. For convenience:"
msgstr ""
#. type: Plain text
#: en/config.txt:123
msgid ""
-"If the pattern starts with `~/`, `~` will be substituted with the content of "
-"the environment variable `HOME`."
+"If the pattern starts with `~/`, `~` will be substituted with the content of"
+" the environment variable `HOME`."
msgstr ""
#. type: Plain text
@@ -2249,16 +2125,16 @@ msgstr ""
#: en/config.txt:130
msgid ""
"If the pattern does not start with either `~/`, `./` or `/`, `**/` will be "
-"automatically prepended. For example, the pattern `foo/bar` becomes `**/foo/"
-"bar` and would match `/any/path/to/foo/bar`."
+"automatically prepended. For example, the pattern `foo/bar` becomes "
+"`**/foo/bar` and would match `/any/path/to/foo/bar`."
msgstr ""
#. type: Plain text
#: en/config.txt:134
msgid ""
-"If the pattern ends with `/`, `**` will be automatically added. For example, "
-"the pattern `foo/` becomes `foo/**`. In other words, it matches \"foo\" and "
-"everything inside, recursively."
+"If the pattern ends with `/`, `**` will be automatically added. For example,"
+" the pattern `foo/` becomes `foo/**`. In other words, it matches \"foo\" and"
+" everything inside, recursively."
msgstr ""
#. type: Labeled list
@@ -2271,8 +2147,8 @@ msgstr "git-add(1)"
#. type: Plain text
#: en/config.txt:138
msgid ""
-"This is the same as `gitdir` except that matching is done case-insensitively "
-"(e.g. on case-insensitive file sytems)"
+"This is the same as `gitdir` except that matching is done case-insensitively"
+" (e.g. on case-insensitive file sytems)"
msgstr ""
#. type: Plain text
@@ -2288,8 +2164,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:145
msgid ""
-"Note that \"../\" is not special and will match literally, which is unlikely "
-"what you want."
+"Note that \"../\" is not special and will match literally, which is unlikely"
+" what you want."
msgstr ""
#. type: Title ~
@@ -2414,7 +2290,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:201
-msgid "or `1`. Also, a variable defined without `= <value>` is taken as true."
+msgid ""
+"or `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2450,8 +2327,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:213
msgid ""
-"The value for many variables that specify various sizes can be suffixed with "
-"`k`, `M`,... to mean \"scale the number by 1024\", \"by 1024x1024\", etc."
+"The value for many variables that specify various sizes can be suffixed with"
+" `k`, `M`,... to mean \"scale the number by 1024\", \"by 1024x1024\", etc."
msgstr ""
#. type: Labeled list
@@ -2479,8 +2356,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:227
msgid ""
-"Colors may also be given as numbers between 0 and 255; these use ANSI 256-"
-"color mode (but note that not all terminals may support this). If your "
+"Colors may also be given as numbers between 0 and 255; these use ANSI "
+"256-color mode (but note that not all terminals may support this). If your "
"terminal supports it, you may also specify 24-bit RGB values as hex, like "
"`#ff0ab3`."
msgstr ""
@@ -2491,8 +2368,8 @@ msgid ""
"The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, "
"`italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The "
"position of any attributes with respect to the colors (before, after, or in "
-"between), doesn't matter. Specific attributes may be turned off by prefixing "
-"them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
+"between), doesn't matter. Specific attributes may be turned off by prefixing"
+" them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
@@ -2506,13 +2383,13 @@ msgstr ""
#: en/config.txt:246
msgid ""
"For git's pre-defined color slots, the attributes are meant to be reset at "
-"the beginning of each item in the colored output. So setting `color.decorate."
-"branch` to `black` will paint that branch name in a plain `black`, even if "
-"the previous thing on the same output line (e.g. opening parenthesis before "
-"the list of branch names in `log --decorate` output) is set to be painted "
-"with `bold` or some other attribute. However, custom log formats may do "
-"more complicated and layered coloring, and the negated forms may be useful "
-"there."
+"the beginning of each item in the colored output. So setting "
+"`color.decorate.branch` to `black` will paint that branch name in a plain "
+"`black`, even if the previous thing on the same output line (e.g. opening "
+"parenthesis before the list of branch names in `log --decorate` output) is "
+"set to be painted with `bold` or some other attribute. However, custom log "
+"formats may do more complicated and layered coloring, and the negated forms "
+"may be useful there."
msgstr ""
#. type: Labeled list
@@ -2525,8 +2402,8 @@ msgstr ""
#: en/config.txt:253
msgid ""
"A variable that takes a pathname value can be given a string that begins "
-"with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such "
-"a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the "
+"with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such"
+" a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the "
"specified user's home directory."
msgstr ""
@@ -2540,8 +2417,8 @@ msgstr ""
#: en/config.txt:261
msgid ""
"Note that this list is non-comprehensive and not necessarily complete. For "
-"command-specific variables, you will find a more detailed description in the "
-"appropriate manual page."
+"command-specific variables, you will find a more detailed description in the"
+" appropriate manual page."
msgstr ""
#. type: Plain text
@@ -2549,8 +2426,8 @@ msgstr ""
msgid ""
"Other git-related tools may and do use their own variables. When inventing "
"new variables for use in your own tool, make sure their names do not "
-"conflict with those that are used by Git itself and other popular tools, and "
-"describe them in your documentation."
+"conflict with those that are used by Git itself and other popular tools, and"
+" describe them in your documentation."
msgstr ""
#. type: Labeled list
@@ -2563,8 +2440,8 @@ msgstr ""
#: en/config.txt:272
msgid ""
"These variables control various optional help messages designed to aid new "
-"users. All 'advice.*' variables default to 'true', and you can tell Git that "
-"you do not need help by setting these to 'false':"
+"users. All 'advice.*' variables default to 'true', and you can tell Git that"
+" you do not need help by setting these to 'false':"
msgstr ""
#. type: Labeled list
@@ -2783,9 +2660,8 @@ msgstr ""
#: en/config.txt:332
#, no-wrap
msgid "core.fileMode"
-msgstr ""
+msgstr "core.fileMode"
-#
#. type: Plain text
#: en/config.txt:335
#, fuzzy
@@ -2809,48 +2685,47 @@ msgstr ""
#: en/config.txt:351
msgid ""
"A repository, however, may be on a filesystem that handles the filemode "
-"correctly, and this variable is set to 'true' when created, but later may be "
-"made accessible from another environment that loses the filemode (e.g. "
-"exporting ext4 via CIFS mount, visiting a Cygwin created repository with Git "
-"for Windows or Eclipse). In such a case it may be necessary to set this "
+"correctly, and this variable is set to 'true' when created, but later may be"
+" made accessible from another environment that loses the filemode (e.g. "
+"exporting ext4 via CIFS mount, visiting a Cygwin created repository with Git"
+" for Windows or Eclipse). In such a case it may be necessary to set this "
"variable to 'false'. See linkgit:git-update-index[1]."
msgstr ""
#. type: Plain text
#: en/config.txt:353
msgid ""
-"The default is true (when core.filemode is not specified in the config file)."
+"The default is true (when core.filemode is not specified in the config "
+"file)."
msgstr ""
#. type: Labeled list
#: en/config.txt:354
-#, fuzzy, no-wrap
-#| msgid "whitespace"
+#, no-wrap
msgid "core.hideDotFiles"
-msgstr "whitespace"
+msgstr "core.hideDotFiles"
#. type: Plain text
#: en/config.txt:359
msgid ""
"(Windows-only) If true, mark newly-created directories and files whose name "
-"starts with a dot as hidden. If 'dotGitOnly', only the `.git/` directory is "
-"hidden, but no other files starting with a dot. The default mode is "
+"starts with a dot as hidden. If 'dotGitOnly', only the `.git/` directory is"
+" hidden, but no other files starting with a dot. The default mode is "
"'dotGitOnly'."
msgstr ""
#. type: Labeled list
#: en/config.txt:360
-#, fuzzy, no-wrap
-#| msgid "whitespace"
+#, no-wrap
msgid "core.ignoreCase"
-msgstr "whitespace"
+msgstr "core.ignoreCase"
#. type: Plain text
#: en/config.txt:367
msgid ""
"If true, this option enables various workarounds to enable Git to work "
-"better on filesystems that are not case sensitive, like FAT. For example, if "
-"a directory listing finds \"makefile\" when Git expects \"Makefile\", Git "
+"better on filesystems that are not case sensitive, like FAT. For example, if"
+" a directory listing finds \"makefile\" when Git expects \"Makefile\", Git "
"will assume it is really the same file, and continue to remember it as "
"\"Makefile\"."
msgstr ""
@@ -2867,24 +2742,24 @@ msgstr ""
#: en/config.txt:372
#, no-wrap
msgid "core.precomposeUnicode"
-msgstr ""
+msgstr "core.precomposeUnicode"
#. type: Plain text
#: en/config.txt:380
msgid ""
-"This option is only used by Mac OS implementation of Git. When core."
-"precomposeUnicode=true, Git reverts the unicode decomposition of filenames "
-"done by Mac OS. This is useful when sharing a repository between Mac OS and "
-"Linux or Windows. (Git for Windows 1.7.10 or higher is needed, or Git under "
-"cygwin 1.7). When false, file names are handled fully transparent by Git, "
-"which is backward compatible with older versions of Git."
+"This option is only used by Mac OS implementation of Git. When "
+"core.precomposeUnicode=true, Git reverts the unicode decomposition of "
+"filenames done by Mac OS. This is useful when sharing a repository between "
+"Mac OS and Linux or Windows. (Git for Windows 1.7.10 or higher is needed, "
+"or Git under cygwin 1.7). When false, file names are handled fully "
+"transparent by Git, which is backward compatible with older versions of Git."
msgstr ""
#. type: Labeled list
#: en/config.txt:381
#, no-wrap
msgid "core.protectHFS"
-msgstr ""
+msgstr "core.protectHFS"
#. type: Plain text
#: en/config.txt:385
@@ -2898,7 +2773,7 @@ msgstr ""
#: en/config.txt:386
#, no-wrap
msgid "core.protectNTFS"
-msgstr ""
+msgstr "core.protectNTFS"
#. type: Plain text
#: en/config.txt:391
@@ -2910,10 +2785,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:392
-#, fuzzy, no-wrap
-#| msgid "whitespace"
+#, no-wrap
msgid "core.trustctime"
-msgstr "whitespace"
+msgstr "core.trustctime"
#. type: Plain text
#: en/config.txt:398
@@ -2928,20 +2802,20 @@ msgstr ""
#: en/config.txt:399
#, no-wrap
msgid "core.splitIndex"
-msgstr ""
+msgstr "core.splitIndex"
#. type: Plain text
#: en/config.txt:402
msgid ""
-"If true, the split-index feature of the index will be used. See linkgit:git-"
-"update-index[1]. False by default."
+"If true, the split-index feature of the index will be used. See "
+"linkgit:git-update-index[1]. False by default."
msgstr ""
#. type: Labeled list
#: en/config.txt:403
#, no-wrap
msgid "core.untrackedCache"
-msgstr ""
+msgstr "core.untrackedCache"
#. type: Plain text
#: en/config.txt:411
@@ -2958,7 +2832,7 @@ msgstr ""
#: en/config.txt:412
#, no-wrap
msgid "core.checkStat"
-msgstr ""
+msgstr "core.checkStat"
#. type: Plain text
#: en/config.txt:417
@@ -2973,20 +2847,20 @@ msgstr ""
#: en/config.txt:418
#, no-wrap
msgid "core.quotePath"
-msgstr ""
+msgstr "core.quotePath"
#. type: Plain text
#: en/config.txt:432
msgid ""
-"Commands that output paths (e.g. 'ls-files', 'diff'), will quote \"unusual\" "
-"characters in the pathname by enclosing the pathname in double-quotes and "
-"escaping those characters with backslashes in the same way C escapes control "
-"characters (e.g. `\\t` for TAB, `\\n` for LF, `\\\\` for backslash) or "
-"bytes with values larger than 0x80 (e.g. octal `\\302\\265` for \"micro\" in "
-"UTF-8). If this variable is set to false, bytes higher than 0x80 are not "
+"Commands that output paths (e.g. 'ls-files', 'diff'), will quote \"unusual\""
+" characters in the pathname by enclosing the pathname in double-quotes and "
+"escaping those characters with backslashes in the same way C escapes control"
+" characters (e.g. `\\t` for TAB, `\\n` for LF, `\\\\` for backslash) or "
+"bytes with values larger than 0x80 (e.g. octal `\\302\\265` for \"micro\" in"
+" UTF-8). If this variable is set to false, bytes higher than 0x80 are not "
"considered \"unusual\" any more. Double-quotes, backslash and control "
-"characters are always escaped regardless of the setting of this variable. A "
-"simple space character is not considered \"unusual\". Many commands can "
+"characters are always escaped regardless of the setting of this variable. A"
+" simple space character is not considered \"unusual\". Many commands can "
"output pathnames completely verbatim using the `-z` option. The default "
"value is true."
msgstr ""
@@ -2995,7 +2869,7 @@ msgstr ""
#: en/config.txt:433
#, no-wrap
msgid "core.eol"
-msgstr ""
+msgstr "core.eol"
#. type: Plain text
#: en/config.txt:440
@@ -3011,19 +2885,19 @@ msgstr ""
#: en/config.txt:441
#, no-wrap
msgid "core.safecrlf"
-msgstr ""
+msgstr "core.safecrlf"
#. type: Plain text
#: en/config.txt:451
msgid ""
-"If true, makes Git check if converting `CRLF` is reversible when end-of-line "
-"conversion is active. Git will verify if a command modifies a file in the "
+"If true, makes Git check if converting `CRLF` is reversible when end-of-line"
+" conversion is active. Git will verify if a command modifies a file in the "
"work tree either directly or indirectly. For example, committing a file "
-"followed by checking out the same file should yield the original file in the "
-"work tree. If this is not the case for the current setting of `core."
-"autocrlf`, Git will reject the file. The variable can be set to \"warn\", "
-"in which case Git will only warn about an irreversible conversion but "
-"continue the operation."
+"followed by checking out the same file should yield the original file in the"
+" work tree. If this is not the case for the current setting of "
+"`core.autocrlf`, Git will reject the file. The variable can be set to "
+"\"warn\", in which case Git will only warn about an irreversible conversion "
+"but continue the operation."
msgstr ""
#. type: Plain text
@@ -3053,8 +2927,8 @@ msgstr ""
msgid ""
"Unfortunately, the desired effect of cleaning up text files with mixed line "
"endings and the undesired effect of corrupting binary files cannot be "
-"distinguished. In both cases CRLFs are removed in an irreversible way. For "
-"text files this is the right thing to do because CRLFs are line endings, "
+"distinguished. In both cases CRLFs are removed in an irreversible way. For"
+" text files this is the right thing to do because CRLFs are line endings, "
"while for binary files converting CRLFs corrupts data."
msgstr ""
@@ -3076,14 +2950,14 @@ msgstr ""
#: en/config.txt:486
#, no-wrap
msgid "core.autocrlf"
-msgstr ""
+msgstr "core.autocrlf"
#. type: Plain text
#: en/config.txt:493
msgid ""
"Setting this variable to \"true\" is the same as setting the `text` "
-"attribute to \"auto\" on all files and core.eol to \"crlf\". Set to true if "
-"you want to have `CRLF` line endings in your working directory and the "
+"attribute to \"auto\" on all files and core.eol to \"crlf\". Set to true if"
+" you want to have `CRLF` line endings in your working directory and the "
"repository has LF line endings. This variable can be set to 'input', in "
"which case no output conversion is performed."
msgstr ""
@@ -3092,7 +2966,7 @@ msgstr ""
#: en/config.txt:494
#, no-wrap
msgid "core.symlinks"
-msgstr ""
+msgstr "core.symlinks"
#. type: Plain text
#: en/config.txt:500
@@ -3106,8 +2980,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:504
msgid ""
-"The default is true, except linkgit:git-clone[1] or linkgit:git-init[1] will "
-"probe and set core.symlinks false if appropriate when the repository is "
+"The default is true, except linkgit:git-clone[1] or linkgit:git-init[1] will"
+" probe and set core.symlinks false if appropriate when the repository is "
"created."
msgstr ""
@@ -3115,15 +2989,15 @@ msgstr ""
#: en/config.txt:505
#, no-wrap
msgid "core.gitProxy"
-msgstr ""
+msgstr "core.gitProxy"
#. type: Plain text
#: en/config.txt:513
msgid ""
"A \"proxy command\" to execute (as 'command host port') instead of "
"establishing direct connection to the remote server when using the Git "
-"protocol for fetching. If the variable value is in the \"COMMAND for DOMAIN"
-"\" format, the command is applied only on hostnames ending with the "
+"protocol for fetching. If the variable value is in the \"COMMAND for "
+"DOMAIN\" format, the command is applied only on hostnames ending with the "
"specified domain string. This variable may be set multiple times and is "
"matched in the given order; the first match wins."
msgstr ""
@@ -3140,15 +3014,15 @@ msgstr ""
msgid ""
"The special string `none` can be used as the proxy command to specify that "
"no proxy be used for a given domain pattern. This is useful for excluding "
-"servers inside a firewall from proxy use, while defaulting to a common proxy "
-"for external domains."
+"servers inside a firewall from proxy use, while defaulting to a common proxy"
+" for external domains."
msgstr ""
#. type: Labeled list
#: en/config.txt:523
#, no-wrap
msgid "core.sshCommand"
-msgstr ""
+msgstr "core.sshCommand"
#. type: Plain text
#: en/config.txt:529
@@ -3163,29 +3037,29 @@ msgstr ""
#: en/config.txt:530
#, no-wrap
msgid "core.ignoreStat"
-msgstr ""
+msgstr "core.ignoreStat"
#. type: Plain text
#: en/config.txt:534
msgid ""
"If true, Git will avoid using lstat() calls to detect if files have changed "
-"by setting the \"assume-unchanged\" bit for those tracked files which it has "
-"updated identically in both the index and working tree."
+"by setting the \"assume-unchanged\" bit for those tracked files which it has"
+" updated identically in both the index and working tree."
msgstr ""
#. type: Plain text
#: en/config.txt:539
msgid ""
"When files are modified outside of Git, the user will need to stage the "
-"modified files explicitly (e.g. see 'Examples' section in linkgit:git-update-"
-"index[1]). Git will not normally detect changes to those files."
+"modified files explicitly (e.g. see 'Examples' section in linkgit:git-"
+"update-index[1]). Git will not normally detect changes to those files."
msgstr ""
#. type: Plain text
#: en/config.txt:542
msgid ""
-"This is useful on systems where lstat() calls are very slow, such as CIFS/"
-"Microsoft Windows."
+"This is useful on systems where lstat() calls are very slow, such as "
+"CIFS/Microsoft Windows."
msgstr ""
#. type: Plain text
@@ -3197,7 +3071,7 @@ msgstr ""
#: en/config.txt:545
#, no-wrap
msgid "core.preferSymlinkRefs"
-msgstr ""
+msgstr "core.preferSymlinkRefs"
#. type: Plain text
#: en/config.txt:550
@@ -3211,24 +3085,24 @@ msgstr ""
#: en/config.txt:551
#, no-wrap
msgid "core.bare"
-msgstr ""
+msgstr "core.bare"
#. type: Plain text
#: en/config.txt:556
msgid ""
-"If true this repository is assumed to be 'bare' and has no working directory "
-"associated with it. If this is the case a number of commands that require a "
-"working directory will be disabled, such as linkgit:git-add[1] or linkgit:"
-"git-merge[1]."
+"If true this repository is assumed to be 'bare' and has no working directory"
+" associated with it. If this is the case a number of commands that require "
+"a working directory will be disabled, such as linkgit:git-add[1] or "
+"linkgit:git-merge[1]."
msgstr ""
#. type: Plain text
#: en/config.txt:561
msgid ""
-"This setting is automatically guessed by linkgit:git-clone[1] or linkgit:git-"
-"init[1] when the repository was created. By default a repository that ends "
-"in \"/.git\" is assumed to be not bare (bare = false), while all other "
-"repositories are assumed to be bare (bare"
+"This setting is automatically guessed by linkgit:git-clone[1] or "
+"linkgit:git-init[1] when the repository was created. By default a "
+"repository that ends in \"/.git\" is assumed to be not bare (bare = false), "
+"while all other repositories are assumed to be bare (bare"
msgstr ""
#. type: Title =
@@ -3239,10 +3113,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:563
-#, fuzzy, no-wrap
-#| msgid "whitespace"
+#, no-wrap
msgid "core.worktree"
-msgstr "whitespace"
+msgstr "core.worktree"
#. type: Plain text
#: en/config.txt:576
@@ -3251,8 +3124,8 @@ msgid ""
"environment variable is set, core.worktree is ignored and not used for "
"determining the root of working tree. This can be overridden by the "
"`GIT_WORK_TREE` environment variable and the `--work-tree` command-line "
-"option. The value can be an absolute path or relative to the path to the ."
-"git directory, which is either specified by --git-dir or GIT_DIR, or "
+"option. The value can be an absolute path or relative to the path to the "
+".git directory, which is either specified by --git-dir or GIT_DIR, or "
"automatically discovered. If --git-dir or GIT_DIR is specified but none of "
"--work-tree, GIT_WORK_TREE and core.worktree is specified, the current "
"working directory is regarded as the top level of your working tree."
@@ -3262,32 +3135,32 @@ msgstr ""
#: en/config.txt:586
msgid ""
"Note that this variable is honored even when set in a configuration file in "
-"a \".git\" subdirectory of a directory and its value differs from the latter "
-"directory (e.g. \"/path/to/.git/config\" has core.worktree set to \"/"
-"different/path\"), which is most likely a misconfiguration. Running Git "
-"commands in the \"/path/to\" directory will still use \"/different/path\" as "
-"the root of the work tree and can cause confusion unless you know what you "
-"are doing (e.g. you are creating a read-only snapshot of the same index to a "
-"location different from the repository's usual working tree)."
+"a \".git\" subdirectory of a directory and its value differs from the latter"
+" directory (e.g. \"/path/to/.git/config\" has core.worktree set to "
+"\"/different/path\"), which is most likely a misconfiguration. Running Git "
+"commands in the \"/path/to\" directory will still use \"/different/path\" as"
+" the root of the work tree and can cause confusion unless you know what you "
+"are doing (e.g. you are creating a read-only snapshot of the same index to a"
+" location different from the repository's usual working tree)."
msgstr ""
#. type: Labeled list
#: en/config.txt:587
#, no-wrap
msgid "core.logAllRefUpdates"
-msgstr ""
+msgstr "core.logAllRefUpdates"
#. type: Plain text
#: en/config.txt:598
msgid ""
-"Enable the reflog. Updates to a ref <ref> is logged to the file \"`$GIT_DIR/"
-"logs/<ref>`\", by appending the new and old SHA-1, the date/time and the "
-"reason of the update, but only when the file exists. If this configuration "
-"variable is set to `true`, missing \"`$GIT_DIR/logs/<ref>`\" file is "
-"automatically created for branch heads (i.e. under `refs/heads/`), remote "
-"refs (i.e. under `refs/remotes/`), note refs (i.e. under `refs/notes/`), and "
-"the symbolic ref `HEAD`. If it is set to `always`, then a missing reflog is "
-"automatically created for any ref under `refs/`."
+"Enable the reflog. Updates to a ref <ref> is logged to the file "
+"\"`$GIT_DIR/logs/<ref>`\", by appending the new and old SHA-1, the date/time"
+" and the reason of the update, but only when the file exists. If this "
+"configuration variable is set to `true`, missing \"`$GIT_DIR/logs/<ref>`\" "
+"file is automatically created for branch heads (i.e. under `refs/heads/`), "
+"remote refs (i.e. under `refs/remotes/`), note refs (i.e. under "
+"`refs/notes/`), and the symbolic ref `HEAD`. If it is set to `always`, then"
+" a missing reflog is automatically created for any ref under `refs/`."
msgstr ""
#. type: Plain text
@@ -3308,28 +3181,29 @@ msgstr ""
#: en/config.txt:606
#, no-wrap
msgid "core.repositoryFormatVersion"
-msgstr ""
+msgstr "core.repositoryFormatVersion"
#. type: Plain text
#: en/config.txt:609
-msgid "Internal variable identifying the repository format and layout version."
+msgid ""
+"Internal variable identifying the repository format and layout version."
msgstr ""
#. type: Labeled list
#: en/config.txt:610
#, no-wrap
msgid "core.sharedRepository"
-msgstr ""
+msgstr "core.sharedRepository"
#. type: Plain text
#: en/config.txt:624
msgid ""
"When 'group' (or 'true'), the repository is made shareable between several "
-"users in a group (making sure all the files and objects are group-writable). "
-"When 'all' (or 'world' or 'everybody'), the repository will be readable by "
-"all users, additionally to being group-shareable. When 'umask' (or 'false'), "
-"Git will use permissions reported by umask(2). When '0xxx', where '0xxx' is "
-"an octal number, files in the repository will have this mode value. '0xxx' "
+"users in a group (making sure all the files and objects are group-writable)."
+" When 'all' (or 'world' or 'everybody'), the repository will be readable by "
+"all users, additionally to being group-shareable. When 'umask' (or 'false'),"
+" Git will use permissions reported by umask(2). When '0xxx', where '0xxx' is"
+" an octal number, files in the repository will have this mode value. '0xxx' "
"will override user's umask value (whereas the other options will only "
"override requested parts of the user's umask value). Examples: '0660' will "
"make the repo read/write-able for the owner and group, but inaccessible to "
@@ -3342,7 +3216,7 @@ msgstr ""
#: en/config.txt:625
#, no-wrap
msgid "core.warnAmbiguousRefs"
-msgstr ""
+msgstr "core.warnAmbiguousRefs"
#. type: Plain text
#: en/config.txt:628
@@ -3355,7 +3229,7 @@ msgstr ""
#: en/config.txt:629
#, no-wrap
msgid "core.compression"
-msgstr ""
+msgstr "core.compression"
#. type: Plain text
#: en/config.txt:635
@@ -3370,22 +3244,22 @@ msgstr ""
#: en/config.txt:636
#, no-wrap
msgid "core.looseCompression"
-msgstr ""
+msgstr "core.looseCompression"
#. type: Plain text
#: en/config.txt:642
msgid ""
"An integer -1..9, indicating the compression level for objects that are not "
-"in a pack file. -1 is the zlib default. 0 means no compression, and 1..9 are "
-"various speed/size tradeoffs, 9 being slowest. If not set, defaults to core."
-"compression. If that is not set, defaults to 1 (best speed)."
+"in a pack file. -1 is the zlib default. 0 means no compression, and 1..9 are"
+" various speed/size tradeoffs, 9 being slowest. If not set, defaults to "
+"core.compression. If that is not set, defaults to 1 (best speed)."
msgstr ""
#. type: Labeled list
#: en/config.txt:643
#, no-wrap
msgid "core.packedGitWindowSize"
-msgstr ""
+msgstr "core.packedGitWindowSize"
#. type: Plain text
#: en/config.txt:651
@@ -3415,7 +3289,7 @@ msgstr ""
#: en/config.txt:659
#, no-wrap
msgid "core.packedGitLimit"
-msgstr ""
+msgstr "core.packedGitLimit"
#. type: Plain text
#: en/config.txt:664
@@ -3438,7 +3312,7 @@ msgstr ""
#: en/config.txt:671
#, no-wrap
msgid "core.deltaBaseCacheLimit"
-msgstr ""
+msgstr "core.deltaBaseCacheLimit"
#. type: Plain text
#: en/config.txt:677
@@ -3452,23 +3326,23 @@ msgstr ""
#. type: Plain text
#: en/config.txt:681
msgid ""
-"Default is 96 MiB on all platforms. This should be reasonable for all users/"
-"operating systems, except on the largest projects. You probably do not need "
-"to adjust this value."
+"Default is 96 MiB on all platforms. This should be reasonable for all "
+"users/operating systems, except on the largest projects. You probably do "
+"not need to adjust this value."
msgstr ""
#. type: Labeled list
#: en/config.txt:684
#, no-wrap
msgid "core.bigFileThreshold"
-msgstr ""
+msgstr "core.bigFileThreshold"
#. type: Plain text
#: en/config.txt:690
msgid ""
"Files larger than this size are stored deflated, without attempting delta "
-"compression. Storing large files without delta compression avoids excessive "
-"memory usage, at the slight expense of increased disk usage. Additionally "
+"compression. Storing large files without delta compression avoids excessive"
+" memory usage, at the slight expense of increased disk usage. Additionally "
"files larger than this size are always treated as binary."
msgstr ""
@@ -3484,23 +3358,23 @@ msgstr ""
#: en/config.txt:697
#, no-wrap
msgid "core.excludesFile"
-msgstr ""
+msgstr "core.excludesFile"
#. type: Plain text
#: en/config.txt:704
msgid ""
"Specifies the pathname to the file that contains patterns to describe paths "
"that are not meant to be tracked, in addition to '.gitignore' (per-"
-"directory) and '.git/info/exclude'. Defaults to `$XDG_CONFIG_HOME/git/"
-"ignore`. If `$XDG_CONFIG_HOME` is either not set or empty, `$HOME/.config/"
-"git/ignore` is used instead. See linkgit:gitignore[5]."
+"directory) and '.git/info/exclude'. Defaults to "
+"`$XDG_CONFIG_HOME/git/ignore`. If `$XDG_CONFIG_HOME` is either not set or "
+"empty, `$HOME/.config/git/ignore` is used instead. See linkgit:gitignore[5]."
msgstr ""
#. type: Labeled list
#: en/config.txt:705
#, no-wrap
msgid "core.askPass"
-msgstr ""
+msgstr "core.askPass"
#. type: Plain text
#: en/config.txt:713
@@ -3518,14 +3392,14 @@ msgstr ""
#: en/config.txt:714
#, no-wrap
msgid "core.attributesFile"
-msgstr ""
+msgstr "core.attributesFile"
#. type: Plain text
#: en/config.txt:721
msgid ""
"In addition to '.gitattributes' (per-directory) and '.git/info/attributes', "
-"Git looks into this file for attributes (see linkgit:gitattributes[5]). Path "
-"expansions are made the same way as for `core.excludesFile`. Its default "
+"Git looks into this file for attributes (see linkgit:gitattributes[5]). Path"
+" expansions are made the same way as for `core.excludesFile`. Its default "
"value is `$XDG_CONFIG_HOME/git/attributes`. If `$XDG_CONFIG_HOME` is either "
"not set or empty, `$HOME/.config/git/attributes` is used instead."
msgstr ""
@@ -3534,7 +3408,7 @@ msgstr ""
#: en/config.txt:722
#, no-wrap
msgid "core.hooksPath"
-msgstr ""
+msgstr "core.hooksPath"
#. type: Plain text
#: en/config.txt:728
@@ -3556,23 +3430,23 @@ msgstr ""
#. type: Plain text
#: en/config.txt:738
msgid ""
-"This configuration variable is useful in cases where you'd like to centrally "
-"configure your Git hooks instead of configuring them on a per-repository "
-"basis, or as a more flexible and centralized alternative to having an `init."
-"templateDir` where you've changed default hooks."
+"This configuration variable is useful in cases where you'd like to centrally"
+" configure your Git hooks instead of configuring them on a per-repository "
+"basis, or as a more flexible and centralized alternative to having an "
+"`init.templateDir` where you've changed default hooks."
msgstr ""
#. type: Labeled list
#: en/config.txt:739
#, no-wrap
msgid "core.editor"
-msgstr ""
+msgstr "core.editor"
#. type: Plain text
#: en/config.txt:744
msgid ""
-"Commands such as `commit` and `tag` that lets you edit messages by launching "
-"an editor uses the value of this variable when it is set, and the "
+"Commands such as `commit` and `tag` that lets you edit messages by launching"
+" an editor uses the value of this variable when it is set, and the "
"environment variable `GIT_EDITOR` is not set. See linkgit:git-var[1]."
msgstr ""
@@ -3580,7 +3454,7 @@ msgstr ""
#: en/config.txt:745
#, no-wrap
msgid "core.commentChar"
-msgstr ""
+msgstr "core.commentChar"
#. type: Plain text
#: en/config.txt:750
@@ -3601,7 +3475,7 @@ msgstr ""
#: en/config.txt:754
#, no-wrap
msgid "core.packedRefsTimeout"
-msgstr ""
+msgstr "core.packedRefsTimeout"
#. type: Plain text
#: en/config.txt:759
@@ -3620,18 +3494,17 @@ msgstr ""
#. type: Plain text
#: en/config.txt:765
msgid ""
-"Text editor used by `git rebase -i` for editing the rebase instruction "
-"file. The value is meant to be interpreted by the shell when it is used. "
-"It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable. "
-"When not configured the default commit message editor is used instead."
+"Text editor used by `git rebase -i` for editing the rebase instruction file."
+" The value is meant to be interpreted by the shell when it is used. It can"
+" be overridden by the `GIT_SEQUENCE_EDITOR` environment variable. When not "
+"configured the default commit message editor is used instead."
msgstr ""
#. type: Labeled list
#: en/config.txt:766
-#, fuzzy, no-wrap
-#| msgid "whitespace"
+#, no-wrap
msgid "core.pager"
-msgstr "whitespace"
+msgstr "core.pager"
#. type: Plain text
#: en/config.txt:772 en/git-var.txt:58
@@ -3655,31 +3528,30 @@ msgid ""
"`less -+F` will deactivate the `F` option specified by the environment from "
"the command-line, deactivating the \"quit if one screen\" behavior of "
"`less`. One can specifically activate some flags for particular commands: "
-"for example, setting `pager.blame` to `less -S` enables line truncation only "
-"for `git blame`."
+"for example, setting `pager.blame` to `less -S` enables line truncation only"
+" for `git blame`."
msgstr ""
#. type: Plain text
#: en/config.txt:790
msgid ""
-"Likewise, when the `LV` environment variable is unset, Git sets it to `-c`. "
-"You can override this setting by exporting `LV` with another value or "
+"Likewise, when the `LV` environment variable is unset, Git sets it to `-c`."
+" You can override this setting by exporting `LV` with another value or "
"setting `core.pager` to `lv +c`."
msgstr ""
#. type: Labeled list
#: en/config.txt:791
-#, fuzzy, no-wrap
-#| msgid "whitespace"
+#, no-wrap
msgid "core.whitespace"
-msgstr "whitespace"
+msgstr "core.whitespace"
#. type: Plain text
#: en/config.txt:797
msgid ""
"A comma separated list of common whitespace problems to notice. 'git diff' "
-"will use `color.diff.whitespace` to highlight them, and 'git apply --"
-"whitespace=error' will consider them as errors. You can prefix `-` to "
+"will use `color.diff.whitespace` to highlight them, and 'git apply "
+"--whitespace=error' will consider them as errors. You can prefix `-` to "
"disable any of them (e.g. `-trailing-space`):"
msgstr ""
@@ -3730,8 +3602,8 @@ msgstr ""
#: en/config.txt:816
msgid ""
"`cr-at-eol` treats a carriage-return at the end of line as part of the line "
-"terminator, i.e. with it, `trailing-space` does not trigger if the character "
-"before such a carriage-return is not a whitespace (not enabled by default)."
+"terminator, i.e. with it, `trailing-space` does not trigger if the character"
+" before such a carriage-return is not a whitespace (not enabled by default)."
msgstr ""
#. type: Plain text
@@ -3744,10 +3616,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:820
-#, fuzzy, no-wrap
-#| msgid "git-fsck-objects(1)"
+#, no-wrap
msgid "core.fsyncObjectFiles"
-msgstr "git-fsck-objects(1)"
+msgstr "core.fsyncObjectFiles"
#. type: Plain text
#: en/config.txt:822
@@ -3759,15 +3630,15 @@ msgstr ""
msgid ""
"This is a total waste of time and effort on a filesystem that orders data "
"writes properly, but can be useful for filesystems that do not use "
-"journalling (traditional UNIX filesystems) or that only journal metadata and "
-"not file contents (OS X's HFS+, or Linux ext3 with \"data=writeback\")."
+"journalling (traditional UNIX filesystems) or that only journal metadata and"
+" not file contents (OS X's HFS+, or Linux ext3 with \"data=writeback\")."
msgstr ""
#. type: Labeled list
#: en/config.txt:828
#, no-wrap
msgid "core.preloadIndex"
-msgstr ""
+msgstr "core.preloadIndex"
#. type: Plain text
#: en/config.txt:830
@@ -3787,13 +3658,13 @@ msgstr ""
#: en/config.txt:837
#, no-wrap
msgid "core.createObject"
-msgstr ""
+msgstr "core.createObject"
#. type: Plain text
#: en/config.txt:841
msgid ""
-"You can set this to 'link', in which case a hardlink followed by a delete of "
-"the source are used to make sure that object creation will not overwrite "
+"You can set this to 'link', in which case a hardlink followed by a delete of"
+" the source are used to make sure that object creation will not overwrite "
"existing objects."
msgstr ""
@@ -3807,10 +3678,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:846 en/git-notes.txt:313
-#, fuzzy, no-wrap
-#| msgid "whitespace"
+#, no-wrap
msgid "core.notesRef"
-msgstr "whitespace"
+msgstr "core.notesRef"
#. type: Plain text
#: en/config.txt:851
@@ -3823,15 +3693,15 @@ msgstr ""
#. type: Plain text
#: en/config.txt:854
msgid ""
-"This setting defaults to \"refs/notes/commits\", and it can be overridden by "
-"the `GIT_NOTES_REF` environment variable. See linkgit:git-notes[1]."
+"This setting defaults to \"refs/notes/commits\", and it can be overridden by"
+" the `GIT_NOTES_REF` environment variable. See linkgit:git-notes[1]."
msgstr ""
#. type: Labeled list
#: en/config.txt:855
#, no-wrap
msgid "core.sparseCheckout"
-msgstr ""
+msgstr "core.sparseCheckout"
#. type: Plain text
#: en/config.txt:858
@@ -3844,7 +3714,7 @@ msgstr ""
#: en/config.txt:859
#, no-wrap
msgid "core.abbrev"
-msgstr ""
+msgstr "core.abbrev"
#. type: Plain text
#: en/config.txt:865
@@ -3870,10 +3740,10 @@ msgstr ""
#. type: Plain text
#: en/config.txt:873
msgid ""
-"Tells 'git add' to continue adding files when some files cannot be added due "
-"to indexing errors. Equivalent to the `--ignore-errors` option of linkgit:"
-"git-add[1]. `add.ignore-errors` is deprecated, as it does not follow the "
-"usual naming convention for configuration variables."
+"Tells 'git add' to continue adding files when some files cannot be added due"
+" to indexing errors. Equivalent to the `--ignore-errors` option of "
+"linkgit:git-add[1]. `add.ignore-errors` is deprecated, as it does not "
+"follow the usual naming convention for configuration variables."
msgstr ""
#. type: Labeled list
@@ -3889,18 +3759,18 @@ msgid ""
"defining \"alias.last = cat-file commit HEAD\", the invocation \"git last\" "
"is equivalent to \"git cat-file commit HEAD\". To avoid confusion and "
"troubles with script usage, aliases that hide existing Git commands are "
-"ignored. Arguments are split by spaces, the usual shell quoting and escaping "
-"is supported. A quote pair or a backslash can be used to quote them."
+"ignored. Arguments are split by spaces, the usual shell quoting and escaping"
+" is supported. A quote pair or a backslash can be used to quote them."
msgstr ""
#. type: Plain text
#: en/config.txt:892
msgid ""
"If the alias expansion is prefixed with an exclamation point, it will be "
-"treated as a shell command. For example, defining \"alias.new = !gitk --all "
-"--not ORIG_HEAD\", the invocation \"git new\" is equivalent to running the "
-"shell command \"gitk --all --not ORIG_HEAD\". Note that shell commands will "
-"be executed from the top-level directory of a repository, which may not "
+"treated as a shell command. For example, defining \"alias.new = !gitk --all"
+" --not ORIG_HEAD\", the invocation \"git new\" is equivalent to running the "
+"shell command \"gitk --all --not ORIG_HEAD\". Note that shell commands will"
+" be executed from the top-level directory of a repository, which may not "
"necessarily be the current directory. `GIT_PREFIX` is set as returned by "
"running 'git rev-parse --show-prefix' from the original current directory. "
"See linkgit:git-rev-parse[1]."
@@ -3916,9 +3786,9 @@ msgstr ""
#: en/config.txt:899
msgid ""
"If true, git-am will call git-mailsplit for patches in mbox format with "
-"parameter `--keep-cr`. In this case git-mailsplit will not remove `\\r` from "
-"lines ending with `\\r\\n`. Can be overridden by giving `--no-keep-cr` from "
-"the command line. See linkgit:git-am[1], linkgit:git-mailsplit[1]."
+"parameter `--keep-cr`. In this case git-mailsplit will not remove `\\r` from"
+" lines ending with `\\r\\n`. Can be overridden by giving `--no-keep-cr` from"
+" the command line. See linkgit:git-am[1], linkgit:git-mailsplit[1]."
msgstr ""
#. type: Labeled list
@@ -3930,11 +3800,11 @@ msgstr ""
#. type: Plain text
#: en/config.txt:907
msgid ""
-"By default, `git am` will fail if the patch does not apply cleanly. When set "
-"to true, this setting tells `git am` to fall back on 3-way merge if the "
+"By default, `git am` will fail if the patch does not apply cleanly. When set"
+" to true, this setting tells `git am` to fall back on 3-way merge if the "
"patch records the identity of blobs it is supposed to apply to and we have "
-"those blobs available locally (equivalent to giving the `--3way` option from "
-"the command line). Defaults to `false`. See linkgit:git-am[1]."
+"those blobs available locally (equivalent to giving the `--3way` option from"
+" the command line). Defaults to `false`. See linkgit:git-am[1]."
msgstr ""
#. type: Labeled list
@@ -3948,9 +3818,9 @@ msgstr "whitespace"
#: en/config.txt:915
msgid ""
"When set to 'change', tells 'git apply' to ignore changes in whitespace, in "
-"the same way as the `--ignore-space-change` option. When set to one of: no, "
-"none, never, false tells 'git apply' to respect all whitespace differences. "
-"See linkgit:git-apply[1]."
+"the same way as the `--ignore-space-change` option. When set to one of: no,"
+" none, never, false tells 'git apply' to respect all whitespace differences."
+" See linkgit:git-apply[1]."
msgstr ""
#. type: Labeled list
@@ -3963,24 +3833,24 @@ msgstr "whitespace"
#. type: Plain text
#: en/config.txt:919
msgid ""
-"Tells 'git apply' how to handle whitespaces, in the same way as the `--"
-"whitespace` option. See linkgit:git-apply[1]."
+"Tells 'git apply' how to handle whitespaces, in the same way as the "
+"`--whitespace` option. See linkgit:git-apply[1]."
msgstr ""
#. type: Labeled list
#: en/config.txt:920
#, no-wrap
msgid "branch.autoSetupMerge"
-msgstr ""
+msgstr "branch.autoSetupMerge"
#. type: Plain text
#: en/config.txt:931
msgid ""
-"Tells 'git branch' and 'git checkout' to set up new branches so that linkgit:"
-"git-pull[1] will appropriately merge from the starting point branch. Note "
-"that even if this option is not set, this behavior can be chosen per-branch "
-"using the `--track` and `--no-track` options. The valid settings are: "
-"`false` -- no automatic setup is done; `true` -- automatic setup is done "
+"Tells 'git branch' and 'git checkout' to set up new branches so that "
+"linkgit:git-pull[1] will appropriately merge from the starting point branch."
+" Note that even if this option is not set, this behavior can be chosen per-"
+"branch using the `--track` and `--no-track` options. The valid settings are:"
+" `false` -- no automatic setup is done; `true` -- automatic setup is done "
"when the starting point is a remote-tracking branch; `always` -- automatic "
"setup is done when the starting point is either a local branch or remote-"
"tracking branch. This option defaults to true."
@@ -3990,18 +3860,18 @@ msgstr ""
#: en/config.txt:932
#, no-wrap
msgid "branch.autoSetupRebase"
-msgstr ""
+msgstr "branch.autoSetupRebase"
#. type: Plain text
#: en/config.txt:946
msgid ""
-"When a new branch is created with 'git branch' or 'git checkout' that tracks "
-"another branch, this variable tells Git to set up pull to rebase instead of "
-"merge (see \"branch.<name>.rebase\"). When `never`, rebase is never "
+"When a new branch is created with 'git branch' or 'git checkout' that tracks"
+" another branch, this variable tells Git to set up pull to rebase instead of"
+" merge (see \"branch.<name>.rebase\"). When `never`, rebase is never "
"automatically set to true. When `local`, rebase is set to true for tracked "
"branches of other local branches. When `remote`, rebase is set to true for "
-"tracked branches of remote-tracking branches. When `always`, rebase will be "
-"set to true for all tracking branches. See \"branch.autoSetupMerge\" for "
+"tracked branches of remote-tracking branches. When `always`, rebase will be"
+" set to true for all tracking branches. See \"branch.autoSetupMerge\" for "
"details on how to set up a branch to track another branch. This option "
"defaults to never."
msgstr ""
@@ -4016,13 +3886,13 @@ msgstr ""
#: en/config.txt:957
msgid ""
"When on branch <name>, it tells 'git fetch' and 'git push' which remote to "
-"fetch from/push to. The remote to push to may be overridden with `remote."
-"pushDefault` (for all branches). The remote to push to, for the current "
-"branch, may be further overridden by `branch.<name>.pushRemote`. If no "
-"remote is configured, or if you are not on any branch, it defaults to "
-"`origin` for fetching and `remote.pushDefault` for pushing. Additionally, `."
-"` (a period) is the current local repository (a dot-repository), see `branch."
-"<name>.merge`'s final note below."
+"fetch from/push to. The remote to push to may be overridden with "
+"`remote.pushDefault` (for all branches). The remote to push to, for the "
+"current branch, may be further overridden by `branch.<name>.pushRemote`. If"
+" no remote is configured, or if you are not on any branch, it defaults to "
+"`origin` for fetching and `remote.pushDefault` for pushing. Additionally, "
+"`.` (a period) is the current local repository (a dot-repository), see "
+"`branch.<name>.merge`'s final note below."
msgstr ""
#. type: Labeled list
@@ -4036,9 +3906,9 @@ msgstr ""
msgid ""
"When on branch <name>, it overrides `branch.<name>.remote` for pushing. It "
"also overrides `remote.pushDefault` for pushing from branch <name>. When "
-"you pull from one place (e.g. your upstream) and push to another place (e.g. "
-"your own publishing repository), you would want to set `remote.pushDefault` "
-"to specify the remote to push to for all branches, and use this option to "
+"you pull from one place (e.g. your upstream) and push to another place (e.g."
+" your own publishing repository), you would want to set `remote.pushDefault`"
+" to specify the remote to push to for all branches, and use this option to "
"override it for a specific branch."
msgstr ""
@@ -4054,16 +3924,16 @@ msgid ""
"Defines, together with branch.<name>.remote, the upstream branch for the "
"given branch. It tells 'git fetch'/'git pull'/'git rebase' which branch to "
"merge and can also affect 'git push' (see push.default). When in branch "
-"<name>, it tells 'git fetch' the default refspec to be marked for merging in "
-"FETCH_HEAD. The value is handled like the remote part of a refspec, and must "
-"match a ref which is fetched from the remote given by \"branch.<name>.remote"
-"\". The merge information is used by 'git pull' (which at first calls 'git "
-"fetch') to lookup the default branch for merging. Without this option, 'git "
-"pull' defaults to merge the first refspec fetched. Specify multiple values "
-"to get an octopus merge. If you wish to setup 'git pull' so that it merges "
-"into <name> from another branch in the local repository, you can point "
-"branch.<name>.merge to the desired branch, and use the relative path setting "
-"`.` (a period) for branch.<name>.remote."
+"<name>, it tells 'git fetch' the default refspec to be marked for merging in"
+" FETCH_HEAD. The value is handled like the remote part of a refspec, and "
+"must match a ref which is fetched from the remote given by "
+"\"branch.<name>.remote\". The merge information is used by 'git pull' "
+"(which at first calls 'git fetch') to lookup the default branch for merging."
+" Without this option, 'git pull' defaults to merge the first refspec "
+"fetched. Specify multiple values to get an octopus merge. If you wish to "
+"setup 'git pull' so that it merges into <name> from another branch in the "
+"local repository, you can point branch.<name>.merge to the desired branch, "
+"and use the relative path setting `.` (a period) for branch.<name>.remote."
msgstr ""
#. type: Labeled list
@@ -4089,9 +3959,9 @@ msgstr ""
#. type: Plain text
#: en/config.txt:996
msgid ""
-"When true, rebase the branch <name> on top of the fetched branch, instead of "
-"merging the default branch from the default remote when \"git pull\" is run. "
-"See \"pull.rebase\" for doing this in a non branch-specific manner."
+"When true, rebase the branch <name> on top of the fetched branch, instead of"
+" merging the default branch from the default remote when \"git pull\" is "
+"run. See \"pull.rebase\" for doing this in a non branch-specific manner."
msgstr ""
#. type: Plain text
@@ -4103,7 +3973,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1002 en/config.txt:2489
-msgid "When the value is `interactive`, the rebase is run in interactive mode."
+msgid ""
+"When the value is `interactive`, the rebase is run in interactive mode."
msgstr ""
#. type: Plain text
@@ -4182,8 +4053,8 @@ msgstr "Mode interactif"
#: en/config.txt:1033
msgid ""
"A boolean to enable/disable color in the output of linkgit:git-branch[1]. "
-"May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which "
-"case colors are used only when the output is to a terminal. If unset, then "
+"May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which"
+" case colors are used only when the output is to a terminal. If unset, then "
"the value of `color.ui` is used (`auto` by default)."
msgstr ""
@@ -4221,9 +4092,9 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1053
msgid ""
-"This does not affect linkgit:git-format-patch[1] or the 'git-diff-"
-"{asterisk}' plumbing commands. Can be overridden on the command line with "
-"the `--color[=<when>]` option."
+"This does not affect linkgit:git-format-patch[1] or the 'git-"
+"diff-{asterisk}' plumbing commands. Can be overridden on the command line "
+"with the `--color[=<when>]` option."
msgstr ""
#. type: Labeled list
@@ -4408,9 +4279,9 @@ msgstr "Mode interactif"
#. type: Plain text
#: en/config.txt:1107
msgid ""
-"When set to `always`, always use colors for interactive prompts and displays "
-"(such as those used by \"git-add --interactive\" and \"git-clean --"
-"interactive\"). When false (or `never`), never. When set to `true` or "
+"When set to `always`, always use colors for interactive prompts and displays"
+" (such as those used by \"git-add --interactive\" and \"git-clean "
+"--interactive\"). When false (or `never`), never. When set to `true` or "
"`auto`, use colors only when the output is to the terminal. If unset, then "
"the value of `color.ui` is used (`auto` by default)."
msgstr ""
@@ -4425,9 +4296,9 @@ msgstr "Mode interactif"
#. type: Plain text
#: en/config.txt:1113
msgid ""
-"Use customized color for 'git add --interactive' and 'git clean --"
-"interactive' output. `<slot>` may be `prompt`, `header`, `help` or `error`, "
-"for four distinct types of normal output from interactive commands."
+"Use customized color for 'git add --interactive' and 'git clean "
+"--interactive' output. `<slot>` may be `prompt`, `header`, `help` or "
+"`error`, for four distinct types of normal output from interactive commands."
msgstr ""
#. type: Labeled list
@@ -4440,8 +4311,8 @@ msgstr "status"
#. type: Plain text
#: en/config.txt:1117
msgid ""
-"A boolean to enable/disable colored output when the pager is in use (default "
-"is true)."
+"A boolean to enable/disable colored output when the pager is in use (default"
+" is true)."
msgstr ""
#. type: Labeled list
@@ -4456,7 +4327,8 @@ msgid ""
"A boolean to enable/disable color in the output of linkgit:git-show-"
"branch[1]. May be set to `always`, `false` (or `never`) or `auto` (or "
"`true`), in which case colors are used only when the output is to a "
-"terminal. If unset, then the value of `color.ui` is used (`auto` by default)."
+"terminal. If unset, then the value of `color.ui` is used (`auto` by "
+"default)."
msgstr ""
#. type: Labeled list
@@ -4470,8 +4342,8 @@ msgstr "status"
#: en/config.txt:1131
msgid ""
"A boolean to enable/disable color in the output of linkgit:git-status[1]. "
-"May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which "
-"case colors are used only when the output is to a terminal. If unset, then "
+"May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which"
+" case colors are used only when the output is to a terminal. If unset, then "
"the value of `color.ui` is used (`auto` by default)."
msgstr ""
@@ -4489,8 +4361,8 @@ msgid ""
"(the header text of the status message), `added` or `updated` (files which "
"are added but not committed), `changed` (files which are changed but not "
"added in the index), `untracked` (files which are not tracked by Git), "
-"`branch` (the current branch), `nobranch` (the color the 'no branch' warning "
-"is shown in, defaulting to red), or `unmerged` (files which have unmerged "
+"`branch` (the current branch), `nobranch` (the color the 'no branch' warning"
+" is shown in, defaulting to red), or `unmerged` (files which have unmerged "
"changes)."
msgstr ""
@@ -4504,13 +4376,13 @@ msgstr "status"
#. type: Plain text
#: en/config.txt:1154
msgid ""
-"This variable determines the default value for variables such as `color."
-"diff` and `color.grep` that control the use of color per command family. Its "
-"scope will expand as more commands learn configuration to set a default for "
-"the `--color` option. Set it to `false` or `never` if you prefer Git "
-"commands not to use color unless enabled explicitly with some other "
-"configuration or the `--color` option. Set it to `always` if you want all "
-"output not intended for machine consumption to use color, to `true` or "
+"This variable determines the default value for variables such as "
+"`color.diff` and `color.grep` that control the use of color per command "
+"family. Its scope will expand as more commands learn configuration to set a "
+"default for the `--color` option. Set it to `false` or `never` if you "
+"prefer Git commands not to use color unless enabled explicitly with some "
+"other configuration or the `--color` option. Set it to `always` if you want "
+"all output not intended for machine consumption to use color, to `true` or "
"`auto` (this is the default since Git 1.8.4) if you want such output to use "
"color when written to the terminal."
msgstr ""
@@ -4691,8 +4563,8 @@ msgstr "status"
#. type: Plain text
#: en/config.txt:1210
msgid ""
-"Specify whether to output tag listing in `git tag` in columns. See `column."
-"ui` for details."
+"Specify whether to output tag listing in `git tag` in columns. See "
+"`column.ui` for details."
msgstr ""
#. type: Labeled list
@@ -4708,9 +4580,9 @@ msgid ""
"This setting overrides the default of the `--cleanup` option in `git "
"commit`. See linkgit:git-commit[1] for details. Changing the default can be "
"useful when you always want to keep lines that begin with comment character "
-"`#` in your log message, in which case you would do `git config commit."
-"cleanup whitespace` (note that you will have to remove the help lines that "
-"begin with `#` in the commit log template yourself, if you do this)."
+"`#` in your log message, in which case you would do `git config "
+"commit.cleanup whitespace` (note that you will have to remove the help lines"
+" that begin with `#` in the commit log template yourself, if you do this)."
msgstr ""
#. type: Labeled list
@@ -4921,8 +4793,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1302
msgid ""
-"This option can be either set to a boolean value or to 'on-demand'. Setting "
-"it to a boolean changes the behavior of fetch and pull to unconditionally "
+"This option can be either set to a boolean value or to 'on-demand'. Setting"
+" it to a boolean changes the behavior of fetch and pull to unconditionally "
"recurse into submodules when set to true or to not recurse at all when set "
"to false. When set to 'on-demand' (the default value), fetch and pull will "
"only recurse into a populated submodule when its superproject retrieves a "
@@ -4939,8 +4811,8 @@ msgstr "git-fsck-objects(1)"
#. type: Plain text
#: en/config.txt:1309
msgid ""
-"If it is set to true, git-fetch-pack will check all fetched objects. It will "
-"abort in the case of a malformed object or a broken link. The result of an "
+"If it is set to true, git-fetch-pack will check all fetched objects. It will"
+" abort in the case of a malformed object or a broken link. The result of an "
"abort are only dangling objects. Defaults to false. If not set, the value "
"of `transfer.fsckObjects` is used instead."
msgstr ""
@@ -4955,12 +4827,12 @@ msgstr ""
#: en/config.txt:1320
msgid ""
"If the number of objects fetched over the Git native transfer is below this "
-"limit, then the objects will be unpacked into loose object files. However if "
-"the number of received objects equals or exceeds this limit then the "
+"limit, then the objects will be unpacked into loose object files. However if"
+" the number of received objects equals or exceeds this limit then the "
"received pack will be stored as a pack, after adding any missing delta "
"bases. Storing the pack from a push can make the push operation complete "
-"faster, especially on slow filesystems. If not set, the value of `transfer."
-"unpackLimit` is used instead."
+"faster, especially on slow filesystems. If not set, the value of "
+"`transfer.unpackLimit` is used instead."
msgstr ""
#. type: Labeled list
@@ -5016,8 +4888,8 @@ msgstr "Configuration"
#. type: Plain text
#: en/config.txt:1346
msgid ""
-"Provides the default value for the `--from` option to format-patch. Accepts "
-"a boolean value, or a name and email address. If false, format-patch "
+"Provides the default value for the `--from` option to format-patch. Accepts"
+" a boolean value, or a name and email address. If false, format-patch "
"defaults to `--no-from`, using commit authors directly in the \"From:\" "
"field of patch mails. If true, format-patch defaults to `--from`, using "
"your committer identity in the \"From:\" field of patch mails and including "
@@ -5039,7 +4911,8 @@ msgid ""
"A boolean which can enable or disable sequence numbers in patch subjects. "
"It defaults to \"auto\" which enables it only if there is more than one "
"patch. It can be enabled or disabled for all messages by setting it to "
-"\"true\" or \"false\". See --numbered option in linkgit:git-format-patch[1]."
+"\"true\" or \"false\". See --numbered option in linkgit:git-format-"
+"patch[1]."
msgstr ""
#. type: Labeled list
@@ -5052,8 +4925,8 @@ msgstr "Configuration"
#. type: Plain text
#: en/config.txt:1357
msgid ""
-"Additional email headers to include in a patch to be submitted by mail. See "
-"linkgit:git-format-patch[1]."
+"Additional email headers to include in a patch to be submitted by mail. See"
+" linkgit:git-format-patch[1]."
msgstr ""
#. type: Labeled list
@@ -5101,8 +4974,8 @@ msgstr "Configuration"
#: en/config.txt:1373
msgid ""
"The default for format-patch is to output a signature containing the Git "
-"version number. Use this variable to change that default. Set this variable "
-"to the empty string (\"\") to suppress signature generation."
+"version number. Use this variable to change that default. Set this variable"
+" to the empty string (\"\") to suppress signature generation."
msgstr ""
#. type: Labeled list
@@ -5130,8 +5003,8 @@ msgstr "Configuration"
#: en/config.txt:1382
msgid ""
"The default for format-patch is to output files with the suffix `.patch`. "
-"Use this variable to change that suffix (make sure to include the dot if you "
-"want it)."
+"Use this variable to change that suffix (make sure to include the dot if you"
+" want it)."
msgstr ""
#. type: Labeled list
@@ -5140,7 +5013,6 @@ msgstr ""
msgid "format.pretty"
msgstr ""
-#
#. type: Plain text
#: en/config.txt:1387
#, fuzzy
@@ -5164,10 +5036,10 @@ msgstr "Configuration"
#. type: Plain text
#: en/config.txt:1397
msgid ""
-"The default threading style for 'git format-patch'. Can be a boolean value, "
-"or `shallow` or `deep`. `shallow` threading makes every mail a reply to the "
-"head of the series, where the head is chosen from the cover letter, the `--"
-"in-reply-to`, and the first patch mail, in this order. `deep` threading "
+"The default threading style for 'git format-patch'. Can be a boolean value,"
+" or `shallow` or `deep`. `shallow` threading makes every mail a reply to "
+"the head of the series, where the head is chosen from the cover letter, the "
+"`--in-reply-to`, and the first patch mail, in this order. `deep` threading "
"makes every mail a reply to the previous one. A true boolean value is the "
"same as `shallow`, and a false value disables threading."
msgstr ""
@@ -5198,8 +5070,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1409
msgid ""
-"A boolean that controls whether to generate a cover-letter when format-patch "
-"is invoked, but in addition can be set to \"auto\", to generate a cover-"
+"A boolean that controls whether to generate a cover-letter when format-patch"
+" is invoked, but in addition can be set to \"auto\", to generate a cover-"
"letter only when there's more than one patch."
msgstr ""
@@ -5293,11 +5165,12 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1446 en/config.txt:2679
msgid ""
-"The path to a sorted list of object names (i.e. one SHA-1 per line) that are "
-"known to be broken in a non-fatal way and should be ignored. This feature is "
-"useful when an established project should be accepted despite early commits "
-"containing errors that can be safely ignored such as invalid committer email "
-"addresses. Note: corrupt objects cannot be skipped with this setting."
+"The path to a sorted list of object names (i.e. one SHA-1 per line) that are"
+" known to be broken in a non-fatal way and should be ignored. This feature "
+"is useful when an established project should be accepted despite early "
+"commits containing errors that can be safely ignored such as invalid "
+"committer email addresses. Note: corrupt objects cannot be skipped with "
+"this setting."
msgstr ""
#. type: Labeled list
@@ -5337,8 +5210,8 @@ msgstr ""
msgid ""
"When there are approximately more than this many loose objects in the "
"repository, `git gc --auto` will pack them. Some Porcelain commands use "
-"this command to perform a light-weight garbage collection from time to "
-"time. The default value is 6700. Setting this to 0 disables it."
+"this command to perform a light-weight garbage collection from time to time."
+" The default value is 6700. Setting this to 0 disables it."
msgstr ""
#. type: Labeled list
@@ -5378,8 +5251,8 @@ msgstr ""
#: en/config.txt:1479
msgid ""
"If the file gc.log exists, then `git gc --auto` won't run unless that file "
-"is more than 'gc.logExpiry' old. Default is \"1.day\". See `gc."
-"pruneExpire` for more ways to specify its value."
+"is more than 'gc.logExpiry' old. Default is \"1.day\". See "
+"`gc.pruneExpire` for more ways to specify its value."
msgstr ""
#. type: Labeled list
@@ -5427,8 +5300,9 @@ msgstr ""
msgid ""
"When 'git gc' is run, it calls 'git worktree prune --expire 3.months.ago'. "
"This config variable can be used to set a different grace period. The value "
-"\"now\" may be used to disable the grace period and prune `$GIT_DIR/"
-"worktrees` immediately, or \"never\" may be used to suppress pruning."
+"\"now\" may be used to disable the grace period and prune "
+"`$GIT_DIR/worktrees` immediately, or \"never\" may be used to suppress "
+"pruning."
msgstr ""
#. type: Labeled list
@@ -5446,8 +5320,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1513
msgid ""
-"'git reflog expire' removes reflog entries older than this time; defaults to "
-"90 days. The value \"now\" expires all entries immediately, and \"never\" "
+"'git reflog expire' removes reflog entries older than this time; defaults to"
+" 90 days. The value \"now\" expires all entries immediately, and \"never\" "
"suppresses expiration altogether. With \"<pattern>\" (e.g. \"refs/stash\") "
"in the middle the setting applies only to the refs that match the <pattern>."
msgstr ""
@@ -5483,8 +5357,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1528
msgid ""
-"Records of conflicted merge you resolved earlier are kept for this many days "
-"when 'git rerere gc' is run. The default is 60 days. See linkgit:git-"
+"Records of conflicted merge you resolved earlier are kept for this many days"
+" when 'git rerere gc' is run. The default is 60 days. See linkgit:git-"
"rerere[1]."
msgstr ""
@@ -5555,8 +5429,8 @@ msgid ""
"treat a file as text, the `-k` mode will be left blank so CVS clients will "
"treat it as text. If they suppress text conversion, the file will be set "
"with '-kb' mode, which suppresses any newline munging the client might "
-"otherwise do. If the attributes do not allow the file type to be determined, "
-"then `gitcvs.allBinary` is used. See linkgit:gitattributes[5]."
+"otherwise do. If the attributes do not allow the file type to be determined,"
+" then `gitcvs.allBinary` is used. See linkgit:gitattributes[5]."
msgstr ""
#. type: Labeled list
@@ -5568,12 +5442,12 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1566
msgid ""
-"This is used if `gitcvs.usecrlfattr` does not resolve the correct '-kb' mode "
-"to use. If true, all unresolved files are sent to the client in mode '-kb'. "
-"This causes the client to treat them as binary files, which suppresses any "
-"newline munging it otherwise might do. Alternatively, if it is set to \"guess"
-"\", then the contents of the file are examined to decide if it is binary, "
-"similar to `core.autocrlf`."
+"This is used if `gitcvs.usecrlfattr` does not resolve the correct '-kb' mode"
+" to use. If true, all unresolved files are sent to the client in mode '-kb'."
+" This causes the client to treat them as binary files, which suppresses any "
+"newline munging it otherwise might do. Alternatively, if it is set to "
+"\"guess\", then the contents of the file are examined to decide if it is "
+"binary, similar to `core.autocrlf`."
msgstr ""
#. type: Labeled list
@@ -5766,8 +5640,8 @@ msgstr ""
#: en/config.txt:1627 en/git-grep.txt:52
msgid ""
"Set the default matching behavior. Using a value of 'basic', 'extended', "
-"'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`, `--"
-"fixed-strings`, or `--perl-regexp` option accordingly, while the value "
+"'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`, "
+"`--fixed-strings`, or `--perl-regexp` option accordingly, while the value "
"'default' will return to the default matching behavior."
msgstr ""
@@ -5780,8 +5654,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1632 en/git-grep.txt:57
msgid ""
-"If set to true, enable `--extended-regexp` option by default. This option is "
-"ignored when the `grep.patternType` option is set to a value other than "
+"If set to true, enable `--extended-regexp` option by default. This option is"
+" ignored when the `grep.patternType` option is set to a value other than "
"'default'."
msgstr ""
@@ -5820,14 +5694,14 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1651
msgid ""
-"Use this custom program instead of \"`gpg`\" found on `$PATH` when making or "
-"verifying a PGP signature. The program must support the same command-line "
+"Use this custom program instead of \"`gpg`\" found on `$PATH` when making or"
+" verifying a PGP signature. The program must support the same command-line "
"interface as GPG, namely, to verify a detached signature, \"`gpg --verify "
"$file - <$signature`\" is run, and the program is expected to signal a good "
"signature by exiting with code 0, and to generate an ASCII-armored detached "
"signature, the standard input of \"`gpg -bsau $key`\" is fed with the "
-"contents to be signed, and the program is expected to send the result to its "
-"standard output."
+"contents to be signed, and the program is expected to send the result to its"
+" standard output."
msgstr ""
#. type: Labeled list
@@ -5853,8 +5727,8 @@ msgstr "contenu nouveau"
#. type: Plain text
#: en/config.txt:1659
msgid ""
-"Specifies how many context lines should be used in calls to diff made by the "
-"linkgit:git-gui[1]. The default is \"5\"."
+"Specifies how many context lines should be used in calls to diff made by the"
+" linkgit:git-gui[1]. The default is \"5\"."
msgstr ""
#. type: Labeled list
@@ -5866,8 +5740,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1663
msgid ""
-"Determines if linkgit:git-gui[1] shows untracked files in the file list. The "
-"default is \"true\"."
+"Determines if linkgit:git-gui[1] shows untracked files in the file list. The"
+" default is \"true\"."
msgstr ""
#. type: Labeled list
@@ -5880,9 +5754,9 @@ msgstr ""
#: en/config.txt:1671
msgid ""
"Specifies the default encoding to use for displaying of file contents in "
-"linkgit:git-gui[1] and linkgit:gitk[1]. It can be overridden by setting the "
-"'encoding' attribute for relevant files (see linkgit:gitattributes[5]). If "
-"this option is not set, the tools default to the locale encoding."
+"linkgit:git-gui[1] and linkgit:gitk[1]. It can be overridden by setting the"
+" 'encoding' attribute for relevant files (see linkgit:gitattributes[5]). If"
+" this option is not set, the tools default to the locale encoding."
msgstr ""
#. type: Labeled list
@@ -5894,8 +5768,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1676
msgid ""
-"Determines if new branches created with linkgit:git-gui[1] should default to "
-"tracking remote branches with matching names or not. Default: \"false\"."
+"Determines if new branches created with linkgit:git-gui[1] should default to"
+" tracking remote branches with matching names or not. Default: \"false\"."
msgstr ""
#. type: Labeled list
@@ -5974,8 +5848,8 @@ msgstr ""
#: en/config.txt:1703
msgid ""
"Specifies the threshold to use in 'git gui blame' original location "
-"detection, measured in alphanumeric characters. See the linkgit:git-blame[1] "
-"manual for more information on copy detection."
+"detection, measured in alphanumeric characters. See the linkgit:git-blame[1]"
+" manual for more information on copy detection."
msgstr ""
#. type: Labeled list
@@ -6003,9 +5877,9 @@ msgstr ""
#: en/config.txt:1718
msgid ""
"Specifies the shell command line to execute when the corresponding item of "
-"the linkgit:git-gui[1] `Tools` menu is invoked. This option is mandatory for "
-"every tool. The command is executed from the root of the working directory, "
-"and in the environment it receives the name of the tool as `GIT_GUITOOL`, "
+"the linkgit:git-gui[1] `Tools` menu is invoked. This option is mandatory for"
+" every tool. The command is executed from the root of the working directory,"
+" and in the environment it receives the name of the tool as `GIT_GUITOOL`, "
"the name of the currently selected file as 'FILENAME', and the name of the "
"current branch as 'CUR_BRANCH' (if the head is detached, 'CUR_BRANCH' is "
"empty)."
@@ -6069,8 +5943,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1741
msgid ""
-"Request a string argument from the user, and pass it to the tool through the "
-"`ARGS` environment variable. Since requesting an argument implies "
+"Request a string argument from the user, and pass it to the tool through the"
+" `ARGS` environment variable. Since requesting an argument implies "
"confirmation, the 'confirm' option has no effect if this is enabled. If the "
"option is set to 'true', 'yes', or '1', the dialog uses a built-in generic "
"prompt; otherwise the exact value of the variable is used."
@@ -6154,8 +6028,8 @@ msgstr "Configuration"
#. type: Plain text
#: en/config.txt:1769
msgid ""
-"Override the default help format used by linkgit:git-help[1]. Values 'man', "
-"'info', 'web' and 'html' are supported. 'man' is the default. 'web' and "
+"Override the default help format used by linkgit:git-help[1]. Values 'man',"
+" 'info', 'web' and 'html' are supported. 'man' is the default. 'web' and "
"'html' are the same."
msgstr ""
@@ -6171,8 +6045,8 @@ msgid ""
"Automatically correct and execute mistyped commands after waiting for the "
"given number of deciseconds (0.1 sec). If more than one command can be "
"deduced from the entered text, nothing will be executed. If the value of "
-"this option is negative, the corrected command will be executed immediately. "
-"If the value is 0 - the command will be just shown but not executed. This "
+"this option is negative, the corrected command will be executed immediately."
+" If the value is 0 - the command will be just shown but not executed. This "
"is the default."
msgstr ""
@@ -6185,9 +6059,9 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1784
msgid ""
-"Specify the path where the HTML documentation resides. File system paths and "
-"URLs are supported. HTML pages will be prefixed with this path when help is "
-"displayed in the 'web' format. This defaults to the documentation path of "
+"Specify the path where the HTML documentation resides. File system paths and"
+" URLs are supported. HTML pages will be prefixed with this path when help is"
+" displayed in the 'web' format. This defaults to the documentation path of "
"your Git installation."
msgstr ""
@@ -6202,12 +6076,12 @@ msgstr ""
msgid ""
"Override the HTTP proxy, normally configured using the 'http_proxy', "
"'https_proxy', and 'all_proxy' environment variables (see `curl(1)`). In "
-"addition to the syntax understood by curl, it is possible to specify a proxy "
-"string with a user name but no password, in which case git will attempt to "
-"acquire one in the same way it does for other credentials. See linkgit:"
-"gitcredentials[7] for more information. The syntax thus is '[protocol://]"
-"[user[:password]@]proxyhost[:port]'. This can be overridden on a per-remote "
-"basis; see remote.<name>.proxy"
+"addition to the syntax understood by curl, it is possible to specify a proxy"
+" string with a user name but no password, in which case git will attempt to "
+"acquire one in the same way it does for other credentials. See "
+"linkgit:gitcredentials[7] for more information. The syntax thus is "
+"'[protocol://][user[:password]@]proxyhost[:port]'. This can be overridden on"
+" a per-remote basis; see remote.<name>.proxy"
msgstr ""
#. type: Labeled list
@@ -6221,8 +6095,8 @@ msgstr ""
msgid ""
"Set the method with which to authenticate against the HTTP proxy. This only "
"takes effect if the configured proxy string contains a user name part (i.e. "
-"is of the form 'user@host' or 'user@host:port'). This can be overridden on a "
-"per-remote basis; see `remote.<name>.proxyAuthMethod`. Both can be "
+"is of the form 'user@host' or 'user@host:port'). This can be overridden on a"
+" per-remote basis; see `remote.<name>.proxyAuthMethod`. Both can be "
"overridden by the `GIT_HTTP_PROXY_AUTHMETHOD` environment variable. "
"Possible values are:"
msgstr ""
@@ -6244,8 +6118,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1811
msgid ""
-"`digest` - HTTP Digest authentication; this prevents the password from being "
-"transmitted to the proxy in clear text"
+"`digest` - HTTP Digest authentication; this prevents the password from being"
+" transmitted to the proxy in clear text"
msgstr ""
#. type: Plain text
@@ -6284,9 +6158,9 @@ msgstr ""
#: en/config.txt:1827
msgid ""
"Control GSSAPI credential delegation. The delegation is disabled by default "
-"in libcurl since version 7.21.7. Set parameter to tell the server what it is "
-"allowed to delegate when it comes to user credentials. Used with GSS/"
-"kerberos. Possible values are:"
+"in libcurl since version 7.21.7. Set parameter to tell the server what it is"
+" allowed to delegate when it comes to user credentials. Used with "
+"GSS/kerberos. Possible values are:"
msgstr ""
#. type: Plain text
@@ -6334,8 +6208,8 @@ msgid ""
"should be used in the Git http session, if they match the server. The file "
"format of the file to read cookies from should be plain HTTP headers or the "
"Netscape/Mozilla cookie file format (see `curl(1)`). NOTE that the file "
-"specified with http.cookieFile is used only as input unless http.saveCookies "
-"is set."
+"specified with http.cookieFile is used only as input unless http.saveCookies"
+" is set."
msgstr ""
#. type: Labeled list
@@ -6347,8 +6221,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1854
msgid ""
-"If set, store cookies received during requests to the file specified by http."
-"cookieFile. Has no effect if http.cookieFile is unset."
+"If set, store cookies received during requests to the file specified by "
+"http.cookieFile. Has no effect if http.cookieFile is unset."
msgstr ""
#. type: Labeled list
@@ -6362,10 +6236,10 @@ msgstr ""
msgid ""
"The SSL version to use when negotiating an SSL connection, if you want to "
"force the default. The available and default version depend on whether "
-"libcurl was built against NSS or OpenSSL and the particular configuration of "
-"the crypto library in use. Internally this sets the 'CURLOPT_SSL_VERSION' "
-"option; see the libcurl documentation for more details on the format of this "
-"option and for the ssl version supported. Actually the possible values of "
+"libcurl was built against NSS or OpenSSL and the particular configuration of"
+" the crypto library in use. Internally this sets the 'CURLOPT_SSL_VERSION' "
+"option; see the libcurl documentation for more details on the format of this"
+" option and for the ssl version supported. Actually the possible values of "
"this option are:"
msgstr ""
@@ -6403,8 +6277,8 @@ msgstr ""
#: en/config.txt:1877
msgid ""
"Can be overridden by the `GIT_SSL_VERSION` environment variable. To force "
-"git to use libcurl's default ssl version and ignore any explicit http."
-"sslversion option, set `GIT_SSL_VERSION` to the empty string."
+"git to use libcurl's default ssl version and ignore any explicit "
+"http.sslversion option, set `GIT_SSL_VERSION` to the empty string."
msgstr ""
#. type: Labeled list
@@ -6417,8 +6291,8 @@ msgstr ""
#: en/config.txt:1885
msgid ""
"A list of SSL ciphers to use when negotiating an SSL connection. The "
-"available ciphers depend on whether libcurl was built against NSS or OpenSSL "
-"and the particular configuration of the crypto library in use. Internally "
+"available ciphers depend on whether libcurl was built against NSS or OpenSSL"
+" and the particular configuration of the crypto library in use. Internally "
"this sets the 'CURLOPT_SSL_CIPHER_LIST' option; see the libcurl "
"documentation for more details on the format of this list."
msgstr ""
@@ -6427,8 +6301,8 @@ msgstr ""
#: en/config.txt:1890
msgid ""
"Can be overridden by the `GIT_SSL_CIPHER_LIST` environment variable. To "
-"force git to use libcurl's default cipher list and ignore any explicit http."
-"sslCipherList option, set `GIT_SSL_CIPHER_LIST` to the empty string."
+"force git to use libcurl's default cipher list and ignore any explicit "
+"http.sslCipherList option, set `GIT_SSL_CIPHER_LIST` to the empty string."
msgstr ""
#. type: Labeled list
@@ -6453,8 +6327,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1900
msgid ""
-"File containing the SSL certificate when fetching or pushing over HTTPS. Can "
-"be overridden by the `GIT_SSL_CERT` environment variable."
+"File containing the SSL certificate when fetching or pushing over HTTPS. Can"
+" be overridden by the `GIT_SSL_CERT` environment variable."
msgstr ""
#. type: Labeled list
@@ -6466,8 +6340,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1905
msgid ""
-"File containing the SSL private key when fetching or pushing over HTTPS. Can "
-"be overridden by the `GIT_SSL_KEY` environment variable."
+"File containing the SSL private key when fetching or pushing over HTTPS. Can"
+" be overridden by the `GIT_SSL_KEY` environment variable."
msgstr ""
#. type: Labeled list
@@ -6480,8 +6354,8 @@ msgstr ""
#: en/config.txt:1911
msgid ""
"Enable Git's password prompt for the SSL certificate. Otherwise OpenSSL "
-"will prompt the user, possibly many times, if the certificate or private key "
-"is encrypted. Can be overridden by the `GIT_SSL_CERT_PASSWORD_PROTECTED` "
+"will prompt the user, possibly many times, if the certificate or private key"
+" is encrypted. Can be overridden by the `GIT_SSL_CERT_PASSWORD_PROTECTED` "
"environment variable."
msgstr ""
@@ -6523,10 +6397,10 @@ msgstr ""
#: en/config.txt:1929
msgid ""
"Public key of the https service. It may either be the filename of a PEM or "
-"DER encoded public key file or a string starting with 'sha256//' followed by "
-"the base64 encoded sha256 hash of the public key. See also libcurl "
-"'CURLOPT_PINNEDPUBLICKEY'. git will exit with an error if this option is set "
-"but not supported by cURL."
+"DER encoded public key file or a string starting with 'sha256//' followed by"
+" the base64 encoded sha256 hash of the public key. See also libcurl "
+"'CURLOPT_PINNEDPUBLICKEY'. git will exit with an error if this option is set"
+" but not supported by cURL."
msgstr ""
#. type: Labeled list
@@ -6538,10 +6412,10 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1937
msgid ""
-"Attempt to use AUTH SSL/TLS and encrypted data transfers when connecting via "
-"regular FTP protocol. This might be needed if the FTP server requires it for "
-"security reasons or you wish to connect securely whenever remote FTP server "
-"supports it. Default is false since it might trigger certificate "
+"Attempt to use AUTH SSL/TLS and encrypted data transfers when connecting via"
+" regular FTP protocol. This might be needed if the FTP server requires it "
+"for security reasons or you wish to connect securely whenever remote FTP "
+"server supports it. Default is false since it might trigger certificate "
"verification errors on misconfigured servers."
msgstr ""
@@ -6569,8 +6443,8 @@ msgstr ""
msgid ""
"The number of curl sessions (counted across slots) to be kept across "
"requests. They will not be ended with curl_easy_cleanup() until "
-"http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this value will "
-"be capped at 1. Defaults to 1."
+"http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this value will"
+" be capped at 1. Defaults to 1."
msgstr ""
#. type: Labeled list
@@ -6598,9 +6472,9 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1961
msgid ""
-"If the HTTP transfer speed is less than 'http.lowSpeedLimit' for longer than "
-"'http.lowSpeedTime' seconds, the transfer is aborted. Can be overridden by "
-"the `GIT_HTTP_LOW_SPEED_LIMIT` and `GIT_HTTP_LOW_SPEED_TIME` environment "
+"If the HTTP transfer speed is less than 'http.lowSpeedLimit' for longer than"
+" 'http.lowSpeedTime' seconds, the transfer is aborted. Can be overridden by"
+" the `GIT_HTTP_LOW_SPEED_LIMIT` and `GIT_HTTP_LOW_SPEED_TIME` environment "
"variables."
msgstr ""
@@ -6614,8 +6488,8 @@ msgstr ""
#: en/config.txt:1967
msgid ""
"A boolean which disables using of EPSV ftp command by curl. This can "
-"helpful with some \"poor\" ftp servers which don't support EPSV mode. Can be "
-"overridden by the `GIT_CURL_FTP_NO_EPSV` environment variable. Default is "
+"helpful with some \"poor\" ftp servers which don't support EPSV mode. Can be"
+" overridden by the `GIT_CURL_FTP_NO_EPSV` environment variable. Default is "
"false (curl will use EPSV)."
msgstr ""
@@ -6648,11 +6522,11 @@ msgstr ""
msgid ""
"Whether git should follow HTTP redirects. If set to `true`, git will "
"transparently follow any redirect issued by a server it encounters. If set "
-"to `false`, git will treat all redirects as errors. If set to `initial`, git "
-"will follow redirects only for the initial request to a remote, but not for "
-"subsequent follow-up HTTP requests. Since git uses the redirected URL as the "
-"base for the follow-up requests, this is generally sufficient. The default "
-"is `initial`."
+"to `false`, git will treat all redirects as errors. If set to `initial`, git"
+" will follow redirects only for the initial request to a remote, but not for"
+" subsequent follow-up HTTP requests. Since git uses the redirected URL as "
+"the base for the follow-up requests, this is generally sufficient. The "
+"default is `initial`."
msgstr ""
#. type: Labeled list
@@ -6682,8 +6556,8 @@ msgid ""
"Host/domain name (e.g., `example.com` in `https://example.com/`). This "
"field must match between the config key and the URL. It is possible to "
"specify a `*` as part of the host name to match all subdomains at this "
-"level. `https://*.example.com/` for example would match `https://foo.example."
-"com/`, but not `https://foo.bar.example.com/`."
+"level. `https://*.example.com/` for example would match "
+"`https://foo.example.com/`, but not `https://foo.bar.example.com/`."
msgstr ""
#. type: Plain text
@@ -6698,13 +6572,13 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2014
msgid ""
-"Path (e.g., `repo.git` in `https://example.com/repo.git`). The path field of "
-"the config key must match the path field of the URL either exactly or as a "
+"Path (e.g., `repo.git` in `https://example.com/repo.git`). The path field of"
+" the config key must match the path field of the URL either exactly or as a "
"prefix of slash-delimited path elements. This means a config key with path "
-"`foo/` matches URL path `foo/bar`. A prefix can only match on a slash (`/`) "
-"boundary. Longer matches take precedence (so a config key with path `foo/"
-"bar` is a better match to URL path `foo/bar` than a config key with just "
-"path `foo/`)."
+"`foo/` matches URL path `foo/bar`. A prefix can only match on a slash (`/`)"
+" boundary. Longer matches take precedence (so a config key with path "
+"`foo/bar` is a better match to URL path `foo/bar` than a config key with "
+"just path `foo/`)."
msgstr ""
#. type: Plain text
@@ -6722,8 +6596,8 @@ msgstr ""
msgid ""
"The list above is ordered by decreasing precedence; a URL that matches a "
"config key's path is preferred to one that matches its user name. For "
-"example, if the URL is `https://user@example.com/foo/bar` a config key match "
-"of `https://example.com/foo` will be preferred over a config key match of "
+"example, if the URL is `https://user@example.com/foo/bar` a config key match"
+" of `https://example.com/foo` will be preferred over a config key match of "
"`https://user@example.com`."
msgstr ""
@@ -6735,7 +6609,8 @@ msgid ""
"equivalent URLs that are simply spelled differently will match properly. "
"Environment variable settings always override any matches. The URLs that "
"are matched against are those given directly to Git commands. This means "
-"any URLs visited as a result of a redirection do not participate in matching."
+"any URLs visited as a result of a redirection do not participate in "
+"matching."
msgstr ""
#. type: Labeled list
@@ -6748,8 +6623,8 @@ msgstr ""
#: en/config.txt:2040
msgid ""
"Depending on the value of the environment variables `GIT_SSH` or "
-"`GIT_SSH_COMMAND`, or the config setting `core.sshCommand`, Git auto-detects "
-"whether to adjust its command-line parameters for use with plink or "
+"`GIT_SSH_COMMAND`, or the config setting `core.sshCommand`, Git auto-detects"
+" whether to adjust its command-line parameters for use with plink or "
"tortoiseplink, as opposed to the default (OpenSSH)."
msgstr ""
@@ -6810,8 +6685,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2060
msgid ""
-"The configuration variables in the 'imap' section are described in linkgit:"
-"git-imap-send[1]."
+"The configuration variables in the 'imap' section are described in "
+"linkgit:git-imap-send[1]."
msgstr ""
#. type: Labeled list
@@ -6862,8 +6737,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2076
msgid ""
-"The HTTP daemon command-line to start gitweb on your working repository. See "
-"linkgit:git-instaweb[1]."
+"The HTTP daemon command-line to start gitweb on your working repository. See"
+" linkgit:git-instaweb[1]."
msgstr ""
#. type: Labeled list
@@ -6889,8 +6764,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2085
msgid ""
-"The default module path for linkgit:git-instaweb[1] to use instead of /usr/"
-"lib/apache2/modules. Only used if httpd is Apache."
+"The default module path for linkgit:git-instaweb[1] to use instead of "
+"/usr/lib/apache2/modules. Only used if httpd is Apache."
msgstr ""
#. type: Labeled list
@@ -6916,8 +6791,8 @@ msgstr "Mode interactif"
#: en/config.txt:2098
msgid ""
"In interactive commands, allow the user to provide one-letter input with a "
-"single key (i.e., without hitting enter). Currently this is used by the `--"
-"patch` mode of linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-"
+"single key (i.e., without hitting enter). Currently this is used by the "
+"`--patch` mode of linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-"
"commit[1], linkgit:git-reset[1], and linkgit:git-stash[1]. Note that this "
"setting is silently ignored if portable keystroke input is not available; "
"requires the Perl module Term::ReadKey."
@@ -6946,7 +6821,6 @@ msgstr ""
msgid "log.abbrevCommit"
msgstr ""
-#
#. type: Plain text
#: en/config.txt:2111
#, fuzzy
@@ -6984,13 +6858,13 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2126
msgid ""
-"Print out the ref names of any commits that are shown by the log command. If "
-"'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and "
-"'refs/remotes/' will not be printed. If 'full' is specified, the full ref "
+"Print out the ref names of any commits that are shown by the log command. If"
+" 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and"
+" 'refs/remotes/' will not be printed. If 'full' is specified, the full ref "
"name (including prefix) will be printed. If 'auto' is specified, then if "
"the output is going to a terminal, the ref names are shown as if 'short' "
-"were given, otherwise no ref names are shown. This is the same as the `--"
-"decorate` option of the `git log`."
+"were given, otherwise no ref names are shown. This is the same as the "
+"`--decorate` option of the `git log`."
msgstr ""
#. type: Labeled list
@@ -7042,7 +6916,6 @@ msgstr ""
msgid "log.mailmap"
msgstr ""
-#
#. type: Plain text
#: en/config.txt:2146
#, fuzzy
@@ -7066,10 +6939,10 @@ msgstr "scissors"
#. type: Plain text
#: en/config.txt:2153
msgid ""
-"If true, makes linkgit:git-mailinfo[1] (and therefore linkgit:git-am[1]) act "
-"by default as if the --scissors option was provided on the command-line. "
-"When active, this features removes everything from the message body before a "
-"scissors line (i.e. consisting mainly of \">8\", \"8<\" and \"-\")."
+"If true, makes linkgit:git-mailinfo[1] (and therefore linkgit:git-am[1]) act"
+" by default as if the --scissors option was provided on the command-line. "
+"When active, this features removes everything from the message body before a"
+" scissors line (i.e. consisting mainly of \">8\", \"8<\" and \"-\")."
msgstr ""
#. type: Labeled list
@@ -7084,8 +6957,8 @@ msgid ""
"The location of an augmenting mailmap file. The default mailmap, located in "
"the root of the repository, is loaded first, then the mailmap file pointed "
"to by this variable. The location of the mailmap file may be in a "
-"repository subdirectory, or somewhere outside of the repository itself. See "
-"linkgit:git-shortlog[1] and linkgit:git-blame[1]."
+"repository subdirectory, or somewhere outside of the repository itself. See"
+" linkgit:git-shortlog[1] and linkgit:git-blame[1]."
msgstr ""
#. type: Labeled list
@@ -7140,8 +7013,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2182
msgid ""
-"Override the path for the given tool that may be used to display help in the "
-"'man' format. See linkgit:git-help[1]."
+"Override the path for the given tool that may be used to display help in the"
+" 'man' format. See linkgit:git-help[1]."
msgstr ""
#. type: Labeled list
@@ -7162,8 +7035,8 @@ msgstr "git-commit(1)"
#: en/config.txt:2199
msgid ""
"Specify the command to invoke the specified merge tool. The specified "
-"command is evaluated in shell with the following variables available: 'BASE' "
-"is the name of a temporary file containing the common base of the files to "
+"command is evaluated in shell with the following variables available: 'BASE'"
+" is the name of a temporary file containing the common base of the files to "
"be merged, if available; 'LOCAL' is the name of a temporary file containing "
"the contents of the file on the current branch; 'REMOTE' is the name of a "
"temporary file containing the contents of the file from the branch being "
@@ -7200,8 +7073,8 @@ msgid ""
"attempt to detect whether `meld` supports `--output` by inspecting the "
"output of `meld --help`. Configuring `mergetool.meld.hasOutput` will make "
"Git skip these checks and use the configured value instead. Setting "
-"`mergetool.meld.hasOutput` to `true` tells Git to unconditionally use the `--"
-"output` option, and `false` avoids using `--output`."
+"`mergetool.meld.hasOutput` to `true` tells Git to unconditionally use the "
+"`--output` option, and `false` avoids using `--output`."
msgstr ""
#. type: Labeled list
@@ -7229,10 +7102,10 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2229
msgid ""
-"When invoking a custom merge tool, Git uses a set of temporary files to pass "
-"to the tool. If the tool returns an error and this variable is set to "
-"`true`, then these temporary files will be preserved, otherwise they will be "
-"removed after the tool has exited. Defaults to `false`."
+"When invoking a custom merge tool, Git uses a set of temporary files to pass"
+" to the tool. If the tool returns an error and this variable is set to "
+"`true`, then these temporary files will be preserved, otherwise they will be"
+" removed after the tool has exited. Defaults to `false`."
msgstr ""
#. type: Labeled list
@@ -7272,8 +7145,8 @@ msgstr ""
msgid ""
"Which merge strategy to choose by default when resolving notes conflicts. "
"Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. "
-"Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section of linkgit:git-"
-"notes[1] for more information on each strategy."
+"Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section of "
+"linkgit:git-notes[1] for more information on each strategy."
msgstr ""
#. type: Labeled list
@@ -7285,10 +7158,10 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2250
msgid ""
-"Which merge strategy to choose when doing a notes merge into refs/notes/"
-"<name>. This overrides the more general \"notes.mergeStrategy\". See the "
-"\"NOTES MERGE STRATEGIES\" section in linkgit:git-notes[1] for more "
-"information on the available strategies."
+"Which merge strategy to choose when doing a notes merge into "
+"refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\"."
+" See the \"NOTES MERGE STRATEGIES\" section in linkgit:git-notes[1] for "
+"more information on the available strategies."
msgstr ""
#. type: Labeled list
@@ -7332,9 +7205,9 @@ msgstr ""
#: en/config.txt:2274
msgid ""
"When rewriting commits with <command> (currently `amend` or `rebase`) and "
-"this variable is set to `true`, Git automatically copies your notes from the "
-"original to the rewritten commit. Defaults to `true`, but see \"notes."
-"rewriteRef\" below."
+"this variable is set to `true`, Git automatically copies your notes from the"
+" original to the rewritten commit. Defaults to `true`, but see "
+"\"notes.rewriteRef\" below."
msgstr ""
#. type: Labeled list
@@ -7355,8 +7228,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2284 en/git-notes.txt:359
msgid ""
-"This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment "
-"variable."
+"This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment"
+" variable."
msgstr ""
#. type: Labeled list
@@ -7369,8 +7242,8 @@ msgstr ""
#: en/config.txt:2290
msgid ""
"When copying notes during a rewrite, specifies the (fully qualified) ref "
-"whose notes should be copied. The ref may be a glob, in which case notes in "
-"all matching refs will be copied. You may also specify this configuration "
+"whose notes should be copied. The ref may be a glob, in which case notes in"
+" all matching refs will be copied. You may also specify this configuration "
"several times."
msgstr ""
@@ -7425,8 +7298,8 @@ msgstr ""
#: en/config.txt:2313
msgid ""
"The maximum size of memory that is consumed by each thread in linkgit:git-"
-"pack-objects[1] for pack window memory when no limit is given on the command "
-"line. The value can be suffixed with \"k\", \"m\", or \"g\". When left "
+"pack-objects[1] for pack window memory when no limit is given on the command"
+" line. The value can be suffixed with \"k\", \"m\", or \"g\". When left "
"unconfigured (or set explicitly to 0), there will be no limit."
msgstr ""
@@ -7441,10 +7314,10 @@ msgstr ""
msgid ""
"An integer -1..9, indicating the compression level for objects in a pack "
"file. -1 is the zlib default. 0 means no compression, and 1..9 are various "
-"speed/size tradeoffs, 9 being slowest. If not set, defaults to core."
-"compression. If that is not set, defaults to -1, the zlib default, which is "
-"\"a default compromise between speed and compression (currently equivalent "
-"to level 6).\""
+"speed/size tradeoffs, 9 being slowest. If not set, defaults to "
+"core.compression. If that is not set, defaults to -1, the zlib default, "
+"which is \"a default compromise between speed and compression (currently "
+"equivalent to level 6).\""
msgstr ""
#. type: Plain text
@@ -7468,9 +7341,9 @@ msgid ""
"objects[1] before writing them out to a pack. This cache is used to speed "
"up the writing object phase by not having to recompute the final delta "
"result once the best match for all objects is found. Repacking large "
-"repositories on machines which are tight with memory might be badly impacted "
-"by this though, especially if this cache pushes the system into swapping. A "
-"value of 0 means no limit. The smallest size of 1 byte may be used to "
+"repositories on machines which are tight with memory might be badly impacted"
+" by this though, especially if this cache pushes the system into swapping. "
+"A value of 0 means no limit. The smallest size of 1 byte may be used to "
"virtually disable this cache. Defaults to 256 MiB."
msgstr ""
@@ -7503,8 +7376,8 @@ msgid ""
"pthreads otherwise this option is ignored with a warning. This is meant to "
"reduce packing time on multiprocessor machines. The required amount of "
"memory for the delta search window is however multiplied by the number of "
-"threads. Specifying 0 will cause Git to auto-detect the number of CPU's and "
-"set the number of threads accordingly."
+"threads. Specifying 0 will cause Git to auto-detect the number of CPU's and"
+" set the number of threads accordingly."
msgstr ""
#. type: Labeled list
@@ -7517,10 +7390,10 @@ msgstr ""
#: en/config.txt:2362
msgid ""
"Specify the default pack index version. Valid values are 1 for legacy pack "
-"index used by Git versions prior to 1.5.2, and 2 for the new pack index with "
-"capabilities for packs larger than 4 GB as well as proper protection against "
-"the repacking of corrupted packs. Version 2 is the default. Note that "
-"version 2 is enforced and this config option ignored whenever the "
+"index used by Git versions prior to 1.5.2, and 2 for the new pack index with"
+" capabilities for packs larger than 4 GB as well as proper protection "
+"against the repacking of corrupted packs. Version 2 is the default. Note "
+"that version 2 is enforced and this config option ignored whenever the "
"corresponding pack is larger than 2 GB."
msgstr ""
@@ -7530,9 +7403,9 @@ msgid ""
"If you have an old Git that does not understand the version 2 `*.idx` file, "
"cloning or fetching over a non native protocol (e.g. \"http\") that will "
"copy both `*.pack` file and corresponding `*.idx` file from the other side "
-"may give you a repository that cannot be accessed with your older version of "
-"Git. If the `*.pack` file is smaller than 2 GB, however, you can use linkgit:"
-"git-index-pack[1] on the *.pack file to regenerate the `*.idx` file."
+"may give you a repository that cannot be accessed with your older version of"
+" Git. If the `*.pack` file is smaller than 2 GB, however, you can use "
+"linkgit:git-index-pack[1] on the *.pack file to regenerate the `*.idx` file."
msgstr ""
#. type: Labeled list
@@ -7587,8 +7460,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2402
msgid ""
-"When true, git will include a \"hash cache\" section in the bitmap index (if "
-"one is written). This cache can be used to feed git's delta heuristics, "
+"When true, git will include a \"hash cache\" section in the bitmap index (if"
+" one is written). This cache can be used to feed git's delta heuristics, "
"potentially leading to better deltas between bitmapped and non-bitmapped "
"objects (e.g., when serving a fetch between an older, bitmapped pack and "
"objects that have been pushed since the last gc). The downside is that it "
@@ -7623,10 +7496,10 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2421
msgid ""
-"Alias for a --pretty= format string, as specified in linkgit:git-log[1]. Any "
-"aliases defined here can be used just as the built-in pretty formats could. "
-"For example, running `git config pretty.changelog \"format:* %H %s\"` would "
-"cause the invocation `git log --pretty=changelog` to be equivalent to "
+"Alias for a --pretty= format string, as specified in linkgit:git-log[1]. Any"
+" aliases defined here can be used just as the built-in pretty formats could."
+" For example, running `git config pretty.changelog \"format:* %H %s\"` would"
+" cause the invocation `git log --pretty=changelog` to be equivalent to "
"running `git log \"--pretty=format:* %H %s\"`. Note that an alias with the "
"same name as a built-in format will be silently ignored."
msgstr ""
@@ -7644,7 +7517,8 @@ msgid ""
"explicitly have a policy (`protocol.<name>.allow`). By default, if unset, "
"known-safe protocols (http, https, git, ssh, file) have a default policy of "
"`always`, known-dangerous protocols (ext) have a default policy of `never`, "
-"and all other protocols have a default policy of `user`. Supported policies:"
+"and all other protocols have a default policy of `user`. Supported "
+"policies:"
msgstr ""
#. type: Plain text
@@ -7676,8 +7550,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2447
msgid ""
-"Set a policy to be used by protocol `<name>` with clone/fetch/push commands. "
-"See `protocol.allow` above for the available policies."
+"Set a policy to be used by protocol `<name>` with clone/fetch/push commands."
+" See `protocol.allow` above for the available policies."
msgstr ""
#. type: Plain text
@@ -7694,8 +7568,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2456
msgid ""
-"`git`: the anonymous git protocol over a direct TCP connection (or proxy, if "
-"configured)"
+"`git`: the anonymous git protocol over a direct TCP connection (or proxy, if"
+" configured)"
msgstr ""
#. type: Plain text
@@ -7732,8 +7606,8 @@ msgid ""
"branch is fast-forwarded. When set to `false`, this variable tells Git to "
"create an extra merge commit in such a case (equivalent to giving the `--no-"
"ff` option from the command line). When set to `only`, only such fast-"
-"forward merges are allowed (equivalent to giving the `--ff-only` option from "
-"the command line). This setting overrides `merge.ff` when pulling."
+"forward merges are allowed (equivalent to giving the `--ff-only` option from"
+" the command line). This setting overrides `merge.ff` when pulling."
msgstr ""
#. type: Labeled list
@@ -7783,11 +7657,10 @@ msgstr "default"
#. type: Plain text
#: en/config.txt:2507
msgid ""
-"Defines the action `git push` should take if no refspec is explicitly "
-"given. Different values are well-suited for specific workflows; for "
-"instance, in a purely central workflow (i.e. the fetch source is equal to "
-"the push destination), `upstream` is probably what you want. Possible "
-"values are:"
+"Defines the action `git push` should take if no refspec is explicitly given."
+" Different values are well-suited for specific workflows; for instance, in "
+"a purely central workflow (i.e. the fetch source is equal to the push "
+"destination), `upstream` is probably what you want. Possible values are:"
msgstr ""
#. type: Plain text
@@ -7801,16 +7674,16 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2517
msgid ""
-"`current` - push the current branch to update a branch with the same name on "
-"the receiving end. Works in both central and non-central workflows."
+"`current` - push the current branch to update a branch with the same name on"
+" the receiving end. Works in both central and non-central workflows."
msgstr ""
#. type: Plain text
#: en/config.txt:2523
msgid ""
"`upstream` - push the current branch back to the branch whose changes are "
-"usually integrated into the current branch (which is called `@{upstream}`). "
-"This mode only makes sense if you are pushing to the same repository you "
+"usually integrated into the current branch (which is called `@{upstream}`)."
+" This mode only makes sense if you are pushing to the same repository you "
"would normally pull from (i.e. central workflow)."
msgstr ""
@@ -7823,15 +7696,15 @@ msgstr ""
#: en/config.txt:2529
msgid ""
"`simple` - in centralized workflow, work like `upstream` with an added "
-"safety to refuse to push if the upstream branch's name is different from the "
-"local one."
+"safety to refuse to push if the upstream branch's name is different from the"
+" local one."
msgstr ""
#. type: Plain text
#: en/config.txt:2533
msgid ""
-"When pushing to a remote that is different from the remote you normally pull "
-"from, work as `current`. This is the safest option and is suited for "
+"When pushing to a remote that is different from the remote you normally pull"
+" from, work as `current`. This is the safest option and is suited for "
"beginners."
msgstr ""
@@ -7892,8 +7765,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2571
msgid ""
-"May be set to a boolean value, or the string 'if-asked'. A true value causes "
-"all pushes to be GPG signed, as if `--signed` is passed to linkgit:git-"
+"May be set to a boolean value, or the string 'if-asked'. A true value causes"
+" all pushes to be GPG signed, as if `--signed` is passed to linkgit:git-"
"push[1]. The string 'if-asked' causes pushes to be signed if the server "
"supports it, as if `--signed=if-asked` is passed to 'git push'. A false "
"value may override a value from a lower-priority config file. An explicit "
@@ -7911,12 +7784,12 @@ msgstr "git-add(1)"
#: en/config.txt:2585
msgid ""
"Make sure all submodule commits used by the revisions to be pushed are "
-"available on a remote-tracking branch. If the value is 'check' then Git will "
-"verify that all submodule commits that changed in the revisions to be pushed "
-"are available on at least one remote of the submodule. If any commits are "
-"missing, the push will be aborted and exit with non-zero status. If the "
-"value is 'on-demand' then all submodules that changed in the revisions to be "
-"pushed will be pushed. If on-demand was not able to push all necessary "
+"available on a remote-tracking branch. If the value is 'check' then Git will"
+" verify that all submodule commits that changed in the revisions to be "
+"pushed are available on at least one remote of the submodule. If any commits"
+" are missing, the push will be aborted and exit with non-zero status. If the"
+" value is 'on-demand' then all submodules that changed in the revisions to "
+"be pushed will be pushed. If on-demand was not able to push all necessary "
"revisions it will also be aborted and exit with non-zero status. If the "
"value is 'no' then default behavior of ignoring submodules when pushing is "
"retained. You may override this configuration at time of push by specifying "
@@ -7973,11 +7846,11 @@ msgstr ""
#: en/config.txt:2611
msgid ""
"If set to \"warn\", git rebase -i will print a warning if some commits are "
-"removed (e.g. a line was deleted), however the rebase will still proceed. If "
-"set to \"error\", it will print the previous warning and stop the rebase, "
+"removed (e.g. a line was deleted), however the rebase will still proceed. If"
+" set to \"error\", it will print the previous warning and stop the rebase, "
"'git rebase --edit-todo' can then be used to correct the error. If set to "
-"\"ignore\", no checking is done. To drop a commit without warning or error, "
-"use the `drop` command in the todo-list. Defaults to \"ignore\"."
+"\"ignore\", no checking is done. To drop a commit without warning or error,"
+" use the `drop` command in the todo-list. Defaults to \"ignore\"."
msgstr ""
#. type: Labeled list
@@ -8031,8 +7904,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2631
msgid ""
-"By default, git-receive-pack will run \"git-gc --auto\" after receiving data "
-"from git-push and updating refs. You can stop it by setting this variable "
+"By default, git-receive-pack will run \"git-gc --auto\" after receiving data"
+" from git-push and updating refs. You can stop it by setting this variable "
"to false."
msgstr ""
@@ -8059,15 +7932,15 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2650
msgid ""
-"When a `git push --signed` sent a push certificate with a \"nonce\" that was "
-"issued by a receive-pack serving the same repository within this many "
+"When a `git push --signed` sent a push certificate with a \"nonce\" that was"
+" issued by a receive-pack serving the same repository within this many "
"seconds, export the \"nonce\" found in the certificate to "
"`GIT_PUSH_CERT_NONCE` to the hooks (instead of what the receive-pack asked "
"the sending side to include). This may allow writing checks in `pre-"
"receive` and `post-receive` a bit easier. Instead of checking "
"`GIT_PUSH_CERT_NONCE_SLOP` environment variable that records by how many "
-"seconds the nonce is stale to decide if they want to accept the certificate, "
-"they only can check `GIT_PUSH_CERT_NONCE_STATUS` is `OK`."
+"seconds the nonce is stale to decide if they want to accept the certificate,"
+" they only can check `GIT_PUSH_CERT_NONCE_STATUS` is `OK`."
msgstr ""
#. type: Labeled list
@@ -8081,8 +7954,8 @@ msgstr "git-fsck-objects(1)"
#: en/config.txt:2657
msgid ""
"If it is set to true, git-receive-pack will check all received objects. It "
-"will abort in the case of a malformed object or a broken link. The result of "
-"an abort are only dangling objects. Defaults to false. If not set, the "
+"will abort in the case of a malformed object or a broken link. The result of"
+" an abort are only dangling objects. Defaults to false. If not set, the "
"value of `transfer.fsckObjects` is used instead."
msgstr ""
@@ -8097,10 +7970,10 @@ msgstr ""
msgid ""
"When `receive.fsckObjects` is set to true, errors can be switched to "
"warnings and vice versa by configuring the `receive.fsck.<msg-id>` setting "
-"where the `<msg-id>` is the fsck message ID and the value is one of `error`, "
-"`warn` or `ignore`. For convenience, fsck prefixes the error/warning with "
-"the message ID, e.g. \"missingEmail: invalid author/committer line - missing "
-"email\" means that setting `receive.fsck.missingEmail = ignore` will hide "
+"where the `<msg-id>` is the fsck message ID and the value is one of `error`,"
+" `warn` or `ignore`. For convenience, fsck prefixes the error/warning with "
+"the message ID, e.g. \"missingEmail: invalid author/committer line - missing"
+" email\" means that setting `receive.fsck.missingEmail = ignore` will hide "
"that issue."
msgstr ""
@@ -8147,8 +8020,8 @@ msgstr ""
msgid ""
"If the number of objects received in a push is below this limit then the "
"objects will be unpacked into loose object files. However if the number of "
-"received objects equals or exceeds this limit then the received pack will be "
-"stored as a pack, after adding any missing delta bases. Storing the pack "
+"received objects equals or exceeds this limit then the received pack will be"
+" stored as a pack, after adding any missing delta bases. Storing the pack "
"from a push can make the push operation complete faster, especially on slow "
"filesystems. If not set, the value of `transfer.unpackLimit` is used "
"instead."
@@ -8203,8 +8076,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2721
msgid ""
-"If set to true or \"refuse\", git-receive-pack will deny a ref update to the "
-"currently checked out branch of a non-bare repository. Such a push is "
+"If set to true or \"refuse\", git-receive-pack will deny a ref update to the"
+" currently checked out branch of a non-bare repository. Such a push is "
"potentially dangerous because it brings the HEAD out of sync with the index "
"and working tree. If set to \"warn\", print a warning of such a push to "
"stderr, but allow the push to proceed. If set to false or \"ignore\", allow "
@@ -8218,16 +8091,16 @@ msgid ""
"pushing into the current branch. This option is intended for synchronizing "
"working directories when one side is not easily accessible via interactive "
"ssh (e.g. a live web site, hence the requirement that the working directory "
-"be clean). This mode also comes in handy when developing inside a VM to test "
-"and fix code on different Operating Systems."
+"be clean). This mode also comes in handy when developing inside a VM to test"
+" and fix code on different Operating Systems."
msgstr ""
#. type: Plain text
#: en/config.txt:2732
msgid ""
"By default, \"updateInstead\" will refuse the push if the working tree or "
-"the index have any difference from the HEAD, but the `push-to-checkout` hook "
-"can be used to customize this. See linkgit:githooks[5]."
+"the index have any difference from the HEAD, but the `push-to-checkout` hook"
+" can be used to customize this. See linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
@@ -8240,8 +8113,8 @@ msgstr ""
#: en/config.txt:2738
msgid ""
"If set to true, git-receive-pack will deny a ref update which is not a fast-"
-"forward. Use this to prevent such an update via a push, even if that push is "
-"forced. This configuration variable is set when initializing a shared "
+"forward. Use this to prevent such an update via a push, even if that push is"
+" forced. This configuration variable is set when initializing a shared "
"repository."
msgstr ""
@@ -8333,8 +8206,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2769
msgid ""
-"For remotes that require curl (http, https and ftp), the URL to the proxy to "
-"use for that remote. Set to the empty string to disable proxying for that "
+"For remotes that require curl (http, https and ftp), the URL to the proxy to"
+" use for that remote. Set to the empty string to disable proxying for that "
"remote."
msgstr ""
@@ -8348,8 +8221,8 @@ msgstr ""
#: en/config.txt:2774
msgid ""
"For remotes that require curl (http, https and ftp), the method to use for "
-"authenticating against the proxy in use (probably set in `remote.<name>."
-"proxy`). See `http.proxyAuthMethod`."
+"authenticating against the proxy in use (probably set in "
+"`remote.<name>.proxy`). See `http.proxyAuthMethod`."
msgstr ""
#. type: Labeled list
@@ -8358,7 +8231,6 @@ msgstr ""
msgid "remote.<name>.fetch"
msgstr ""
-#
#. type: Plain text
#: en/config.txt:2778
#, fuzzy
@@ -8378,7 +8250,6 @@ msgstr ""
msgid "remote.<name>.push"
msgstr ""
-#
#. type: Plain text
#: en/config.txt:2782
#, fuzzy
@@ -8401,8 +8272,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2786
msgid ""
-"If true, pushing to this remote will automatically behave as if the `--"
-"mirror` option was given on the command line."
+"If true, pushing to this remote will automatically behave as if the "
+"`--mirror` option was given on the command line."
msgstr ""
#. type: Labeled list
@@ -8414,8 +8285,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2791 en/config.txt:2796
msgid ""
-"If true, this remote will be skipped by default when updating using linkgit:"
-"git-fetch[1] or the `update` subcommand of linkgit:git-remote[1]."
+"If true, this remote will be skipped by default when updating using "
+"linkgit:git-fetch[1] or the `update` subcommand of linkgit:git-remote[1]."
msgstr ""
#. type: Labeled list
@@ -8446,8 +8317,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2804
msgid ""
-"The default program to execute on the remote side when fetching. See option "
-"--upload-pack of linkgit:git-fetch-pack[1]."
+"The default program to execute on the remote side when fetching. See option"
+" --upload-pack of linkgit:git-fetch-pack[1]."
msgstr ""
#. type: Labeled list
@@ -8489,8 +8360,8 @@ msgstr ""
#: en/config.txt:2822
msgid ""
"When set to true, fetching from this remote by default will also remove any "
-"remote-tracking references that no longer exist on the remote (as if the `--"
-"prune` option was given on the command line). Overrides `fetch.prune` "
+"remote-tracking references that no longer exist on the remote (as if the "
+"`--prune` option was given on the command line). Overrides `fetch.prune` "
"settings, if any."
msgstr ""
@@ -8503,8 +8374,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2826
msgid ""
-"The list of remotes which are fetched by \"git remote update <group>\". See "
-"linkgit:git-remote[1]."
+"The list of remotes which are fetched by \"git remote update <group>\". See"
+" linkgit:git-remote[1]."
msgstr ""
#. type: Labeled list
@@ -8534,8 +8405,8 @@ msgstr "git-fsck-objects(1)"
#: en/config.txt:2841
msgid ""
"If set to true, makes `git repack` act as if `--pack-kept-objects` was "
-"passed. See linkgit:git-repack[1] for details. Defaults to `false` normally, "
-"but `true` if a bitmap index is being written (either via `--write-bitmap-"
+"passed. See linkgit:git-repack[1] for details. Defaults to `false` normally,"
+" but `true` if a bitmap index is being written (either via `--write-bitmap-"
"index` or `repack.writeBitmaps`)."
msgstr ""
@@ -8548,9 +8419,9 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2850
msgid ""
-"When true, git will write a bitmap index when packing all objects to disk (e."
-"g., when `git repack -a` is run). This index can speed up the \"counting "
-"objects\" phase of subsequent packs created for clones and fetches, at the "
+"When true, git will write a bitmap index when packing all objects to disk "
+"(e.g., when `git repack -a` is run). This index can speed up the \"counting"
+" objects\" phase of subsequent packs created for clones and fetches, at the "
"cost of some disk space and extra time spent on the initial repack. This "
"has no effect if multiple packfiles are created. Defaults to false."
msgstr ""
@@ -8564,8 +8435,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2855
msgid ""
-"When set to true, `git-rerere` updates the index with the resulting contents "
-"after it cleanly resolves conflicts using previously recorded resolution. "
+"When set to true, `git-rerere` updates the index with the resulting contents"
+" after it cleanly resolves conflicts using previously recorded resolution. "
"Defaults to false."
msgstr ""
@@ -8595,9 +8466,10 @@ msgstr "git-commit(1)"
#. type: Plain text
#: en/config.txt:2869 en/git-send-email.txt:279
msgid ""
-"A configuration identity. When given, causes values in the 'sendemail."
-"<identity>' subsection to take precedence over values in the 'sendemail' "
-"section. The default identity is the value of `sendemail.identity`."
+"A configuration identity. When given, causes values in the "
+"'sendemail.<identity>' subsection to take precedence over values in the "
+"'sendemail' section. The default identity is the value of "
+"`sendemail.identity`."
msgstr ""
#. type: Labeled list
@@ -8634,8 +8506,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2880
msgid ""
-"Path to ca-certificates (either a directory or a single file). Set it to an "
-"empty string to disable certificate verification."
+"Path to ca-certificates (either a directory or a single file). Set it to an"
+" empty string to disable certificate verification."
msgstr ""
#. type: Labeled list
@@ -8852,7 +8724,6 @@ msgstr ""
msgid "showbranch.default"
msgstr "default"
-#
#. type: Plain text
#: en/config.txt:2920
#, fuzzy
@@ -8860,8 +8731,8 @@ msgstr "default"
#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
#| "merge[1], linkgit:git-commit-tree[1]"
msgid ""
-"The default set of branches for linkgit:git-show-branch[1]. See linkgit:git-"
-"show-branch[1]."
+"The default set of branches for linkgit:git-show-branch[1]. See "
+"linkgit:git-show-branch[1]."
msgstr ""
"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
"merge[1], linkgit:git-commit-tree[1]"
@@ -8899,8 +8770,9 @@ msgid ""
"shared index file is created. The value \"now\" expires all entries "
"immediately, and \"never\" suppresses expiration altogether. The default "
"value is \"2.weeks.ago\". Note that a shared index file is considered "
-"modified (for the purpose of expiration) each time a new split-index file is "
-"either created based on it or read from it. See linkgit:git-update-index[1]."
+"modified (for the purpose of expiration) each time a new split-index file is"
+" either created based on it or read from it. See linkgit:git-update-"
+"index[1]."
msgstr ""
#. type: Labeled list
@@ -8970,11 +8842,11 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2975
msgid ""
-"By default, linkgit:git-status[1] and linkgit:git-commit[1] show files which "
-"are not currently tracked by Git. Directories which contain only untracked "
-"files, are shown with the directory name only. Showing untracked files means "
-"that Git needs to lstat() all the files in the whole repository, which might "
-"be slow on some systems. So, this variable controls how the commands "
+"By default, linkgit:git-status[1] and linkgit:git-commit[1] show files which"
+" are not currently tracked by Git. Directories which contain only untracked "
+"files, are shown with the directory name only. Showing untracked files means"
+" that Git needs to lstat() all the files in the whole repository, which "
+"might be slow on some systems. So, this variable controls how the commands "
"displays the untracked files. Possible values are:"
msgstr ""
@@ -8995,7 +8867,8 @@ msgstr "'normal' - Montrer les fichiers et les dossiers non-suivis\n"
#. type: Plain text
#: en/config.txt:2980
#, fuzzy
-#| msgid "'all' - Also shows individual files in untracked directories.\n"
+#| msgid ""
+#| "'all' - Also shows individual files in untracked directories.\n"
msgid "`all` - Show also individual files in untracked directories."
msgstr ""
"'all' - Montrer aussi les fichiers individuels dans le dossiers non-"
@@ -9022,13 +8895,13 @@ msgid ""
"to -1 or an unlimited number), the submodule summary will be enabled and a "
"summary of commits for modified submodules will be shown (see --summary-"
"limit option of linkgit:git-submodule[1]). Please note that the summary "
-"output command will be suppressed for all submodules when `diff."
-"ignoreSubmodules` is set to 'all' or only for those submodules where "
+"output command will be suppressed for all submodules when "
+"`diff.ignoreSubmodules` is set to 'all' or only for those submodules where "
"`submodule.<name>.ignore=all`. The only exception to that rule is that "
"status and commit will show staged submodule changes. To also view the "
"summary for ignored submodules you can either use the --ignore-"
-"submodules=dirty command-line option or the 'git submodule summary' command, "
-"which shows a similar output but does not honor these settings."
+"submodules=dirty command-line option or the 'git submodule summary' command,"
+" which shows a similar output but does not honor these settings."
msgstr ""
#. type: Labeled list
@@ -9042,8 +8915,8 @@ msgstr "status"
#: en/config.txt:3006
msgid ""
"If this is set to true, the `git stash show` command without an option will "
-"show the stash in patch form. Defaults to false. See description of 'show' "
-"command in linkgit:git-stash[1]."
+"show the stash in patch form. Defaults to false. See description of 'show'"
+" command in linkgit:git-stash[1]."
msgstr ""
#. type: Labeled list
@@ -9090,8 +8963,8 @@ msgstr "git-add(1)"
#: en/config.txt:3025
msgid ""
"The default update procedure for a submodule. This variable is populated by "
-"`git submodule init` from the linkgit:gitmodules[5] file. See description of "
-"'update' command in linkgit:git-submodule[1]."
+"`git submodule init` from the linkgit:gitmodules[5] file. See description of"
+" 'update' command in linkgit:git-submodule[1]."
msgstr ""
#. type: Labeled list
@@ -9104,9 +8977,9 @@ msgstr "git-add(1)"
#. type: Plain text
#: en/config.txt:3031
msgid ""
-"The remote branch name for a submodule, used by `git submodule update --"
-"remote`. Set this option to override the value found in the `.gitmodules` "
-"file. See linkgit:git-submodule[1] and linkgit:gitmodules[5] for details."
+"The remote branch name for a submodule, used by `git submodule update "
+"--remote`. Set this option to override the value found in the `.gitmodules`"
+" file. See linkgit:git-submodule[1] and linkgit:gitmodules[5] for details."
msgstr ""
#. type: Labeled list
@@ -9119,9 +8992,9 @@ msgstr ""
#: en/config.txt:3038
msgid ""
"This option can be used to control recursive fetching of this submodule. It "
-"can be overridden by using the --[no-]recurse-submodules command-line option "
-"to \"git fetch\" and \"git pull\". This setting will override that from in "
-"the linkgit:gitmodules[5] file."
+"can be overridden by using the --[no-]recurse-submodules command-line option"
+" to \"git fetch\" and \"git pull\". This setting will override that from in"
+" the linkgit:gitmodules[5] file."
msgstr ""
#. type: Labeled list
@@ -9136,16 +9009,16 @@ msgstr "git-add(1)"
msgid ""
"Defines under what circumstances \"git status\" and the diff family show a "
"submodule as modified. When set to \"all\", it will never be considered "
-"modified (but it will nonetheless show up in the output of status and commit "
-"when it has been staged), \"dirty\" will ignore all changes to the "
+"modified (but it will nonetheless show up in the output of status and commit"
+" when it has been staged), \"dirty\" will ignore all changes to the "
"submodules work tree and takes only differences between the HEAD of the "
"submodule and the commit recorded in the superproject into account. "
"\"untracked\" will additionally let submodules with modified tracked files "
-"in their work tree show up. Using \"none\" (the default when this option is "
-"not set) also shows submodules that have untracked files in their work tree "
-"as changed. This setting overrides any setting made in .gitmodules for this "
-"submodule, both settings can be overridden on the command line by using the "
-"\"--ignore-submodules\" option. The 'git submodule' commands are not "
+"in their work tree show up. Using \"none\" (the default when this option is"
+" not set) also shows submodules that have untracked files in their work tree"
+" as changed. This setting overrides any setting made in .gitmodules for "
+"this submodule, both settings can be overridden on the command line by using"
+" the \"--ignore-submodules\" option. The 'git submodule' commands are not "
"affected by this setting."
msgstr ""
@@ -9160,8 +9033,9 @@ msgstr "git-add(1)"
#: en/config.txt:3060
msgid ""
"Specifies how many submodules are fetched/cloned at the same time. A "
-"positive integer allows up to that number of submodules fetched in parallel. "
-"A value of 0 will give some reasonable default. If unset, it defaults to 1."
+"positive integer allows up to that number of submodules fetched in parallel."
+" A value of 0 will give some reasonable default. If unset, it defaults to "
+"1."
msgstr ""
#. type: Labeled list
@@ -9175,8 +9049,8 @@ msgstr "git-add(1)"
#: en/config.txt:3067
msgid ""
"Specifies how the submodules obtain alternates when submodules are cloned. "
-"Possible values are `no`, `superproject`. By default `no` is assumed, which "
-"doesn't add references. When the value is set to `superproject` the "
+"Possible values are `no`, `superproject`. By default `no` is assumed, which"
+" doesn't add references. When the value is set to `superproject` the "
"submodule to be cloned computes its alternates location relative to the "
"superprojects alternate."
msgstr ""
@@ -9218,9 +9092,9 @@ msgstr ""
#. type: Plain text
#: en/config.txt:3082
msgid ""
-"This variable controls the sort ordering of tags when displayed by linkgit:"
-"git-tag[1]. Without the \"--sort=<value>\" option provided, the value of "
-"this variable will be used as the default."
+"This variable controls the sort ordering of tags when displayed by "
+"linkgit:git-tag[1]. Without the \"--sort=<value>\" option provided, the "
+"value of this variable will be used as the default."
msgstr ""
#. type: Labeled list
@@ -9285,10 +9159,10 @@ msgid ""
"reference before it is matched against `transfer.hiderefs` patterns. For "
"example, if `refs/heads/master` is specified in `transfer.hideRefs` and the "
"current namespace is `foo`, then `refs/namespaces/foo/refs/heads/master` is "
-"omitted from the advertisements but `refs/heads/master` and `refs/namespaces/"
-"bar/refs/heads/master` are still advertised as so-called \"have\" lines. In "
-"order to match refs before stripping, add a `^` in front of the ref name. If "
-"you combine `!` and `^`, `!` must be specified first."
+"omitted from the advertisements but `refs/heads/master` and "
+"`refs/namespaces/bar/refs/heads/master` are still advertised as so-called "
+"\"have\" lines. In order to match refs before stripping, add a `^` in front "
+"of the ref name. If you combine `!` and `^`, `!` must be specified first."
msgstr ""
#. type: Plain text
@@ -9339,8 +9213,8 @@ msgstr ""
msgid ""
"This variable is the same as `transfer.hideRefs`, but applies only to "
"`upload-pack` (and so affects only fetches, not pushes). An attempt to "
-"fetch a hidden ref by `git fetch` will fail. See also `uploadpack."
-"allowTipSHA1InWant`."
+"fetch a hidden ref by `git fetch` will fail. See also "
+"`uploadpack.allowTipSHA1InWant`."
msgstr ""
#. type: Labeled list
@@ -9354,8 +9228,8 @@ msgstr ""
msgid ""
"When `uploadpack.hideRefs` is in effect, allow `upload-pack` to accept a "
"fetch request that asks for an object at the tip of a hidden ref (by "
-"default, such a request is rejected). See also `uploadpack.hideRefs`. Even "
-"if this is false, a client may be able to steal objects via the techniques "
+"default, such a request is rejected). See also `uploadpack.hideRefs`. Even"
+" if this is false, a client may be able to steal objects via the techniques "
"described in the \"SECURITY\" section of the linkgit:gitnamespaces[7] man "
"page; it's best to keep private data in a separate repository."
msgstr ""
@@ -9404,9 +9278,9 @@ msgid ""
"information, but if `--quiet` was used for the fetch, `pack-objects` will "
"output nothing at all until the pack data begins. Some clients and networks "
"may consider the server to be hung and give up. Setting this option "
-"instructs `upload-pack` to send an empty keepalive packet every `uploadpack."
-"keepAlive` seconds. Setting this option to 0 disables keepalive packets "
-"entirely. The default is 5 seconds."
+"instructs `upload-pack` to send an empty keepalive packet every "
+"`uploadpack.keepAlive` seconds. Setting this option to 0 disables keepalive "
+"packets entirely. The default is 5 seconds."
msgstr ""
#. type: Labeled list
@@ -9419,12 +9293,12 @@ msgstr ""
#: en/config.txt:3185
msgid ""
"If this option is set, when `upload-pack` would run `git pack-objects` to "
-"create a packfile for a client, it will run this shell command instead. The "
-"`pack-objects` command and arguments it _would_ have run (including the `git "
-"pack-objects` at the beginning) are appended to the shell command. The stdin "
-"and stdout of the hook are treated as if `pack-objects` itself was run. I."
-"e., `upload-pack` will feed input intended for `pack-objects` to the hook, "
-"and expects a completed packfile on stdout."
+"create a packfile for a client, it will run this shell command instead. The"
+" `pack-objects` command and arguments it _would_ have run (including the "
+"`git pack-objects` at the beginning) are appended to the shell command. The "
+"stdin and stdout of the hook are treated as if `pack-objects` itself was "
+"run. I.e., `upload-pack` will feed input intended for `pack-objects` to the "
+"hook, and expects a completed packfile on stdout."
msgstr ""
#. type: Plain text
@@ -9445,12 +9319,12 @@ msgstr ""
#: en/config.txt:3200
msgid ""
"Any URL that starts with this value will be rewritten to start, instead, "
-"with <base>. In cases where some site serves a large number of repositories, "
-"and serves them with multiple access methods, and some users need to use "
+"with <base>. In cases where some site serves a large number of repositories,"
+" and serves them with multiple access methods, and some users need to use "
"different access methods, this feature allows people to specify any of the "
"equivalent URLs and have Git automatically rewrite the URL to the best "
-"alternative for the particular user, even for a never-before-seen repository "
-"on the site. When more than one insteadOf strings match a given URL, the "
+"alternative for the particular user, even for a never-before-seen repository"
+" on the site. When more than one insteadOf strings match a given URL, the "
"longest match is used."
msgstr ""
@@ -9470,8 +9344,8 @@ msgid ""
"feature allows people to specify a pull-only URL and have Git automatically "
"use an appropriate URL to push, even for a never-before-seen repository on "
"the site. When more than one pushInsteadOf strings match a given URL, the "
-"longest match is used. If a remote has an explicit pushurl, Git will ignore "
-"this setting for that remote."
+"longest match is used. If a remote has an explicit pushurl, Git will ignore"
+" this setting for that remote."
msgstr ""
#. type: Labeled list
@@ -9512,12 +9386,12 @@ msgstr ""
#. type: Plain text
#: en/config.txt:3233
msgid ""
-"Instruct Git to avoid trying to guess defaults for `user.email` and `user."
-"name`, and instead retrieve the values only from the configuration. For "
-"example, if you have multiple email addresses and would like to use a "
+"Instruct Git to avoid trying to guess defaults for `user.email` and "
+"`user.name`, and instead retrieve the values only from the configuration. "
+"For example, if you have multiple email addresses and would like to use a "
"different one for each repository, then with this configuration option set "
-"to `true` in the global config along with a name, Git will prompt you to set "
-"up an email before making new commits in a newly cloned repository. "
+"to `true` in the global config along with a name, Git will prompt you to set"
+" up an email before making new commits in a newly cloned repository. "
"Defaults to `false`."
msgstr ""
@@ -9559,11 +9433,11 @@ msgstr ""
#. type: Plain text
#: en/config.txt:3252
msgid ""
-"Even when version sort is used in linkgit:git-tag[1], tagnames with the same "
-"base version but different suffixes are still sorted lexicographically, "
+"Even when version sort is used in linkgit:git-tag[1], tagnames with the same"
+" base version but different suffixes are still sorted lexicographically, "
"resulting e.g. in prerelease tags appearing after the main release (e.g. "
-"\"1.0-rc1\" after \"1.0\"). This variable can be specified to determine the "
-"sorting order of tags with different suffixes."
+"\"1.0-rc1\" after \"1.0\"). This variable can be specified to determine the"
+" sorting order of tags with different suffixes."
msgstr ""
#. type: Plain text
@@ -9575,13 +9449,13 @@ msgid ""
"\"1.0\". If specified multiple times, once per suffix, then the order of "
"suffixes in the configuration will determine the sorting order of tagnames "
"with those suffixes. E.g. if \"-pre\" appears before \"-rc\" in the "
-"configuration, then all \"1.0-preX\" tags will be listed before any \"1.0-rcX"
-"\" tags. The placement of the main release tag relative to tags with "
-"various suffixes can be determined by specifying the empty suffix among "
-"those other suffixes. E.g. if the suffixes \"-rc\", \"\", \"-ck\" and \"-bfs"
-"\" appear in the configuration in this order, then all \"v4.8-rcX\" tags are "
-"listed first, followed by \"v4.8\", then \"v4.8-ckX\" and finally \"v4.8-bfsX"
-"\"."
+"configuration, then all \"1.0-preX\" tags will be listed before any "
+"\"1.0-rcX\" tags. The placement of the main release tag relative to tags "
+"with various suffixes can be determined by specifying the empty suffix among"
+" those other suffixes. E.g. if the suffixes \"-rc\", \"\", \"-ck\" and "
+"\"-bfs\" appear in the configuration in this order, then all \"v4.8-rcX\" "
+"tags are listed first, followed by \"v4.8\", then \"v4.8-ckX\" and finally "
+"\"v4.8-bfsX\"."
msgstr ""
#. type: Plain text
@@ -9590,8 +9464,8 @@ msgid ""
"If more than one suffixes match the same tagname, then that tagname will be "
"sorted according to the suffix which starts at the earliest position in the "
"tagname. If more than one different matching suffixes start at that "
-"earliest position, then that tagname will be sorted according to the longest "
-"of those suffixes. The sorting order between different suffixes is "
+"earliest position, then that tagname will be sorted according to the longest"
+" of those suffixes. The sorting order between different suffixes is "
"undefined if they are in multiple config files."
msgstr ""
@@ -9638,16 +9512,16 @@ msgstr "Format interne de Git"
#. type: Plain text
#: en/date-formats.txt:15
msgid ""
-"It is `<unix timestamp> <time zone offset>`, where `<unix timestamp>` is the "
-"number of seconds since the UNIX epoch. `<time zone offset>` is a positive "
-"or negative offset from UTC. For example CET (which is 1 hour ahead of UTC) "
-"is `+0100`."
+"It is `<unix timestamp> <time zone offset>`, where `<unix timestamp>` is the"
+" number of seconds since the UNIX epoch. `<time zone offset>` is a positive"
+" or negative offset from UTC. For example CET (which is 1 hour ahead of "
+"UTC) is `+0100`."
msgstr ""
"Il est de la forme `<horodatage unix> <d챕calage de fuseau horaire>`, o첫 "
"`<horodatage unix>` est un nombre de secondes depuis l'챕poque UNIX. "
"`<d챕calage de fuseau horaire>` est un d챕calage positif ou n챕gative par "
-"rapport 횪 UTC. Par exemple, CET (qui est en avance d'une heure sur UTC) est `"
-"+0100`."
+"rapport 횪 UTC. Par exemple, CET (qui est en avance d'une heure sur UTC) est "
+"`+0100`."
#. type: Labeled list
#: en/date-formats.txt:16
@@ -9658,8 +9532,8 @@ msgstr "RFC 2822"
#. type: Plain text
#: en/date-formats.txt:19
msgid ""
-"The standard email format as described by RFC 2822, for example `Thu, 07 Apr "
-"2005 22:13:13 +0200`."
+"The standard email format as described by RFC 2822, for example `Thu, 07 Apr"
+" 2005 22:13:13 +0200`."
msgstr ""
"Le standard de format des courriel tel que d챕crit par la RFC 2822, par "
"exemple `Thu, 07 Apr 2005 22:13:13 +0200`."
@@ -9684,17 +9558,17 @@ msgstr ""
#. type: Plain text
#: en/date-formats.txt:26
msgid ""
-"In addition, the date part is accepted in the following formats: `YYYY.MM."
-"DD`, `MM/DD/YYYY` and `DD.MM.YYYY`."
+"In addition, the date part is accepted in the following formats: "
+"`YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`."
msgstr ""
-"De plus, la partie date est accept챕e dans les formats suivants혻: `AAAA.MM."
-"JJ`, `MM/JJ/AAAA` et `JJ.MM.AAAA`."
+"De plus, la partie date est accept챕e dans les formats suivants혻: "
+"`AAAA.MM.JJ`, `MM/JJ/AAAA` et `JJ.MM.AAAA`."
#. type: Labeled list
#: en/diff-config.txt:1
#, no-wrap
msgid "diff.autoRefreshIndex"
-msgstr ""
+msgstr "diff.autoRefreshIndex"
#. type: Plain text
#: en/diff-config.txt:10
@@ -9711,16 +9585,17 @@ msgstr ""
#: en/diff-config.txt:11
#, no-wrap
msgid "diff.dirstat"
-msgstr ""
+msgstr "diff.dirstat"
#. type: Plain text
#: en/diff-config.txt:18
msgid ""
"A comma separated list of `--dirstat` parameters specifying the default "
"behavior of the `--dirstat` option to linkgit:git-diff[1]` and friends. The "
-"defaults can be overridden on the command line (using `--dirstat=<param1,"
-"param2,...>`). The fallback defaults (when not changed by `diff.dirstat`) "
-"are `changes,noncumulative,3`. The following parameters are available:"
+"defaults can be overridden on the command line (using "
+"`--dirstat=<param1,param2,...>`). The fallback defaults (when not changed by"
+" `diff.dirstat`) are `changes,noncumulative,3`. The following parameters "
+"are available:"
msgstr ""
#. type: Labeled list
@@ -9751,8 +9626,8 @@ msgid ""
"Compute the dirstat numbers by doing the regular line-based diff analysis, "
"and summing the removed/added line counts. (For binary files, count 64-byte "
"chunks instead, since binary files have no natural concept of lines). This "
-"is a more expensive `--dirstat` behavior than the `changes` behavior, but it "
-"does count rearranged lines within a file as much as other changes. The "
+"is a more expensive `--dirstat` behavior than the `changes` behavior, but it"
+" does count rearranged lines within a file as much as other changes. The "
"resulting output is consistent with what you get from the other `--*stat` "
"options."
msgstr ""
@@ -9782,8 +9657,8 @@ msgstr ""
#: en/diff-config.txt:44 en/diff-options.txt:161
msgid ""
"Count changes in a child directory for the parent directory as well. Note "
-"that when using `cumulative`, the sum of the percentages reported may exceed "
-"100%. The default (non-cumulative) behavior can be specified with the "
+"that when using `cumulative`, the sum of the percentages reported may exceed"
+" 100%. The default (non-cumulative) behavior can be specified with the "
"`noncumulative` parameter."
msgstr ""
@@ -9813,7 +9688,7 @@ msgstr ""
#: en/diff-config.txt:55
#, no-wrap
msgid "diff.statGraphWidth"
-msgstr ""
+msgstr "diff.statGraphWidth"
#. type: Plain text
#: en/diff-config.txt:58
@@ -9824,10 +9699,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:59
-#, fuzzy, no-wrap
-#| msgid "new content"
+#, no-wrap
msgid "diff.context"
-msgstr "contenu nouveau"
+msgstr "diff.context"
#. type: Plain text
#: en/diff-config.txt:62
@@ -9840,22 +9714,21 @@ msgstr ""
#: en/diff-config.txt:63
#, no-wrap
msgid "diff.interHunkContext"
-msgstr ""
+msgstr "diff.interHunkContext"
#. type: Plain text
#: en/diff-config.txt:68
msgid ""
"Show the context between diff hunks, up to the specified number of lines, "
-"thereby fusing the hunks that are close to each other. This value serves as "
-"the default for the `--inter-hunk-context` command line option."
+"thereby fusing the hunks that are close to each other. This value serves as"
+" the default for the `--inter-hunk-context` command line option."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:69
-#, fuzzy, no-wrap
-#| msgid "diff"
+#, no-wrap
msgid "diff.external"
-msgstr "diff"
+msgstr "diff.external"
#. type: Plain text
#: en/diff-config.txt:77
@@ -9872,7 +9745,7 @@ msgstr ""
#: en/diff-config.txt:78
#, no-wrap
msgid "diff.ignoreSubmodules"
-msgstr ""
+msgstr "diff.ignoreSubmodules"
#. type: Plain text
#: en/diff-config.txt:87
@@ -9890,7 +9763,7 @@ msgstr ""
#: en/diff-config.txt:88
#, no-wrap
msgid "diff.mnemonicPrefix"
-msgstr ""
+msgstr "diff.mnemonicPrefix"
#. type: Plain text
#: en/diff-config.txt:93
@@ -9962,7 +9835,7 @@ msgstr ""
#: en/diff-config.txt:104
#, no-wrap
msgid "diff.noprefix"
-msgstr ""
+msgstr "diff.noprefix"
#. type: Plain text
#: en/diff-config.txt:106
@@ -9971,10 +9844,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:107
-#, fuzzy, no-wrap
-#| msgid "diff"
+#, no-wrap
msgid "diff.orderFile"
-msgstr "diff"
+msgstr "diff.orderFile"
#. type: Plain text
#: en/diff-config.txt:112
@@ -9988,7 +9860,7 @@ msgstr ""
#: en/diff-config.txt:113
#, no-wrap
msgid "diff.renameLimit"
-msgstr ""
+msgstr "diff.renameLimit"
#. type: Plain text
#: en/diff-config.txt:116
@@ -10001,7 +9873,7 @@ msgstr ""
#: en/diff-config.txt:117
#, no-wrap
msgid "diff.renames"
-msgstr ""
+msgstr "diff.renames"
#. type: Plain text
#: en/diff-config.txt:125
@@ -10010,15 +9882,15 @@ msgid ""
"is disabled. If set to \"true\", basic rename detection is enabled. If set "
"to \"copies\" or \"copy\", Git will detect copies, as well. Defaults to "
"true. Note that this affects only 'git diff' Porcelain like linkgit:git-"
-"diff[1] and linkgit:git-log[1], and not lower level commands such as linkgit:"
-"git-diff-files[1]."
+"diff[1] and linkgit:git-log[1], and not lower level commands such as "
+"linkgit:git-diff-files[1]."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:126
#, no-wrap
msgid "diff.suppressBlankEmpty"
-msgstr ""
+msgstr "diff.suppressBlankEmpty"
#. type: Plain text
#: en/diff-config.txt:129
@@ -10029,26 +9901,25 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:130
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "diff.submodule"
-msgstr "git-add(1)"
+msgstr "diff.submodule"
#. type: Plain text
#: en/diff-config.txt:137
msgid ""
-"Specify the format in which differences in submodules are shown. The \"short"
-"\" format just shows the names of the commits at the beginning and end of "
-"the range. The \"log\" format lists the commits in the range like linkgit:"
-"git-submodule[1] `summary` does. The \"diff\" format shows an inline diff of "
-"the changed contents of the submodule. Defaults to \"short\"."
+"Specify the format in which differences in submodules are shown. The "
+"\"short\" format just shows the names of the commits at the beginning and "
+"end of the range. The \"log\" format lists the commits in the range like "
+"linkgit:git-submodule[1] `summary` does. The \"diff\" format shows an inline"
+" diff of the changed contents of the submodule. Defaults to \"short\"."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:138
#, no-wrap
msgid "diff.wordRegex"
-msgstr ""
+msgstr "diff.wordRegex"
#. type: Plain text
#: en/diff-config.txt:143
@@ -10080,9 +9951,9 @@ msgstr ""
#. type: Plain text
#: en/diff-config.txt:152
msgid ""
-"The regular expression that the diff driver should use to recognize the hunk "
-"header. A built-in pattern may also be used. See linkgit:gitattributes[5] "
-"for details."
+"The regular expression that the diff driver should use to recognize the hunk"
+" header. A built-in pattern may also be used. See linkgit:gitattributes[5]"
+" for details."
msgstr ""
#. type: Labeled list
@@ -10108,8 +9979,8 @@ msgstr ""
#: en/diff-config.txt:162
msgid ""
"The command that the diff driver should call to generate the text-converted "
-"version of a file. The result of the conversion is used to generate a human-"
-"readable diff. See linkgit:gitattributes[5] for details."
+"version of a file. The result of the conversion is used to generate a "
+"human-readable diff. See linkgit:gitattributes[5] for details."
msgstr ""
#. type: Labeled list
@@ -10140,25 +10011,24 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:172 en/git-difftool.txt:111
-#, fuzzy, no-wrap
-#| msgid "diff"
+#, no-wrap
msgid "diff.tool"
-msgstr "diff"
+msgstr "diff.tool"
#. type: Plain text
#: en/diff-config.txt:178
msgid ""
"Controls which diff tool is used by linkgit:git-difftool[1]. This variable "
"overrides the value configured in `merge.tool`. The list below shows the "
-"valid built-in values. Any other value is treated as a custom diff tool and "
-"requires that a corresponding difftool.<tool>.cmd variable is defined."
+"valid built-in values. Any other value is treated as a custom diff tool and"
+" requires that a corresponding difftool.<tool>.cmd variable is defined."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:181
#, no-wrap
msgid "diff.indentHeuristic"
-msgstr ""
+msgstr "diff.indentHeuristic"
#. type: Plain text
#: en/diff-config.txt:184
@@ -10171,7 +10041,7 @@ msgstr ""
#: en/diff-config.txt:185
#, no-wrap
msgid "diff.algorithm"
-msgstr ""
+msgstr "diff.algorithm"
#. type: Plain text
#: en/diff-config.txt:187
@@ -10228,7 +10098,7 @@ msgstr ""
#: en/diff-config.txt:202
#, no-wrap
msgid "diff.wsErrorHighlight"
-msgstr ""
+msgstr "diff.wsErrorHighlight"
#. type: Plain text
#: en/diff-config.txt:206
@@ -10247,8 +10117,8 @@ msgstr ""
#. type: Plain text
#: en/diff-format.txt:6
msgid ""
-"The raw output format from \"git-diff-index\", \"git-diff-tree\", \"git-diff-"
-"files\" and \"git diff --raw\" are very similar."
+"The raw output format from \"git-diff-index\", \"git-diff-tree\", \"git-"
+"diff-files\" and \"git diff --raw\" are very similar."
msgstr ""
#. type: Plain text
@@ -10280,8 +10150,8 @@ msgstr "git-add(1)"
#: en/diff-format.txt:15
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid "compares the <tree-ish> and the index."
msgstr ""
"en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et "
@@ -10312,8 +10182,8 @@ msgstr ""
#. type: Plain text
#: en/diff-format.txt:25
msgid ""
-"The \"git-diff-tree\" command begins its output by printing the hash of what "
-"is being compared. After that, all the commands print one output line per "
+"The \"git-diff-tree\" command begins its output by printing the hash of what"
+" is being compared. After that, all the commands print one output line per "
"changed file."
msgstr ""
@@ -10338,8 +10208,8 @@ msgstr ""
#: en/diff-format.txt:38
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid "That is, from the left to the right:"
msgstr ""
"en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et "
@@ -10373,8 +10243,7 @@ msgstr ""
#. type: Plain text
#: en/diff-format.txt:47
-msgid ""
-"sha1 for \"dst\"; 0\\{40\\} if creation, unmerged or \"look at work tree\"."
+msgid "sha1 for \"dst\"; 0\\{40\\} if creation, unmerged or \"look at work tree\"."
msgstr ""
#. type: Plain text
@@ -10427,7 +10296,6 @@ msgstr ""
msgid "D: deletion of a file"
msgstr ""
-#
#. type: Plain text
#: en/diff-format.txt:61
#, fuzzy
@@ -10460,9 +10328,9 @@ msgstr ""
#: en/diff-format.txt:71
msgid ""
"Status letters C and R are always followed by a score (denoting the "
-"percentage of similarity between the source and target of the move or "
-"copy). Status letter M may be followed by a score (denoting the percentage "
-"of dissimilarity) for file rewrites."
+"percentage of similarity between the source and target of the move or copy)."
+" Status letter M may be followed by a score (denoting the percentage of "
+"dissimilarity) for file rewrites."
msgstr ""
#. type: Plain text
@@ -10488,8 +10356,8 @@ msgstr ""
#. type: Plain text
#: en/diff-format.txt:85 en/git-ls-files.txt:204 en/git-ls-tree.txt:101
msgid ""
-"Without the `-z` option, pathnames with \"unusual\" characters are quoted as "
-"explained for the configuration variable `core.quotePath` (see linkgit:git-"
+"Without the `-z` option, pathnames with \"unusual\" characters are quoted as"
+" explained for the configuration variable `core.quotePath` (see linkgit:git-"
"config[1]). Using `-z` the filename is output verbatim and the line is "
"terminated by a NUL byte."
msgstr ""
@@ -10504,8 +10372,8 @@ msgstr ""
#: en/diff-format.txt:93
msgid ""
"\"git-diff-tree\", \"git-diff-files\" and \"git-diff --raw\" can take `-c` "
-"or `--cc` option to generate diff output also for merge commits. The output "
-"differs from the format described above in the following way:"
+"or `--cc` option to generate diff output also for merge commits. The output"
+" differs from the format described above in the following way:"
msgstr ""
#. type: Plain text
@@ -10566,9 +10434,9 @@ msgstr ""
#: en/diff-format.txt:125
msgid ""
"When showing a change that involves a rename or a copy, `--stat` output "
-"formats the pathnames compactly by combining common prefix and suffix of the "
-"pathnames. For example, a change that moves `arch/i386/Makefile` to `arch/"
-"x86/Makefile` while modifying 4 lines will be shown like this:"
+"formats the pathnames compactly by combining common prefix and suffix of the"
+" pathnames. For example, a change that moves `arch/i386/Makefile` to "
+"`arch/x86/Makefile` while modifying 4 lines will be shown like this:"
msgstr ""
#. type: delimited block -
@@ -10580,8 +10448,9 @@ msgstr ""
#. type: Plain text
#: en/diff-format.txt:133
msgid ""
-"The `--numstat` option gives the diffstat(1) information but is designed for "
-"easier machine consumption. An entry in `--numstat` output looks like this:"
+"The `--numstat` option gives the diffstat(1) information but is designed for"
+" easier machine consumption. An entry in `--numstat` output looks like "
+"this:"
msgstr ""
#. type: delimited block -
@@ -10625,7 +10494,8 @@ msgstr ""
#. type: Plain text
#: en/diff-format.txt:149
-msgid "When `-z` output option is in effect, the output is formatted this way:"
+msgid ""
+"When `-z` output option is in effect, the output is formatted this way:"
msgstr ""
#. type: delimited block -
@@ -10664,8 +10534,8 @@ msgstr ""
#. type: Plain text
#: en/diff-format.txt:171
msgid ""
-"The extra `NUL` before the preimage path in renamed case is to allow scripts "
-"that read the output to tell if the current record being read is a single-"
+"The extra `NUL` before the preimage path in renamed case is to allow scripts"
+" that read the output to tell if the current record being read is a single-"
"path record or a rename/copy record without reading ahead. After reading "
"added and deleted lines, reading up to `NUL` would yield the pathname, but "
"if that is `NUL`, the record will show two paths."
@@ -10770,8 +10640,8 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:55
msgid ""
-"The index line includes the SHA-1 checksum before and after the change. The "
-"<mode> is included if the file mode does not change; otherwise, separate "
+"The index line includes the SHA-1 checksum before and after the change. The"
+" <mode> is included if the file mode does not change; otherwise, separate "
"lines indicate the old and the new mode."
msgstr ""
@@ -10942,8 +10812,8 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:146
msgid ""
-"Similar to two-line header for traditional 'unified' diff format, `/dev/"
-"null` is used to signal created or deleted files."
+"Similar to two-line header for traditional 'unified' diff format, "
+"`/dev/null` is used to signal created or deleted files."
msgstr ""
#. type: Plain text
@@ -10972,12 +10842,12 @@ msgstr ""
#: en/diff-generate-patch.txt:166
msgid ""
"Unlike the traditional 'unified' diff format, which shows two files A and B "
-"with a single column that has `-` (minus -- appears in A but removed in B), `"
-"+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) "
+"with a single column that has `-` (minus -- appears in A but removed in B), "
+"`+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) "
"prefix, this format compares two or more files file1, file2,... with one "
"file X, and shows how X differs from each of fileN. One column for each of "
-"fileN is prepended to the output line to note how X's line is different from "
-"it."
+"fileN is prepended to the output line to note how X's line is different from"
+" it."
msgstr ""
#. type: Plain text
@@ -11005,15 +10875,15 @@ msgid ""
"When shown by `git diff-tree -c`, it compares the parents of a merge commit "
"with the merge result (i.e. file1..fileN are the parents). When shown by "
"`git diff-files -c`, it compares the two unresolved merge parents with the "
-"working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage "
-"3 aka \"their version\")."
+"working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage"
+" 3 aka \"their version\")."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:17 en/git-rebase.txt:319 en/merge-options.txt:57
#, no-wrap
msgid "--no-stat"
-msgstr ""
+msgstr "--no-stat"
#. type: Plain text
#: en/diff-options.txt:19
@@ -11060,10 +10930,9 @@ msgstr "-s"
#. type: Labeled list
#: en/diff-options.txt:31
-#, fuzzy, no-wrap
-#| msgid "patch"
+#, no-wrap
msgid "--no-patch"
-msgstr "patch"
+msgstr "--no-patch"
#. type: Plain text
#: en/diff-options.txt:34
@@ -11100,7 +10969,7 @@ msgstr ""
#: en/git-verify-tag.txt:19
#, no-wrap
msgid "--raw"
-msgstr ""
+msgstr "--raw"
#. type: Plain text
#: en/diff-options.txt:48
@@ -11123,7 +10992,7 @@ msgstr ""
#: en/diff-options.txt:62
#, no-wrap
msgid "--patch-with-raw"
-msgstr ""
+msgstr "--patch-with-raw"
#. type: Plain text
#: en/diff-options.txt:64
@@ -11134,13 +11003,13 @@ msgstr ""
#: en/diff-options.txt:68
#, no-wrap
msgid "--minimal"
-msgstr ""
+msgstr "--minimal"
#. type: Labeled list
#: en/diff-options.txt:72
#, no-wrap
msgid "--patience"
-msgstr ""
+msgstr "--patience"
#. type: Plain text
#: en/diff-options.txt:74
@@ -11151,7 +11020,7 @@ msgstr ""
#: en/diff-options.txt:75
#, no-wrap
msgid "--histogram"
-msgstr ""
+msgstr "--histogram"
#. type: Plain text
#: en/diff-options.txt:77
@@ -11186,16 +11055,16 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:112
msgid ""
-"Generate a diffstat. By default, as much space as necessary will be used for "
-"the filename part, and the rest for the graph part. Maximum width defaults "
+"Generate a diffstat. By default, as much space as necessary will be used for"
+" the filename part, and the rest for the graph part. Maximum width defaults "
"to terminal width, or 80 columns if not connected to a terminal, and can be "
"overridden by `<width>`. The width of the filename part can be limited by "
"giving another width `<name-width>` after a comma. The width of the graph "
"part can be limited by using `--stat-graph-width=<width>` (affects all "
-"commands generating a stat graph) or by setting `diff."
-"statGraphWidth=<width>` (does not affect `git format-patch`). By giving a "
-"third parameter `<count>`, you can limit the output to the first `<count>` "
-"lines, followed by `...` if there are more."
+"commands generating a stat graph) or by setting "
+"`diff.statGraphWidth=<width>` (does not affect `git format-patch`). By "
+"giving a third parameter `<count>`, you can limit the output to the first "
+"`<count>` lines, followed by `...` if there are more."
msgstr ""
#. type: Plain text
@@ -11209,7 +11078,7 @@ msgstr ""
#: en/diff-options.txt:116 en/git-apply.txt:45
#, no-wrap
msgid "--numstat"
-msgstr ""
+msgstr "--numstat"
#. type: Plain text
#: en/diff-options.txt:122
@@ -11223,7 +11092,7 @@ msgstr ""
#: en/diff-options.txt:123
#, no-wrap
msgid "--shortstat"
-msgstr ""
+msgstr "--shortstat"
#. type: Plain text
#: en/diff-options.txt:127
@@ -11253,8 +11122,8 @@ msgstr ""
msgid ""
"Example: The following will count changed files, while ignoring directories "
"with less than 10% of the total amount of changed files, and accumulating "
-"child directory counts in the parent directories: `--dirstat=files,10,"
-"cumulative`."
+"child directory counts in the parent directories: "
+"`--dirstat=files,10,cumulative`."
msgstr ""
#. type: Labeled list
@@ -11262,20 +11131,20 @@ msgstr ""
#: en/merge-options.txt:98
#, no-wrap
msgid "--summary"
-msgstr ""
+msgstr "--summary"
#. type: Plain text
#: en/diff-options.txt:175
msgid ""
-"Output a condensed summary of extended header information such as creations, "
-"renames and mode changes."
+"Output a condensed summary of extended header information such as creations,"
+" renames and mode changes."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:177
#, no-wrap
msgid "--patch-with-stat"
-msgstr ""
+msgstr "--patch-with-stat"
#. type: Plain text
#: en/diff-options.txt:179
@@ -11301,8 +11170,8 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:189
msgid ""
-"Also, when `--raw` or `--numstat` has been given, do not munge pathnames and "
-"use NULs as output field terminators."
+"Also, when `--raw` or `--numstat` has been given, do not munge pathnames and"
+" use NULs as output field terminators."
msgstr ""
#. type: Plain text
@@ -11326,7 +11195,7 @@ msgstr ""
#: en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, no-wrap
msgid "--name-only"
-msgstr ""
+msgstr "--name-only"
#. type: Plain text
#: en/diff-options.txt:201
@@ -11335,16 +11204,15 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:202 en/git-ls-tree.txt:60
-#, fuzzy, no-wrap
-#| msgid "status"
+#, no-wrap
msgid "--name-status"
-msgstr "status"
+msgstr "--name-status"
#. type: Plain text
#: en/diff-options.txt:205
msgid ""
-"Show only names and status of changed files. See the description of the `--"
-"diff-filter` option on what the status letters mean."
+"Show only names and status of changed files. See the description of the "
+"`--diff-filter` option on what the status letters mean."
msgstr ""
#. type: Labeled list
@@ -11356,10 +11224,10 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:217
msgid ""
-"Specify how differences in submodules are shown. When specifying `--"
-"submodule=short` the 'short' format is used. This format just shows the "
-"names of the commits at the beginning and end of the range. When `--"
-"submodule` or `--submodule=log` is specified, the 'log' format is used. "
+"Specify how differences in submodules are shown. When specifying "
+"`--submodule=short` the 'short' format is used. This format just shows the "
+"names of the commits at the beginning and end of the range. When "
+"`--submodule` or `--submodule=log` is specified, the 'log' format is used. "
"This format lists the commits in the range like linkgit:git-submodule[1] "
"`summary` does. When `--submodule=diff` is specified, the 'diff' format is "
"used. This format shows an inline diff of the changes in the submodule "
@@ -11377,8 +11245,8 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:222
msgid ""
-"Show colored diff. `--color` (i.e. without '=<when>') is the same as `--"
-"color=always`. '<when>' can be one of `always`, `never`, or `auto`."
+"Show colored diff. `--color` (i.e. without '=<when>') is the same as "
+"`--color=always`. '<when>' can be one of `always`, `never`, or `auto`."
msgstr ""
#. type: Plain text
@@ -11394,7 +11262,7 @@ msgstr ""
#: en/git-show-branch.txt:124
#, no-wrap
msgid "--no-color"
-msgstr ""
+msgstr "--no-color"
#. type: Plain text
#: en/diff-options.txt:229
@@ -11454,8 +11322,8 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:254
msgid ""
-"Use a special line-based format intended for script consumption. Added/"
-"removed/unchanged runs are printed in the usual unified diff format, "
+"Use a special line-based format intended for script consumption. "
+"Added/removed/unchanged runs are printed in the usual unified diff format, "
"starting with a `+`/`-`/` ` character at the beginning of the line and "
"extending to the end of the line. Newlines in the input are represented by "
"a tilde `~` on a line of its own."
@@ -11475,8 +11343,8 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:260
msgid ""
-"Note that despite the name of the first mode, color is used to highlight the "
-"changed parts in all modes if enabled."
+"Note that despite the name of the first mode, color is used to highlight the"
+" changed parts in all modes if enabled."
msgstr ""
#. type: Labeled list
@@ -11500,8 +11368,8 @@ msgid ""
"between these matches is considered whitespace and ignored(!) for the "
"purposes of finding differences. You may want to append `|[^[:space:]]` to "
"your regular expression to make sure that it matches all non-whitespace "
-"characters. A match that contains a newline is silently truncated(!) at the "
-"newline."
+"characters. A match that contains a newline is silently truncated(!) at the"
+" newline."
msgstr ""
#. type: Plain text
@@ -11537,7 +11405,7 @@ msgstr ""
#: en/diff-options.txt:287
#, no-wrap
msgid "--no-renames"
-msgstr ""
+msgstr "--no-renames"
#. type: Plain text
#: en/diff-options.txt:290
@@ -11550,7 +11418,7 @@ msgstr ""
#: en/diff-options.txt:292 en/git-apply.txt:58
#, no-wrap
msgid "--check"
-msgstr ""
+msgstr "--check"
#. type: Plain text
#: en/diff-options.txt:301
@@ -11586,7 +11454,7 @@ msgstr ""
#: en/diff-options.txt:315
#, no-wrap
msgid "--full-index"
-msgstr ""
+msgstr "--full-index"
#. type: Plain text
#: en/diff-options.txt:319
@@ -11600,13 +11468,13 @@ msgstr ""
#: en/diff-options.txt:320 en/git-apply.txt:150
#, no-wrap
msgid "--binary"
-msgstr ""
+msgstr "--binary"
#. type: Plain text
#: en/diff-options.txt:323
msgid ""
-"In addition to `--full-index`, output a binary diff that can be applied with "
-"`git-apply`."
+"In addition to `--full-index`, output a binary diff that can be applied with"
+" `git-apply`."
msgstr ""
#. type: Labeled list
@@ -11622,8 +11490,8 @@ msgid ""
"Instead of showing the full 40-byte hexadecimal object name in diff-raw "
"format output and diff-tree header lines, show only a partial prefix. This "
"is independent of the `--full-index` option above, which controls the diff-"
-"patch output format. Non default number of digits can be specified with `--"
-"abbrev=<n>`."
+"patch output format. Non default number of digits can be specified with "
+"`--abbrev=<n>`."
msgstr ""
#. type: Labeled list
@@ -11648,23 +11516,24 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:346
msgid ""
-"It affects the way a change that amounts to a total rewrite of a file not as "
-"a series of deletion and insertion mixed together with a very few lines that "
-"happen to match textually as the context, but as a single deletion of "
+"It affects the way a change that amounts to a total rewrite of a file not as"
+" a series of deletion and insertion mixed together with a very few lines "
+"that happen to match textually as the context, but as a single deletion of "
"everything old followed by a single insertion of everything new, and the "
-"number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` "
-"specifies that less than 30% of the original should remain in the result for "
-"Git to consider it a total rewrite (i.e. otherwise the resulting patch will "
-"be a series of deletion and insertion mixed together with context lines)."
+"number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%`"
+" specifies that less than 30% of the original should remain in the result "
+"for Git to consider it a total rewrite (i.e. otherwise the resulting patch "
+"will be a series of deletion and insertion mixed together with context "
+"lines)."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:354
msgid ""
-"When used with -M, a totally-rewritten file is also considered as the source "
-"of a rename (usually -M only considers a file that disappeared as the source "
-"of a rename), and the number `n` controls this aspect of the -B option "
-"(defaults to 50%). `-B20%` specifies that a change with addition and "
+"When used with -M, a totally-rewritten file is also considered as the source"
+" of a rename (usually -M only considers a file that disappeared as the "
+"source of a rename), and the number `n` controls this aspect of the -B "
+"option (defaults to 50%). `-B20%` specifies that a change with addition and "
"deletion compared to 20% or more of the file's size are eligible for being "
"picked up as a possible source of a rename to another file."
msgstr ""
@@ -11734,7 +11603,7 @@ msgstr ""
#: en/diff-options.txt:380 en/git-svn.txt:595
#, no-wrap
msgid "--find-copies-harder"
-msgstr ""
+msgstr "--find-copies-harder"
#. type: Plain text
#: en/diff-options.txt:388
@@ -11742,8 +11611,8 @@ msgid ""
"For performance reasons, by default, `-C` option finds copies only if the "
"original file of the copy was modified in the same changeset. This flag "
"makes the command inspect unmodified files as candidates for the source of "
-"copy. This is a very expensive operation for large projects, so use it with "
-"caution. Giving more than one `-C` option has the same effect."
+"copy. This is a very expensive operation for large projects, so use it with"
+" caution. Giving more than one `-C` option has the same effect."
msgstr ""
#. type: Labeled list
@@ -11756,14 +11625,14 @@ msgstr ""
#: en/diff-options.txt:390
#, no-wrap
msgid "--irreversible-delete"
-msgstr ""
+msgstr "--irreversible-delete"
#. type: Plain text
#: en/diff-options.txt:398
msgid ""
"Omit the preimage for deletes, i.e. print only the header but not the diff "
-"between the preimage and `/dev/null`. The resulting patch is not meant to be "
-"applied with `patch` or `git apply`; this is solely for people who want to "
+"between the preimage and `/dev/null`. The resulting patch is not meant to be"
+" applied with `patch` or `git apply`; this is solely for people who want to "
"just concentrate on reviewing the text after the change. In addition, the "
"output obviously lack enough information to apply such a patch in reverse, "
"even manually, hence the name of the option."
@@ -11772,8 +11641,8 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:401
msgid ""
-"When used together with `-B`, omit also the preimage in the deletion part of "
-"a delete/create pair."
+"When used together with `-B`, omit also the preimage in the deletion part of"
+" a delete/create pair."
msgstr ""
#. type: Labeled list
@@ -11804,8 +11673,8 @@ msgid ""
"Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, "
"submodule, ...) changed (`T`), are Unmerged (`U`), are Unknown (`X`), or "
"have had their pairing Broken (`B`). Any combination of the filter "
-"characters (including none) can be used. When `*` (All-or-none) is added to "
-"the combination, all paths are selected if there is any file that matches "
+"characters (including none) can be used. When `*` (All-or-none) is added to"
+" the combination, all paths are selected if there is any file that matches "
"other criteria in the comparison; if there is no file that matches other "
"criteria, nothing is selected."
msgstr ""
@@ -11833,8 +11702,8 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:435
msgid ""
-"It is useful when you're looking for an exact block of code (like a struct), "
-"and want to know the history of that block since it first came into being: "
+"It is useful when you're looking for an exact block of code (like a struct),"
+" and want to know the history of that block since it first came into being: "
"use the feature iteratively to feed the interesting block in the preimage "
"back into `-S`, and keep going until you get the very first version of the "
"block."
@@ -11856,8 +11725,8 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:443
msgid ""
-"To illustrate the difference between `-S<regex> --pickaxe-regex` and `-"
-"G<regex>`, consider a commit with the following diff in the same file:"
+"To illustrate the difference between `-S<regex> --pickaxe-regex` and "
+"`-G<regex>`, consider a commit with the following diff in the same file:"
msgstr ""
#. type: delimited block -
@@ -11872,21 +11741,22 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:453
msgid ""
-"While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S"
-"\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of "
+"While `git log -G\"regexec\\(regexp\"` will show this commit, `git log "
+"-S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of "
"occurrences of that string did not change)."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:456
-msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
+msgid ""
+"See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:457
#, no-wrap
msgid "--pickaxe-all"
-msgstr ""
+msgstr "--pickaxe-all"
#. type: Plain text
#: en/diff-options.txt:461
@@ -11899,7 +11769,7 @@ msgstr ""
#: en/diff-options.txt:462
#, no-wrap
msgid "--pickaxe-regex"
-msgstr ""
+msgstr "--pickaxe-regex"
#. type: Plain text
#: en/diff-options.txt:465
@@ -11925,14 +11795,14 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:484
msgid ""
-"The output order is determined by the order of glob patterns in "
-"<orderfile>. All files with pathnames that match the first pattern are "
-"output first, all files with pathnames that match the second pattern (but "
-"not the first) are output next, and so on. All files with pathnames that do "
-"not match any pattern are output last, as if there was an implicit match-all "
-"pattern at the end of the file. If multiple pathnames have the same rank "
-"(they match the same pattern but no earlier patterns), their output order "
-"relative to each other is the normal order."
+"The output order is determined by the order of glob patterns in <orderfile>."
+" All files with pathnames that match the first pattern are output first, "
+"all files with pathnames that match the second pattern (but not the first) "
+"are output next, and so on. All files with pathnames that do not match any "
+"pattern are output last, as if there was an implicit match-all pattern at "
+"the end of the file. If multiple pathnames have the same rank (they match "
+"the same pattern but no earlier patterns), their output order relative to "
+"each other is the normal order."
msgstr ""
#. type: Plain text
@@ -11962,11 +11832,11 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:503
msgid ""
-"Patterns have the same syntax and semantics as patterns used for fnmantch(3) "
-"without the FNM_PATHNAME flag, except a pathname also matches a pattern if "
+"Patterns have the same syntax and semantics as patterns used for fnmantch(3)"
+" without the FNM_PATHNAME flag, except a pathname also matches a pattern if "
"removing any number of the final pathname components matches the pattern. "
-"For example, the pattern \"`foo*bar`\" matches \"`fooasdfbar`\" and \"`foo/"
-"bar/baz/asdf`\" but not \"`foobarx`\"."
+"For example, the pattern \"`foo*bar`\" matches \"`fooasdfbar`\" and "
+"\"`foo/bar/baz/asdf`\" but not \"`foobarx`\"."
msgstr ""
#. type: Labeled list
@@ -11993,8 +11863,8 @@ msgstr ""
msgid ""
"When run from a subdirectory of the project, it can be told to exclude "
"changes outside the directory and show pathnames relative to it with this "
-"option. When you are not in a subdirectory (e.g. in a bare repository), you "
-"can name which subdirectory to make the output relative to by giving a "
+"option. When you are not in a subdirectory (e.g. in a bare repository), you"
+" can name which subdirectory to make the output relative to by giving a "
"<path> as an argument."
msgstr ""
@@ -12013,7 +11883,7 @@ msgstr "-a"
#: en/diff-options.txt:519 en/git-grep.txt:106
#, no-wrap
msgid "--text"
-msgstr ""
+msgstr "--text"
#. type: Plain text
#: en/diff-options.txt:521
@@ -12024,7 +11894,7 @@ msgstr ""
#: en/diff-options.txt:522
#, no-wrap
msgid "--ignore-space-at-eol"
-msgstr ""
+msgstr "--ignore-space-at-eol"
#. type: Plain text
#: en/diff-options.txt:524
@@ -12050,13 +11920,13 @@ msgstr ""
#: en/git-grep.txt:131 en/git-hash-object.txt:31 en/git-help.txt:66
#, no-wrap
msgid "-w"
-msgstr ""
+msgstr "-w"
#. type: Labeled list
#: en/diff-options.txt:532
#, no-wrap
msgid "--ignore-all-space"
-msgstr ""
+msgstr "--ignore-all-space"
#. type: Plain text
#: en/diff-options.txt:536
@@ -12069,7 +11939,7 @@ msgstr ""
#: en/diff-options.txt:537
#, no-wrap
msgid "--ignore-blank-lines"
-msgstr ""
+msgstr "--ignore-blank-lines"
#. type: Plain text
#: en/diff-options.txt:539
@@ -12086,8 +11956,8 @@ msgstr ""
#: en/diff-options.txt:545
msgid ""
"Show the context between diff hunks, up to the specified number of lines, "
-"thereby fusing hunks that are close to each other. Defaults to `diff."
-"interHunkContext` or 0 if the config option is unset."
+"thereby fusing hunks that are close to each other. Defaults to "
+"`diff.interHunkContext` or 0 if the config option is unset."
msgstr ""
#. type: Labeled list
@@ -12100,7 +11970,7 @@ msgstr ""
#: en/diff-options.txt:547 en/git-grep.txt:247
#, no-wrap
msgid "--function-context"
-msgstr ""
+msgstr "--function-context"
#. type: Plain text
#: en/diff-options.txt:549
@@ -12111,13 +11981,13 @@ msgstr ""
#: en/diff-options.txt:552 en/git-ls-remote.txt:46
#, no-wrap
msgid "--exit-code"
-msgstr ""
+msgstr "--exit-code"
#. type: Plain text
#: en/diff-options.txt:556
msgid ""
-"Make the program exit with codes similar to diff(1). That is, it exits with "
-"1 if there were differences and 0 means no differences."
+"Make the program exit with codes similar to diff(1). That is, it exits with"
+" 1 if there were differences and 0 means no differences."
msgstr ""
#. type: Labeled list
@@ -12144,10 +12014,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:562
-#, fuzzy, no-wrap
-#| msgid "diff"
+#, no-wrap
msgid "--ext-diff"
-msgstr "diff"
+msgstr "--ext-diff"
#. type: Plain text
#: en/diff-options.txt:566
@@ -12161,7 +12030,7 @@ msgstr ""
#: en/diff-options.txt:567
#, no-wrap
msgid "--no-ext-diff"
-msgstr ""
+msgstr "--no-ext-diff"
#. type: Plain text
#: en/diff-options.txt:569
@@ -12172,13 +12041,13 @@ msgstr ""
#: en/diff-options.txt:570 en/git-cat-file.txt:59 en/git-grep.txt:109
#, no-wrap
msgid "--textconv"
-msgstr ""
+msgstr "--textconv"
#. type: Labeled list
#: en/diff-options.txt:571 en/git-grep.txt:112
#, no-wrap
msgid "--no-textconv"
-msgstr ""
+msgstr "--no-textconv"
#. type: Plain text
#: en/diff-options.txt:580
@@ -12188,8 +12057,8 @@ msgid ""
"textconv filters are typically a one-way conversion, the resulting diff is "
"suitable for human consumption, but cannot be applied. For this reason, "
"textconv filters are enabled by default only for linkgit:git-diff[1] and "
-"linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing "
-"commands."
+"linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing"
+" commands."
msgstr ""
#. type: Labeled list
@@ -12206,12 +12075,12 @@ msgid ""
"\"none\" will consider the submodule modified when it either contains "
"untracked or modified files or its HEAD differs from the commit recorded in "
"the superproject and can be used to override any settings of the 'ignore' "
-"option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" "
-"is used submodules are not considered dirty when they only contain untracked "
-"content (but they are still scanned for modified content). Using \"dirty\" "
-"ignores all changes to the work tree of submodules, only changes to the "
-"commits stored in the superproject are shown (this was the behavior until "
-"1.7.0). Using \"all\" hides all changes to submodules."
+"option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\""
+" is used submodules are not considered dirty when they only contain "
+"untracked content (but they are still scanned for modified content). Using "
+"\"dirty\" ignores all changes to the work tree of submodules, only changes "
+"to the commits stored in the superproject are shown (this was the behavior "
+"until 1.7.0). Using \"all\" hides all changes to submodules."
msgstr ""
#. type: Labeled list
@@ -12240,7 +12109,7 @@ msgstr ""
#: en/diff-options.txt:600
#, no-wrap
msgid "--no-prefix"
-msgstr ""
+msgstr "--no-prefix"
#. type: Plain text
#: en/diff-options.txt:602
@@ -12262,7 +12131,7 @@ msgstr ""
#: en/diff-options.txt:606
#, no-wrap
msgid "--ita-invisible-in-index"
-msgstr ""
+msgstr "--ita-invisible-in-index"
#. type: Plain text
#: en/diff-options.txt:613
@@ -12277,8 +12146,8 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:615
msgid ""
-"For more detailed explanation on these common options, see also linkgit:"
-"gitdiffcore[7]."
+"For more detailed explanation on these common options, see also "
+"linkgit:gitdiffcore[7]."
msgstr ""
#. type: Labeled list
@@ -12303,7 +12172,7 @@ msgstr ""
#: en/fetch-options.txt:5
#, no-wrap
msgid "--append"
-msgstr ""
+msgstr "--append"
#. type: Plain text
#: en/fetch-options.txt:9
@@ -12323,8 +12192,8 @@ msgstr ""
#: en/fetch-options.txt:16
msgid ""
"Limit fetching to the specified number of commits from the tip of each "
-"remote branch history. If fetching to a 'shallow' repository created by `git "
-"clone` with `--depth=<depth>` option (see linkgit:git-clone[1]), deepen or "
+"remote branch history. If fetching to a 'shallow' repository created by `git"
+" clone` with `--depth=<depth>` option (see linkgit:git-clone[1]), deepen or "
"shorten the history to the specified number of commits. Tags for the "
"deepened commits are not fetched."
msgstr ""
@@ -12374,7 +12243,7 @@ msgstr ""
#: en/fetch-options.txt:31
#, no-wrap
msgid "--unshallow"
-msgstr ""
+msgstr "--unshallow"
#. type: Plain text
#: en/fetch-options.txt:35
@@ -12394,13 +12263,13 @@ msgstr ""
#: en/fetch-options.txt:39
#, no-wrap
msgid "--update-shallow"
-msgstr ""
+msgstr "--update-shallow"
#. type: Plain text
#: en/fetch-options.txt:44
msgid ""
-"By default when fetching from a shallow repository, `git fetch` refuses refs "
-"that require updating .git/shallow. This option updates .git/shallow and "
+"By default when fetching from a shallow repository, `git fetch` refuses refs"
+" that require updating .git/shallow. This option updates .git/shallow and "
"accept such refs."
msgstr ""
@@ -12455,9 +12324,9 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:58 en/git-am.txt:40 en/git-cvsexportcommit.txt:67
-#: en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:108
-#: en/git-ls-files.txt:73 en/git-mailinfo.txt:27 en/git-mv.txt:34
-#: en/git-repack.txt:139
+#: en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53
+#: en/git-format-patch.txt:108 en/git-ls-files.txt:73 en/git-mailinfo.txt:27
+#: en/git-mv.txt:34 en/git-repack.txt:139
#, no-wrap
msgid "-k"
msgstr "-k"
@@ -12478,7 +12347,7 @@ msgstr ""
#: en/fetch-options.txt:63
#, no-wrap
msgid "--multiple"
-msgstr ""
+msgstr "--multiple"
#. type: Plain text
#: en/fetch-options.txt:66
@@ -12489,10 +12358,9 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:68 en/git-push.txt:98
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "--prune"
-msgstr "git-add(1)"
+msgstr "--prune"
#. type: Plain text
#: en/fetch-options.txt:77
@@ -12515,7 +12383,8 @@ msgstr ""
#: en/git-read-tree.txt:57 en/git-rebase.txt:318 en/git-reflog.txt:114
#: en/git-repack.txt:77 en/git-revert.txt:69 en/git-rm.txt:43
#: en/git-shortlog.txt:29 en/git-submodule.txt:310 en/git-svn.txt:648
-#: en/git-unpack-objects.txt:30 en/git-worktree.txt:110 en/merge-options.txt:56
+#: en/git-unpack-objects.txt:30 en/git-worktree.txt:110
+#: en/merge-options.txt:56
#, no-wrap
msgid "-n"
msgstr "-n"
@@ -12524,7 +12393,7 @@ msgstr "-n"
#: en/fetch-options.txt:82
#, no-wrap
msgid "--no-tags"
-msgstr ""
+msgstr "--no-tags"
#. type: Plain text
#: en/fetch-options.txt:88
@@ -12557,15 +12426,15 @@ msgstr ""
#: en/git-show-ref.txt:40
#, no-wrap
msgid "--tags"
-msgstr ""
+msgstr "--tags"
#. type: Plain text
#: en/fetch-options.txt:106
msgid ""
"Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into "
-"local tags with the same name), in addition to whatever else would otherwise "
-"be fetched. Using this option alone does not subject tags to pruning, even "
-"if --prune is used (though tags may be pruned anyway if they are also the "
+"local tags with the same name), in addition to whatever else would otherwise"
+" be fetched. Using this option alone does not subject tags to pruning, even"
+" if --prune is used (though tags may be pruned anyway if they are also the "
"destination of an explicit refspec; see `--prune`)."
msgstr ""
@@ -12592,7 +12461,7 @@ msgstr ""
#: en/fetch-options.txt:118
#, no-wrap
msgid "-j"
-msgstr ""
+msgstr "-j"
#. type: Labeled list
#: en/fetch-options.txt:119
@@ -12610,10 +12479,9 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:125 en/git-push.txt:274
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "--no-recurse-submodules"
-msgstr "git-add(1)"
+msgstr "--no-recurse-submodules"
#. type: Plain text
#: en/fetch-options.txt:128
@@ -12645,18 +12513,18 @@ msgstr ""
#. type: Plain text
#: en/fetch-options.txt:141
msgid ""
-"This option is used internally to temporarily provide a non-negative default "
-"value for the --recurse-submodules option. All other methods of configuring "
-"fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and "
-"linkgit:git-config[1]) override this option, as does specifying --"
-"[no-]recurse-submodules directly."
+"This option is used internally to temporarily provide a non-negative default"
+" value for the --recurse-submodules option. All other methods of "
+"configuring fetch's submodule recursion (such as settings in "
+"linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as "
+"does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:144
#, no-wrap
msgid "--update-head-ok"
-msgstr ""
+msgstr "--update-head-ok"
#. type: Plain text
#: en/fetch-options.txt:151
@@ -12676,9 +12544,9 @@ msgstr ""
#. type: Plain text
#: en/fetch-options.txt:157
msgid ""
-"When given, and the repository to fetch from is handled by 'git fetch-pack', "
-"`--exec=<upload-pack>` is passed to the command to specify non-default path "
-"for the command run on the other end."
+"When given, and the repository to fetch from is handled by 'git fetch-pack',"
+" `--exec=<upload-pack>` is passed to the command to specify non-default path"
+" for the command run on the other end."
msgstr ""
#. type: Labeled list
@@ -12750,28 +12618,28 @@ msgstr "Mode bavard."
#: en/git-push.txt:268 en/merge-options.txt:112
#, no-wrap
msgid "--progress"
-msgstr ""
+msgstr "--progress"
#. type: Plain text
#: en/fetch-options.txt:175 en/git-clone.txt:133 en/git-pack-objects.txt:141
#: en/git-push.txt:273
msgid ""
"Progress status is reported on the standard error stream by default when it "
-"is attached to a terminal, unless -q is specified. This flag forces progress "
-"status even if the standard error stream is not directed to a terminal."
+"is attached to a terminal, unless -q is specified. This flag forces progress"
+" status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:176 en/git-push.txt:295
#, no-wrap
msgid "-4"
-msgstr ""
+msgstr "-4"
#. type: Labeled list
#: en/fetch-options.txt:177 en/git-push.txt:296
#, no-wrap
msgid "--ipv4"
-msgstr ""
+msgstr "--ipv4"
#. type: Plain text
#: en/fetch-options.txt:179 en/git-push.txt:298
@@ -12782,13 +12650,13 @@ msgstr ""
#: en/fetch-options.txt:180 en/git-push.txt:299
#, no-wrap
msgid "-6"
-msgstr ""
+msgstr "-6"
#. type: Labeled list
#: en/fetch-options.txt:181 en/git-push.txt:300
#, no-wrap
msgid "--ipv6"
-msgstr ""
+msgstr "--ipv6"
#. type: Plain text
#: en/fetch-options.txt:182 en/git-push.txt:302
@@ -12833,47 +12701,49 @@ msgstr "git-add(1)"
#: en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5
#: en/git-blame.txt:5 en/git-branch.txt:5 en/git-bundle.txt:5
#: en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5
-#: en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5
-#: en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5
-#: en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5
-#: en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5
-#: en/git-config.txt:5 en/git-count-objects.txt:5
-#: en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5
-#: en/git-credential-store.txt:5 en/git-credential.txt:5
-#: en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5
-#: en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5
-#: en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5
-#: en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5
-#: en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5
-#: en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5
-#: en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5
-#: en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5
-#: en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5
-#: en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5
-#: en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5
-#: en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5
-#: en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5
-#: en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5
-#: en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5
+#: en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5
+#: en/git-checkout.txt:5 en/git-check-ref-format.txt:5
+#: en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5
+#: en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5
+#: en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5
+#: en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5
+#: en/git-credential-cache.txt:5 en/git-credential-store.txt:5
+#: en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5
+#: en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5
+#: en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5
+#: en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5
+#: en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5
+#: en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5
+#: en/git-for-each-ref.txt:5 en/git-format-patch.txt:5
+#: en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5
+#: en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5
+#: en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5
+#: en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5
+#: en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5
+#: en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5
+#: en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5
+#: en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5
+#: en/git-merge-file.txt:5 en/git-merge-index.txt:5
#: en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5
#: en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5
-#: en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5
-#: en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5
-#: en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5
-#: en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5
-#: en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5
-#: en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5
-#: en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5
-#: en/git-remote-testgit.txt:5 en/git-remote.txt:5 en/git-repack.txt:5
-#: en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5
-#: en/git-reset.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5
-#: en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5
-#: en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5
-#: en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5
-#: en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5
-#: en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5
-#: en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5
-#: en/git-svn.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5
+#: en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5
+#: en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5
+#: en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5
+#: en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5
+#: en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5
+#: en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5
+#: en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5
+#: en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote-testgit.txt:5
+#: en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5
+#: en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5
+#: en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5
+#: en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5
+#: en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5
+#: en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5
+#: en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5
+#: en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5
+#: en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5
+#: en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5
#: en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5
#: en/git-update-index.txt:5 en/git-update-ref.txt:5
#: en/git-update-server-info.txt:5 en/git-upload-archive.txt:5
@@ -12884,7 +12754,6 @@ msgstr "git-add(1)"
msgid "NAME"
msgstr "NAME"
-#
#. type: Plain text
#: en/git-add.txt:7
msgid "git-add - Add file contents to the index"
@@ -12896,16 +12765,17 @@ msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index"
#: en/git-blame.txt:9 en/git-branch.txt:9 en/git-bundle.txt:10
#: en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10
#: en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10
-#: en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9
-#: en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9
-#: en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10
-#: en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9
-#: en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9
-#: en/git-credential-store.txt:9 en/git-credential.txt:9
-#: en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9
-#: en/git-daemon.txt:9 en/git-describe.txt:10 en/git-diff-files.txt:10
-#: en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10
-#: en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10
+#: en/git-checkout.txt:9 en/git-check-ref-format.txt:9
+#: en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9
+#: en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9
+#: en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10
+#: en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9
+#: en/git-credential-cache.txt:9 en/git-credential-store.txt:9
+#: en/git-credential.txt:9 en/git-cvsexportcommit.txt:10
+#: en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9
+#: en/git-describe.txt:10 en/git-diff-files.txt:10 en/git-diff-index.txt:10
+#: en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10
+#: en/git-fast-export.txt:10 en/git-fast-import.txt:10
#: en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9
#: en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9
#: en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10
@@ -13009,18 +12879,17 @@ msgstr ""
#: en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15
#: en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:26
#: en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:24
-#: en/git-svn.txt:14 en/git-symbolic-ref.txt:16 en/git-tag.txt:21 en/git.txt:20
-#: en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16
+#: en/git-svn.txt:14 en/git-symbolic-ref.txt:16 en/git-tag.txt:21
+#: en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16
#: en/git-update-index.txt:29 en/git-update-ref.txt:14
#: en/git-update-server-info.txt:15 en/git-upload-archive.txt:15
#: en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16
-#: en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15
-#: en/git-worktree.txt:19 en/git-write-tree.txt:15
+#: en/git-verify-tag.txt:14 en/git-web--browse.txt:14
+#: en/git-whatchanged.txt:15 en/git-worktree.txt:19 en/git-write-tree.txt:15
#, no-wrap
msgid "DESCRIPTION"
msgstr "DESCRIPTION"
-#
#. type: Plain text
#: en/git-add.txt:24
msgid ""
@@ -13031,20 +12900,19 @@ msgid ""
"changes made to the working tree files applied, or remove paths that do not "
"exist in the working tree anymore."
msgstr ""
-"Cette commande met 횪 jour l'index en utilisant le contenu actuel trouv챕 dans "
-"l'arbre de travail, pour pr챕parer le contenu de la prochaine validation. "
+"Cette commande met 횪 jour l'index en utilisant le contenu actuel trouv챕 dans"
+" l'arbre de travail, pour pr챕parer le contenu de la prochaine validation. "
"Typiquement, elle ajoute int챕gralement le contenu actuel des chemins "
"existant, mais peut aussi n'ajouter que certaines parties des modifications "
"au moyen d'options ou soustraire certains chemins qui n'existent plus dans "
"l'arbre de travail."
-#
#. type: Plain text
#: en/git-add.txt:30
msgid ""
-"The \"index\" holds a snapshot of the content of the working tree, and it is "
-"this snapshot that is taken as the contents of the next commit. Thus after "
-"making any changes to the working tree, and before running the commit "
+"The \"index\" holds a snapshot of the content of the working tree, and it is"
+" this snapshot that is taken as the contents of the next commit. Thus after"
+" making any changes to the working tree, and before running the commit "
"command, you must use the `add` command to add any new or modified files to "
"the index."
msgstr ""
@@ -13054,7 +12922,6 @@ msgstr ""
"avant de lancer la commande commit, vous devez utiliser la commande `add` "
"pour ajouter tout fichier nouveau ou modifi챕 횪 l'index."
-#
#. type: Plain text
#: en/git-add.txt:35
msgid ""
@@ -13063,50 +12930,47 @@ msgid ""
"you want subsequent changes included in the next commit, then you must run "
"`git add` again to add the new content to the index."
msgstr ""
-"Cette commande peut 챗tre effectu챕e plusieurs fois avant la validation. Elle "
-"n'ajoute que le contenu des fichiers sp챕cifi챕s au moment o첫 la commande "
+"Cette commande peut 챗tre effectu챕e plusieurs fois avant la validation. Elle"
+" n'ajoute que le contenu des fichiers sp챕cifi챕s au moment o첫 la commande "
"`add` est lanc챕e혻; si vous souhaitez inclure des modifications post챕rieures "
-"횪 un `add` dans la prochaine validation, vous devez alors lancer `git add` 횪 "
-"nouveau pour ajouter le nouveau contenu 횪 l'index."
+"횪 un `add` dans la prochaine validation, vous devez alors lancer `git add` 횪"
+" nouveau pour ajouter le nouveau contenu 횪 l'index."
-#
#. type: Plain text
#: en/git-add.txt:38
msgid ""
-"The `git status` command can be used to obtain a summary of which files have "
-"changes that are staged for the next commit."
+"The `git status` command can be used to obtain a summary of which files have"
+" changes that are staged for the next commit."
msgstr ""
"La commande `git status` permet d'obtenir un r챕sum챕 des fichiers modifi챕s "
"qui sont pr챕par챕s pour la prochaine validation."
-#
#. type: Plain text
#: en/git-add.txt:45
msgid ""
-"The `git add` command will not add ignored files by default. If any ignored "
-"files were explicitly specified on the command line, `git add` will fail "
+"The `git add` command will not add ignored files by default. If any ignored"
+" files were explicitly specified on the command line, `git add` will fail "
"with a list of ignored files. Ignored files reached by directory recursion "
"or filename globbing performed by Git (quote your globs before the shell) "
"will be silently ignored. The 'git add' command can be used to add ignored "
"files with the `-f` (force) option."
msgstr ""
-"Par d챕faut, la commande `git add` n'ajoute pas les fichiers ignor챕s. Si des "
-"fichiers ignor챕s sont sp챕cifi챕s explicitement en ligne de commande, `git "
+"Par d챕faut, la commande `git add` n'ajoute pas les fichiers ignor챕s. Si des"
+" fichiers ignor챕s sont sp챕cifi챕s explicitement en ligne de commande, `git "
"add` 챕chouera avec la liste des fichiers ignor챕s. Les fichiers ignor챕s "
-"atteint via la r챕cursion de r챕pertoires ou les patrons de fichiers g챕r챕s par "
-"Git (les patrons doivent alors 챗tre 챕chapp챕s du shell par des quotes) "
+"atteint via la r챕cursion de r챕pertoires ou les patrons de fichiers g챕r챕s par"
+" Git (les patrons doivent alors 챗tre 챕chapp챕s du shell par des quotes) "
"seront ignor챕s silencieusement. La commande `git add` peut tout de m챗me "
"ajouter des fichiers ignor챕s avec l'option `-f` (force)."
-#
#. type: Plain text
#: en/git-add.txt:48
msgid ""
"Please see linkgit:git-commit[1] for alternative ways to add content to a "
"commit."
msgstr ""
-"R챕f챕rez-vous linkgit:git-commit[1] pour des m챕thodes alternatives d'ajout de "
-"contenu 횪 une validation."
+"R챕f챕rez-vous linkgit:git-commit[1] pour des m챕thodes alternatives d'ajout de"
+" contenu 횪 une validation."
#. type: Title -
#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24
@@ -13151,8 +13015,8 @@ msgstr ""
#: en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29
#: en/git-update-index.txt:41 en/git-update-server-info.txt:24
#: en/git-upload-archive.txt:56 en/git-var.txt:19 en/git-verify-commit.txt:18
-#: en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43
-#: en/git-worktree.txt:83 en/git-write-tree.txt:29
+#: en/git-verify-pack.txt:22 en/git-verify-tag.txt:18
+#: en/git-web--browse.txt:43 en/git-worktree.txt:83 en/git-write-tree.txt:29
#, no-wrap
msgid "OPTIONS"
msgstr "OPTIONS"
@@ -13167,25 +13031,25 @@ msgstr "<sp챕cificateur de chemin>..."
#: en/git-add.txt:64
msgid ""
"Files to add content from. Fileglobs (e.g. `*.c`) can be given to add all "
-"matching files. Also a leading directory name (e.g. `dir` to add `dir/"
-"file1` and `dir/file2`) can be given to update the index to match the "
+"matching files. Also a leading directory name (e.g. `dir` to add "
+"`dir/file1` and `dir/file2`) can be given to update the index to match the "
"current state of the directory as a whole (e.g. specifying `dir` will "
-"record not just a file `dir/file1` modified in the working tree, a file `dir/"
-"file2` added to the working tree, but also a file `dir/file3` removed from "
-"the working tree). Note that older versions of Git used to ignore removed "
-"files; use `--no-all` option if you want to add modified or new files but "
-"ignore removed ones."
+"record not just a file `dir/file1` modified in the working tree, a file "
+"`dir/file2` added to the working tree, but also a file `dir/file3` removed "
+"from the working tree). Note that older versions of Git used to ignore "
+"removed files; use `--no-all` option if you want to add modified or new "
+"files but ignore removed ones."
msgstr ""
"Fichiers dont le contenu doit 챗tre ajout챕. Les patrons (ex : `*.c`) "
"permettent de restreindre 횪 tous les fichiers correspondant. Un nom de "
-"r챕pertoire (ex : `rep` pour ajouter `rep/fichier1` et `rep/fichier2`) permet "
-"d'ajouter r챕cursivement tous les fichiers d'un r챕pertoire (par exemple "
-"sp챕cifier `rep` n'enregistrera pas seulement le fichier modifi챕 dans l'arbre "
-"de travail `rep/fichier1` ou un fichier ajout챕 `rep/fichier2`, mais aussi un "
-"fichier `rep/fichier3` supprim챕 de l'arbre de travail). Veuillez noter que "
-"des version anciennes de Git ignoraient les fichiers supprim챕s혻; utilisez "
-"l'option `--no-all` si vous souhaitez ajouter les fichiers nouveaux ou "
-"modifi챕s mais ignorer les fichiers supprim챕s."
+"r챕pertoire (ex : `rep` pour ajouter `rep/fichier1` et `rep/fichier2`) permet"
+" d'ajouter r챕cursivement tous les fichiers d'un r챕pertoire (par exemple "
+"sp챕cifier `rep` n'enregistrera pas seulement le fichier modifi챕 dans l'arbre"
+" de travail `rep/fichier1` ou un fichier ajout챕 `rep/fichier2`, mais aussi "
+"un fichier `rep/fichier3` supprim챕 de l'arbre de travail). Veuillez noter "
+"que des version anciennes de Git ignoraient les fichiers supprim챕s혻; "
+"utilisez l'option `--no-all` si vous souhaitez ajouter les fichiers nouveaux"
+" ou modifi챕s mais ignorer les fichiers supprim챕s."
#. type: Plain text
#: en/git-add.txt:69
@@ -13226,24 +13090,27 @@ msgid ""
"the working tree. See ``Interactive mode'' for details."
msgstr ""
"Ajouter le contenu modifi챕 dans l'arbre de travail 횪 l'index. Les arguments "
-"optionnels de chemin permettent de limiter les op챕rations 횪 un sous-ensemble "
-"de l'arbre de travail. R챕f챕rez-vous 횪 짬혻Mode interactif혻쨩 pour plus de "
+"optionnels de chemin permettent de limiter les op챕rations 횪 un sous-ensemble"
+" de l'arbre de travail. R챕f챕rez-vous 횪 짬혻Mode interactif혻쨩 pour plus de "
"d챕tails."
#. type: Plain text
#: en/git-add.txt:91
msgid ""
"Interactively choose hunks of patch between the index and the work tree and "
-"add them to the index. This gives the user a chance to review the difference "
-"before adding modified contents to the index."
-msgstr "Choisir de mani챔re interactive les sections de patch entre l'index et la copie de travail et les ajouter 횪 l'index. Cela permet 횪 l'utilisateur de r챕viser les diff챕rences avec d'ajouter le contenu modifi챕 횪 l'index."
+"add them to the index. This gives the user a chance to review the difference"
+" before adding modified contents to the index."
+msgstr ""
+"Choisir de mani챔re interactive les sections de patch entre l'index et la "
+"copie de travail et les ajouter 횪 l'index. Cela permet 횪 l'utilisateur de "
+"r챕viser les diff챕rences avec d'ajouter le contenu modifi챕 횪 l'index."
#. type: Plain text
#: en/git-add.txt:95
msgid ""
"This effectively runs `add --interactive`, but bypasses the initial command "
-"menu and directly jumps to the `patch` subcommand. See ``Interactive mode'' "
-"for details."
+"menu and directly jumps to the `patch` subcommand. See ``Interactive mode''"
+" for details."
msgstr ""
"Cela lance effectivement `add --interactive` mais court-circuite le menu "
"initial et saute directement 횪 la sous-commande `patch`. R챕f챕rez-vous 횪 "
@@ -13273,25 +13140,22 @@ msgid ""
"the editor was closed, adjust the hunk headers and apply the patch to the "
"index."
msgstr ""
-"Ouvrir les diff챕rences avec l'index dans un 챕diteur et laisser l'utilisateur "
-"les 챕diter. Apr챔s la fermeture de l'챕diteur, ajuster les ent챗tes de sections "
-"et appliquer le patch 횪 l'index."
+"Ouvrir les diff챕rences avec l'index dans un 챕diteur et laisser l'utilisateur"
+" les 챕diter. Apr챔s la fermeture de l'챕diteur, ajuster les ent챗tes de "
+"sections et appliquer le patch 횪 l'index."
#. type: Plain text
#: en/git-add.txt:107
msgid ""
-"The intent of this option is to pick and choose lines of the patch to apply, "
-"or even to modify the contents of lines to be staged. This can be quicker "
+"The intent of this option is to pick and choose lines of the patch to apply,"
+" or even to modify the contents of lines to be staged. This can be quicker "
"and more flexible than using the interactive hunk selector. However, it is "
-"easy to confuse oneself and create a patch that does not apply to the index. "
-"See EDITING PATCHES below."
+"easy to confuse oneself and create a patch that does not apply to the index."
+" See EDITING PATCHES below."
msgstr ""
-"L'objectif de cette option est de permettre de choisir et retenir les lignes "
-"du patch 횪 appliquer, ou m챗me de modifier le contenu des lignes\n"
-"횪 indexer. Cela peut 챗tre plus rapide et plus flexible que l'utilisation du "
-"s챕lecteur interactif. Cependant, il est plus facile de se \n"
-"tromper et de cr챕er un patch qui ne s'applique pas. R챕f챕rez-vous 횪 횋DITER "
-"LES PATCHS ci-dessous."
+"L'objectif de cette option est de permettre de choisir et retenir les lignes du patch 횪 appliquer, ou m챗me de modifier le contenu des lignes\n"
+"횪 indexer. Cela peut 챗tre plus rapide et plus flexible que l'utilisation du s챕lecteur interactif. Cependant, il est plus facile de se \n"
+"tromper et de cr챕er un patch qui ne s'applique pas. R챕f챕rez-vous 횪 횋DITER LES PATCHS ci-dessous."
#. type: Labeled list
#: en/git-add.txt:109
@@ -13313,14 +13177,14 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:118
msgid ""
-"If no <pathspec> is given when `-u` option is used, all tracked files in the "
-"entire working tree are updated (old versions of Git used to limit the "
+"If no <pathspec> is given when `-u` option is used, all tracked files in the"
+" entire working tree are updated (old versions of Git used to limit the "
"update to the current directory and its subdirectories)."
msgstr ""
-"Si aucun <chemin> n'est sp챕cifi챕, quand l'option `-u` est utilis챕e, tous les "
-"fichiers suivis dans la totalit챕 de l'arbre de travail sont mis 횪 jour (les "
-"versions anciennes de Git limitaient la mise 횪 jour au r챕pertoire courant et "
-"ses sous-r챕pertoires)."
+"Si aucun <chemin> n'est sp챕cifi챕, quand l'option `-u` est utilis챕e, tous les"
+" fichiers suivis dans la totalit챕 de l'arbre de travail sont mis 횪 jour (les"
+" versions anciennes de Git limitaient la mise 횪 jour au r챕pertoire courant "
+"et ses sous-r챕pertoires)."
#. type: Labeled list
#: en/git-add.txt:119 en/git-repack.txt:44 en/git-svn.txt:402
@@ -13342,8 +13206,8 @@ msgid ""
"modifies, and removes index entries to match the working tree."
msgstr ""
"Mettre 횪 jour l'index non seulement pour tous les fichiers de l'arbre de "
-"travail correspondant 횪 <chemin> mais aussi pour toutes les entr챕es existant "
-"d챕j횪 dans l'index. Ceci ajoute, modifie et retire des entr챕es d'index pour "
+"travail correspondant 횪 <chemin> mais aussi pour toutes les entr챕es existant"
+" d챕j횪 dans l'index. Ceci ajoute, modifie et retire des entr챕es d'index pour "
"correspondre 횪 la copie de travail."
#. type: Plain text
@@ -13372,8 +13236,8 @@ msgstr "--ignore-removal"
#. type: Plain text
#: en/git-add.txt:138
msgid ""
-"Update the index by adding new files that are unknown to the index and files "
-"modified in the working tree, but ignore files that have been removed from "
+"Update the index by adding new files that are unknown to the index and files"
+" modified in the working tree, but ignore files that have been removed from "
"the working tree. This option is a no-op when no <pathspec> is used."
msgstr ""
"Mettre 횪 jour l'index en y ajoutant les nouveaux fichiers qui sont inconnus "
@@ -13409,8 +13273,8 @@ msgstr "--intent-to-add"
#: en/git-add.txt:150
msgid ""
"Record only the fact that the path will be added later. An entry for the "
-"path is placed in the index with no content. This is useful for, among other "
-"things, showing the unstaged content of such files with `git diff` and "
+"path is placed in the index with no content. This is useful for, among other"
+" things, showing the unstaged content of such files with `git diff` and "
"committing them with `git commit -a`."
msgstr ""
"N'enregistrer que le fait que le chemin sera ajout챕 plus tard. Une entr챕e "
@@ -13430,8 +13294,8 @@ msgid ""
"Don't add the file(s), but only refresh their stat() information in the "
"index."
msgstr ""
-"Ne pas ajouter le ou les fichiers mais rafra챤chir seulement leur information "
-"de stat() dans l'index."
+"Ne pas ajouter le ou les fichiers mais rafra챤chir seulement leur information"
+" de stat() dans l'index."
#. type: Labeled list
#: en/git-add.txt:155
@@ -13443,15 +13307,15 @@ msgstr "--ignore-errors"
#: en/git-add.txt:161
msgid ""
"If some files could not be added because of errors indexing them, do not "
-"abort the operation, but continue adding the others. The command shall still "
-"exit with non-zero status. The configuration variable `add.ignoreErrors` "
+"abort the operation, but continue adding the others. The command shall still"
+" exit with non-zero status. The configuration variable `add.ignoreErrors` "
"can be set to true to make this the default behaviour."
msgstr ""
"Si des fichiers n'ont pas pu 챗tre ajout챕s 횪 cause d'erreurs lors de leur "
"indexation, ne pas annuler l'op챕ration mais continuer l'ajout des autres "
"fichiers. La commande se terminera tout de m챗me avec un code d'erreur non "
-"nul. Le param챔tre de configuration `add.ignoreErrors` peut 챗tre positionn챕 횪 "
-"true pour que ce comportement soit celui par d챕faut."
+"nul. Le param챔tre de configuration `add.ignoreErrors` peut 챗tre positionn챕 횪"
+" true pour que ce comportement soit celui par d챕faut."
#. type: Labeled list
#: en/git-add.txt:162 en/git-notes.txt:169 en/git-update-index.txt:70
@@ -13467,8 +13331,8 @@ msgid ""
"the user can check if any of the given files would be ignored, no matter if "
"they are already present in the work tree or not."
msgstr ""
-"Cette option ne peut 챗tre utilis챕e que coupl챕e avec --dry-run. L'utilisation "
-"de cette option permet 횪 l'utilisateur de v챕rifier si un des fichiers "
+"Cette option ne peut 챗tre utilis챕e que coupl챕e avec --dry-run. L'utilisation"
+" de cette option permet 횪 l'utilisateur de v챕rifier si un des fichiers "
"indiqu챕s serait ignor챕, qu'il soit pr챕sent ou non dans la copie de travail."
#. type: Labeled list
@@ -13513,20 +13377,19 @@ msgstr ""
msgid "Configuration"
msgstr "Configuration"
-#
#. type: Plain text
#: en/git-add.txt:186
msgid ""
"The optional configuration variable `core.excludesFile` indicates a path to "
-"a file containing patterns of file names to exclude from git-add, similar to "
-"$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to "
-"those in info/exclude. See linkgit:gitignore[5]."
+"a file containing patterns of file names to exclude from git-add, similar to"
+" $GIT_DIR/info/exclude. Patterns in the exclude file are used in addition "
+"to those in info/exclude. See linkgit:gitignore[5]."
msgstr ""
"Le param챔tre de configuration optionnel `core.excludesFile` indique un "
"chemin vers un fichier contenant les patrons des noms de fichier 횪 exclure "
"de git-add, similaire 횪 $GIT_DIR/info/exclude. Les patrons dans le fichier "
-"d'exclusion sont additionn챕s 횪 ceux de info/exclude. R챕f챕rez-vous 횪 linkgit:"
-"gitignore[5]."
+"d'exclusion sont additionn챕s 횪 ceux de info/exclude. R챕f챕rez-vous 횪 "
+"linkgit:gitignore[5]."
#. type: Title -
#: en/git-add.txt:189 en/git-archive.txt:149 en/git-bisect.txt:370
@@ -13538,17 +13401,16 @@ msgstr ""
#: en/git-daemon.txt:235 en/git-describe.txt:110 en/git-diff.txt:109
#: en/git-fast-export.txt:125 en/git-fetch.txt:155 en/git-for-each-ref.txt:237
#: en/git-format-patch.txt:591 en/git-http-backend.txt:67 en/git-init.txt:141
-#: en/git-interpret-trailers.txt:205 en/git-log.txt:108 en/git-ls-remote.txt:75
-#: en/git-merge-file.txt:81 en/git-merge.txt:310 en/git-notes.txt:278
-#: en/git-pull.txt:206 en/git-remote-fd.txt:37 en/git-reset.txt:102
-#: en/git-revert.txt:109 en/git-rev-parse.txt:427 en/git-rm.txt:159
-#: en/git-show.txt:58 en/git-stash.txt:201 en/git-stripspace.txt:49
-#: en/git-worktree.txt:224
+#: en/git-interpret-trailers.txt:205 en/git-log.txt:108
+#: en/git-ls-remote.txt:75 en/git-merge-file.txt:81 en/git-merge.txt:310
+#: en/git-notes.txt:278 en/git-pull.txt:206 en/git-remote-fd.txt:37
+#: en/git-reset.txt:102 en/git-revert.txt:109 en/git-rev-parse.txt:427
+#: en/git-rm.txt:159 en/git-show.txt:58 en/git-stash.txt:201
+#: en/git-stripspace.txt:49 en/git-worktree.txt:224
#, no-wrap
msgid "EXAMPLES"
msgstr "EXEMPLES"
-#
#. type: Plain text
#: en/git-add.txt:193
msgid ""
@@ -13564,7 +13426,6 @@ msgstr ""
msgid "$ git add Documentation/\\*.txt\n"
msgstr "$ git add Documentation/\\*.txt\n"
-#
#. type: Plain text
#: en/git-add.txt:201
msgid ""
@@ -13576,7 +13437,6 @@ msgstr ""
"permet d'inclure les fichiers dans les sous-r챕pertoires du R챕pertoire "
"`Documentation/`."
-#
#. type: Plain text
#: en/git-add.txt:203
msgid "Considers adding content from all git-*.sh scripts:"
@@ -13588,7 +13448,6 @@ msgstr "Ajouter le contenu de tous les scripts git-*.sh혻:"
msgid "$ git add git-*.sh\n"
msgstr "$ git add git-*.sh\n"
-#
#. type: Plain text
#: en/git-add.txt:211
msgid ""
@@ -13605,7 +13464,6 @@ msgstr ""
msgid "Interactive mode"
msgstr "Mode interactif"
-#
#. type: Plain text
#: en/git-add.txt:217
msgid ""
@@ -13615,13 +13473,12 @@ msgstr ""
"Quand la commande entre en mode interactif, elle affiche le r챕sultat de la "
"sous-commande 'status', puis entre en boucle de commande interactive."
-#
#. type: Plain text
#: en/git-add.txt:222 en/git-clean.txt:84
msgid ""
-"The command loop shows the list of subcommands available, and gives a prompt "
-"\"What now> \". In general, when the prompt ends with a single '>', you can "
-"pick only one of the choices given and type return, like this:"
+"The command loop shows the list of subcommands available, and gives a prompt"
+" \"What now> \". In general, when the prompt ends with a single '>', you "
+"can pick only one of the choices given and type return, like this:"
msgstr ""
"La boucle de commande affiche la liste des sous-commandes disponibles et "
"affiche le prompt 짬혻What now>혻쨩 (Que faire maintenant). En g챕n챕ral, lorsque "
@@ -13642,7 +13499,6 @@ msgstr ""
" 5: patch 6: diff 7: quit 8: help\n"
" What now> 1\n"
-#
#. type: Plain text
#: en/git-add.txt:232
msgid ""
@@ -13652,13 +13508,12 @@ msgstr ""
"Vous pouvez indiquer `s` ou `sta` ou `status` dans le cas ci-dessus, 횪 "
"condition que le choix soit univoque."
-#
#. type: Plain text
#: en/git-add.txt:234
msgid "The main command loop has 6 subcommands (plus help and quit)."
msgstr ""
-"La boucle de commande principale propose 6 sous-commandes (plus help (aide) "
-"et quit (quitter))."
+"La boucle de commande principale propose 6 sous-commandes (plus help (aide)"
+" et quit (quitter))."
#. type: Labeled list
#: en/git-add.txt:235
@@ -13666,20 +13521,19 @@ msgstr ""
msgid "status"
msgstr "status"
-#
#. type: Plain text
#: en/git-add.txt:242
msgid ""
-"This shows the change between HEAD and index (i.e. what will be committed if "
-"you say `git commit`), and between index and working tree files (i.e. what "
-"you could stage further before `git commit` using `git add`) for each path. "
-"A sample output looks like this:"
+"This shows the change between HEAD and index (i.e. what will be committed if"
+" you say `git commit`), and between index and working tree files (i.e. what "
+"you could stage further before `git commit` using `git add`) for each path."
+" A sample output looks like this:"
msgstr ""
"Affiche les modifications entre HEAD et l'index (c-횪-d ce qui serait valid챕 "
"si vous lanciez `git commit`), et entre l'index et les fichiers de la copie "
"de travail (c-횪-d ce que vous pourriez indexer au moyen de `git add` avant "
-"de lancer `git commit`) pour chaque chemin. Un exemple d'affichage ressemble "
-"횪 ceci :"
+"de lancer `git commit`) pour chaque chemin. Un exemple d'affichage ressemble"
+" 횪 ceci :"
#. type: delimited block -
#: en/git-add.txt:247
@@ -13693,7 +13547,6 @@ msgstr ""
" 1: binary nothing foo.png\n"
" 2: +403/-35 +1/-1 git-add--interactive.perl\n"
-#
#. type: Plain text
#: en/git-add.txt:258
msgid ""
@@ -13702,15 +13555,15 @@ msgid ""
"the working tree version (if the working tree version were also different, "
"'binary' would have been shown in place of 'nothing'). The other file, git-"
"add{litdd}interactive.perl, has 403 lines added and 35 lines deleted if you "
-"commit what is in the index, but working tree file has further modifications "
-"(one addition and one deletion)."
+"commit what is in the index, but working tree file has further modifications"
+" (one addition and one deletion)."
msgstr ""
"foo.png contient des diff챕rences avec HEAD (mais c'est un format binaire "
"donc le nombre de lignes ne peut pas 챗tre affich챕) et il n'y a pas "
"diff챕rence entre la copie index챕e et la copie de travail (si la copie de "
"travail avait 챕t챕 aussi diff챕rente, 'binary' aurait 챕t챕 affich챕 횪 la place "
-"de 'nothing'). L'autre fichier, git-add{litdd}interactive.perl, a 430 lignes "
-"ajout챕es et 35 effac챕es si vous validez ce qui est dans l'index, mais la "
+"de 'nothing'). L'autre fichier, git-add{litdd}interactive.perl, a 430 lignes"
+" ajout챕es et 35 effac챕es si vous validez ce qui est dans l'index, mais la "
"copie de travail contient d'autres modifications (un ajout et un retrait)."
#. type: Labeled list
@@ -13719,26 +13572,24 @@ msgstr ""
msgid "update"
msgstr "update"
-#
#. type: Plain text
#: en/git-add.txt:268
msgid ""
"This shows the status information and issues an \"Update>>\" prompt. When "
"the prompt ends with double '>>', you can make more than one selection, "
-"concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 "
-"7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range "
-"is omitted, all remaining patches are taken. E.g. \"7-\" to choose 7,8,9 "
+"concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5"
+" 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range"
+" is omitted, all remaining patches are taken. E.g. \"7-\" to choose 7,8,9 "
"from the list. You can say '*' to choose everything."
msgstr ""
"Affiche l'information d'챕tat et un prompt \"Update>>\". Quand le prompt se "
"termine par un double '>', vous pouvez s챕lectionner plus d'une option, "
-"concat챕n챕es avec des espaces ou des virgules. Vous pouvez aussi indiquer des "
-"intervalles. Par exemple \"2-5 7,9\" pour choisir 2, 3, 4, 5, 7 et 9 dans "
+"concat챕n챕es avec des espaces ou des virgules. Vous pouvez aussi indiquer des"
+" intervalles. Par exemple \"2-5 7,9\" pour choisir 2, 3, 4, 5, 7 et 9 dans "
"la liste. Si le second nombre d'un intervalle est absent, tous les patchs "
"restants sont s챕lectionn챕s. Par ex. \"7-\" choisit 7, 8 et 9 dans la liste. "
"'*' permet de tout s챕lectionner."
-#
#. type: Plain text
#: en/git-add.txt:271
msgid "What you chose are then highlighted with '*', like this:"
@@ -13756,7 +13607,6 @@ msgstr ""
" 1: binary nothing foo.png\n"
"* 2: +403/-35 +1/-1 git-add--interactive.perl\n"
-#
#. type: Plain text
#: en/git-add.txt:280
msgid "To remove selection, prefix the input with `-` like this:"
@@ -13768,13 +13618,14 @@ msgstr "Pour retirer une s챕lection, pr챕fixez-la avec `-` comme ceci혻:"
msgid "Update>> -2\n"
msgstr "Update>> -2\n"
-#
#. type: Plain text
#: en/git-add.txt:287
msgid ""
"After making the selection, answer with an empty line to stage the contents "
"of working tree files for selected paths in the index."
-msgstr "Apr챔s s챕lection, r챕pondez avec une ligne vide pour indexer le contenu des fichiers s챕lectionn챕s de l'arbre de travail."
+msgstr ""
+"Apr챔s s챕lection, r챕pondez avec une ligne vide pour indexer le contenu des "
+"fichiers s챕lectionn챕s de l'arbre de travail."
#. type: Labeled list
#: en/git-add.txt:288
@@ -13782,7 +13633,6 @@ msgstr "Apr챔s s챕lection, r챕pondez avec une ligne vide pour indexer le contenu
msgid "revert"
msgstr "revert"
-#
#. type: Plain text
#: en/git-add.txt:293
msgid ""
@@ -13800,7 +13650,6 @@ msgstr ""
msgid "add untracked"
msgstr "add untracked"
-#
#. type: Plain text
#: en/git-add.txt:298
msgid ""
@@ -13816,7 +13665,6 @@ msgstr ""
msgid "patch"
msgstr "patch"
-#
#. type: Plain text
#: en/git-add.txt:306
msgid ""
@@ -13831,7 +13679,6 @@ msgstr ""
"chaque section de modification. Vous pouvez s챕lectionner une des options "
"suivantes et taper entr챕e혻:"
-#
#. type: Plain text
#: en/git-add.txt:321
#, no-wrap
@@ -13866,17 +13713,15 @@ msgstr ""
"e - manually edit the current hunk\n"
"? - print help\n"
-#
#. type: Plain text
#: en/git-add.txt:324
msgid ""
-"After deciding the fate for all hunks, if there is any hunk that was chosen, "
-"the index is updated with the selected hunks."
+"After deciding the fate for all hunks, if there is any hunk that was chosen,"
+" the index is updated with the selected hunks."
msgstr ""
-"Apr챔s avoir d챕cid챕 du devenir de chaque section, l'index est mis 횪 jour avec "
-"les sections s챕lectionn챕es."
+"Apr챔s avoir d챕cid챕 du devenir de chaque section, l'index est mis 횪 jour avec"
+" les sections s챕lectionn챕es."
-#
#. type: Plain text
#: en/git-add.txt:327
msgid ""
@@ -13892,7 +13737,6 @@ msgstr ""
msgid "diff"
msgstr "diff"
-#
#. type: Plain text
#: en/git-add.txt:332
msgid ""
@@ -13907,7 +13751,6 @@ msgstr ""
msgid "EDITING PATCHES"
msgstr "횋DITER LES PATCHES"
-#
#. type: Plain text
#: en/git-add.txt:345
msgid ""
@@ -13936,7 +13779,6 @@ msgstr ""
msgid "added content"
msgstr "contenu ajout챕"
-#
#. type: Plain text
#: en/git-add.txt:351
msgid ""
@@ -13953,16 +13795,15 @@ msgstr ""
msgid "removed content"
msgstr "contenu supprim챕"
-#
#. type: Plain text
#: en/git-add.txt:356
msgid ""
"Removed content is represented by lines beginning with \"-\". You can "
"prevent staging their removal by converting the \"-\" to a \" \" (space)."
msgstr ""
-"Le contenu supprim챕 est repr챕sent챕 par des lignes commen챌ant par \"-\". Vous "
-"pouvez emp챗cher l'indexation de ces suppression en convertissant le \"-\" en "
-"\" \" (espace)."
+"Le contenu supprim챕 est repr챕sent챕 par des lignes commen챌ant par \"-\". Vous"
+" pouvez emp챗cher l'indexation de ces suppression en convertissant le \"-\" "
+"en \" \" (espace)."
#. type: Labeled list
#: en/git-add.txt:357
@@ -13970,7 +13811,6 @@ msgstr ""
msgid "modified content"
msgstr "contenu modifi챕"
-#
#. type: Plain text
#: en/git-add.txt:364
msgid ""
@@ -13987,25 +13827,23 @@ msgstr ""
"vous혻: ne modifier que la moiti챕 de la paire de lignes a de fortes chances "
"de cr챕er des modifications inattendues dans l'index."
-#
#. type: Plain text
#: en/git-add.txt:372
msgid ""
"There are also more complex operations that can be performed. But beware "
"that because the patch is applied only to the index and not the working "
-"tree, the working tree will appear to \"undo\" the change in the index. For "
-"example, introducing a new line into the index that is in neither the HEAD "
+"tree, the working tree will appear to \"undo\" the change in the index. For"
+" example, introducing a new line into the index that is in neither the HEAD "
"nor the working tree will stage the new line for commit, but the line will "
"appear to be reverted in the working tree."
msgstr ""
"Il existe aussi des op챕rations plus complexes. M챕fiez-vous혻: quand le patch "
"n'est appliqu챕 que dans l'index et pas dans l'arbre de travail, l'arbre de "
"travail semblera 짬혻d챕faire혻쨩 les modifications de l'index. Par exemple, "
-"l'introduction dans l'index d'une nouvelle ligne qui n'apparait ni dans HEAD "
-"ni dans l'arbre de travail indexera la nouvelle ligne pour validation, mais "
-"cette ligne semblera 챗tre supprim챕e dans l'arbre de travail."
+"l'introduction dans l'index d'une nouvelle ligne qui n'apparait ni dans HEAD"
+" ni dans l'arbre de travail indexera la nouvelle ligne pour validation, mais"
+" cette ligne semblera 챗tre supprim챕e dans l'arbre de travail."
-#
#. type: Plain text
#: en/git-add.txt:374
msgid "Avoid using these constructs, or do so with extreme caution."
@@ -14019,7 +13857,6 @@ msgstr ""
msgid "removing untouched content"
msgstr "suppression de contenu intact"
-#
#. type: Plain text
#: en/git-add.txt:382
msgid ""
@@ -14030,8 +13867,9 @@ msgid ""
msgstr ""
"Le contenu qui ne diff챔re pas entre l'index et l'arbre de travail peut 챗tre "
"visible dans des lignes de contexte commen챌ant par un \" \" (espace). Vous "
-"pouvez indexer l'챕limination de lignes de contexte en convertissant l'espace "
-"en \"-\". Le fichier dans l'arbre de travail semblera r챕-ajouter le contenu."
+"pouvez indexer l'챕limination de lignes de contexte en convertissant l'espace"
+" en \"-\". Le fichier dans l'arbre de travail semblera r챕-ajouter le "
+"contenu."
#. type: Labeled list
#: en/git-add.txt:383
@@ -14039,12 +13877,11 @@ msgstr ""
msgid "modifying existing content"
msgstr "modification de contenu existant"
-#
#. type: Plain text
#: en/git-add.txt:390
msgid ""
-"One can also modify context lines by staging them for removal (by converting "
-"\" \" to \"-\") and adding a \"{plus}\" line with the new content. "
+"One can also modify context lines by staging them for removal (by converting"
+" \" \" to \"-\") and adding a \"{plus}\" line with the new content. "
"Similarly, one can modify \"{plus}\" lines for existing additions or "
"modifications. In all cases, the new modification will appear reverted in "
"the working tree."
@@ -14062,7 +13899,6 @@ msgstr ""
msgid "new content"
msgstr "contenu nouveau"
-#
#. type: Plain text
#: en/git-add.txt:396
msgid ""
@@ -14074,7 +13910,6 @@ msgstr ""
"patch혻; ajoutez simplement des nouvelles lignes, chacune commen챌ant par "
"\"{plus}\". L'ajout semblera annul챕 dans l'arbre de travail."
-#
#. type: Plain text
#: en/git-add.txt:400
msgid ""
@@ -14084,19 +13919,16 @@ msgstr ""
"Il existe aussi quelques op챕rations 횪 챕viter compl챔tement car celles-ci "
"rendent le patch inapplicable혻:"
-#
#. type: Plain text
#: en/git-add.txt:402
msgid "adding context (\" \") or removal (\"-\") lines"
msgstr "ajout de context (\" \") ou lignes de suppression (\"-\")"
-#
#. type: Plain text
#: en/git-add.txt:403
msgid "deleting context or removal lines"
msgstr "suppression de contexte ou de lignes supprim챕es"
-#
#. type: Plain text
#: en/git-add.txt:404
msgid "modifying the contents of context or removal lines"
@@ -14106,13 +13938,13 @@ msgstr "modification de contenu de contexte ou de lignes supprim챕es"
#: en/git-add.txt:406 en/git-am.txt:227 en/git-annotate.txt:29
#: en/git-apply.txt:270 en/git-archive.txt:192 en/git-bisect.txt:494
#: en/git-blame.txt:232 en/git-branch.txt:313 en/git-check-attr.txt:115
-#: en/git-check-ignore.txt:113 en/git-cherry-pick.txt:228 en/git-cherry.txt:140
-#: en/git-clean.txt:136 en/git-commit-tree.txt:113 en/git-commit.txt:480
-#: en/git-difftool.txt:135 en/git-diff.txt:179 en/git-fast-export.txt:213
-#: en/git-fast-import.txt:1470 en/git-fetch-pack.txt:127 en/git-fetch.txt:207
-#: en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:339
-#: en/git-format-patch.txt:636 en/git-gc.txt:178 en/git-gui.txt:103
-#: en/git-imap-send.txt:178 en/git-instaweb.txt:88
+#: en/git-check-ignore.txt:113 en/git-cherry-pick.txt:228
+#: en/git-cherry.txt:140 en/git-clean.txt:136 en/git-commit-tree.txt:113
+#: en/git-commit.txt:480 en/git-difftool.txt:135 en/git-diff.txt:179
+#: en/git-fast-export.txt:213 en/git-fast-import.txt:1470
+#: en/git-fetch-pack.txt:127 en/git-fetch.txt:207 en/git-fmt-merge-msg.txt:73
+#: en/git-for-each-ref.txt:339 en/git-format-patch.txt:636 en/git-gc.txt:178
+#: en/git-gui.txt:103 en/git-imap-send.txt:178 en/git-instaweb.txt:88
#: en/git-interpret-trailers.txt:334 en/git-ls-files.txt:237
#: en/git-merge.txt:353 en/git-pack-objects.txt:235
#: en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:78
@@ -14128,7 +13960,6 @@ msgstr "modification de contenu de contexte ou de lignes supprim챕es"
msgid "SEE ALSO"
msgstr "VOIR AUSSI"
-#
#. type: Plain text
#: en/git-add.txt:413
msgid ""
@@ -14160,43 +13991,45 @@ msgstr ""
#: en/git-format-patch.txt:640 en/git-fsck-objects.txt:21 en/git-fsck.txt:158
#: en/git-gc.txt:185 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:313
#: en/git-gui.txt:126 en/git-hash-object.txt:64 en/git-help.txt:190
-#: en/git-http-backend.txt:276 en/git-http-fetch.txt:51 en/git-http-push.txt:96
-#: en/git-imap-send.txt:182 en/git-index-pack.txt:104 en/git-init-db.txt:22
-#: en/git-init.txt:157 en/git-instaweb.txt:92 en/git-interpret-trailers.txt:338
-#: en/git-log.txt:223 en/git-ls-files.txt:241 en/git-ls-remote.txt:94
-#: en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56
-#: en/git-merge-base.txt:182 en/git-merge-file.txt:94 en/git-merge-index.txt:78
+#: en/git-http-backend.txt:276 en/git-http-fetch.txt:51
+#: en/git-http-push.txt:96 en/git-imap-send.txt:182 en/git-index-pack.txt:104
+#: en/git-init-db.txt:22 en/git-init.txt:157 en/git-instaweb.txt:92
+#: en/git-interpret-trailers.txt:338 en/git-log.txt:223
+#: en/git-ls-files.txt:241 en/git-ls-remote.txt:94 en/git-ls-tree.txt:103
+#: en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:182
+#: en/git-merge-file.txt:94 en/git-merge-index.txt:78
#: en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:46
#: en/git-mergetool.txt:100 en/git-merge-tree.txt:28 en/git-merge.txt:362
#: en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68
#: en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:241
#: en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72
-#: en/git-parse-remote.txt:22 en/git-patch-id.txt:63 en/git-prune-packed.txt:46
-#: en/git-prune.txt:85 en/git-pull.txt:256 en/git-push.txt:566
-#: en/git-quiltimport.txt:60 en/git-read-tree.txt:430 en/git-rebase.txt:801
-#: en/git-receive-pack.txt:222 en/git-reflog.txt:132 en/git-remote-ext.txt:124
-#: en/git-remote-fd.txt:58 en/git-remote-testgit.txt:29 en/git-remote.txt:251
-#: en/git-repack.txt:165 en/git-replace.txt:155 en/git-request-pull.txt:78
-#: en/git-rerere.txt:215 en/git-reset.txt:453 en/git-revert.txt:128
-#: en/git-rev-list.txt:120 en/git-rev-parse.txt:452 en/git-rm.txt:187
-#: en/git-send-email.txt:481 en/git-send-pack.txt:149 en/git-shell.txt:89
-#: en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89
-#: en/git-show-branch.txt:203 en/git-show-index.txt:26 en/git-show-ref.txt:185
-#: en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22
-#: en/git-stash.txt:294 en/git-status.txt:358 en/git-stripspace.txt:93
-#: en/git-submodule.txt:437 en/git-svn.txt:1135 en/git-symbolic-ref.txt:68
-#: en/git-tag.txt:350 en/git.txt:1295 en/git-unpack-file.txt:27
-#: en/git-unpack-objects.txt:51 en/git-update-index.txt:485
-#: en/git-update-ref.txt:151 en/git-update-server-info.txt:43
-#: en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69
-#: en/git-verify-commit.txt:31 en/git-verify-pack.txt:52
-#: en/git-verify-tag.txt:31 en/git-web--browse.txt:123
-#: en/git-whatchanged.txt:42 en/git-worktree.txt:258 en/git-write-tree.txt:41
+#: en/git-parse-remote.txt:22 en/git-patch-id.txt:63
+#: en/git-prune-packed.txt:46 en/git-prune.txt:85 en/git-pull.txt:256
+#: en/git-push.txt:566 en/git-quiltimport.txt:60 en/git-read-tree.txt:430
+#: en/git-rebase.txt:801 en/git-receive-pack.txt:222 en/git-reflog.txt:132
+#: en/git-remote-ext.txt:124 en/git-remote-fd.txt:58
+#: en/git-remote-testgit.txt:29 en/git-remote.txt:251 en/git-repack.txt:165
+#: en/git-replace.txt:155 en/git-request-pull.txt:78 en/git-rerere.txt:215
+#: en/git-reset.txt:453 en/git-revert.txt:128 en/git-rev-list.txt:120
+#: en/git-rev-parse.txt:452 en/git-rm.txt:187 en/git-send-email.txt:481
+#: en/git-send-pack.txt:149 en/git-shell.txt:89
+#: en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42
+#: en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:26
+#: en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94
+#: en/git-stage.txt:22 en/git-stash.txt:294 en/git-status.txt:358
+#: en/git-stripspace.txt:93 en/git-submodule.txt:437 en/git-svn.txt:1135
+#: en/git-symbolic-ref.txt:68 en/git-tag.txt:350 en/git.txt:1295
+#: en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51
+#: en/git-update-index.txt:485 en/git-update-ref.txt:151
+#: en/git-update-server-info.txt:43 en/git-upload-archive.txt:61
+#: en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31
+#: en/git-verify-pack.txt:52 en/git-verify-tag.txt:31
+#: en/git-web--browse.txt:123 en/git-whatchanged.txt:42
+#: en/git-worktree.txt:258 en/git-write-tree.txt:41
#, no-wrap
msgid "GIT"
msgstr "GIT"
-#
#. type: Plain text
#: en/git-add.txt:416 en/git-am.txt:232 en/git-annotate.txt:34
#: en/git-apply.txt:275 en/git-archimport.txt:112 en/git-archive.txt:197
@@ -14219,38 +14052,41 @@ msgstr "GIT"
#: en/git-format-patch.txt:641 en/git-fsck-objects.txt:22 en/git-fsck.txt:159
#: en/git-gc.txt:186 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:314
#: en/git-gui.txt:127 en/git-hash-object.txt:65 en/git-help.txt:191
-#: en/git-http-backend.txt:277 en/git-http-fetch.txt:52 en/git-http-push.txt:97
-#: en/git-imap-send.txt:183 en/git-index-pack.txt:105 en/git-init-db.txt:23
-#: en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:339
-#: en/git-log.txt:224 en/git-ls-files.txt:242 en/git-ls-remote.txt:95
-#: en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57
-#: en/git-merge-base.txt:183 en/git-merge-file.txt:95 en/git-merge-index.txt:79
+#: en/git-http-backend.txt:277 en/git-http-fetch.txt:52
+#: en/git-http-push.txt:97 en/git-imap-send.txt:183 en/git-index-pack.txt:105
+#: en/git-init-db.txt:23 en/git-init.txt:158 en/git-instaweb.txt:93
+#: en/git-interpret-trailers.txt:339 en/git-log.txt:224
+#: en/git-ls-files.txt:242 en/git-ls-remote.txt:95 en/git-ls-tree.txt:104
+#: en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:183
+#: en/git-merge-file.txt:95 en/git-merge-index.txt:79
#: en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:47
#: en/git-mergetool.txt:101 en/git-merge-tree.txt:29 en/git-merge.txt:363
#: en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69
#: en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:242
#: en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73
-#: en/git-parse-remote.txt:23 en/git-patch-id.txt:64 en/git-prune-packed.txt:47
-#: en/git-prune.txt:86 en/git-pull.txt:257 en/git-push.txt:567
-#: en/git-quiltimport.txt:61 en/git-read-tree.txt:431 en/git-rebase.txt:802
-#: en/git-receive-pack.txt:223 en/git-reflog.txt:133 en/git-remote-ext.txt:125
-#: en/git-remote-fd.txt:59 en/git-remote-testgit.txt:30 en/git-remote.txt:252
-#: en/git-repack.txt:166 en/git-replace.txt:156 en/git-request-pull.txt:79
-#: en/git-rerere.txt:216 en/git-reset.txt:454 en/git-revert.txt:129
-#: en/git-rev-list.txt:121 en/git-rev-parse.txt:453 en/git-rm.txt:188
-#: en/git-send-email.txt:482 en/git-send-pack.txt:150 en/git-shell.txt:90
-#: en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90
-#: en/git-show-branch.txt:204 en/git-show-index.txt:27 en/git-show-ref.txt:186
-#: en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23
-#: en/git-stash.txt:295 en/git-status.txt:359 en/git-stripspace.txt:94
-#: en/git-submodule.txt:438 en/git-svn.txt:1136 en/git-symbolic-ref.txt:69
-#: en/git-tag.txt:351 en/git.txt:1296 en/git-unpack-file.txt:28
-#: en/git-unpack-objects.txt:52 en/git-update-index.txt:486
-#: en/git-update-ref.txt:152 en/git-update-server-info.txt:44
-#: en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70
-#: en/git-verify-commit.txt:32 en/git-verify-pack.txt:53
-#: en/git-verify-tag.txt:32 en/git-web--browse.txt:124
-#: en/git-whatchanged.txt:43 en/git-worktree.txt:259 en/git-write-tree.txt:42
+#: en/git-parse-remote.txt:23 en/git-patch-id.txt:64
+#: en/git-prune-packed.txt:47 en/git-prune.txt:86 en/git-pull.txt:257
+#: en/git-push.txt:567 en/git-quiltimport.txt:61 en/git-read-tree.txt:431
+#: en/git-rebase.txt:802 en/git-receive-pack.txt:223 en/git-reflog.txt:133
+#: en/git-remote-ext.txt:125 en/git-remote-fd.txt:59
+#: en/git-remote-testgit.txt:30 en/git-remote.txt:252 en/git-repack.txt:166
+#: en/git-replace.txt:156 en/git-request-pull.txt:79 en/git-rerere.txt:216
+#: en/git-reset.txt:454 en/git-revert.txt:129 en/git-rev-list.txt:121
+#: en/git-rev-parse.txt:453 en/git-rm.txt:188 en/git-send-email.txt:482
+#: en/git-send-pack.txt:150 en/git-shell.txt:90
+#: en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43
+#: en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:27
+#: en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95
+#: en/git-stage.txt:23 en/git-stash.txt:295 en/git-status.txt:359
+#: en/git-stripspace.txt:94 en/git-submodule.txt:438 en/git-svn.txt:1136
+#: en/git-symbolic-ref.txt:69 en/git-tag.txt:351 en/git.txt:1296
+#: en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52
+#: en/git-update-index.txt:486 en/git-update-ref.txt:152
+#: en/git-update-server-info.txt:44 en/git-upload-archive.txt:62
+#: en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32
+#: en/git-verify-pack.txt:53 en/git-verify-tag.txt:32
+#: en/git-web--browse.txt:124 en/git-whatchanged.txt:43
+#: en/git-worktree.txt:259 en/git-write-tree.txt:42
msgid "Part of the linkgit:git[1] suite"
msgstr "Fait partie de la suite linkgit:git[1]"
@@ -14309,8 +14145,8 @@ msgid ""
"argument, the command reads from the standard input. If you supply "
"directories, they will be treated as Maildirs."
msgstr ""
-"La liste de fichiers de bo챤te aux lettres desquelles on lit les rustines. Si "
-"vous ne fournissez pas cet argument, la commande lit depuis l'entr챕e "
+"La liste de fichiers de bo챤te aux lettres desquelles on lit les rustines. Si"
+" vous ne fournissez pas cet argument, la commande lit depuis l'entr챕e "
"standard. Si vous fournissez des r챕pertoires, ils sont lus comme des "
"Maildirs."
@@ -14358,13 +14194,13 @@ msgstr "--[no-]keep-cr"
#: en/git-am.txt:52
msgid ""
"With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) with "
-"the same option, to prevent it from stripping CR at the end of lines. `am."
-"keepcr` configuration variable can be used to specify the default "
+"the same option, to prevent it from stripping CR at the end of lines. "
+"`am.keepcr` configuration variable can be used to specify the default "
"behaviour. `--no-keep-cr` is useful to override `am.keepcr`."
msgstr ""
"Avec `--keep-cr`, appeler 'git mailsplit' (voir linkgit:git-mailsplit[1]) "
-"avec la m챗me option, pour l'emp챗cher de supprimer les CR en fin de ligne. La "
-"variable de configuration `am.keepcr` peut 챗tre utilis챕e pour sp챕cifier le "
+"avec la m챗me option, pour l'emp챗cher de supprimer les CR en fin de ligne. La"
+" variable de configuration `am.keepcr` peut 챗tre utilis챕e pour sp챕cifier le "
"comportement par d챕faut. `--no-keep-cr` permet de surcharger `am.keepcr`."
#. type: Labeled list
@@ -14389,9 +14225,9 @@ msgid ""
"mailinfo[1]). Can be activated by default using the `mailinfo.scissors` "
"configuration variable."
msgstr ""
-"Retirer tout du corps du message avant la ligne de ciseaux (voir linkgit:git-"
-"mailinfo[1]). Peut 챗tre activ챕 par d챕faut en utilisant la variable de "
-"configuration `mailinfo.scissors`."
+"Retirer tout du corps du message avant la ligne de ciseaux (voir "
+"linkgit:git-mailinfo[1]). Peut 챗tre activ챕 par d챕faut en utilisant la "
+"variable de configuration `mailinfo.scissors`."
#. type: Labeled list
#: en/git-am.txt:59 en/git-mailinfo.txt:90
@@ -14441,8 +14277,8 @@ msgid ""
"Do not add the Message-ID header to the commit message. `no-message-id` is "
"useful to override `am.messageid`."
msgstr ""
-"Ne pas ajouter l'ent챗te Message-ID au message de validation. `no-message-id` "
-"est utile pour surcharger `am.messageid`."
+"Ne pas ajouter l'ent챗te Message-ID au message de validation. `no-message-id`"
+" est utile pour surcharger `am.messageid`."
#. type: Plain text
#: en/git-am.txt:76
@@ -14510,17 +14346,18 @@ msgstr "--no-3way"
#. type: Plain text
#: en/git-am.txt:101
msgid ""
-"When the patch does not apply cleanly, fall back on 3-way merge if the patch "
-"records the identity of blobs it is supposed to apply to and we have those "
+"When the patch does not apply cleanly, fall back on 3-way merge if the patch"
+" records the identity of blobs it is supposed to apply to and we have those "
"blobs available locally. `--no-3way` can be used to override am.threeWay "
-"configuration variable. For more information, see am.threeWay in linkgit:git-"
-"config[1]."
+"configuration variable. For more information, see am.threeWay in "
+"linkgit:git-config[1]."
msgstr ""
"Quand la rustine ne s'applique pas correctement, revenir 횪 une fusion 횪 3 "
"points si la rustine contient l'identit챕 des blobs auxquels elle est "
-"suppos챕e s'appliquer et que ces blobs sont disponibles localement. `--"
-"no-3way` permet de surcharger la variable de configuration am.threeWay. Pour "
-"plus d'information, r챕f챕rez-vous 횪 am.threeWay dans linkgit:git-config[1]."
+"suppos챕e s'appliquer et que ces blobs sont disponibles localement. "
+"`--no-3way` permet de surcharger la variable de configuration am.threeWay. "
+"Pour plus d'information, r챕f챕rez-vous 횪 am.threeWay dans linkgit:git-"
+"config[1]."
#. type: Labeled list
#: en/git-am.txt:103 en/git-apply.txt:173 en/git-rebase.txt:361
@@ -14608,8 +14445,8 @@ msgstr "--committer-date-is-author-date"
msgid ""
"By default the command records the date from the e-mail message as the "
"commit author date, and uses the time of commit creation as the committer "
-"date. This allows the user to lie about the committer date by using the same "
-"value as the author date."
+"date. This allows the user to lie about the committer date by using the same"
+" value as the author date."
msgstr ""
#. type: Labeled list
@@ -14673,7 +14510,7 @@ msgstr ""
#: en/sequencer.txt:1
#, no-wrap
msgid "--continue"
-msgstr ""
+msgstr "--continue"
#. type: Labeled list
#: en/git-am.txt:151 en/git-branch.txt:136 en/git-cherry-pick.txt:74
@@ -14682,19 +14519,19 @@ msgstr ""
#: en/rev-list-options.txt:887
#, no-wrap
msgid "-r"
-msgstr ""
+msgstr "-r"
#. type: Labeled list
#: en/git-am.txt:152
#, no-wrap
msgid "--resolved"
-msgstr ""
+msgstr "--resolved"
#. type: Plain text
#: en/git-am.txt:159
msgid ""
-"After a patch failure (e.g. attempting to apply conflicting patch), the user "
-"has applied it by hand and the index file stores the result of the "
+"After a patch failure (e.g. attempting to apply conflicting patch), the user"
+" has applied it by hand and the index file stores the result of the "
"application. Make a commit using the authorship and commit log extracted "
"from the e-mail message and the current index file, and continue."
msgstr ""
@@ -14709,9 +14546,9 @@ msgstr ""
#: en/git-am.txt:166
msgid ""
"When a patch failure occurs, <msg> will be printed to the screen before "
-"exiting. This overrides the standard message informing you to use `--"
-"continue` or `--skip` to handle the failure. This is solely for internal "
-"use between 'git rebase' and 'git am'."
+"exiting. This overrides the standard message informing you to use "
+"`--continue` or `--skip` to handle the failure. This is solely for internal"
+" use between 'git rebase' and 'git am'."
msgstr ""
#. type: Labeled list
@@ -14719,7 +14556,7 @@ msgstr ""
#: en/git-rebase.txt:248 en/sequencer.txt:11
#, no-wrap
msgid "--abort"
-msgstr ""
+msgstr "--abort"
#. type: Plain text
#: en/git-am.txt:169
@@ -14739,26 +14576,26 @@ msgstr "DISCUSSION"
#. type: Plain text
#: en/git-am.txt:179
msgid ""
-"The commit author name is taken from the \"From: \" line of the message, and "
-"commit author date is taken from the \"Date: \" line of the message. The "
+"The commit author name is taken from the \"From: \" line of the message, and"
+" commit author date is taken from the \"Date: \" line of the message. The "
"\"Subject: \" line is used as the title of the commit, after stripping "
-"common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to "
-"concisely describe what the commit is about in one line of text."
+"common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to"
+" concisely describe what the commit is about in one line of text."
msgstr ""
#. type: Plain text
#: en/git-am.txt:182
msgid ""
-"\"From: \" and \"Subject: \" lines starting the body override the respective "
-"commit author name and title values taken from the headers."
+"\"From: \" and \"Subject: \" lines starting the body override the respective"
+" commit author name and title values taken from the headers."
msgstr ""
#. type: Plain text
#: en/git-am.txt:187
msgid ""
"The commit message is formed by the title taken from the \"Subject: \", a "
-"blank line and the body of the message up to where the patch begins. Excess "
-"whitespace at the end of each line is automatically stripped."
+"blank line and the body of the message up to where the patch begins. Excess"
+" whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
@@ -14808,8 +14645,8 @@ msgstr ""
#: en/git-am.txt:208
msgid ""
"hand resolve the conflict in the working directory, and update the index "
-"file to bring it into a state that the patch should have produced. Then run "
-"the command with the `--continue` option."
+"file to bring it into a state that the patch should have produced. Then run"
+" the command with the `--continue` option."
msgstr ""
#. type: Plain text
@@ -14825,8 +14662,8 @@ msgstr ""
msgid ""
"Before any patches are applied, ORIG_HEAD is set to the tip of the current "
"branch. This is useful if you have problems with multiple commits, like "
-"running 'git am' on the wrong branch or an error in the commits that is more "
-"easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
+"running 'git am' on the wrong branch or an error in the commits that is more"
+" easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
@@ -14839,15 +14676,15 @@ msgstr "CROCHETS"
#: en/git-am.txt:225
#, fuzzy
#| msgid ""
-#| "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, "
-#| "and `post-commit` hooks. See linkgit:githooks[5] for more information."
+#| "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, and "
+#| "`post-commit` hooks. See linkgit:githooks[5] for more information."
msgid ""
"This command can run `applypatch-msg`, `pre-applypatch`, and `post-"
"applypatch` hooks. See linkgit:githooks[5] for more information."
msgstr ""
"Cette commande peut lancer les crochets `commit-msg`, `prepare-commit-msg`, "
-"`pre-commit` et `post-commit`. Voir linkgit:githooks[5] pour de plus amples "
-"informations."
+"`pre-commit` et `post-commit`. Voir linkgit:githooks[5] pour de plus amples"
+" informations."
#. type: Plain text
#: en/git-am.txt:229
@@ -14874,16 +14711,16 @@ msgstr ""
#. type: Plain text
#: en/git-annotate.txt:17
msgid ""
-"Annotates each line in the given file with information from the commit which "
-"introduced the line. Optionally annotates from a given revision."
+"Annotates each line in the given file with information from the commit which"
+" introduced the line. Optionally annotates from a given revision."
msgstr ""
#. type: Plain text
#: en/git-annotate.txt:22
msgid ""
"The only difference between this command and linkgit:git-blame[1] is that "
-"they use slightly different output formats, and this command exists only for "
-"backward compatibility to support existing scripts, and provide a more "
+"they use slightly different output formats, and this command exists only for"
+" backward compatibility to support existing scripts, and provide a more "
"familiar command name for people coming from other SCM systems."
msgstr ""
@@ -14893,7 +14730,6 @@ msgstr ""
msgid "git-apply(1)"
msgstr "git-apply(1)"
-#
#. type: Plain text
#: en/git-apply.txt:7
#, fuzzy
@@ -14929,9 +14765,9 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:34
msgid ""
-"This command applies the patch but does not create a commit. Use linkgit:"
-"git-am[1] to create commits from patches generated by linkgit:git-format-"
-"patch[1] and/or received by email."
+"This command applies the patch but does not create a commit. Use "
+"linkgit:git-am[1] to create commits from patches generated by linkgit:git-"
+"format-patch[1] and/or received by email."
msgstr ""
#. type: Labeled list
@@ -14944,18 +14780,17 @@ msgstr "patch"
#. type: Plain text
#: en/git-apply.txt:40
msgid ""
-"The files to read the patch from. '-' can be used to read from the standard "
-"input."
+"The files to read the patch from. '-' can be used to read from the standard"
+" input."
msgstr ""
"Prendre le message de validation depuis le fichier indiqu챕. Utilisez '-' "
"pour lire le message depuis l'entr챕e standard."
#. type: Labeled list
#: en/git-apply.txt:41 en/git-rebase.txt:314 en/merge-options.txt:55
-#, fuzzy, no-wrap
-#| msgid "status"
+#, no-wrap
msgid "--stat"
-msgstr "status"
+msgstr "--stat"
#. type: Plain text
#: en/git-apply.txt:44
@@ -14977,30 +14812,31 @@ msgstr ""
#: en/git-apply.txt:57
msgid ""
"Instead of applying the patch, output a condensed summary of information "
-"obtained from git diff extended headers, such as creations, renames and mode "
-"changes. Turns off \"apply\"."
+"obtained from git diff extended headers, such as creations, renames and mode"
+" changes. Turns off \"apply\"."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:62
msgid ""
-"Instead of applying the patch, see if the patch is applicable to the current "
-"working tree and/or the index file and detects errors. Turns off \"apply\"."
+"Instead of applying the patch, see if the patch is applicable to the current"
+" working tree and/or the index file and detects errors. Turns off "
+"\"apply\"."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:63 en/git-checkout-index.txt:26
#, no-wrap
msgid "--index"
-msgstr ""
+msgstr "--index"
#. type: Plain text
#: en/git-apply.txt:71
msgid ""
"When `--check` is in effect, or when applying the patch (which is the "
"default when none of the options that disables it is in effect), make sure "
-"the patch is applicable to what the current index file records. If the file "
-"to be patched in the working tree is not up-to-date, it is flagged as an "
+"the patch is applicable to what the current index file records. If the file"
+" to be patched in the working tree is not up-to-date, it is flagged as an "
"error. This flag also causes the index file to be updated."
msgstr ""
@@ -15010,7 +14846,7 @@ msgstr ""
#: en/git-submodule.txt:300
#, no-wrap
msgid "--cached"
-msgstr ""
+msgstr "--cached"
#. type: Plain text
#: en/git-apply.txt:76
@@ -15023,12 +14859,12 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:85
msgid ""
-"When the patch does not apply cleanly, fall back on 3-way merge if the patch "
-"records the identity of blobs it is supposed to apply to, and we have those "
-"blobs available locally, possibly leaving the conflict markers in the files "
-"in the working tree for the user to resolve. This option implies the `--"
-"index` option, and is incompatible with the `--reject` and the `--cached` "
-"options."
+"When the patch does not apply cleanly, fall back on 3-way merge if the patch"
+" records the identity of blobs it is supposed to apply to, and we have those"
+" blobs available locally, possibly leaving the conflict markers in the files"
+" in the working tree for the user to resolve. This option implies the "
+"`--index` option, and is incompatible with the `--reject` and the `--cached`"
+" options."
msgstr ""
#. type: Labeled list
@@ -15049,16 +14885,15 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:95
msgid ""
-"When a pure mode change is encountered (which has no index information), the "
-"information is read from the current index instead."
+"When a pure mode change is encountered (which has no index information), the"
+" information is read from the current index instead."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:97 en/rev-list-options.txt:659
-#, fuzzy, no-wrap
-#| msgid "revert"
+#, no-wrap
msgid "--reverse"
-msgstr "revert"
+msgstr "--reverse"
#. type: Plain text
#: en/git-apply.txt:99
@@ -15098,24 +14933,24 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:124 en/git-rebase.txt:334
msgid ""
-"Ensure at least <n> lines of surrounding context match before and after each "
-"change. When fewer lines of surrounding context exist they all must match. "
-"By default no context is ever ignored."
+"Ensure at least <n> lines of surrounding context match before and after each"
+" change. When fewer lines of surrounding context exist they all must match."
+" By default no context is ever ignored."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:125
#, no-wrap
msgid "--unidiff-zero"
-msgstr ""
+msgstr "--unidiff-zero"
#. type: Plain text
#: en/git-apply.txt:131
msgid ""
"By default, 'git apply' expects that the patch being applied is a unified "
-"diff with at least one line of context. This provides good safety measures, "
-"but breaks down when applying a diff generated with `--unified=0`. To bypass "
-"these checks use `--unidiff-zero`."
+"diff with at least one line of context. This provides good safety measures,"
+" but breaks down when applying a diff generated with `--unified=0`. To "
+"bypass these checks use `--unidiff-zero`."
msgstr ""
#. type: Plain text
@@ -15127,39 +14962,38 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:135
-#, fuzzy, no-wrap
-#| msgid "git-apply(1)"
+#, no-wrap
msgid "--apply"
-msgstr "git-apply(1)"
+msgstr "--apply"
#. type: Plain text
#: en/git-apply.txt:141
msgid ""
"If you use any of the options marked \"Turns off 'apply'\" above, 'git "
-"apply' reads and outputs the requested information without actually applying "
-"the patch. Give this flag after those flags to also apply the patch."
+"apply' reads and outputs the requested information without actually applying"
+" the patch. Give this flag after those flags to also apply the patch."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:142
#, no-wrap
msgid "--no-add"
-msgstr ""
+msgstr "--no-add"
#. type: Plain text
#: en/git-apply.txt:148
msgid ""
-"When applying a patch, ignore additions made by the patch. This can be used "
-"to extract the common part between two files by first running 'diff' on them "
-"and applying the result with this option, which would apply the deletion "
-"part but not the addition part."
+"When applying a patch, ignore additions made by the patch. This can be used"
+" to extract the common part between two files by first running 'diff' on "
+"them and applying the result with this option, which would apply the "
+"deletion part but not the addition part."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:149
#, no-wrap
msgid "--allow-binary-replacement"
-msgstr ""
+msgstr "--allow-binary-replacement"
#. type: Plain text
#: en/git-apply.txt:155
@@ -15200,11 +15034,11 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:171
msgid ""
-"When `--exclude` and `--include` patterns are used, they are examined in the "
-"order they appear on the command line, and the first match determines if a "
+"When `--exclude` and `--include` patterns are used, they are examined in the"
+" order they appear on the command line, and the first match determines if a "
"patch to each path is used. A patch to a path that does not match any "
-"include/exclude pattern is used by default if there is no include pattern on "
-"the command line, and ignored if there is any include pattern."
+"include/exclude pattern is used by default if there is no include pattern on"
+" the command line, and ignored if there is any include pattern."
msgstr ""
#. type: Plain text
@@ -15227,11 +15061,11 @@ msgstr "whitespace"
#: en/git-apply.txt:188
msgid ""
"When applying a patch, detect a new or modified line that has whitespace "
-"errors. What are considered whitespace errors is controlled by `core."
-"whitespace` configuration. By default, trailing whitespaces (including "
-"lines that solely consist of whitespaces) and a space character that is "
-"immediately followed by a tab character inside the initial indent of the "
-"line are considered whitespace errors."
+"errors. What are considered whitespace errors is controlled by "
+"`core.whitespace` configuration. By default, trailing whitespaces "
+"(including lines that solely consist of whitespaces) and a space character "
+"that is immediately followed by a tab character inside the initial indent of"
+" the line are considered whitespace errors."
msgstr ""
#. type: Plain text
@@ -15284,13 +15118,13 @@ msgstr ""
#: en/git-apply.txt:207
#, no-wrap
msgid "--inaccurate-eof"
-msgstr ""
+msgstr "--inaccurate-eof"
#. type: Plain text
#: en/git-apply.txt:213
msgid ""
-"Under certain circumstances, some versions of 'diff' do not correctly detect "
-"a missing new-line at the end of the file. As a result, patches created by "
+"Under certain circumstances, some versions of 'diff' do not correctly detect"
+" a missing new-line at the end of the file. As a result, patches created by "
"such 'diff' programs do not record incomplete lines correctly. This option "
"adds support for applying such patches by working around this bug."
msgstr ""
@@ -15307,7 +15141,7 @@ msgstr ""
#: en/git-apply.txt:220
#, no-wrap
msgid "--recount"
-msgstr ""
+msgstr "--recount"
#. type: Plain text
#: en/git-apply.txt:224
@@ -15333,40 +15167,40 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:232
msgid ""
-"For example, a patch that talks about updating `a/git-gui.sh` to `b/git-gui."
-"sh` can be applied to the file in the working tree `modules/git-gui/git-gui."
-"sh` by running `git apply --directory=modules/git-gui`."
+"For example, a patch that talks about updating `a/git-gui.sh` to `b/git-"
+"gui.sh` can be applied to the file in the working tree `modules/git-gui/git-"
+"gui.sh` by running `git apply --directory=modules/git-gui`."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:233
#, no-wrap
msgid "--unsafe-paths"
-msgstr ""
+msgstr "--unsafe-paths"
#. type: Plain text
#: en/git-apply.txt:238
msgid ""
"By default, a patch that affects outside the working area (either a Git "
-"controlled working tree, or the current working directory when \"git apply\" "
-"is used as a replacement of GNU patch) is rejected as a mistake (or a "
+"controlled working tree, or the current working directory when \"git apply\""
+" is used as a replacement of GNU patch) is rejected as a mistake (or a "
"mischief)."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:242
msgid ""
-"When `git apply` is used as a \"better GNU patch\", the user can pass the `--"
-"unsafe-paths` option to override this safety check. This option has no "
+"When `git apply` is used as a \"better GNU patch\", the user can pass the "
+"`--unsafe-paths` option to override this safety check. This option has no "
"effect when `--index` or `--cached` is in use."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:250
msgid ""
-"Set to 'change' if you want changes in whitespace to be ignored by default. "
-"Set to one of: no, none, never, false if you want changes in whitespace to "
-"be significant."
+"Set to 'change' if you want changes in whitespace to be ignored by default."
+" Set to one of: no, none, never, false if you want changes in whitespace to"
+" be significant."
msgstr ""
#. type: Plain text
@@ -15395,8 +15229,9 @@ msgstr ""
msgid ""
"If `--index` is specified (explicitly or implicitly), then the submodule "
"commits must match the index exactly for the patch to apply. If any of the "
-"submodules are checked-out, then these check-outs are completely ignored, i."
-"e., they are not required to be up-to-date or clean and they are not updated."
+"submodules are checked-out, then these check-outs are completely ignored, "
+"i.e., they are not required to be up-to-date or clean and they are not "
+"updated."
msgstr ""
#. type: Plain text
@@ -15435,18 +15270,18 @@ msgstr ""
#: en/git-archimport.txt:22
msgid ""
"Imports a project from one or more Arch repositories. It will follow "
-"branches and repositories within the namespaces defined by the <archive/"
-"branch> parameters supplied. If it cannot find the remote branch a merge "
-"comes from it will just import it as a regular commit. If it can find it, it "
-"will mark it as a merge whenever possible (see discussion below)."
+"branches and repositories within the namespaces defined by the "
+"<archive/branch> parameters supplied. If it cannot find the remote branch a "
+"merge comes from it will just import it as a regular commit. If it can find "
+"it, it will mark it as a merge whenever possible (see discussion below)."
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:26
msgid ""
"The script expects you to provide the key roots where it can start the "
-"import from an 'initial import' or 'tag' type of Arch commit. It will follow "
-"and import new branches within the provided roots."
+"import from an 'initial import' or 'tag' type of Arch commit. It will follow"
+" and import new branches within the provided roots."
msgstr ""
#. type: Plain text
@@ -15460,8 +15295,8 @@ msgstr ""
#. type: Plain text
#: en/git-archimport.txt:36
msgid ""
-"'git archimport' uses `tla` extensively in the background to access the Arch "
-"repository. Make sure you have a recent version of `tla` available in the "
+"'git archimport' uses `tla` extensively in the background to access the Arch"
+" repository. Make sure you have a recent version of `tla` available in the "
"path. `tla` must know about the repositories you pass to 'git archimport'."
msgstr ""
@@ -15469,8 +15304,8 @@ msgstr ""
#: en/git-archimport.txt:41
msgid ""
"For the initial import, 'git archimport' expects to find itself in an empty "
-"directory. To follow the development of a project that uses Arch, rerun 'git "
-"archimport' with the same parameters as the initial import to perform "
+"directory. To follow the development of a project that uses Arch, rerun 'git"
+" archimport' with the same parameters as the initial import to perform "
"incremental imports."
msgstr ""
@@ -15488,8 +15323,8 @@ msgstr ""
#. type: Plain text
#: en/git-archimport.txt:53
msgid ""
-"Associating multiple Arch branches to one Git branch is possible; the result "
-"will make the most sense only if no commits are made to the first branch, "
+"Associating multiple Arch branches to one Git branch is possible; the result"
+" will make the most sense only if no commits are made to the first branch, "
"after the second branch is created. Still, this is useful to convert Arch "
"repositories that had been rotated periodically."
msgstr ""
@@ -15514,8 +15349,8 @@ msgstr ""
#: en/git-archimport.txt:66
msgid ""
"Fortunately, when you try and merge branches imported from Arch, Git will "
-"find a good merge base, and it has a good chance of identifying patches that "
-"have been traded out-of-sequence between the branches."
+"find a good merge base, and it has a good chance of identifying patches that"
+" have been traded out-of-sequence between the branches."
msgstr ""
#. type: Plain text
@@ -15537,15 +15372,15 @@ msgstr ""
#. type: Plain text
#: en/git-archimport.txt:79
msgid ""
-"Many tags. Will create a tag for every commit, reflecting the commit name in "
-"the Arch repository."
+"Many tags. Will create a tag for every commit, reflecting the commit name in"
+" the Arch repository."
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:84
msgid ""
-"Use the fast patchset import strategy. This can be significantly faster for "
-"large trees, but cannot handle directory renames or permissions changes. "
+"Use the fast patchset import strategy. This can be significantly faster for"
+" large trees, but cannot handle directory renames or permissions changes. "
"The default strategy is slow and safe."
msgstr ""
@@ -15560,10 +15395,10 @@ msgstr "-o"
#: en/git-archimport.txt:92
msgid ""
"Use this for compatibility with old-style branch names used by earlier "
-"versions of 'git archimport'. Old-style branch names were category{litdd}"
-"branch, whereas new-style branch names are archive,category{litdd}"
-"branch{litdd}version. In both cases, names given on the command-line will "
-"override the automatically-generated ones."
+"versions of 'git archimport'. Old-style branch names were "
+"category{litdd}branch, whereas new-style branch names are "
+"archive,category{litdd}branch{litdd}version. In both cases, names given on "
+"the command-line will override the automatically-generated ones."
msgstr ""
#. type: Labeled list
@@ -15610,17 +15445,16 @@ msgstr ""
#. type: Title =
#: en/git-archive.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-archive(1)"
-msgstr "git-add(1)"
+msgstr "git-archive(1)"
#. type: Plain text
#: en/git-archive.txt:7
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid "git-archive - Create an archive of files from a named tree"
msgstr ""
"en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et "
@@ -15639,8 +15473,8 @@ msgstr ""
#. type: Plain text
#: en/git-archive.txt:23
msgid ""
-"Creates an archive of the specified format containing the tree structure for "
-"the named tree, and writes it out to the standard output. If <prefix> is "
+"Creates an archive of the specified format containing the tree structure for"
+" the named tree, and writes it out to the standard output. If <prefix> is "
"specified it is prepended to the filenames in the archive."
msgstr ""
@@ -15677,7 +15511,7 @@ msgstr ""
#: en/git-show-branch.txt:80
#, no-wrap
msgid "--list"
-msgstr ""
+msgstr "--list"
#. type: Plain text
#: en/git-archive.txt:46
@@ -15686,16 +15520,8 @@ msgstr ""
#. type: Plain text
#: en/git-archive.txt:50
-#, fuzzy
-#| msgid ""
-#| "-v::\n"
-#| "--verbose::\n"
-#| " Be verbose.\n"
msgid "Report progress to stderr."
-msgstr ""
-"-v::\n"
-"--verbose::\n"
-" Mode bavard.\n"
+msgstr "Mode bavard."
#. type: Labeled list
#: en/git-archive.txt:51 en/git-read-tree.txt:84 en/git-write-tree.txt:35
@@ -15729,13 +15555,13 @@ msgstr ""
#: en/git-archive.txt:58
#, no-wrap
msgid "--worktree-attributes"
-msgstr ""
+msgstr "--worktree-attributes"
#. type: Plain text
#: en/git-archive.txt:61
msgid ""
-"Look for attributes in .gitattributes files in the working tree as well (see "
-"<<ATTRIBUTES>>)."
+"Look for attributes in .gitattributes files in the working tree as well (see"
+" <<ATTRIBUTES>>)."
msgstr ""
#. type: Labeled list
@@ -15801,8 +15627,8 @@ msgstr ""
#: en/git-archive.txt:84
msgid ""
"Without an optional path parameter, all files and subdirectories of the "
-"current working directory are included in the archive. If one or more paths "
-"are specified, only these are included."
+"current working directory are included in the archive. If one or more paths"
+" are specified, only these are included."
msgstr ""
#. type: Title -
@@ -15821,7 +15647,7 @@ msgstr ""
#: en/git-archive.txt:90 en/git-diff-files.txt:28
#, no-wrap
msgid "-0"
-msgstr ""
+msgstr "-0"
#. type: Plain text
#: en/git-archive.txt:92
@@ -15832,13 +15658,13 @@ msgstr ""
#: en/git-archive.txt:92
#, no-wrap
msgid "-9"
-msgstr ""
+msgstr "-9"
#. type: Plain text
#: en/git-archive.txt:95
msgid ""
-"Highest and slowest compression level. You can specify any number from 1 to "
-"9 to adjust compression speed and ratio."
+"Highest and slowest compression level. You can specify any number from 1 to"
+" 9 to adjust compression speed and ratio."
msgstr ""
#. type: Title -
@@ -15929,19 +15755,19 @@ msgstr ""
#. type: Plain text
#: en/git-archive.txt:139
msgid ""
-"If the attribute export-subst is set for a file then Git will expand several "
-"placeholders when adding this file to an archive. See linkgit:"
-"gitattributes[5] for details."
+"If the attribute export-subst is set for a file then Git will expand several"
+" placeholders when adding this file to an archive. See "
+"linkgit:gitattributes[5] for details."
msgstr ""
#. type: Plain text
#: en/git-archive.txt:147
msgid ""
-"Note that attributes are by default taken from the `.gitattributes` files in "
-"the tree that is being archived. If you want to tweak the way the output is "
-"generated after the fact (e.g. you committed without adding an appropriate "
-"export-ignore in its `.gitattributes`), adjust the checked out `."
-"gitattributes` file as necessary and use `--worktree-attributes` option. "
+"Note that attributes are by default taken from the `.gitattributes` files in"
+" the tree that is being archived. If you want to tweak the way the output "
+"is generated after the fact (e.g. you committed without adding an "
+"appropriate export-ignore in its `.gitattributes`), adjust the checked out "
+"`.gitattributes` file as necessary and use `--worktree-attributes` option. "
"Alternatively you can keep necessary attributes that should apply while "
"archiving any tree in your `$GIT_DIR/info/attributes` file."
msgstr ""
@@ -15949,7 +15775,8 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:150
#, no-wrap
-msgid "`git archive --format=tar --prefix=junk/ HEAD | (cd /var/tmp/ && tar xf -)`"
+msgid ""
+"`git archive --format=tar --prefix=junk/ HEAD | (cd /var/tmp/ && tar xf -)`"
msgstr ""
#. type: Plain text
@@ -15962,7 +15789,9 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:156
#, no-wrap
-msgid "`git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip >git-1.4.0.tar.gz`"
+msgid ""
+"`git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip "
+">git-1.4.0.tar.gz`"
msgstr ""
#. type: Plain text
@@ -15973,7 +15802,8 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:160
#, no-wrap
-msgid "`git archive --format=tar.gz --prefix=git-1.4.0/ v1.4.0 >git-1.4.0.tar.gz`"
+msgid ""
+"`git archive --format=tar.gz --prefix=git-1.4.0/ v1.4.0 >git-1.4.0.tar.gz`"
msgstr ""
#. type: Plain text
@@ -15995,7 +15825,9 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:168
#, no-wrap
-msgid "`git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip >git-1.4.0.tar.gz`"
+msgid ""
+"`git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip "
+">git-1.4.0.tar.gz`"
msgstr ""
#. type: Plain text
@@ -16008,7 +15840,9 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:173
#, no-wrap
-msgid "`git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > git-1.4.0-docs.zip`"
+msgid ""
+"`git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > "
+"git-1.4.0-docs.zip`"
msgstr ""
#. type: Plain text
@@ -16059,7 +15893,8 @@ msgstr "git-bisect(1)"
#. type: Plain text
#: en/git-bisect.txt:7
-msgid "git-bisect - Use binary search to find the commit that introduced a bug"
+msgid ""
+"git-bisect - Use binary search to find the commit that introduced a bug"
msgstr ""
#. type: Plain text
@@ -16097,9 +15932,9 @@ msgstr ""
#: en/git-bisect.txt:40
msgid ""
"This command uses a binary search algorithm to find which commit in your "
-"project's history introduced a bug. You use it by first telling it a \"bad\" "
-"commit that is known to contain the bug, and a \"good\" commit that is known "
-"to be before the bug was introduced. Then `git bisect` picks a commit "
+"project's history introduced a bug. You use it by first telling it a \"bad\""
+" commit that is known to contain the bug, and a \"good\" commit that is "
+"known to be before the bug was introduced. Then `git bisect` picks a commit "
"between those two endpoints and asks you whether the selected commit is "
"\"good\" or \"bad\". It continues narrowing down the range until it finds "
"the exact commit that introduced the change."
@@ -16111,9 +15946,9 @@ msgid ""
"In fact, `git bisect` can be used to find the commit that changed *any* "
"property of your project; e.g., the commit that fixed a bug, or the commit "
"that caused a benchmark's performance to improve. To support this more "
-"general usage, the terms \"old\" and \"new\" can be used in place of \"good"
-"\" and \"bad\", or you can choose your own terms. See section \"Alternate "
-"terms\" below for more information."
+"general usage, the terms \"old\" and \"new\" can be used in place of "
+"\"good\" and \"bad\", or you can choose your own terms. See section "
+"\"Alternate terms\" below for more information."
msgstr ""
#. type: Title ~
@@ -16126,8 +15961,8 @@ msgstr ""
#: en/git-bisect.txt:54
msgid ""
"As an example, suppose you are trying to find the commit that broke a "
-"feature that was known to work in version `v2.6.13-rc2` of your project. You "
-"start a bisect session as follows:"
+"feature that was known to work in version `v2.6.13-rc2` of your project. You"
+" start a bisect session as follows:"
msgstr ""
#. type: delimited block -
@@ -16202,8 +16037,8 @@ msgstr ""
#: en/git-bisect.txt:95
msgid ""
"Eventually there will be no more revisions left to inspect, and the command "
-"will print out a description of the first bad commit. The reference `refs/"
-"bisect/bad` will be left pointing at that commit."
+"will print out a description of the first bad commit. The reference "
+"`refs/bisect/bad` will be left pointing at that commit."
msgstr ""
#. type: Title ~
@@ -16265,22 +16100,22 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:132
msgid ""
-"Sometimes you are not looking for the commit that introduced a breakage, but "
-"rather for a commit that caused a change between some other \"old\" state "
+"Sometimes you are not looking for the commit that introduced a breakage, but"
+" rather for a commit that caused a change between some other \"old\" state "
"and \"new\" state. For example, you might be looking for the commit that "
-"introduced a particular fix. Or you might be looking for the first commit in "
-"which the source-code filenames were finally all converted to your company's "
-"naming standard. Or whatever."
+"introduced a particular fix. Or you might be looking for the first commit in"
+" which the source-code filenames were finally all converted to your "
+"company's naming standard. Or whatever."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:138
msgid ""
-"In such cases it can be very confusing to use the terms \"good\" and \"bad\" "
-"to refer to \"the state before the change\" and \"the state after the change"
-"\". So instead, you can use the terms \"old\" and \"new\", respectively, in "
-"place of \"good\" and \"bad\". (But note that you cannot mix \"good\" and "
-"\"bad\" with \"old\" and \"new\" in a single session.)"
+"In such cases it can be very confusing to use the terms \"good\" and \"bad\""
+" to refer to \"the state before the change\" and \"the state after the "
+"change\". So instead, you can use the terms \"old\" and \"new\", "
+"respectively, in place of \"good\" and \"bad\". (But note that you cannot "
+"mix \"good\" and \"bad\" with \"old\" and \"new\" in a single session.)"
msgstr ""
#. type: Plain text
@@ -16289,8 +16124,8 @@ msgid ""
"In this more general usage, you provide `git bisect` with a \"new\" commit "
"has some property and an \"old\" commit that doesn't have that property. "
"Each time `git bisect` checks out a commit, you test if that commit has the "
-"property. If it does, mark the commit as \"new\"; otherwise, mark it as \"old"
-"\". When the bisection is done, `git bisect` will report which commit "
+"property. If it does, mark the commit as \"new\"; otherwise, mark it as "
+"\"old\". When the bisection is done, `git bisect` will report which commit "
"introduced the property."
msgstr ""
@@ -16341,15 +16176,15 @@ msgstr "$ git commit\n"
#. type: Plain text
#: en/git-bisect.txt:170
msgid ""
-"You can get just the old (respectively new) term with `git bisect term --"
-"term-old` or `git bisect term --term-good`."
+"You can get just the old (respectively new) term with `git bisect term "
+"--term-old` or `git bisect term --term-good`."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:175
msgid ""
-"If you would like to use your own terms instead of \"bad\"/\"good\" or \"new"
-"\"/\"old\", you can choose any names you like (except existing bisect "
+"If you would like to use your own terms instead of \"bad\"/\"good\" or "
+"\"new\"/\"old\", you can choose any names you like (except existing bisect "
"subcommands like `reset`, `start`, ...) by starting the bisection using"
msgstr ""
@@ -16419,8 +16254,8 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:211
msgid ""
-"If the `DISPLAY` environment variable is not set, 'git log' is used "
-"instead. You can also give command-line options such as `-p` and `--stat`."
+"If the `DISPLAY` environment variable is not set, 'git log' is used instead."
+" You can also give command-line options such as `-p` and `--stat`."
msgstr ""
#. type: delimited block -
@@ -16439,8 +16274,8 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:221
msgid ""
-"After having marked revisions as good or bad, issue the following command to "
-"show what has been done so far:"
+"After having marked revisions as good or bad, issue the following command to"
+" show what has been done so far:"
msgstr ""
#. type: delimited block -
@@ -16640,21 +16475,21 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:332
msgid ""
-"Any other exit code will abort the bisect process. It should be noted that a "
-"program that terminates via `exit(-1)` leaves $? = 255, (see the exit(3) "
+"Any other exit code will abort the bisect process. It should be noted that a"
+" program that terminates via `exit(-1)` leaves $? = 255, (see the exit(3) "
"manual page), as the value is chopped with `& 0377`."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:341
msgid ""
-"The special exit code 125 should be used when the current source code cannot "
-"be tested. If the script exits with this code, the current revision will be "
-"skipped (see `git bisect skip` above). 125 was chosen as the highest "
+"The special exit code 125 should be used when the current source code cannot"
+" be tested. If the script exits with this code, the current revision will be"
+" skipped (see `git bisect skip` above). 125 was chosen as the highest "
"sensible value to use for this purpose, because 126 and 127 are used by "
"POSIX shells to signal specific error status (127 is for command not found, "
-"126 is for command found but not executable--these details do not matter, as "
-"they are normal errors in the script, as far as `bisect run` is concerned)."
+"126 is for command found but not executable--these details do not matter, as"
+" they are normal errors in the script, as far as `bisect run` is concerned)."
msgstr ""
#. type: Plain text
@@ -16663,8 +16498,8 @@ msgid ""
"You may often find that during a bisect session you want to have temporary "
"modifications (e.g. s/#define DEBUG 0/#define DEBUG 1/ in a header file, or "
"\"revision that does not have this commit needs this patch applied to work "
-"around another problem this bisection is not interested in\") applied to the "
-"revision being tested."
+"around another problem this bisection is not interested in\") applied to the"
+" revision being tested."
msgstr ""
#. type: Plain text
@@ -16689,8 +16524,8 @@ msgstr "--no-checkout"
#: en/git-bisect.txt:363
msgid ""
"Do not checkout the new working tree at each iteration of the bisection "
-"process. Instead just update a special reference named `BISECT_HEAD` to make "
-"it point to the commit that should be tested."
+"process. Instead just update a special reference named `BISECT_HEAD` to make"
+" it point to the commit that should be tested."
msgstr ""
#. type: Plain text
@@ -16918,16 +16753,15 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:497
msgid ""
-"link:git-bisect-lk2009.html[Fighting regressions with git bisect], linkgit:"
-"git-blame[1]."
+"link:git-bisect-lk2009.html[Fighting regressions with git bisect], "
+"linkgit:git-blame[1]."
msgstr ""
#. type: Title =
#: en/git-blame.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-blame(1)"
-msgstr "git-add(1)"
+msgstr "git-blame(1)"
#. type: Plain text
#: en/git-blame.txt:7
@@ -16956,8 +16790,8 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:24
msgid ""
-"When specified one or more times, `-L` restricts annotation to the requested "
-"lines."
+"When specified one or more times, `-L` restricts annotation to the requested"
+" lines."
msgstr ""
#. type: Plain text
@@ -16972,8 +16806,8 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:34
msgid ""
-"The report does not tell you anything about lines which have been deleted or "
-"replaced; you need to use a tool such as 'git diff' or the \"pickaxe\" "
+"The report does not tell you anything about lines which have been deleted or"
+" replaced; you need to use a tool such as 'git diff' or the \"pickaxe\" "
"interface briefly mentioned in the following paragraph."
msgstr ""
@@ -16981,8 +16815,8 @@ msgstr ""
#: en/git-blame.txt:41
msgid ""
"Apart from supporting file annotation, Git also supports searching the "
-"development history for when a code snippet occurred in a change. This makes "
-"it possible to track when a code snippet was added to a file, moved or "
+"development history for when a code snippet occurred in a change. This makes"
+" it possible to track when a code snippet was added to a file, moved or "
"copied between files, and eventually deleted or replaced. It works by "
"searching for a text string in the diff. A small example of the pickaxe "
"interface that searches for `blame_usage`:"
@@ -17006,23 +16840,24 @@ msgstr ""
#: en/git-blame.txt:55
#, no-wrap
msgid "--score-debug"
-msgstr ""
+msgstr "--score-debug"
#. type: Plain text
#: en/git-blame.txt:63
msgid ""
-"Include debugging information related to the movement of lines between files "
-"(see `-C`) and lines moved within a file (see `-M`). The first number "
-"listed is the score. This is the number of alphanumeric characters detected "
-"as having been moved between or within files. This must be above a certain "
-"threshold for 'git blame' to consider those lines of code to have been moved."
+"Include debugging information related to the movement of lines between files"
+" (see `-C`) and lines moved within a file (see `-M`). The first number "
+"listed is the score. This is the number of alphanumeric characters detected"
+" as having been moved between or within files. This must be above a certain"
+" threshold for 'git blame' to consider those lines of code to have been "
+"moved."
msgstr ""
#. type: Labeled list
#: en/git-blame.txt:65
#, no-wrap
msgid "--show-name"
-msgstr ""
+msgstr "--show-name"
#. type: Plain text
#: en/git-blame.txt:69
@@ -17036,7 +16871,7 @@ msgstr ""
#: en/git-blame.txt:71
#, no-wrap
msgid "--show-number"
-msgstr ""
+msgstr "--show-number"
#. type: Plain text
#: en/git-blame.txt:73
@@ -17128,8 +16963,8 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:114
msgid ""
-"the author name (\"author\"), email (\"author-mail\"), time (\"author-time"
-"\"), and time zone (\"author-tz\"); similarly for committer."
+"the author name (\"author\"), email (\"author-mail\"), time (\"author-"
+"time\"), and time zone (\"author-tz\"); similarly for committer."
msgstr ""
#. type: Plain text
@@ -17153,11 +16988,12 @@ msgstr ""
#: en/git-blame.txt:128
msgid ""
"The porcelain format generally suppresses commit information that has "
-"already been seen. For example, two lines that are blamed to the same commit "
-"will both be shown, but the details for that commit will be shown only once. "
-"This is more efficient, but may require more state be kept by the reader. "
-"The `--line-porcelain` option can be used to output full commit information "
-"for each line, allowing simpler (but less efficient) usage like:"
+"already been seen. For example, two lines that are blamed to the same commit"
+" will both be shown, but the details for that commit will be shown only "
+"once. This is more efficient, but may require more state be kept by the "
+"reader. The `--line-porcelain` option can be used to output full commit "
+"information for each line, allowing simpler (but less efficient) usage "
+"like:"
msgstr ""
#. type: Plain text
@@ -17189,8 +17025,8 @@ msgstr ""
#: en/git-blame.txt:147
msgid ""
"When you are interested in finding the origin for lines 40-60 for file "
-"`foo`, you can use the `-L` option like so (they mean the same thing -- both "
-"ask for 21 lines starting at line 40):"
+"`foo`, you can use the `-L` option like so (they mean the same thing -- both"
+" ask for 21 lines starting at line 40):"
msgstr ""
#. type: Plain text
@@ -17221,8 +17057,8 @@ msgstr ""
#: en/git-blame.txt:160
msgid ""
"When you are not interested in changes older than version v2.6.18, or "
-"changes older than 3 weeks, you can use revision range specifiers similar to "
-"'git rev-list':"
+"changes older than 3 weeks, you can use revision range specifiers similar to"
+" 'git rev-list':"
msgstr ""
#. type: Plain text
@@ -17313,8 +17149,8 @@ msgstr ""
msgid ""
"The first time that a commit shows up in the stream, it has various other "
"information about it printed out with a one-word tag at the beginning of "
-"each line describing the extra commit information (author, email, committer, "
-"dates, summary, etc.)."
+"each line describing the extra commit information (author, email, committer,"
+" dates, summary, etc.)."
msgstr ""
#. type: Plain text
@@ -17356,10 +17192,9 @@ msgstr ""
#. type: Title =
#: en/git-branch.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-branch(1)"
-msgstr "git-add(1)"
+msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
@@ -17388,19 +17223,19 @@ msgstr ""
msgid ""
"If `--list` is given, or if there are no non-option arguments, existing "
"branches are listed; the current branch will be highlighted with an "
-"asterisk. Option `-r` causes the remote-tracking branches to be listed, and "
-"option `-a` shows both local and remote branches. If a `<pattern>` is given, "
-"it is used as a shell wildcard to restrict the output to matching branches. "
-"If multiple patterns are given, a branch is shown if it matches any of the "
-"patterns. Note that when providing a `<pattern>`, you must use `--list`; "
-"otherwise the command is interpreted as branch creation."
+"asterisk. Option `-r` causes the remote-tracking branches to be listed, and"
+" option `-a` shows both local and remote branches. If a `<pattern>` is "
+"given, it is used as a shell wildcard to restrict the output to matching "
+"branches. If multiple patterns are given, a branch is shown if it matches "
+"any of the patterns. Note that when providing a `<pattern>`, you must use "
+"`--list`; otherwise the command is interpreted as branch creation."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:43
msgid ""
-"With `--contains`, shows only the branches that contain the named commit (in "
-"other words, the branches whose tip commits are descendants of the named "
+"With `--contains`, shows only the branches that contain the named commit (in"
+" other words, the branches whose tip commits are descendants of the named "
"commit). With `--merged`, only branches merged into the named commit (i.e. "
"the branches whose tip commits are reachable from the named commit) will be "
"listed. With `--no-merged` only branches not merged into the named commit "
@@ -17411,8 +17246,8 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:46
msgid ""
-"The command's second form creates a new branch head named <branchname> which "
-"points to the current `HEAD`, or <start-point> if given."
+"The command's second form creates a new branch head named <branchname> which"
+" points to the current `HEAD`, or <start-point> if given."
msgstr ""
#. type: Plain text
@@ -17426,13 +17261,13 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:58
msgid ""
-"When a local branch is started off a remote-tracking branch, Git sets up the "
-"branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` "
+"When a local branch is started off a remote-tracking branch, Git sets up the"
+" branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` "
"configuration entries) so that 'git pull' will appropriately merge from the "
-"remote-tracking branch. This behavior may be changed via the global `branch."
-"autoSetupMerge` configuration flag. That setting can be overridden by using "
-"the `--track` and `--no-track` options, and changed later using `git branch "
-"--set-upstream-to`."
+"remote-tracking branch. This behavior may be changed via the global "
+"`branch.autoSetupMerge` configuration flag. That setting can be overridden "
+"by using the `--track` and `--no-track` options, and changed later using "
+"`git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
@@ -17447,8 +17282,8 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:68
msgid ""
-"With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify "
-"more than one branch for deletion. If the branch currently has a reflog "
+"With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify"
+" more than one branch for deletion. If the branch currently has a reflog "
"then the reflog will also be deleted."
msgstr ""
@@ -17457,8 +17292,8 @@ msgstr ""
msgid ""
"Use `-r` together with `-d` to delete remote-tracking branches. Note, that "
"it only makes sense to delete remote-tracking branches if they no longer "
-"exist in the remote repository or if 'git fetch' was configured not to fetch "
-"them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a "
+"exist in the remote repository or if 'git fetch' was configured not to fetch"
+" them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a "
"way to clean up all obsolete remote-tracking branches."
msgstr ""
@@ -17470,14 +17305,14 @@ msgstr ""
#: en/git-tag.txt:75
#, no-wrap
msgid "-d"
-msgstr ""
+msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:79 en/git-push.txt:126 en/git-replace.txt:65
#: en/git-symbolic-ref.txt:36 en/git-tag.txt:76
#, no-wrap
msgid "--delete"
-msgstr ""
+msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:83
@@ -17495,26 +17330,26 @@ msgstr ""
#: en/git-branch.txt:88 en/git-tag.txt:152
#, no-wrap
msgid "--create-reflog"
-msgstr ""
+msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:97
msgid ""
-"Create the branch's reflog. This activates recording of all changes made to "
-"the branch ref, enabling use of date based sha1 expressions such as "
-"\"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs "
-"are usually enabled by default by the `core.logallrefupdates` config "
-"option. The negated form `--no-create-reflog` only overrides an earlier `--"
-"create-reflog`, but currently does not negate the setting of `core."
-"logallrefupdates`."
+"Create the branch's reflog. This activates recording of all changes made to"
+" the branch ref, enabling use of date based sha1 expressions such as "
+"\"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs"
+" are usually enabled by default by the `core.logallrefupdates` config "
+"option. The negated form `--no-create-reflog` only overrides an earlier "
+"`--create-reflog`, but currently does not negate the setting of "
+"`core.logallrefupdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:106
msgid ""
-"Reset <branchname> to <startpoint> if <branchname> exists already. Without `-"
-"f` 'git branch' refuses to change an existing branch. In combination with `-"
-"d` (or `--delete`), allow deleting the branch irrespective of its merged "
+"Reset <branchname> to <startpoint> if <branchname> exists already. Without "
+"`-f` 'git branch' refuses to change an existing branch. In combination with"
+" `-d` (or `--delete`), allow deleting the branch irrespective of its merged "
"status. In combination with `-m` (or `--move`), allow renaming the branch "
"even if the new branch name already exists."
msgstr ""
@@ -17523,7 +17358,7 @@ msgstr ""
#: en/git-branch.txt:108
#, no-wrap
msgid "--move"
-msgstr ""
+msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:110
@@ -17558,10 +17393,9 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:125 en/git-for-each-ref.txt:82 en/git-grep.txt:117
#: en/git-tag.txt:112
-#, fuzzy, no-wrap
-#| msgid "whitespace"
+#, no-wrap
msgid "--ignore-case"
-msgstr "whitespace"
+msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:127
@@ -17576,10 +17410,9 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-status.txt:105 en/git-tag.txt:116
-#, fuzzy, no-wrap
-#| msgid "status"
+#, no-wrap
msgid "--no-column"
-msgstr "status"
+msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:133
@@ -17613,15 +17446,15 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:147
msgid ""
-"Activate the list mode. `git branch <pattern>` would try to create a branch, "
-"use `git branch --list <pattern>` to list matching branches."
+"Activate the list mode. `git branch <pattern>` would try to create a branch,"
+" use `git branch --list <pattern>` to list matching branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:149
#, no-wrap
msgid "-vv"
-msgstr ""
+msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:156
@@ -17655,7 +17488,7 @@ msgstr ""
#: en/git-branch.txt:167
#, no-wrap
msgid "--no-abbrev"
-msgstr ""
+msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:169
@@ -17667,17 +17500,17 @@ msgstr ""
#: en/git-branch.txt:171 en/git-checkout.txt:156
#, no-wrap
msgid "--track"
-msgstr ""
+msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:179
msgid ""
-"When creating a new branch, set up `branch.<name>.remote` and `branch.<name>."
-"merge` configuration entries to mark the start-point branch as \"upstream\" "
-"from the new branch. This configuration will tell git to show the "
-"relationship between the two branches in `git status` and `git branch -v`. "
-"Furthermore, it directs `git pull` without arguments to pull from the "
-"upstream when the new branch is checked out."
+"When creating a new branch, set up `branch.<name>.remote` and "
+"`branch.<name>.merge` configuration entries to mark the start-point branch "
+"as \"upstream\" from the new branch. This configuration will tell git to "
+"show the relationship between the two branches in `git status` and `git "
+"branch -v`. Furthermore, it directs `git pull` without arguments to pull "
+"from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
@@ -17685,8 +17518,8 @@ msgstr ""
msgid ""
"This behavior is the default when the start point is a remote-tracking "
"branch. Set the branch.autoSetupMerge configuration variable to `false` if "
-"you want `git checkout` and `git branch` to always behave as if `--no-track` "
-"were given. Set it to `always` if you want this behavior when the start-"
+"you want `git checkout` and `git branch` to always behave as if `--no-track`"
+" were given. Set it to `always` if you want this behavior when the start-"
"point is either a local or remote-tracking branch."
msgstr ""
@@ -17694,7 +17527,7 @@ msgstr ""
#: en/git-branch.txt:186 en/git-checkout.txt:170
#, no-wrap
msgid "--no-track"
-msgstr ""
+msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:189 en/git-checkout.txt:173
@@ -17707,14 +17540,15 @@ msgstr ""
#: en/git-branch.txt:190 en/git-push.txt:246
#, no-wrap
msgid "--set-upstream"
-msgstr ""
+msgstr "--set-upstream"
#. type: Plain text
#: en/git-branch.txt:195
msgid ""
"If specified branch does not exist yet or if `--force` has been given, acts "
-"exactly like `--track`. Otherwise sets up configuration like `--track` would "
-"when creating the branch, except that where branch points to is not changed."
+"exactly like `--track`. Otherwise sets up configuration like `--track` would"
+" when creating the branch, except that where branch points to is not "
+"changed."
msgstr ""
#. type: Labeled list
@@ -17741,7 +17575,7 @@ msgstr ""
#: en/git-branch.txt:202
#, no-wrap
msgid "--unset-upstream"
-msgstr ""
+msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:205
@@ -17752,10 +17586,9 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:206
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "--edit-description"
-msgstr "git-add(1)"
+msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:211
@@ -17814,8 +17647,8 @@ msgstr ""
#: en/git-branch.txt:229
msgid ""
"The name of the branch to create or delete. The new branch name must pass "
-"all checks defined by linkgit:git-check-ref-format[1]. Some of these checks "
-"may restrict the characters allowed in a branch name."
+"all checks defined by linkgit:git-check-ref-format[1]. Some of these checks"
+" may restrict the characters allowed in a branch name."
msgstr ""
#. type: Labeled list
@@ -17867,11 +17700,11 @@ msgstr ""
#: en/git-branch.txt:251
msgid ""
"Sort based on the key given. Prefix `-` to sort in descending order of the "
-"value. You may use the --sort=<key> option multiple times, in which case the "
-"last key becomes the primary key. The keys supported are the same as those "
+"value. You may use the --sort=<key> option multiple times, in which case the"
+" last key becomes the primary key. The keys supported are the same as those "
"in `git for-each-ref`. Sort order defaults to sorting based on the full "
-"refname (including `refs/...` prefix). This lists detached HEAD (if present) "
-"first, then local branches and finally remote-tracking branches."
+"refname (including `refs/...` prefix). This lists detached HEAD (if present)"
+" first, then local branches and finally remote-tracking branches."
msgstr ""
#. type: Labeled list
@@ -17951,9 +17784,9 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:288
msgid ""
-"Delete the remote-tracking branches \"todo\", \"html\" and \"man\". The next "
-"'fetch' or 'pull' will create them again unless you configure them not to. "
-"See linkgit:git-fetch[1]."
+"Delete the remote-tracking branches \"todo\", \"html\" and \"man\". The next"
+" 'fetch' or 'pull' will create them again unless you configure them not to."
+" See linkgit:git-fetch[1]."
msgstr ""
#. type: Plain text
@@ -18004,8 +17837,8 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:311
msgid ""
-"`--no-merged` is used to find branches which are candidates for merging into "
-"HEAD, since those branches are not fully contained by HEAD."
+"`--no-merged` is used to find branches which are candidates for merging into"
+" HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
@@ -18018,10 +17851,9 @@ msgstr ""
#. type: Title =
#: en/git-bundle.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-bundle(1)"
-msgstr "git-add(1)"
+msgstr "git-bundle(1)"
#. type: Plain text
#: en/git-bundle.txt:7
@@ -18063,8 +17895,8 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:39
msgid ""
-"Used to create a bundle named 'file'. This requires the 'git-rev-list-args' "
-"arguments to define the bundle contents."
+"Used to create a bundle named 'file'. This requires the 'git-rev-list-args'"
+" arguments to define the bundle contents."
msgstr ""
#. type: Labeled list
@@ -18078,8 +17910,8 @@ msgstr ""
msgid ""
"Used to check that a bundle file is valid and will apply cleanly to the "
"current repository. This includes checks on the bundle format itself as "
-"well as checking that the prerequisite commits exist and are fully linked in "
-"the current repository. 'git bundle' prints a list of missing commits, if "
+"well as checking that the prerequisite commits exist and are fully linked in"
+" the current repository. 'git bundle' prints a list of missing commits, if "
"any, and exits with a non-zero status."
msgstr ""
@@ -18107,8 +17939,8 @@ msgstr ""
msgid ""
"Passes the objects in the bundle to 'git index-pack' for storage in the "
"repository, then prints the names of all defined references. If a list of "
-"references is given, only references matching those in the list are printed. "
-"This command is really plumbing, intended to be called only by 'git fetch'."
+"references is given, only references matching those in the list are printed."
+" This command is really plumbing, intended to be called only by 'git fetch'."
msgstr ""
#. type: Labeled list
@@ -18121,11 +17953,11 @@ msgstr "<git-rev-list-args>"
#: en/git-bundle.txt:69
msgid ""
"A list of arguments, acceptable to 'git rev-parse' and 'git rev-list' (and "
-"containing a named ref, see SPECIFYING REFERENCES below), that specifies the "
-"specific objects and references to transport. For example, `master~10.."
-"master` causes the current master reference to be packaged along with all "
-"objects added since its 10th ancestor commit. There is no explicit limit to "
-"the number of references and objects that may be packaged."
+"containing a named ref, see SPECIFYING REFERENCES below), that specifies the"
+" specific objects and references to transport. For example, "
+"`master~10..master` causes the current master reference to be packaged along"
+" with all objects added since its 10th ancestor commit. There is no "
+"explicit limit to the number of references and objects that may be packaged."
msgstr ""
#. type: Labeled list
@@ -18155,11 +17987,11 @@ msgstr ""
msgid ""
"'git bundle' will only package references that are shown by 'git show-ref': "
"this includes heads, tags, and remote heads. References such as `master~1` "
-"cannot be packaged, but are perfectly suitable for defining the basis. More "
-"than one reference may be packaged, and more than one basis can be "
-"specified. The objects packaged are those not contained in the union of the "
-"given bases. Each basis can be specified explicitly (e.g. `^master~10`), or "
-"implicitly (e.g. `master~10..master`, `--since=10.days.ago master`)."
+"cannot be packaged, but are perfectly suitable for defining the basis. More"
+" than one reference may be packaged, and more than one basis can be "
+"specified. The objects packaged are those not contained in the union of the"
+" given bases. Each basis can be specified explicitly (e.g. `^master~10`), "
+"or implicitly (e.g. `master~10..master`, `--since=10.days.ago master`)."
msgstr ""
#. type: Plain text
@@ -18184,9 +18016,9 @@ msgstr "EXEMPLES"
#. type: Plain text
#: en/git-bundle.txt:103
msgid ""
-"Assume you want to transfer the history from a repository R1 on machine A to "
-"another repository R2 on machine B. For whatever reason, direct connection "
-"between A and B is not allowed, but we can move data from A to B via some "
+"Assume you want to transfer the history from a repository R1 on machine A to"
+" another repository R2 on machine B. For whatever reason, direct connection"
+" between A and B is not allowed, but we can move data from A to B via some "
"mechanism (CD, email, etc.). We want to update R2 with development made on "
"the branch master in R1."
msgstr ""
@@ -18226,9 +18058,9 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:126
msgid ""
-"This will define a remote called \"origin\" in the resulting repository that "
-"lets you fetch and pull from the bundle. The $GIT_DIR/config file in R2 will "
-"have an entry like this:"
+"This will define a remote called \"origin\" in the resulting repository that"
+" lets you fetch and pull from the bundle. The $GIT_DIR/config file in R2 "
+"will have an entry like this:"
msgstr ""
#. type: delimited block -
@@ -18267,8 +18099,8 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:148
msgid ""
-"You then transfer the bundle to the other machine to replace /home/me/tmp/"
-"file.bundle, and pull from it."
+"You then transfer the bundle to the other machine to replace "
+"/home/me/tmp/file.bundle, and pull from it."
msgstr ""
#. type: delimited block -
@@ -18328,8 +18160,8 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:181
msgid ""
-"You can run `git-bundle verify` to see if you can extract from a bundle that "
-"was created with a basis:"
+"You can run `git-bundle verify` to see if you can extract from a bundle that"
+" was created with a basis:"
msgstr ""
#. type: delimited block -
@@ -18394,19 +18226,19 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:21
msgid ""
-"In its first form, the command provides the content or the type of an object "
-"in the repository. The type is required unless `-t` or `-p` is used to find "
-"the object type, or `-s` is used to find the object size, or `--textconv` or "
-"`--filters` is used (which imply type \"blob\")."
+"In its first form, the command provides the content or the type of an object"
+" in the repository. The type is required unless `-t` or `-p` is used to find"
+" the object type, or `-s` is used to find the object size, or `--textconv` "
+"or `--filters` is used (which imply type \"blob\")."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:28
msgid ""
"In the second form, a list of objects (separated by linefeeds) is provided "
-"on stdin, and the SHA-1, type, and size of each object is printed on stdout. "
-"The output format can be overridden using the optional `<format>` argument. "
-"If either `--textconv` or `--filters` was specified, the input is expected "
+"on stdin, and the SHA-1, type, and size of each object is printed on stdout."
+" The output format can be overridden using the optional `<format>` argument."
+" If either `--textconv` or `--filters` was specified, the input is expected "
"to list the object names followed by the path name, separated by a single "
"white space, so that the appropriate drivers can be determined."
msgstr ""
@@ -18421,8 +18253,8 @@ msgstr ""
#: en/git-cat-file.txt:35
msgid ""
"The name of the object to show. For a more complete list of ways to spell "
-"object names, see the \"SPECIFYING REVISIONS\" section in linkgit:"
-"gitrevisions[7]."
+"object names, see the \"SPECIFYING REVISIONS\" section in "
+"linkgit:gitrevisions[7]."
msgstr ""
#. type: Plain text
@@ -18438,8 +18270,8 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:47
msgid ""
-"Suppress all output; instead exit with zero status if <object> exists and is "
-"a valid object."
+"Suppress all output; instead exit with zero status if <object> exists and is"
+" a valid object."
msgstr ""
#. type: Plain text
@@ -18457,8 +18289,8 @@ msgstr ""
#: en/git-cat-file.txt:58
msgid ""
"Typically this matches the real type of <object> but asking for a type that "
-"can trivially be dereferenced from the given <object> is also permitted. An "
-"example is to ask for a \"tree\" with <object> being a commit object that "
+"can trivially be dereferenced from the given <object> is also permitted. An"
+" example is to ask for a \"tree\" with <object> being a commit object that "
"contains it, or to ask for a \"blob\" with <object> being a tag object that "
"points at it."
msgstr ""
@@ -18466,8 +18298,8 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:64
msgid ""
-"Show the content as transformed by a textconv filter. In this case, <object> "
-"has to be of the form <tree-ish>:<path>, or :<path> in order to apply the "
+"Show the content as transformed by a textconv filter. In this case, <object>"
+" has to be of the form <tree-ish>:<path>, or :<path> in order to apply the "
"filter to the content recorded in the index at <path>."
msgstr ""
@@ -18475,15 +18307,15 @@ msgstr ""
#: en/git-cat-file.txt:65
#, no-wrap
msgid "--filters"
-msgstr ""
+msgstr "--filters"
#. type: Plain text
#: en/git-cat-file.txt:70
msgid ""
"Show the content as converted by the filters configured in the current "
"working tree for the given <path> (i.e. smudge filters, end-of-line "
-"conversion, etc). In this case, <object> has to be of the form <tree-ish>:"
-"<path>, or :<path>."
+"conversion, etc). In this case, <object> has to be of the form <tree-"
+"ish>:<path>, or :<path>."
msgstr ""
#. type: Labeled list
@@ -18496,17 +18328,16 @@ msgstr "patch"
#. type: Plain text
#: en/git-cat-file.txt:75
msgid ""
-"For use with --textconv or --filters, to allow specifying an object name and "
-"a path separately, e.g. when it is difficult to figure out the revision from "
-"which the blob came."
+"For use with --textconv or --filters, to allow specifying an object name and"
+" a path separately, e.g. when it is difficult to figure out the revision "
+"from which the blob came."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:76 en/git-mktree.txt:32
-#, fuzzy, no-wrap
-#| msgid "patch"
+#, no-wrap
msgid "--batch"
-msgstr "patch"
+msgstr "--batch"
#. type: Labeled list
#: en/git-cat-file.txt:77
@@ -18520,15 +18351,16 @@ msgstr "Configuration"
msgid ""
"Print object information and contents for each object provided on stdin. "
"May not be combined with any other options or arguments except `--textconv` "
-"or `--filters`, in which case the input lines also need to specify the path, "
-"separated by white space. See the section `BATCH OUTPUT` below for details."
+"or `--filters`, in which case the input lines also need to specify the path,"
+" separated by white space. See the section `BATCH OUTPUT` below for "
+"details."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:84
#, no-wrap
msgid "--batch-check"
-msgstr ""
+msgstr "--batch-check"
#. type: Labeled list
#: en/git-cat-file.txt:85
@@ -18540,8 +18372,8 @@ msgstr ""
#: en/git-cat-file.txt:91
msgid ""
"Print object information for each object provided on stdin. May not be "
-"combined with any other options or arguments except `--textconv` or `--"
-"filters`, in which case the input lines also need to specify the path, "
+"combined with any other options or arguments except `--textconv` or "
+"`--filters`, in which case the input lines also need to specify the path, "
"separated by white space. See the section `BATCH OUTPUT` below for details."
msgstr ""
@@ -18549,7 +18381,7 @@ msgstr ""
#: en/git-cat-file.txt:92
#, no-wrap
msgid "--batch-all-objects"
-msgstr ""
+msgstr "--batch-all-objects"
#. type: Plain text
#: en/git-cat-file.txt:98
@@ -18557,14 +18389,15 @@ msgid ""
"Instead of reading a list of objects on stdin, perform the requested batch "
"operation on all objects in the repository and any alternate object stores "
"(not just reachable objects). Requires `--batch` or `--batch-check` be "
-"specified. Note that the objects are visited in order sorted by their hashes."
+"specified. Note that the objects are visited in order sorted by their "
+"hashes."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:99
#, no-wrap
msgid "--buffer"
-msgstr ""
+msgstr "--buffer"
#. type: Plain text
#: en/git-cat-file.txt:105
@@ -18579,7 +18412,7 @@ msgstr ""
#: en/git-cat-file.txt:106
#, no-wrap
msgid "--allow-unknown-type"
-msgstr ""
+msgstr "--allow-unknown-type"
#. type: Plain text
#: en/git-cat-file.txt:108
@@ -18590,17 +18423,17 @@ msgstr ""
#: en/git-cat-file.txt:109
#, no-wrap
msgid "--follow-symlinks"
-msgstr ""
+msgstr "--follow-symlinks"
#. type: Plain text
#: en/git-cat-file.txt:118
msgid ""
"With --batch or --batch-check, follow symlinks inside the repository when "
-"requesting objects with extended SHA-1 expressions of the form tree-ish:path-"
-"in-tree. Instead of providing output about the link itself, provide output "
-"about the linked-to object. If a symlink points outside the tree-ish (e.g. "
-"a link to /foo or a root-level link to ../foo), the portion of the link "
-"which is outside the tree will be printed."
+"requesting objects with extended SHA-1 expressions of the form tree-"
+"ish:path-in-tree. Instead of providing output about the link itself, "
+"provide output about the linked-to object. If a symlink points outside the "
+"tree-ish (e.g. a link to /foo or a root-level link to ../foo), the portion "
+"of the link which is outside the tree will be printed."
msgstr ""
#. type: Plain text
@@ -18736,8 +18569,8 @@ msgstr "FORMATS DE DATE"
#: en/git-cat-file.txt:185
msgid ""
"If `--batch` or `--batch-check` is given, `cat-file` will read objects from "
-"stdin, one per line, and print information about them. By default, the whole "
-"line is considered as an object, as if it were fed to linkgit:git-rev-"
+"stdin, one per line, and print information about them. By default, the whole"
+" line is considered as an object, as if it were fed to linkgit:git-rev-"
"parse[1]."
msgstr ""
@@ -18746,8 +18579,8 @@ msgstr ""
msgid ""
"You can specify the information shown for each object by using a custom "
"`<format>`. The `<format>` is copied literally to stdout for each object, "
-"with placeholders of the form `%(atom)` expanded, followed by a newline. The "
-"available atoms are:"
+"with placeholders of the form `%(atom)` expanded, followed by a newline. The"
+" available atoms are:"
msgstr ""
#. type: Labeled list
@@ -18822,8 +18655,8 @@ msgid ""
"If this atom is used in the output string, input lines are split at the "
"first whitespace boundary. All characters before that whitespace are "
"considered to be the object name; characters after that first run of "
-"whitespace (i.e., the \"rest\" of the line) are output in place of the `"
-"%(rest)` atom."
+"whitespace (i.e., the \"rest\" of the line) are output in place of the "
+"`%(rest)` atom."
msgstr ""
#. type: Plain text
@@ -18880,8 +18713,8 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:247
msgid ""
-"If --follow-symlinks is used, and a symlink in the repository points outside "
-"the repository, then `cat-file` will ignore any custom format and print:"
+"If --follow-symlinks is used, and a symlink in the repository points outside"
+" the repository, then `cat-file` will ignore any custom format and print:"
msgstr ""
#. type: delimited block -
@@ -18895,15 +18728,16 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:256
msgid ""
-"The symlink will either be absolute (beginning with a /), or relative to the "
-"tree root. For instance, if dir/link points to ../../foo, then <symlink> "
+"The symlink will either be absolute (beginning with a /), or relative to the"
+" tree root. For instance, if dir/link points to ../../foo, then <symlink> "
"will be ../foo. <size> is the size of the symlink in bytes."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:259
msgid ""
-"If --follow-symlinks is used, the following error messages will be displayed:"
+"If --follow-symlinks is used, the following error messages will be "
+"displayed:"
msgstr ""
#. type: Plain text
@@ -18937,8 +18771,8 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:278
msgid ""
-"is printed for symlink loops (or any symlinks that require more than 40 link "
-"resolutions to resolve)."
+"is printed for symlink loops (or any symlinks that require more than 40 link"
+" resolutions to resolve)."
msgstr ""
#. type: delimited block -
@@ -18977,8 +18811,8 @@ msgstr ""
#: en/git-cat-file.txt:299
msgid ""
"Note also that multiple copies of an object may be present in the object "
-"database; in this case, it is undefined which copy's size or delta base will "
-"be reported."
+"database; in this case, it is undefined which copy's size or delta base will"
+" be reported."
msgstr ""
#. type: Title =
@@ -19025,9 +18859,10 @@ msgstr ""
#: en/git-check-attr.txt:29
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
-msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
+msgid ""
+"Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
"en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et "
"de l'index, encore une fois, avant d'utiliser la commande 'commit',"
@@ -19041,7 +18876,7 @@ msgstr ""
#: en/git-update-index.txt:140 en/rev-list-options.txt:194
#, no-wrap
msgid "--stdin"
-msgstr ""
+msgstr "--stdin"
#. type: Plain text
#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
@@ -19053,9 +18888,9 @@ msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:38
msgid ""
-"The output format is modified to be machine-parseable. If `--stdin` is also "
-"given, input paths are separated with a NUL character instead of a linefeed "
-"character."
+"The output format is modified to be machine-parseable. If `--stdin` is also"
+" given, input paths are separated with a NUL character instead of a linefeed"
+" character."
msgstr ""
#. type: Plain text
@@ -19081,8 +18916,8 @@ msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:55
msgid ""
-"unless `-z` is in effect, in which case NUL is used as delimiter: <path> NUL "
-"<attribute> NUL <info> NUL"
+"unless `-z` is in effect, in which case NUL is used as delimiter: <path> NUL"
+" <attribute> NUL <info> NUL"
msgstr ""
#. type: Plain text
@@ -19139,8 +18974,8 @@ msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
msgid ""
-"Buffering happens as documented under the `GIT_FLUSH` option in linkgit:"
-"git[1]. The caller is responsible for avoiding deadlocks caused by "
+"Buffering happens as documented under the `GIT_FLUSH` option in "
+"linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by "
"overfilling an input buffer or reading from an empty output buffer."
msgstr ""
@@ -19236,7 +19071,7 @@ msgstr "linkgit:gitattributes[5]."
#: en/git-check-ignore.txt:2
#, no-wrap
msgid "git-check-ignore(1)"
-msgstr ""
+msgstr "git-check-ignore(1)"
#. type: Plain text
#: en/git-check-ignore.txt:7
@@ -19262,8 +19097,8 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:25
msgid ""
-"By default, tracked files are not shown at all since they are not subject to "
-"exclude rules; but see `--no-index'."
+"By default, tracked files are not shown at all since they are not subject to"
+" exclude rules; but see `--no-index'."
msgstr ""
#. type: Labeled list
@@ -19296,9 +19131,9 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:45
msgid ""
-"The output format is modified to be machine-parseable (see below). If `--"
-"stdin` is also given, input paths are separated with a NUL character instead "
-"of a linefeed character."
+"The output format is modified to be machine-parseable (see below). If "
+"`--stdin` is also given, input paths are separated with a NUL character "
+"instead of a linefeed character."
msgstr ""
#. type: Labeled list
@@ -19310,8 +19145,8 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:51
msgid ""
-"Show given paths which don't match any pattern.\t This only makes sense when "
-"`--verbose` is enabled, otherwise it would not be possible to distinguish "
+"Show given paths which don't match any pattern.\t This only makes sense when"
+" `--verbose` is enabled, otherwise it would not be possible to distinguish "
"between paths which match a pattern and those which don't."
msgstr ""
@@ -19319,7 +19154,7 @@ msgstr ""
#: en/git-check-ignore.txt:52 en/git-grep.txt:76
#, no-wrap
msgid "--no-index"
-msgstr ""
+msgstr "--no-index"
#. type: Plain text
#: en/git-check-ignore.txt:58
@@ -19333,8 +19168,8 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:66
msgid ""
-"By default, any of the given pathnames which match an ignore pattern will be "
-"output, one per line. If no pattern matches a given path, nothing will be "
+"By default, any of the given pathnames which match an ignore pattern will be"
+" output, one per line. If no pattern matches a given path, nothing will be "
"output for that path; this means that path will not be ignored."
msgstr ""
@@ -19356,9 +19191,9 @@ msgid ""
"pattern, <source> is the pattern's source file, and <linenum> is the line "
"number of the pattern within that source. If the pattern contained a `!` "
"prefix or `/` suffix, it will be preserved in the output. <source> will be "
-"an absolute path when referring to the file configured by `core."
-"excludesFile`, or relative to the repository root when referring to `.git/"
-"info/exclude` or a per-directory exclude file."
+"an absolute path when referring to the file configured by "
+"`core.excludesFile`, or relative to the repository root when referring to "
+"`.git/info/exclude` or a per-directory exclude file."
msgstr ""
#. type: Plain text
@@ -19427,7 +19262,6 @@ msgstr ""
msgid "A fatal error was encountered."
msgstr ""
-#
#. type: Plain text
#: en/git-check-ignore.txt:117
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
@@ -19479,9 +19313,8 @@ msgstr ""
#: en/git-checkout-index.txt:2
#, no-wrap
msgid "git-checkout-index(1)"
-msgstr ""
+msgstr "git-checkout-index(1)"
-#
#. type: Plain text
#: en/git-checkout-index.txt:7
#, fuzzy
@@ -19504,8 +19337,8 @@ msgstr ""
#: en/git-checkout-index.txt:22
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid ""
"Will copy all files listed from the index to the working directory (not "
"overwriting existing files)."
@@ -19518,7 +19351,6 @@ msgstr ""
msgid "update stat information for the checked out entries in the index file."
msgstr ""
-#
#. type: Plain text
#: en/git-checkout-index.txt:33
#, fuzzy
@@ -19550,7 +19382,7 @@ msgstr ""
#: en/git-checkout-index.txt:44
#, no-wrap
msgid "--no-create"
-msgstr ""
+msgstr "--no-create"
#. type: Plain text
#: en/git-checkout-index.txt:47
@@ -19588,7 +19420,7 @@ msgstr ""
#: en/git-checkout-index.txt:57
#, no-wrap
msgid "--temp"
-msgstr ""
+msgstr "--temp"
#. type: Plain text
#: en/git-checkout-index.txt:61
@@ -19601,8 +19433,8 @@ msgstr ""
#: en/git-checkout-index.txt:66 en/git-update-index.txt:144
msgid ""
"Instead of taking list of paths from the command line, read list of paths "
-"from the standard input. Paths are separated by LF (i.e. one path per line) "
-"by default."
+"from the standard input. Paths are separated by LF (i.e. one path per line)"
+" by default."
msgstr ""
#. type: Plain text
@@ -19700,10 +19532,10 @@ msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:121
msgid ""
-"The first format is what gets used when `--stage` is omitted or is not `--"
-"stage=all`. The field tempname is the temporary file name holding the file "
-"content and path is the tracked path name in the index. Only the requested "
-"entries are output."
+"The first format is what gets used when `--stage` is omitted or is not "
+"`--stage=all`. The field tempname is the temporary file name holding the "
+"file content and path is the tracked path name in the index. Only the "
+"requested entries are output."
msgstr ""
#. type: Plain text
@@ -19749,7 +19581,9 @@ msgstr ""
#. type: delimited block -
#: en/git-checkout-index.txt:148 en/git-update-index.txt:342
#, no-wrap
-msgid "$ git checkout-index -n -f -a && git update-index --ignore-missing --refresh\n"
+msgid ""
+"$ git checkout-index -n -f -a && git update-index --ignore-missing "
+"--refresh\n"
msgstr ""
#. type: Labeled list
@@ -19761,9 +19595,9 @@ msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:154
msgid ""
-"The prefix ability basically makes it trivial to use 'git checkout-index' as "
-"an \"export as tree\" function. Just read the desired tree into the index, "
-"and do:"
+"The prefix ability basically makes it trivial to use 'git checkout-index' as"
+" an \"export as tree\" function. Just read the desired tree into the index,"
+" and do:"
msgstr ""
#. type: delimited block -
@@ -19800,8 +19634,8 @@ msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:174
msgid ""
-"This will check out the currently cached copy of `Makefile` into the file `."
-"merged-Makefile`."
+"This will check out the currently cached copy of `Makefile` into the file "
+"`.merged-Makefile`."
msgstr ""
#. type: Title =
@@ -19810,7 +19644,6 @@ msgstr ""
msgid "git-checkout(1)"
msgstr "git-checkout(1)"
-#
#. type: Plain text
#: en/git-checkout.txt:7
#, fuzzy
@@ -19850,8 +19683,8 @@ msgstr "$ git commit\n"
msgid ""
"To prepare for working on <branch>, switch to it by updating the index and "
"the files in the working tree, and by pointing HEAD at the branch. Local "
-"modifications to the files in the working tree are kept, so that they can be "
-"committed to the <branch>."
+"modifications to the files in the working tree are kept, so that they can be"
+" committed to the <branch>."
msgstr ""
#. type: Plain text
@@ -19871,8 +19704,8 @@ msgstr ""
#: en/git-checkout.txt:44
msgid ""
"You could omit <branch>, in which case the command degenerates to \"check "
-"out the current branch\", which is a glorified no-op with a rather expensive "
-"side-effects to show only the tracking information, if exists, for the "
+"out the current branch\", which is a glorified no-op with a rather expensive"
+" side-effects to show only the tracking information, if exists, for the "
"current branch."
msgstr ""
@@ -19886,17 +19719,17 @@ msgstr ""
#: en/git-checkout.txt:53
msgid ""
"Specifying `-b` causes a new branch to be created as if linkgit:git-"
-"branch[1] were called and then checked out. In this case you can use the `--"
-"track` or `--no-track` options, which will be passed to 'git branch'. As a "
-"convenience, `--track` without `-b` implies branch creation; see the "
+"branch[1] were called and then checked out. In this case you can use the "
+"`--track` or `--no-track` options, which will be passed to 'git branch'. As"
+" a convenience, `--track` without `-b` implies branch creation; see the "
"description of `--track` below."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:56
msgid ""
-"If `-B` is given, <new_branch> is created if it doesn't exist; otherwise, it "
-"is reset. This is the transactional equivalent of"
+"If `-B` is given, <new_branch> is created if it doesn't exist; otherwise, it"
+" is reset. This is the transactional equivalent of"
msgstr ""
#. type: delimited block -
@@ -19961,11 +19794,11 @@ msgstr ""
msgid ""
"When <paths> or `--patch` are given, 'git checkout' does *not* switch "
"branches. It updates the named paths in the working tree from the index "
-"file or from a named <tree-ish> (most often a commit). In this case, the `-"
-"b` and `--track` options are meaningless and giving either of them results "
-"in an error. The <tree-ish> argument can be used to specify a specific tree-"
-"ish (i.e. commit, tag or tree) to update the index for the given paths "
-"before updating the working tree."
+"file or from a named <tree-ish> (most often a commit). In this case, the "
+"`-b` and `--track` options are meaningless and giving either of them results"
+" in an error. The <tree-ish> argument can be used to specify a specific "
+"tree-ish (i.e. commit, tag or tree) to update the index for the given paths"
+" before updating the working tree."
msgstr ""
#. type: Plain text
@@ -20006,8 +19839,8 @@ msgstr ""
msgid ""
"Progress status is reported on the standard error stream by default when it "
"is attached to a terminal, unless `--quiet` is specified. This flag enables "
-"progress reporting even if not attached to a terminal, regardless of `--"
-"quiet`."
+"progress reporting even if not attached to a terminal, regardless of "
+"`--quiet`."
msgstr ""
#. type: Plain text
@@ -20028,13 +19861,13 @@ msgstr ""
#: en/git-checkout.txt:125 en/git-merge-file.txt:73
#, no-wrap
msgid "--ours"
-msgstr ""
+msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:126 en/git-merge-file.txt:74
#, no-wrap
msgid "--theirs"
-msgstr ""
+msgstr "--theirs"
#. type: Plain text
#: en/git-checkout.txt:129
@@ -20059,9 +19892,9 @@ msgid ""
"the remote as the shared canonical one, and treats the work done on the "
"branch you are rebasing as the third-party work to be integrated, and you "
"are temporarily assuming the role of the keeper of the canonical history "
-"during the rebase. As the keeper of the canonical history, you need to view "
-"the history from the remote as `ours` (i.e. \"our shared canonical history"
-"\"), while what you did on your side branch as `theirs` (i.e. \"one "
+"during the rebase. As the keeper of the canonical history, you need to view"
+" the history from the remote as `ours` (i.e. \"our shared canonical "
+"history\"), while what you did on your side branch as `theirs` (i.e. \"one "
"contributor's work on top of it\")."
msgstr ""
@@ -20089,16 +19922,16 @@ msgstr "Mode interactif"
#. type: Plain text
#: en/git-checkout.txt:154
msgid ""
-"Creates the branch <new_branch> and start it at <start_point>; if it already "
-"exists, then reset it to <start_point>. This is equivalent to running \"git "
-"branch\" with \"-f\"; see linkgit:git-branch[1] for details."
+"Creates the branch <new_branch> and start it at <start_point>; if it already"
+" exists, then reset it to <start_point>. This is equivalent to running \"git"
+" branch\" with \"-f\"; see linkgit:git-branch[1] for details."
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:159
msgid ""
-"When creating a new branch, set up \"upstream\" configuration. See \"--track"
-"\" in linkgit:git-branch[1] for details."
+"When creating a new branch, set up \"upstream\" configuration. See \"--"
+"track\" in linkgit:git-branch[1] for details."
msgstr ""
#. type: Plain text
@@ -20106,11 +19939,11 @@ msgstr ""
msgid ""
"If no `-b` option is given, the name of the new branch will be derived from "
"the remote-tracking branch, by looking at the local part of the refspec "
-"configured for the corresponding remote, and then stripping the initial part "
-"up to the \"*\". This would tell us to use \"hack\" as the local branch "
+"configured for the corresponding remote, and then stripping the initial part"
+" up to the \"*\". This would tell us to use \"hack\" as the local branch "
"when branching off of \"origin/hack\" (or \"remotes/origin/hack\", or even "
-"\"refs/remotes/origin/hack\"). If the given name has no slash, or the above "
-"guessing results in an empty name, the guessing is aborted. You can "
+"\"refs/remotes/origin/hack\"). If the given name has no slash, or the above"
+" guessing results in an empty name, the guessing is aborted. You can "
"explicitly give a name with `-b` in such a case."
msgstr ""
@@ -20123,7 +19956,7 @@ msgstr ""
#: en/git-checkout.txt:178 en/git-daemon.txt:134 en/git-worktree.txt:100
#, no-wrap
msgid "--detach"
-msgstr ""
+msgstr "--detach"
#. type: Plain text
#: en/git-checkout.txt:184
@@ -20143,8 +19976,8 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:191
msgid ""
-"Create a new 'orphan' branch, named <new_branch>, started from <start_point> "
-"and switch to it. The first commit made on this new branch will have no "
+"Create a new 'orphan' branch, named <new_branch>, started from <start_point>"
+" and switch to it. The first commit made on this new branch will have no "
"parents and it will be the root of a new history totally disconnected from "
"all the other branches and commits."
msgstr ""
@@ -20153,8 +19986,8 @@ msgstr ""
#: en/git-checkout.txt:196
msgid ""
"The index and the working tree are adjusted as if you had previously run "
-"\"git checkout <start_point>\". This allows you to start a new history that "
-"records a set of paths similar to <start_point> by easily running \"git "
+"\"git checkout <start_point>\". This allows you to start a new history that"
+" records a set of paths similar to <start_point> by easily running \"git "
"commit -a\" to make the root commit."
msgstr ""
@@ -20170,12 +20003,12 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:209
msgid ""
-"If you want to start a disconnected history that records a set of paths that "
-"is totally different from the one of <start_point>, then you should clear "
+"If you want to start a disconnected history that records a set of paths that"
+" is totally different from the one of <start_point>, then you should clear "
"the index and the working tree right after creating the orphan branch by "
-"running \"git rm -rf .\" from the top level of the working tree. Afterwards "
-"you will be ready to prepare your new files, repopulating the working tree, "
-"by copying them from elsewhere, extracting a tarball, etc."
+"running \"git rm -rf .\" from the top level of the working tree. Afterwards"
+" you will be ready to prepare your new files, repopulating the working tree,"
+" by copying them from elsewhere, extracting a tarball, etc."
msgstr ""
#. type: Labeled list
@@ -20187,8 +20020,8 @@ msgstr "--ignore-skip-worktree-bits"
#. type: Plain text
#: en/git-checkout.txt:215
msgid ""
-"In sparse checkout mode, `git checkout -- <paths>` would update only entries "
-"matched by <paths> and sparse patterns in $GIT_DIR/info/sparse-checkout. "
+"In sparse checkout mode, `git checkout -- <paths>` would update only entries"
+" matched by <paths> and sparse patterns in $GIT_DIR/info/sparse-checkout. "
"This option ignores the sparse patterns and adds back any files in <paths>."
msgstr ""
@@ -20254,11 +20087,11 @@ msgstr ""
#: en/git-checkout.txt:252
#, fuzzy
#| msgid ""
-#| "by using the --interactive or --patch switches with the 'commit' command "
-#| "to decide one by one which files or hunks should be part of the commit in "
-#| "addition to contents in the index, before finalizing the operation. See "
-#| "the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to "
-#| "operate these modes."
+#| "by using the --interactive or --patch switches with the 'commit' command to "
+#| "decide one by one which files or hunks should be part of the commit in "
+#| "addition to contents in the index, before finalizing the operation. See the "
+#| "``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate "
+#| "these modes."
msgid ""
"This means that you can use `git checkout -p` to selectively discard edits "
"from your current working tree. See the ``Interactive Mode'' section of "
@@ -20274,14 +20107,14 @@ msgstr ""
#: en/git-checkout.txt:253
#, no-wrap
msgid "--ignore-other-worktrees"
-msgstr ""
+msgstr "--ignore-other-worktrees"
#. type: Plain text
#: en/git-checkout.txt:258
msgid ""
-"`git checkout` refuses when the wanted ref is already checked out by another "
-"worktree. This option makes it check the ref out anyway. In other words, the "
-"ref can be held by more than one worktree."
+"`git checkout` refuses when the wanted ref is already checked out by another"
+" worktree. This option makes it check the ref out anyway. In other words, "
+"the ref can be held by more than one worktree."
msgstr ""
#. type: Labeled list
@@ -20295,9 +20128,9 @@ msgstr "Mode interactif"
#: en/git-checkout.txt:265
msgid ""
"Branch to checkout; if it refers to a branch (i.e., a name that, when "
-"prepended with \"refs/heads/\", is a valid ref), then that branch is checked "
-"out. Otherwise, if it refers to a valid commit, your HEAD becomes \"detached"
-"\" and you are no longer on any branch (see below for details)."
+"prepended with \"refs/heads/\", is a valid ref), then that branch is checked"
+" out. Otherwise, if it refers to a valid commit, your HEAD becomes "
+"\"detached\" and you are no longer on any branch (see below for details)."
msgstr ""
#. type: Plain text
@@ -20357,8 +20190,8 @@ msgstr ""
#: en/git-checkout.txt:292
msgid ""
"HEAD normally refers to a named branch (e.g. 'master'). Meanwhile, each "
-"branch refers to a specific commit. Let's look at a repo with three commits, "
-"one of them tagged, and with branch 'master' checked out:"
+"branch refers to a specific commit. Let's look at a repo with three commits,"
+" one of them tagged, and with branch 'master' checked out:"
msgstr ""
#. type: delimited block -
@@ -20538,8 +20371,8 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:408
msgid ""
-"similarly creates a new branch 'foo', which refers to commit 'f', but leaves "
-"HEAD detached."
+"similarly creates a new branch 'foo', which refers to commit 'f', but leaves"
+" HEAD detached."
msgstr ""
#. type: Plain text
@@ -20551,10 +20384,10 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:416
msgid ""
-"If we have moved away from commit 'f', then we must first recover its object "
-"name (typically by using git reflog), and then we can create a reference to "
-"it. For example, to see the last two commits to which HEAD referred, we can "
-"use either of these commands:"
+"If we have moved away from commit 'f', then we must first recover its object"
+" name (typically by using git reflog), and then we can create a reference to"
+" it. For example, to see the last two commits to which HEAD referred, we can"
+" use either of these commands:"
msgstr ""
#. type: delimited block -
@@ -20637,7 +20470,8 @@ msgstr "$ git commit\n"
msgid ""
"Note the quotes around `*.c`. The file `hello.c` will also be checked out, "
"even though it is no longer in the working tree, because the file globbing "
-"is used to match entries in the index (not in the working tree by the shell)."
+"is used to match entries in the index (not in the working tree by the "
+"shell)."
msgstr ""
#. type: Plain text
@@ -20673,8 +20507,8 @@ msgstr "$ git commit\n"
#: en/git-checkout.txt:482
msgid ""
"However, your \"wrong\" branch and correct \"mytopic\" branch may differ in "
-"files that you have modified locally, in which case the above checkout would "
-"fail like this:"
+"files that you have modified locally, in which case the above checkout would"
+" fail like this:"
msgstr ""
#. type: delimited block -
@@ -20688,7 +20522,8 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:490
msgid ""
-"You can give the `-m` flag to the command, which would try a three-way merge:"
+"You can give the `-m` flag to the command, which would try a three-way "
+"merge:"
msgstr ""
#. type: delimited block -
@@ -20774,10 +20609,10 @@ msgstr ""
#: en/git-check-ref-format.txt:27
msgid ""
"A reference is used in Git to specify branches and tags. A branch head is "
-"stored in the `refs/heads` hierarchy, while a tag is stored in the `refs/"
-"tags` hierarchy of the ref namespace (typically in `$GIT_DIR/refs/heads` and "
-"`$GIT_DIR/refs/tags` directories or, as entries in file `$GIT_DIR/packed-"
-"refs` if refs are packed by `git gc`)."
+"stored in the `refs/heads` hierarchy, while a tag is stored in the "
+"`refs/tags` hierarchy of the ref namespace (typically in "
+"`$GIT_DIR/refs/heads` and `$GIT_DIR/refs/tags` directories or, as entries in"
+" file `$GIT_DIR/packed-refs` if refs are packed by `git gc`)."
msgstr ""
#. type: Plain text
@@ -20796,9 +20631,9 @@ msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:38
msgid ""
-"They must contain at least one `/`. This enforces the presence of a category "
-"like `heads/`, `tags/` etc. but the actual names are not restricted. If the "
-"`--allow-onelevel` option is used, this rule is waived."
+"They must contain at least one `/`. This enforces the presence of a category"
+" like `heads/`, `tags/` etc. but the actual names are not restricted. If "
+"the `--allow-onelevel` option is used, this rule is waived."
msgstr ""
#. type: Plain text
@@ -20809,8 +20644,8 @@ msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:44
msgid ""
-"They cannot have ASCII control characters (i.e. bytes whose values are lower "
-"than \\040, or \\177 `DEL`), space, tilde `~`, caret `^`, or colon `:` "
+"They cannot have ASCII control characters (i.e. bytes whose values are lower"
+" than \\040, or \\177 `DEL`), space, tilde `~`, caret `^`, or colon `:` "
"anywhere."
msgstr ""
@@ -20818,8 +20653,8 @@ msgstr ""
#: en/git-check-ref-format.txt:48
msgid ""
"They cannot have question-mark `?`, asterisk `*`, or open bracket `[` "
-"anywhere. See the `--refspec-pattern` option below for an exception to this "
-"rule."
+"anywhere. See the `--refspec-pattern` option below for an exception to this"
+" rule."
msgstr ""
#. type: Plain text
@@ -20868,15 +20703,15 @@ msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:72
msgid ""
-"A tilde `~` and caret `^` are used to introduce the postfix 'nth parent' and "
-"'peel onion' operation."
+"A tilde `~` and caret `^` are used to introduce the postfix 'nth parent' and"
+" 'peel onion' operation."
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:77
msgid ""
-"A colon `:` is used as in `srcref:dstref` to mean \"use srcref\\'s value and "
-"store it in dstref\" in fetch and push operations. It may also be used to "
+"A colon `:` is used as in `srcref:dstref` to mean \"use srcref\\'s value and"
+" store it in dstref\" in fetch and push operations. It may also be used to "
"select a specific object such as with 'git cat-file': \"git cat-file blob "
"v1.3.3:refs.c\"."
msgstr ""
@@ -20889,23 +20724,23 @@ msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:85
msgid ""
-"With the `--branch` option, it expands the ``previous branch syntax'' `@{-n}"
-"`. For example, `@{-1}` is a way to refer the last branch you were on. "
-"This option should be used by porcelains to accept this syntax anywhere a "
-"branch name is expected, so they can act as if you typed the branch name."
+"With the `--branch` option, it expands the ``previous branch syntax'' "
+"`@{-n}`. For example, `@{-1}` is a way to refer the last branch you were "
+"on. This option should be used by porcelains to accept this syntax anywhere"
+" a branch name is expected, so they can act as if you typed the branch name."
msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:88
#, no-wrap
msgid "--[no-]allow-onelevel"
-msgstr ""
+msgstr "--[no-]allow-onelevel"
#. type: Plain text
#: en/git-check-ref-format.txt:92
msgid ""
-"Controls whether one-level refnames are accepted (i.e., refnames that do not "
-"contain multiple `/`-separated components). The default is `--no-allow-"
+"Controls whether one-level refnames are accepted (i.e., refnames that do not"
+" contain multiple `/`-separated components). The default is `--no-allow-"
"onelevel`."
msgstr ""
@@ -20913,7 +20748,7 @@ msgstr ""
#: en/git-check-ref-format.txt:93
#, no-wrap
msgid "--refspec-pattern"
-msgstr ""
+msgstr "--refspec-pattern"
#. type: Plain text
#: en/git-check-ref-format.txt:99
@@ -20928,7 +20763,7 @@ msgstr ""
#: en/git-check-ref-format.txt:100
#, no-wrap
msgid "--normalize"
-msgstr ""
+msgstr "--normalize"
#. type: Plain text
#: en/git-check-ref-format.txt:107
@@ -20936,8 +20771,8 @@ msgid ""
"Normalize 'refname' by removing any leading slash (`/`) characters and "
"collapsing runs of adjacent slashes between name components into a single "
"slash. If the normalized refname is valid then print it to standard output "
-"and exit with a status of 0, otherwise exit with a non-zero status. (`--"
-"print` is a deprecated way to spell `--normalize`.)"
+"and exit with a status of 0, otherwise exit with a non-zero status. "
+"(`--print` is a deprecated way to spell `--normalize`.)"
msgstr ""
#. type: Plain text
@@ -20968,11 +20803,12 @@ msgstr ""
#: en/git-cherry-pick.txt:2
#, no-wrap
msgid "git-cherry-pick(1)"
-msgstr ""
+msgstr "git-cherry-pick(1)"
#. type: Plain text
#: en/git-cherry-pick.txt:7
-msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
+msgid ""
+"git-cherry-pick - Apply the changes introduced by some existing commits"
msgstr ""
#. type: Plain text
@@ -21009,15 +20845,15 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:31
msgid ""
-"The `CHERRY_PICK_HEAD` ref is set to point at the commit that introduced the "
-"change that is difficult to apply."
+"The `CHERRY_PICK_HEAD` ref is set to point at the commit that introduced the"
+" change that is difficult to apply."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:33
msgid ""
-"Paths in which the change applied cleanly are updated both in the index file "
-"and in your working tree."
+"Paths in which the change applied cleanly are updated both in the index file"
+" and in your working tree."
msgstr ""
#. type: Plain text
@@ -21050,11 +20886,11 @@ msgstr "<commit>..."
#: en/git-cherry-pick.txt:54
msgid ""
"Commits to cherry-pick. For a more complete list of ways to spell commits, "
-"see linkgit:gitrevisions[7]. Sets of commits can be passed but no traversal "
-"is done by default, as if the `--no-walk` option was specified, see linkgit:"
-"git-rev-list[1]. Note that specifying a range will feed all <commit>... "
-"arguments to a single revision walk (see a later example that uses 'maint "
-"master..next')."
+"see linkgit:gitrevisions[7]. Sets of commits can be passed but no traversal"
+" is done by default, as if the `--no-walk` option was specified, see "
+"linkgit:git-rev-list[1]. Note that specifying a range will feed all "
+"<commit>... arguments to a single revision walk (see a later example that "
+"uses 'maint master..next')."
msgstr ""
#. type: Plain text
@@ -21068,7 +20904,7 @@ msgstr ""
#: en/git-cherry-pick.txt:60 en/git-clean.txt:62
#, no-wrap
msgid "-x"
-msgstr ""
+msgstr "-x"
#. type: Plain text
#: en/git-cherry-pick.txt:73
@@ -21078,8 +20914,8 @@ msgid ""
"commit this change was cherry-picked from. This is done only for cherry "
"picks without conflicts. Do not use this option if you are cherry-picking "
"from your private branch because the information is useless to the "
-"recipient. If on the other hand you are cherry-picking between two publicly "
-"visible branches (e.g. backporting a fix to a maintenance branch for an "
+"recipient. If on the other hand you are cherry-picking between two publicly"
+" visible branches (e.g. backporting a fix to a maintenance branch for an "
"older release from a development branch), adding this information can be "
"useful."
msgstr ""
@@ -21087,9 +20923,9 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:78
msgid ""
-"It used to be that the command defaulted to do `-x` described above, and `-"
-"r` was to disable it. Now the default is not to do `-x` so this option is a "
-"no-op."
+"It used to be that the command defaulted to do `-x` described above, and "
+"`-r` was to disable it. Now the default is not to do `-x` so this option is"
+" a no-op."
msgstr ""
#. type: Labeled list
@@ -21107,8 +20943,8 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:86
msgid ""
-"Usually you cannot cherry-pick a merge because you do not know which side of "
-"the merge should be considered the mainline. This option specifies the "
+"Usually you cannot cherry-pick a merge because you do not know which side of"
+" the merge should be considered the mainline. This option specifies the "
"parent number (starting from 1) of the mainline and allows cherry-pick to "
"replay the change relative to the specified parent."
msgstr ""
@@ -21125,8 +20961,8 @@ msgid ""
"Usually the command automatically creates a sequence of commits. This flag "
"applies the changes necessary to cherry-pick each named commit to your "
"working tree and the index, without making any commit. In addition, when "
-"this option is used, your index does not have to match the HEAD commit. The "
-"cherry-pick is done against the beginning state of your index."
+"this option is used, your index does not have to match the HEAD commit. The"
+" cherry-pick is done against the beginning state of your index."
msgstr ""
#. type: Plain text
@@ -21147,7 +20983,7 @@ msgstr ""
#: en/git-cherry-pick.txt:111 en/merge-options.txt:30
#, no-wrap
msgid "--ff"
-msgstr ""
+msgstr "--ff"
#. type: Plain text
#: en/git-cherry-pick.txt:115
@@ -21169,12 +21005,11 @@ msgid ""
"explicit invocation of `git commit --allow-empty` is required. This option "
"overrides that behavior, allowing empty commits to be preserved "
"automatically in a cherry-pick. Note that when \"--ff\" is in effect, empty "
-"commits that meet the \"fast-forward\" requirement will be kept even without "
-"this option. Note also, that use of this option only keeps commits that "
-"were initially empty (i.e. the commit recorded the same tree as its "
-"parent). Commits which are made empty due to a previous commit are "
-"dropped. To force the inclusion of those commits use `--keep-redundant-"
-"commits`."
+"commits that meet the \"fast-forward\" requirement will be kept even without"
+" this option. Note also, that use of this option only keeps commits that "
+"were initially empty (i.e. the commit recorded the same tree as its parent)."
+" Commits which are made empty due to a previous commit are dropped. To "
+"force the inclusion of those commits use `--keep-redundant-commits`."
msgstr ""
#. type: Labeled list
@@ -21195,7 +21030,7 @@ msgstr ""
#: en/git-cherry-pick.txt:134
#, no-wrap
msgid "--keep-redundant-commits"
-msgstr ""
+msgstr "--keep-redundant-commits"
#. type: Plain text
#: en/git-cherry-pick.txt:140
@@ -21203,8 +21038,8 @@ msgid ""
"If a commit being cherry picked duplicates a commit already in the current "
"history, it will become empty. By default these redundant commits cause "
"`cherry-pick` to stop so the user can examine the commit. This option "
-"overrides that behavior and creates an empty commit object. Implies `--"
-"allow-empty`."
+"overrides that behavior and creates an empty commit object. Implies "
+"`--allow-empty`."
msgstr ""
#. type: Labeled list
@@ -21275,8 +21110,8 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:167
msgid ""
-"Apply the changes introduced by all commits that are ancestors of master but "
-"not of HEAD to produce new commits."
+"Apply the changes introduced by all commits that are ancestors of master but"
+" not of HEAD to produce new commits."
msgstr ""
#. type: Labeled list
@@ -21295,8 +21130,8 @@ msgstr ""
#: en/git-cherry-pick.txt:176
msgid ""
"Apply the changes introduced by all commits that are ancestors of maint or "
-"next, but not master or any of its ancestors. Note that the latter does not "
-"mean `maint` and everything between `master` and `next`; specifically, "
+"next, but not master or any of its ancestors. Note that the latter does not"
+" mean `maint` and everything between `master` and `next`; specifically, "
"`maint` will not be used if it is included in `master`."
msgstr ""
@@ -21322,9 +21157,9 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:189
msgid ""
-"Apply to the working tree and the index the changes introduced by the second "
-"last commit pointed to by master and by the last commit pointed to by next, "
-"but do not create any commit with these changes."
+"Apply to the working tree and the index the changes introduced by the second"
+" last commit pointed to by master and by the last commit pointed to by next,"
+" but do not create any commit with these changes."
msgstr ""
#. type: Labeled list
@@ -21352,8 +21187,8 @@ msgstr ""
#: en/git-cherry-pick.txt:204
msgid ""
"Apply the changes introduced by all commits on the master branch that "
-"touched README to the working tree and index, so the result can be inspected "
-"and made into a single new commit if suitable."
+"touched README to the working tree and index, so the result can be inspected"
+" and made into a single new commit if suitable."
msgstr ""
#. type: Plain text
@@ -21377,8 +21212,8 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:219
msgid ""
-"apply the change that would be shown by `git show topic^`. In this example, "
-"the patch does not apply cleanly, so information about the conflict is "
+"apply the change that would be shown by `git show topic^`. In this example,"
+" the patch does not apply cleanly, so information about the conflict is "
"written to the index and working tree and no new commit results."
msgstr ""
@@ -21397,8 +21232,8 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:226
msgid ""
-"try to apply the change introduced by `topic^` again, spending extra time to "
-"avoid mistakes based on incorrectly matching context lines."
+"try to apply the change introduced by `topic^` again, spending extra time to"
+" avoid mistakes based on incorrectly matching context lines."
msgstr ""
#. type: Title =
@@ -21429,16 +21264,16 @@ msgstr ""
#: en/git-cherry.txt:22
msgid ""
"The equivalence test is based on the diff, after removing whitespace and "
-"line numbers. git-cherry therefore detects when commits have been \"copied"
-"\" by means of linkgit:git-cherry-pick[1], linkgit:git-am[1] or linkgit:git-"
-"rebase[1]."
+"line numbers. git-cherry therefore detects when commits have been "
+"\"copied\" by means of linkgit:git-cherry-pick[1], linkgit:git-am[1] or "
+"linkgit:git-rebase[1]."
msgstr ""
#. type: Plain text
#: en/git-cherry.txt:26
msgid ""
-"Outputs the SHA1 of every commit in `<limit>..<head>`, prefixed with `-` for "
-"commits that have an equivalent in <upstream>, and `+` for commits that do "
+"Outputs the SHA1 of every commit in `<limit>..<head>`, prefixed with `-` for"
+" commits that have an equivalent in <upstream>, and `+` for commits that do "
"not."
msgstr ""
@@ -21485,10 +21320,10 @@ msgstr ""
#. type: Plain text
#: en/git-cherry.txt:52
msgid ""
-"git-cherry is frequently used in patch-based workflows (see linkgit:"
-"gitworkflows[7]) to determine if a series of patches has been applied by the "
-"upstream maintainer. In such a workflow you might create and send a topic "
-"branch like this:"
+"git-cherry is frequently used in patch-based workflows (see "
+"linkgit:gitworkflows[7]) to determine if a series of patches has been "
+"applied by the upstream maintainer. In such a workflow you might create and"
+" send a topic branch like this:"
msgstr ""
#. type: delimited block -
@@ -21568,8 +21403,8 @@ msgstr ""
msgid ""
"Here, we see that the commits A and C (marked with `-`) can be dropped from "
"your `topic` branch when you rebase it on top of `origin/master`, while the "
-"commit B (marked with `+`) still needs to be kept so that it will be sent to "
-"be applied to `origin/master`."
+"commit B (marked with `+`) still needs to be kept so that it will be sent to"
+" be applied to `origin/master`."
msgstr ""
#. type: Title ~
@@ -21582,8 +21417,8 @@ msgstr ""
#: en/git-cherry.txt:110
msgid ""
"The optional <limit> is useful in cases where your topic is based on other "
-"work that is not in upstream. Expanding on the previous example, this might "
-"look like:"
+"work that is not in upstream. Expanding on the previous example, this might"
+" look like:"
msgstr ""
#. type: delimited block -
@@ -21643,32 +21478,31 @@ msgstr "'git citool'\n"
#. type: Plain text
#: en/git-citool.txt:19
msgid ""
-"A Tcl/Tk based graphical interface to review modified files, stage them into "
-"the index, enter a commit message and record the new commit onto the current "
-"branch. This interface is an alternative to the less interactive 'git "
-"commit' program."
+"A Tcl/Tk based graphical interface to review modified files, stage them into"
+" the index, enter a commit message and record the new commit onto the "
+"current branch. This interface is an alternative to the less interactive "
+"'git commit' program."
msgstr ""
#. type: Plain text
#: en/git-citool.txt:22
msgid ""
-"'git citool' is actually a standard alias for `git gui citool`. See linkgit:"
-"git-gui[1] for more details."
+"'git citool' is actually a standard alias for `git gui citool`. See "
+"linkgit:git-gui[1] for more details."
msgstr ""
#. type: Title =
#: en/git-clean.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-clean(1)"
-msgstr "git-add(1)"
+msgstr "git-clean(1)"
#. type: Plain text
#: en/git-clean.txt:7
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid "git-clean - Remove untracked files from the working tree"
msgstr ""
"en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et "
@@ -21677,7 +21511,9 @@ msgstr ""
#. type: Plain text
#: en/git-clean.txt:12
#, no-wrap
-msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>...\n"
+msgid ""
+"'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "
+"<path>...\n"
msgstr ""
#. type: Plain text
@@ -21707,8 +21543,8 @@ msgstr ""
msgid ""
"Remove untracked directories in addition to untracked files. If an "
"untracked directory is managed by a different Git repository, it is not "
-"removed by default. Use -f option twice if you really want to remove such a "
-"directory."
+"removed by default. Use -f option twice if you really want to remove such a"
+" directory."
msgstr ""
#. type: Plain text
@@ -21716,8 +21552,8 @@ msgstr ""
msgid ""
"If the Git configuration variable clean.requireForce is not set to false, "
"'git clean' will refuse to delete files or directories unless given -f, -n "
-"or -i. Git will refuse to delete directories with .git sub directory or file "
-"unless a second -f is given."
+"or -i. Git will refuse to delete directories with .git sub directory or file"
+" unless a second -f is given."
msgstr ""
#. type: Plain text
@@ -21764,16 +21600,16 @@ msgstr ""
#. type: Plain text
#: en/git-clean.txt:61
msgid ""
-"In addition to those found in .gitignore (per directory) and $GIT_DIR/info/"
-"exclude, also consider these patterns to be in the set of the ignore rules "
-"in effect."
+"In addition to those found in .gitignore (per directory) and "
+"$GIT_DIR/info/exclude, also consider these patterns to be in the set of the "
+"ignore rules in effect."
msgstr ""
#. type: Plain text
#: en/git-clean.txt:69
msgid ""
-"Don't use the standard ignore rules read from .gitignore (per directory) and "
-"$GIT_DIR/info/exclude, but do still use the ignore rules given with `-e` "
+"Don't use the standard ignore rules read from .gitignore (per directory) and"
+" $GIT_DIR/info/exclude, but do still use the ignore rules given with `-e` "
"options. This allows removing all untracked files, including build "
"products. This can be used (possibly in conjunction with 'git reset') to "
"create a pristine working directory to test a clean build."
@@ -21792,7 +21628,6 @@ msgid ""
"from scratch, but keep manually created files."
msgstr ""
-#
#. type: Plain text
#: en/git-clean.txt:79
#, fuzzy
@@ -21825,28 +21660,26 @@ msgstr ""
" 5: patch 6: diff 7: quit 8: help\n"
" What now> 1\n"
-#
#. type: Plain text
#: en/git-clean.txt:93
#, fuzzy
#| msgid ""
-#| "You also could say `s` or `sta` or `status` above as long as the choice "
-#| "is unique."
+#| "You also could say `s` or `sta` or `status` above as long as the choice is "
+#| "unique."
msgid ""
"You also could say `c` or `clean` above as long as the choice is unique."
msgstr ""
"Vous pouvez indiquer `s` ou `sta` ou `status` dans le cas si dessus, 횪 "
"condition que le choix soit unique."
-#
#. type: Plain text
#: en/git-clean.txt:95
#, fuzzy
#| msgid "The main command loop has 6 subcommands (plus help and quit)."
msgid "The main command loop has 6 subcommands."
msgstr ""
-"La boucle de commande principale propose 6 sous-commandes (plus help (aide) "
-"et quit (quitter))."
+"La boucle de commande principale propose 6 sous-commandes (plus help (aide)"
+" et quit (quitter))."
#. type: Labeled list
#: en/git-clean.txt:96
@@ -21870,9 +21703,9 @@ msgstr ""
msgid ""
"This shows the files and directories to be deleted and issues an \"Input "
"ignore patterns>>\" prompt. You can input space-separated patterns to "
-"exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes "
-"files end with \".c\" and \".h\" from deletion. When you are satisfied with "
-"the filtered result, press ENTER (empty) back to the main menu."
+"exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes"
+" files end with \".c\" and \".h\" from deletion. When you are satisfied with"
+" the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
#. type: Labeled list
@@ -21881,32 +21714,30 @@ msgstr ""
msgid "select by numbers"
msgstr ""
-#
#. type: Plain text
#: en/git-clean.txt:120
#, fuzzy
#| msgid ""
-#| "This shows the status information and issues an \"Update>>\" prompt. "
-#| "When the prompt ends with double '>>', you can make more than one "
-#| "selection, concatenated with whitespace or comma. Also you can say "
-#| "ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the "
-#| "second number in a range is omitted, all remaining patches are taken. E."
-#| "g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose "
-#| "everything."
+#| "This shows the status information and issues an \"Update>>\" prompt. When "
+#| "the prompt ends with double '>>', you can make more than one selection, "
+#| "concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5"
+#| " 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range"
+#| " is omitted, all remaining patches are taken. E.g. \"7-\" to choose 7,8,9 "
+#| "from the list. You can say '*' to choose everything."
msgid ""
"This shows the files and directories to be deleted and issues an \"Select "
-"items to delete>>\" prompt. When the prompt ends with double '>>' like this, "
-"you can make more than one selection, concatenated with whitespace or "
+"items to delete>>\" prompt. When the prompt ends with double '>>' like this,"
+" you can make more than one selection, concatenated with whitespace or "
"comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 "
"from the list. If the second number in a range is omitted, all remaining "
-"items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say "
-"'*' to choose everything. Also when you are satisfied with the filtered "
+"items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say"
+" '*' to choose everything. Also when you are satisfied with the filtered "
"result, press ENTER (empty) back to the main menu."
msgstr ""
"Affiche l'information d'챕tat et un prompt \"Update>>\". Quand le prompt se "
"termine par un double '>', vous pouvez s챕lectionner plus d'une option, "
-"concat챕n챕es avec des espaces ou des virgules. Vous pouvez aussi indiquer des "
-"intervalles. Par exemple \"2-5 7,9\" pour choisir 2, 3, 4, 5, 7 et 9 dans "
+"concat챕n챕es avec des espaces ou des virgules. Vous pouvez aussi indiquer des"
+" intervalles. Par exemple \"2-5 7,9\" pour choisir 2, 3, 4, 5, 7 et 9 dans "
"la liste. Si le second nombre d'un intervalle est absent, tous les patchs "
"restants sont s챕lectionn챕s. Par ex. \"7-\" choisit 7, 8 et 9 dans la liste. "
"'*' permet de tout s챕lectionner."
@@ -21920,8 +21751,8 @@ msgstr ""
#. type: Plain text
#: en/git-clean.txt:126
msgid ""
-"This will start to clean, and you must confirm one by one in order to delete "
-"items. Please note that this action is not as efficient as the above two "
+"This will start to clean, and you must confirm one by one in order to delete"
+" items. Please note that this action is not as efficient as the above two "
"actions."
msgstr ""
@@ -21980,8 +21811,8 @@ msgstr ""
#: en/git-clone.txt:28
msgid ""
"Clones a repository into a newly created directory, creates remote-tracking "
-"branches for each branch in the cloned repository (visible using `git branch "
-"-r`), and creates and checks out an initial branch that is forked from the "
+"branches for each branch in the cloned repository (visible using `git branch"
+" -r`), and creates and checks out an initial branch that is forked from the "
"cloned repository's currently active branch."
msgstr ""
@@ -22002,8 +21833,8 @@ msgstr ""
#| "(see linkgit:git-config[1])."
msgid ""
"This default configuration is achieved by creating references to the remote "
-"branch heads under `refs/remotes/origin` and by initializing `remote.origin."
-"url` and `remote.origin.fetch` configuration variables."
+"branch heads under `refs/remotes/origin` and by initializing "
+"`remote.origin.url` and `remote.origin.fetch` configuration variables."
msgstr ""
"La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration "
"`commit.cleanup` (voir linkgit:git-config[1])."
@@ -22013,7 +21844,7 @@ msgstr ""
#: en/git-pack-objects.txt:127 en/git-svn.txt:229
#, no-wrap
msgid "--local"
-msgstr ""
+msgstr "--local"
#. type: Plain text
#: en/git-clone.txt:51
@@ -22028,32 +21859,33 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:58
msgid ""
-"If the repository is specified as a local path (e.g., `/path/to/repo`), this "
-"is the default, and --local is essentially a no-op. If the repository is "
+"If the repository is specified as a local path (e.g., `/path/to/repo`), this"
+" is the default, and --local is essentially a no-op. If the repository is "
"specified as a URL, then this flag is ignored (and we never use the local "
-"optimizations). Specifying `--no-local` will override the default when `/"
-"path/to/repo` is given, using the regular Git transport instead."
+"optimizations). Specifying `--no-local` will override the default when "
+"`/path/to/repo` is given, using the regular Git transport instead."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:59
#, no-wrap
msgid "--no-hardlinks"
-msgstr ""
+msgstr "--no-hardlinks"
#. type: Plain text
#: en/git-clone.txt:64
msgid ""
"Force the cloning process from a repository on a local filesystem to copy "
"the files under the `.git/objects` directory instead of using hardlinks. "
-"This may be desirable if you are trying to make a back-up of your repository."
+"This may be desirable if you are trying to make a back-up of your "
+"repository."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:65
#, no-wrap
msgid "--shared"
-msgstr ""
+msgstr "--shared"
#. type: Plain text
#: en/git-clone.txt:72
@@ -22083,9 +21915,9 @@ msgstr ""
#: en/git-clone.txt:88
msgid ""
"Note that running `git repack` without the `-l` option in a repository "
-"cloned with `-s` will copy objects from the source repository into a pack in "
-"the cloned repository, removing the disk space savings of `clone -s`. It is "
-"safe, however, to run `git gc`, which uses the `-l` option by default."
+"cloned with `-s` will copy objects from the source repository into a pack in"
+" the cloned repository, removing the disk space savings of `clone -s`. It "
+"is safe, however, to run `git gc`, which uses the `-l` option by default."
msgstr ""
#. type: Plain text
@@ -22105,8 +21937,8 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:103
msgid ""
-"If the reference repository is on the local machine, automatically setup `."
-"git/objects/info/alternates` to obtain objects from the reference "
+"If the reference repository is on the local machine, automatically setup "
+"`.git/objects/info/alternates` to obtain objects from the reference "
"repository. Using an already existing repository as an alternate will "
"require fewer objects to be copied from the repository being cloned, "
"reducing network and local storage costs. When using the `--reference-if-"
@@ -22126,18 +21958,18 @@ msgstr ""
#: en/git-clone.txt:107
#, no-wrap
msgid "--dissociate"
-msgstr ""
+msgstr "--dissociate"
#. type: Plain text
#: en/git-clone.txt:117
msgid ""
-"Borrow the objects from reference repositories specified with the `--"
-"reference` options only to reduce network transfer, and stop borrowing from "
-"them after a clone is made by making necessary local copies of borrowed "
-"objects. This option can also be used when cloning locally from a "
+"Borrow the objects from reference repositories specified with the "
+"`--reference` options only to reduce network transfer, and stop borrowing "
+"from them after a clone is made by making necessary local copies of borrowed"
+" objects. This option can also be used when cloning locally from a "
"repository that already borrows objects from another repository--the new "
-"repository will borrow objects from the same repository, and this option can "
-"be used to stop the borrowing."
+"repository will borrow objects from the same repository, and this option can"
+" be used to stop the borrowing."
msgstr ""
#. type: Plain text
@@ -22162,25 +21994,26 @@ msgstr ""
#: en/git-clone.txt:138 en/git-init.txt:48 en/git-p4.txt:268 en/git.txt:624
#, no-wrap
msgid "--bare"
-msgstr ""
+msgstr "--bare"
#. type: Plain text
#: en/git-clone.txt:149
msgid ""
"Make a 'bare' Git repository. That is, instead of creating `<directory>` "
"and placing the administrative files in `<directory>/.git`, make the "
-"`<directory>` itself the `$GIT_DIR`. This obviously implies the `-n` because "
-"there is nowhere to check out the working tree. Also the branch heads at "
+"`<directory>` itself the `$GIT_DIR`. This obviously implies the `-n` because"
+" there is nowhere to check out the working tree. Also the branch heads at "
"the remote are copied directly to corresponding local branch heads, without "
"mapping them to `refs/remotes/origin/`. When this option is used, neither "
-"remote-tracking branches nor the related configuration variables are created."
+"remote-tracking branches nor the related configuration variables are "
+"created."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:150 en/git-push.txt:106
#, no-wrap
msgid "--mirror"
-msgstr ""
+msgstr "--mirror"
#. type: Plain text
#: en/git-clone.txt:157
@@ -22189,7 +22022,8 @@ msgid ""
"to `--bare`, `--mirror` not only maps local branches of the source to local "
"branches of the target, it maps all refs (including remote-tracking "
"branches, notes etc.) and sets up a refspec configuration such that all "
-"these refs are overwritten by a `git remote update` in the target repository."
+"these refs are overwritten by a `git remote update` in the target "
+"repository."
msgstr ""
#. type: Labeled list
@@ -22257,8 +22091,8 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:181
msgid ""
-"Specify the directory from which templates will be used; (See the \"TEMPLATE "
-"DIRECTORY\" section of linkgit:git-init[1].)"
+"Specify the directory from which templates will be used; (See the \"TEMPLATE"
+" DIRECTORY\" section of linkgit:git-init[1].)"
msgstr ""
#. type: Labeled list
@@ -22294,8 +22128,8 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:199
msgid ""
-"Create a 'shallow' clone with a history truncated to the specified number of "
-"commits. Implies `--single-branch` unless `--no-single-branch` is given to "
+"Create a 'shallow' clone with a history truncated to the specified number of"
+" commits. Implies `--single-branch` unless `--no-single-branch` is given to "
"fetch the histories near the tips of all branches. If you want to clone "
"submodules shallowly, also pass `--shallow-submodules`."
msgstr ""
@@ -22309,14 +22143,15 @@ msgstr ""
#: en/git-clone.txt:207
msgid ""
"Create a shallow clone with a history, excluding commits reachable from a "
-"specified remote branch or tag. This option can be specified multiple times."
+"specified remote branch or tag. This option can be specified multiple "
+"times."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:208
#, no-wrap
msgid "--[no-]single-branch"
-msgstr ""
+msgstr "--[no-]single-branch"
#. type: Plain text
#: en/git-clone.txt:217
@@ -22325,38 +22160,37 @@ msgid ""
"specified by the `--branch` option or the primary branch remote's `HEAD` "
"points at. Further fetches into the resulting repository will only update "
"the remote-tracking branch for the branch this option was used for the "
-"initial cloning. If the HEAD at the remote did not point at any branch when "
-"`--single-branch` clone was made, no remote-tracking branch is created."
+"initial cloning. If the HEAD at the remote did not point at any branch when"
+" `--single-branch` clone was made, no remote-tracking branch is created."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:218 en/git-submodule.txt:400
#, no-wrap
msgid "--recursive"
-msgstr ""
+msgstr "--recursive"
#. type: Labeled list
#: en/git-clone.txt:219 en/git-grep.txt:92 en/git-ls-files.txt:142
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "--recurse-submodules"
-msgstr "git-add(1)"
+msgstr "--recurse-submodules"
#. type: Plain text
#: en/git-clone.txt:226
msgid ""
"After the clone is created, initialize all submodules within, using their "
-"default settings. This is equivalent to running `git submodule update --init "
-"--recursive` immediately after the clone is finished. This option is ignored "
-"if the cloned repository does not have a worktree/checkout (i.e. if any of "
-"`--no-checkout`/`-n`, `--bare`, or `--mirror` is given)"
+"default settings. This is equivalent to running `git submodule update --init"
+" --recursive` immediately after the clone is finished. This option is "
+"ignored if the cloned repository does not have a worktree/checkout (i.e. if "
+"any of `--no-checkout`/`-n`, `--bare`, or `--mirror` is given)"
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:227
#, no-wrap
msgid "--[no-]shallow-submodules"
-msgstr ""
+msgstr "--[no-]shallow-submodules"
#. type: Plain text
#: en/git-clone.txt:229
@@ -22423,8 +22257,8 @@ msgstr ""
#: en/git-clone.txt:253
msgid ""
"The name of a new directory to clone into. The \"humanish\" part of the "
-"source repository is used if no directory is explicitly given (`repo` for `/"
-"path/to/repo.git` and `foo` for `host.xz:foo/.git`). Cloning into an "
+"source repository is used if no directory is explicitly given (`repo` for "
+"`/path/to/repo.git` and `foo` for `host.xz:foo/.git`). Cloning into an "
"existing directory is only allowed if the directory is empty."
msgstr ""
@@ -22445,8 +22279,8 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:270
msgid ""
-"Make a local clone that borrows from the current directory, without checking "
-"things out:"
+"Make a local clone that borrows from the current directory, without checking"
+" things out:"
msgstr ""
#. type: delimited block -
@@ -22486,7 +22320,7 @@ msgstr ""
#. type: Title =
#: en/git-column.txt:2
-#, fuzzy, no-wrap
+#, no-wrap
msgid "git-column(1)"
msgstr "git-column(1)"
@@ -22517,7 +22351,8 @@ msgstr ""
#. type: Plain text
#: en/git-column.txt:23
msgid ""
-"Look up layout mode using configuration variable column.<name> and column.ui."
+"Look up layout mode using configuration variable column.<name> and "
+"column.ui."
msgstr ""
#. type: Labeled list
@@ -22554,8 +22389,8 @@ msgstr ""
#. type: Plain text
#: en/git-column.txt:35
msgid ""
-"Specify the terminal width. By default 'git column' will detect the terminal "
-"width, or fall back to 80 if it is unable to do so."
+"Specify the terminal width. By default 'git column' will detect the terminal"
+" width, or fall back to 80 if it is unable to do so."
msgstr ""
#. type: Labeled list
@@ -22594,12 +22429,10 @@ msgstr ""
#. type: Title =
#: en/git-commit-tree.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-commit-tree(1)"
-msgstr "git-commit(1)"
+msgstr "git-commit-tree(1)"
-#
#. type: Plain text
#: en/git-commit-tree.txt:7
#, fuzzy
@@ -22619,8 +22452,8 @@ msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:21
msgid ""
-"This is usually not what an end user wants to run directly. See linkgit:git-"
-"commit[1] instead."
+"This is usually not what an end user wants to run directly. See "
+"linkgit:git-commit[1] instead."
msgstr ""
#. type: Plain text
@@ -22642,15 +22475,15 @@ msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:34
msgid ""
-"While a tree represents a particular directory state of a working directory, "
-"a commit represents that state in \"time\", and explains how to get there."
+"While a tree represents a particular directory state of a working directory,"
+" a commit represents that state in \"time\", and explains how to get there."
msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:40
msgid ""
-"Normally a commit would identify a new \"HEAD\" state, and while Git doesn't "
-"care where you save the note about that state, in practice we tend to just "
+"Normally a commit would identify a new \"HEAD\" state, and while Git doesn't"
+" care where you save the note about that state, in practice we tend to just "
"write the result to the file that is pointed at by `.git/HEAD`, so that we "
"can always see what the last committed state was."
msgstr ""
@@ -22784,9 +22617,10 @@ msgstr ""
msgid ""
"In case (some of) these environment variables are not set, the information "
"is taken from the configuration items user.name and user.email, or, if not "
-"present, the environment variable EMAIL, or, if that is not set, system user "
-"name and the hostname used for outgoing mail (taken from `/etc/mailname` and "
-"falling back to the fully qualified hostname when that file does not exist)."
+"present, the environment variable EMAIL, or, if that is not set, system user"
+" name and the hostname used for outgoing mail (taken from `/etc/mailname` "
+"and falling back to the fully qualified hostname when that file does not "
+"exist)."
msgstr ""
#. type: Plain text
@@ -22873,8 +22707,8 @@ msgstr ""
#. type: Plain text
#: en/git-commit.txt:31
msgid ""
-"by using 'git rm' to remove files from the working tree and the index, again "
-"before using the 'commit' command;"
+"by using 'git rm' to remove files from the working tree and the index, again"
+" before using the 'commit' command;"
msgstr ""
"en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et "
"de l'index, encore une fois, avant d'utiliser la commande 'commit',"
@@ -22882,23 +22716,23 @@ msgstr ""
#. type: Plain text
#: en/git-commit.txt:37
msgid ""
-"by listing files as arguments to the 'commit' command (without --interactive "
-"or --patch switch), in which case the commit will ignore changes staged in "
-"the index, and instead record the current content of the listed files (which "
-"must already be known to Git);"
+"by listing files as arguments to the 'commit' command (without --interactive"
+" or --patch switch), in which case the commit will ignore changes staged in "
+"the index, and instead record the current content of the listed files (which"
+" must already be known to Git);"
msgstr ""
"en listant les fichiers comme arguments de la commande 'commit' (sans les "
"options --interactive ou --patch), auquel cas la validation ignorera les "
-"modifications index챕es et enregistrera plut척t le contenu actuel des fichiers "
-"list챕s (qui doivent d챕j횪 챗tre connus de Git),"
+"modifications index챕es et enregistrera plut척t le contenu actuel des fichiers"
+" list챕s (qui doivent d챕j횪 챗tre connus de Git),"
#. type: Plain text
#: en/git-commit.txt:43
msgid ""
"by using the -a switch with the 'commit' command to automatically \"add\" "
"changes from all known files (i.e. all files that are already listed in the "
-"index) and to automatically \"rm\" files in the index that have been removed "
-"from the working tree, and then perform the actual commit;"
+"index) and to automatically \"rm\" files in the index that have been removed"
+" from the working tree, and then perform the actual commit;"
msgstr ""
"en utilisant l'option -a avec la commande 'commit' pour 짬혻ajouter혻쨩 "
"automatiquement les modifications de tous les fichiers connus (c'est-횪-dire "
@@ -22926,8 +22760,8 @@ msgstr ""
#, fuzzy
msgid ""
"The `--dry-run` option can be used to obtain a summary of what is included "
-"by any of the above for the next commit by giving the same set of parameters "
-"(options and paths)."
+"by any of the above for the next commit by giving the same set of parameters"
+" (options and paths)."
msgstr ""
"L'option `--dry-run` peut 챗tre utilis챕e pour obtenir un r챕sum챕 de ce qui "
"sera inclus par une des commandes ci-dessus pour la prochaine validation en "
@@ -22936,8 +22770,8 @@ msgstr ""
#. type: Plain text
#: en/git-commit.txt:56
msgid ""
-"If you make a commit and then find a mistake immediately after that, you can "
-"recover from it with 'git reset'."
+"If you make a commit and then find a mistake immediately after that, you can"
+" recover from it with 'git reset'."
msgstr ""
"Si vous validez et trouvez une erreur imm챕diatement apr챔s, vous pouvez "
"annuler la validation avec 'git reset'."
@@ -22977,11 +22811,12 @@ msgstr "--reuse-message=<commit>"
#. type: Plain text
#: en/git-commit.txt:77
msgid ""
-"Take an existing commit object, and reuse the log message and the authorship "
-"information (including the timestamp) when creating the commit."
+"Take an existing commit object, and reuse the log message and the authorship"
+" information (including the timestamp) when creating the commit."
msgstr ""
"Prendre un objet commit existant et r챕utiliser son message de validation et "
-"son information d'auteur (y compris l'horodatage) pour la cr챕ation du commit."
+"son information d'auteur (y compris l'horodatage) pour la cr챕ation du "
+"commit."
#. type: Labeled list
#: en/git-commit.txt:78
@@ -22999,8 +22834,8 @@ msgstr ""
#. type: Plain text
#: en/git-commit.txt:82
msgid ""
-"Like '-C', but with `-c` the editor is invoked, so that the user can further "
-"edit the commit message."
+"Like '-C', but with `-c` the editor is invoked, so that the user can further"
+" edit the commit message."
msgstr ""
"Comme '-C', mais avec '-c', l'챕diteur est appel챕 pour permettre 횪 "
"l'utilisateur de modifier le message de validation."
@@ -23019,8 +22854,8 @@ msgid ""
"message will be the subject line from the specified commit with a prefix of "
"\"fixup! \". See linkgit:git-rebase[1] for details."
msgstr ""
-"Construire un message de validation pour une utilisation avec `rebase --"
-"autosquash`. Le message de validation sera la ligne de titre du commit "
+"Construire un message de validation pour une utilisation avec `rebase "
+"--autosquash`. Le message de validation sera la ligne de titre du commit "
"sp챕cifi챕 pr챕fix챕 de 짬혻fixup! 혻쨩. R챕f챕rez-vous 횪 linkgit:git-rebase[1] pour "
"de plus amples d챕tails."
@@ -23035,14 +22870,14 @@ msgstr "--squash=<commit>"
msgid ""
"Construct a commit message for use with `rebase --autosquash`. The commit "
"message subject line is taken from the specified commit with a prefix of "
-"\"squash! \". Can be used with additional commit message options (`-m`/`-c`/"
-"`-C`/`-F`). See linkgit:git-rebase[1] for details."
+"\"squash! \". Can be used with additional commit message options "
+"(`-m`/`-c`/`-C`/`-F`). See linkgit:git-rebase[1] for details."
msgstr ""
-"Construire un message de validation pour une utilisation avec `rebase --"
-"autosquash`. La ligne de titre du message de validation est tir챕e du commit "
-"sp챕cifi챕 pr챕fix챕 par 짬혻squash!혻쨩. Peut 챗tre utilis챕 avec d'autres options de "
-"'commit' (`-m`/`-c`/`-C`/`-F`). R챕f챕rez-vous 횪 linkgit:git-rebase[1] pour "
-"plus de d챕tails."
+"Construire un message de validation pour une utilisation avec `rebase "
+"--autosquash`. La ligne de titre du message de validation est tir챕e du "
+"commit sp챕cifi챕 pr챕fix챕 par 짬혻squash!혻쨩. Peut 챗tre utilis챕 avec d'autres "
+"options de 'commit' (`-m`/`-c`/`-C`/`-F`). R챕f챕rez-vous 횪 linkgit:git-"
+"rebase[1] pour plus de d챕tails."
#. type: Labeled list
#: en/git-commit.txt:96
@@ -23054,8 +22889,8 @@ msgstr "--reset-author"
#: en/git-commit.txt:101
msgid ""
"When used with -C/-c/--amend options, or when committing after a a "
-"conflicting cherry-pick, declare that the authorship of the resulting commit "
-"now belongs to the committer. This also renews the author timestamp."
+"conflicting cherry-pick, declare that the authorship of the resulting commit"
+" now belongs to the committer. This also renews the author timestamp."
msgstr ""
"Utilis챕 avec les options -C/-c/--amend ou lors de validation apr챔s un "
"picorage conflictuel, d챕clarer que la paternit챕 du commit r챕sultant "
@@ -23074,8 +22909,8 @@ msgid ""
"When doing a dry-run, give the output in the short-format. See linkgit:git-"
"status[1] for details. Implies `--dry-run`."
msgstr ""
-"Seulement avec '--dry-run', fournir la sortie en format court. Voir linkgit:"
-"git-status[1] pour plus de d챕tails."
+"Seulement avec '--dry-run', fournir la sortie en format court. Voir "
+"linkgit:git-status[1] pour plus de d챕tails."
#. type: Labeled list
#: en/git-commit.txt:106 en/git-status.txt:32 en/git-submodule.txt:280
@@ -23122,8 +22957,8 @@ msgstr "--null"
#: en/git-commit.txt:126
msgid ""
"When showing `short` or `porcelain` status output, print the filename "
-"verbatim and terminate the entries with NUL, instead of LF. If no format is "
-"given, implies the `--porcelain` output format. Without the `-z` option, "
+"verbatim and terminate the entries with NUL, instead of LF. If no format is"
+" given, implies the `--porcelain` output format. Without the `-z` option, "
"filenames with \"unusual\" characters are quoted as explained for the "
"configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr ""
@@ -23157,17 +22992,17 @@ msgstr "--author=<auteur>"
#. type: Plain text
#: en/git-commit.txt:138
msgid ""
-"Override the commit author. Specify an explicit author using the standard `A "
-"U Thor <author@example.com>` format. Otherwise <author> is assumed to be a "
+"Override the commit author. Specify an explicit author using the standard `A"
+" U Thor <author@example.com>` format. Otherwise <author> is assumed to be a "
"pattern and is used to search for an existing commit by that author (i.e. "
"rev-list --all -i --author=<author>); the commit author is then copied from "
"the first such commit found."
msgstr ""
"Surcharger l'auteur du commit. Sp챕cifier un auteur explicite avec le format "
-"standard `A U Teur <auteur@exemple.com>`. Sinon <auteur> est consid챕r챕 comme "
-"un patron utilis챕 pour chercher un commit existant par cet auteur (c-횪-d rev-"
-"list --all -i --author=<auteur>)혻; l'auteur du commit est alors copi챕 depuis "
-"le premier commit trouv챕."
+"standard `A U Teur <auteur@exemple.com>`. Sinon <auteur> est consid챕r챕 comme"
+" un patron utilis챕 pour chercher un commit existant par cet auteur (c-횪-d "
+"rev-list --all -i --author=<auteur>)혻; l'auteur du commit est alors copi챕 "
+"depuis le premier commit trouv챕."
#. type: Labeled list
#: en/git-commit.txt:139
@@ -23199,8 +23034,9 @@ msgid ""
"Use the given <msg> as the commit message. If multiple `-m` options are "
"given, their values are concatenated as separate paragraphs."
msgstr ""
-"Utiliser le <msg> fourni comme message de validation. Si plusieurs options `-"
-"m` sont fournies, leurs valeurs sont concat챕n챕es comme paragraphes s챕par챕s."
+"Utiliser le <msg> fourni comme message de validation. Si plusieurs options "
+"`-m` sont fournies, leurs valeurs sont concat챕n챕es comme paragraphes "
+"s챕par챕s."
#. type: Labeled list
#: en/git-commit.txt:148
@@ -23220,15 +23056,15 @@ msgid ""
"When editing the commit message, start the editor with the contents in the "
"given file. The `commit.template` configuration variable is often used to "
"give this option implicitly to the command. This mechanism can be used by "
-"projects that want to guide participants with some hints on what to write in "
-"the message in what order. If the user exits the editor without editing the "
-"message, the commit is aborted. This has no effect when a message is given "
-"by other means, e.g. with the `-m` or `-F` options."
+"projects that want to guide participants with some hints on what to write in"
+" the message in what order. If the user exits the editor without editing "
+"the message, the commit is aborted. This has no effect when a message is "
+"given by other means, e.g. with the `-m` or `-F` options."
msgstr ""
"� l'챕dition du message de validation, d챕marrer l'챕diteur avec le contenu du "
"fichier indiqu챕. La variable de configuration `commit.template` est souvent "
-"utilis챕e pour fournir implicitement cette option 횪 la commande. Ce m챕canisme "
-"peut 챗tre utilis챕 par les projets qui souhaitent guider les collaborateurs "
+"utilis챕e pour fournir implicitement cette option 횪 la commande. Ce m챕canisme"
+" peut 챗tre utilis챕 par les projets qui souhaitent guider les collaborateurs "
"avec une aide sur ce qu'il faut 챕crire dans le message et dans quel ordre. "
"Si l'utilisateur sort de l'챕diteur sans changer le message, la validation "
"est annul챕e. Ceci n'a aucun effet quand un message est fourni par un autre "
@@ -23240,14 +23076,14 @@ msgid ""
"Add Signed-off-by line by the committer at the end of the commit log "
"message. The meaning of a signoff depends on the project, but it typically "
"certifies that committer has the rights to submit this work under the same "
-"license and agrees to a Developer Certificate of Origin (see http://"
-"developercertificate.org/ for more information)."
+"license and agrees to a Developer Certificate of Origin (see "
+"http://developercertificate.org/ for more information)."
msgstr ""
"Ajouter une ligne Signed-off-by du validateur 횪 la fin du message de "
-"validation. La signification de signoff d챕pend du projet, mais ceci certifie "
-"typiquement que le validateur a les droits de soumettre son travail sous la "
-"m챗me licence et accepte un Certificat d'Origine de D챕veloppeur (voir http://"
-"developercertificate.org/ pour plus d'information). "
+"validation. La signification de signoff d챕pend du projet, mais ceci certifie"
+" typiquement que le validateur a les droits de soumettre son travail sous la"
+" m챗me licence et accepte un Certificat d'Origine de D챕veloppeur (voir "
+"http://developercertificate.org/ pour plus d'information). "
#. type: Labeled list
#: en/git-commit.txt:169 en/git-rebase.txt:322
@@ -23258,8 +23094,8 @@ msgstr "--no-verify"
#. type: Plain text
#: en/git-commit.txt:172
msgid ""
-"This option bypasses the pre-commit and commit-msg hooks. See also linkgit:"
-"githooks[5]."
+"This option bypasses the pre-commit and commit-msg hooks. See also "
+"linkgit:githooks[5]."
msgstr ""
"Cette option court-circuite les crochets pre-commit et commit-msg. Voir "
"aussi linkgit:githooks[5]."
@@ -23268,9 +23104,9 @@ msgstr ""
#: en/git-commit.txt:178
msgid ""
"Usually recording a commit that has the exact same tree as its sole parent "
-"commit is a mistake, and the command prevents you from making such a "
-"commit. This option bypasses the safety, and is primarily for use by "
-"foreign SCM interface scripts."
+"commit is a mistake, and the command prevents you from making such a commit."
+" This option bypasses the safety, and is primarily for use by foreign SCM "
+"interface scripts."
msgstr ""
"G챕n챕ralement enregistrer un commit qui pointe sur la m챗me version que son "
"unique parent est une erreur et la commande vous emp챗che de cr챕er un tel "
@@ -23286,8 +23122,8 @@ msgid ""
msgstr ""
"Comme --allow-empty cette commande est principalement utilis챕e par les "
"scripts d'interface d'autres SCM. Elle vous permet de cr챕er un commit avec "
-"un message vide sans utiliser de commande de plomberie telle que linkgit:git-"
-"commit-tree[1]."
+"un message vide sans utiliser de commande de plomberie telle que "
+"linkgit:git-commit-tree[1]."
#. type: Labeled list
#: en/git-commit.txt:185 en/git-tag.txt:145
@@ -23353,19 +23189,20 @@ msgstr "scissors"
#: en/git-commit.txt:204
#, fuzzy
#| msgid ""
-#| "Same as `whitespace`, except that everything from (and including) the "
-#| "line \"`# ------------------------ >8 ------------------------`\" is "
-#| "truncated if the message is to be edited. \"`#`\" can be customized with "
+#| "Same as `whitespace`, except that everything from (and including) the line "
+#| "\"`# ------------------------ >8 ------------------------`\" is truncated if"
+#| " the message is to be edited. \"`#`\" can be customized with "
#| "core.commentChar."
msgid ""
"Same as `whitespace`, except that everything from (and including) the line "
-"\"`# ------------------------ >8 ------------------------`\" is truncated if "
-"the message is to be edited. \"`#`\" can be customized with core.commentChar."
+"\"`# ------------------------ >8 ------------------------`\" is truncated if"
+" the message is to be edited. \"`#`\" can be customized with "
+"core.commentChar."
msgstr ""
"Identique 횪 `whitespace`, 횪 l'exception que tout 횪 partir de la ligne \"`# "
-"------------------------ >8 ------------------------`\" incluse sera 챕limin챕 "
-"si le message est 챕dit챕. \"`#`\" peut 챗tre personnalis챕 gr창ce 횪 core."
-"commentChar."
+"------------------------ >8 ------------------------`\" incluse sera 챕limin챕"
+" si le message est 챕dit챕. \"`#`\" peut 챗tre personnalis챕 gr창ce 횪 "
+"core.commentChar."
#. type: Labeled list
#: en/git-commit.txt:204
@@ -23378,7 +23215,8 @@ msgstr "default"
msgid ""
"Same as `strip` if the message is to be edited. Otherwise `whitespace`."
msgstr ""
-"Identique 횪 `strip` si le messages est 챕dit챕. Sinon identique 횪 `whitespace`."
+"Identique 횪 `strip` si le messages est 챕dit챕. Sinon identique 횪 "
+"`whitespace`."
#. type: Plain text
#: en/git-commit.txt:211
@@ -23397,10 +23235,10 @@ msgid ""
"unmodified. This option lets you further edit the message taken from these "
"sources."
msgstr ""
-"Le message tir챕 d'un fichier avec `-F`, ou de la ligne de commande avec `-"
-"m`, ou depuis un objet commit avec `-C` est g챕n챕ralement utilis챕 sans "
-"modification. Cette option permet d'챕diter au passage le message tir챕 de ces "
-"sources."
+"Le message tir챕 d'un fichier avec `-F`, ou de la ligne de commande avec "
+"`-m`, ou depuis un objet commit avec `-C` est g챕n챕ralement utilis챕 sans "
+"modification. Cette option permet d'챕diter au passage le message tir챕 de ces"
+" sources."
#. type: Labeled list
#: en/git-commit.txt:219 en/git-revert.txt:65 en/merge-options.txt:12
@@ -23429,22 +23267,22 @@ msgstr "--amend"
#: en/git-commit.txt:234
#, fuzzy
msgid ""
-"Replace the tip of the current branch by creating a new commit. The recorded "
-"tree is prepared as usual (including the effect of the `-i` and `-o` options "
-"and explicit pathspec), and the message from the original commit is used as "
-"the starting point, instead of an empty message, when no other message is "
-"specified from the command line via options such as `-m`, `-F`, `-c`, etc. "
-"The new commit has the same parents and author as the current one (the `--"
-"reset-author` option can countermand this)."
+"Replace the tip of the current branch by creating a new commit. The recorded"
+" tree is prepared as usual (including the effect of the `-i` and `-o` "
+"options and explicit pathspec), and the message from the original commit is "
+"used as the starting point, instead of an empty message, when no other "
+"message is specified from the command line via options such as `-m`, `-F`, "
+"`-c`, etc. The new commit has the same parents and author as the current "
+"one (the `--reset-author` option can countermand this)."
msgstr ""
"Remplacer le sommet de la branche actuelle en cr챕ant un nouveau commit. "
"L'arbre enregistr챕 est pr챕par챕 comme d'habitude (incluant l'effet des "
"options `-i` et `-o` et les sp챕cificateurs explicites de chemin) et le "
"message du commit originel est utilis챕 comme point de d챕part au lieu d'un "
"message vide, quand aucun autre message n'est sp챕cifi챕 횪 la ligne de "
-"commande via des options telles que `-m`, `-F`, `-c`, etc. Le nouveau commit "
-"a les m챗mes parents et auteur que l'originel (l'option `--reset-author` peut "
-"modifier l'auteur)."
+"commande via des options telles que `-m`, `-F`, `-c`, etc. Le nouveau commit"
+" a les m챗mes parents et auteur que l'originel (l'option `--reset-author` "
+"peut modifier l'auteur)."
#. type: Plain text
#: en/git-commit.txt:237
@@ -23472,12 +23310,12 @@ msgstr "mais peut 챗tre utilis챕 pour corriger un commit de fusion."
#: en/git-commit.txt:249
msgid ""
"You should understand the implications of rewriting history if you amend a "
-"commit that has already been published. (See the \"RECOVERING FROM UPSTREAM "
-"REBASE\" section in linkgit:git-rebase[1].)"
+"commit that has already been published. (See the \"RECOVERING FROM UPSTREAM"
+" REBASE\" section in linkgit:git-rebase[1].)"
msgstr ""
-"Vous devriez comprendre les implications d'une r챕챕criture de l'historique si "
-"vous modifiez un commit qui a d챕j횪 챕t챕 publi챕 (Voir la section 짬혻RATTRAPPER "
-"UN REBASAGE AMONT혻쨩 dans linkgit:git-rebase[1])."
+"Vous devriez comprendre les implications d'une r챕챕criture de l'historique si"
+" vous modifiez un commit qui a d챕j횪 챕t챕 publi챕 (Voir la section 짬혻RATTRAPPER"
+" UN REBASAGE AMONT혻쨩 dans linkgit:git-rebase[1])."
#. type: Labeled list
#: en/git-commit.txt:250
@@ -23503,10 +23341,10 @@ msgid ""
"paths given on the command line as well. This is usually not what you want "
"unless you are concluding a conflicted merge."
msgstr ""
-"Avant de cr챕er un commit 횪 partir du contenu index챕 jusqu'횪 pr챕sent, indexer "
-"aussi les contenus des chemins fournis sur la ligne de commande. Cela n'est "
-"habituellement pas ce que vous souhaitez, 횪 part si vous terminez une fusion "
-"conflictuelle."
+"Avant de cr챕er un commit 횪 partir du contenu index챕 jusqu'횪 pr챕sent, indexer"
+" aussi les contenus des chemins fournis sur la ligne de commande. Cela n'est"
+" habituellement pas ce que vous souhaitez, 횪 part si vous terminez une "
+"fusion conflictuelle."
#. type: Labeled list
#: en/git-commit.txt:261
@@ -23521,8 +23359,8 @@ msgid ""
"specified on the command line, disregarding any contents that have been "
"staged for other paths. This is the default mode of operation of 'git "
"commit' if any paths are given on the command line, in which case this "
-"option can be omitted. If this option is specified together with `--amend`, "
-"then no paths need to be specified, which can be used to amend the last "
+"option can be omitted. If this option is specified together with `--amend`,"
+" then no paths need to be specified, which can be used to amend the last "
"commit without committing changes that have already been staged. If used "
"together with `--allow-empty` paths are also not required, and an empty "
"commit will be created."
@@ -23531,11 +23369,11 @@ msgstr ""
"chemins sp챕cifi챕s sur la ligne de commande, en ignorant tout contenu "
"d'autres chemins d챕j횪 index챕. C'est le mode d'op챕ration par d챕faut de 'git "
"commit' si des chemins sont fournis sur la ligne de commande, auquel cas "
-"l'option peut 챗tre omise. Si cette option est sp챕cifi챕e en m챗me temps que `--"
-"amend`, alors il n'est pas n챕cessaire de sp챕cifier des chemins, ce qui peut "
-"챗tre utile pour corriger le dernier commit sans valider les modifications "
-"qui ont d챕j횪 챕t챕 index챕es. Si utilis챕 avec `--allow-empty`, les chemins ne "
-"sont pas n챕cessaires non plus et un commit vide sera cr챕챕."
+"l'option peut 챗tre omise. Si cette option est sp챕cifi챕e en m챗me temps que "
+"`--amend`, alors il n'est pas n챕cessaire de sp챕cifier des chemins, ce qui "
+"peut 챗tre utile pour corriger le dernier commit sans valider les "
+"modifications qui ont d챕j횪 챕t챕 index챕es. Si utilis챕 avec `--allow-empty`, "
+"les chemins ne sont pas n챕cessaires non plus et un commit vide sera cr챕챕."
#. type: Labeled list
#: en/git-commit.txt:274 en/git-status.txt:55
@@ -23562,8 +23400,8 @@ msgid ""
"'normal', i.e. show untracked files and directories."
msgstr ""
"Le param챔tre de mode est optionnel (par d챕faut, 'all') et sert 횪 sp챕cifier "
-"la gestion des fichiers non suivis ; quand -u n'est pas utilis챕, le mode par "
-"d챕faut est 'normal', c'est-횪-dire montrer les fichiers et les dossiers non-"
+"la gestion des fichiers non suivis ; quand -u n'est pas utilis챕, le mode par"
+" d챕faut est 'normal', c'est-횪-dire montrer les fichiers et les dossiers non-"
"suivis."
#. type: Plain text
@@ -23587,22 +23425,24 @@ msgstr "'normal' - Montrer les fichiers et les dossiers non-suivis\n"
#: en/git-commit.txt:287 en/git-status.txt:68
#, no-wrap
msgid "'all' - Also shows individual files in untracked directories.\n"
-msgstr "'all' - Montrer aussi les fichiers individuels dans les dossiers non-suivis.\n"
+msgstr ""
+"'all' - Montrer aussi les fichiers individuels dans les dossiers non-"
+"suivis.\n"
#. type: Plain text
#: en/git-commit.txt:290 en/git-status.txt:81
msgid ""
-"The default can be changed using the status.showUntrackedFiles configuration "
-"variable documented in linkgit:git-config[1]."
+"The default can be changed using the status.showUntrackedFiles configuration"
+" variable documented in linkgit:git-config[1]."
msgstr ""
-"La valeur par d챕faut est contenue dans la variable de configuration status."
-"showUntrackedFiles document챕e dans linkgit:git-config[1]."
+"La valeur par d챕faut est contenue dans la variable de configuration "
+"status.showUntrackedFiles document챕e dans linkgit:git-config[1]."
#. type: Plain text
#: en/git-commit.txt:301
msgid ""
-"Show unified diff between the HEAD commit and what would be committed at the "
-"bottom of the commit message template to help the user describe the commit "
+"Show unified diff between the HEAD commit and what would be committed at the"
+" bottom of the commit message template to help the user describe the commit "
"by reminding what changes the commit has. Note that this diff output "
"doesn't have its lines prefixed with '#'. This diff will not be a part of "
"the commit message. See the `commit.verbose` configuration variable in "
@@ -23619,7 +23459,8 @@ msgstr ""
#: en/git-commit.txt:305
msgid ""
"If specified twice, show in addition the unified diff between what would be "
-"committed and the worktree files, i.e. the unstaged changes to tracked files."
+"committed and the worktree files, i.e. the unstaged changes to tracked "
+"files."
msgstr ""
"Si sp챕cifi챕 deux fois, afficher en plus le diff unifi챕 entre ce qui serait "
"vali챕 et les fichiers de l'arbre de travail, c'est-횪-dire les modifications "
@@ -23651,8 +23492,8 @@ msgstr "--status"
#: en/git-commit.txt:320
msgid ""
"Include the output of linkgit:git-status[1] in the commit message template "
-"when using an editor to prepare the commit message. Defaults to on, but can "
-"be used to override configuration variable commit.status."
+"when using an editor to prepare the commit message. Defaults to on, but can"
+" be used to override configuration variable commit.status."
msgstr ""
"Inclure la sortie de linkgit:git-status[1] dans le mod챔le de message de "
"validation lors de l'utilisation d'un 챕diteur pour pr챕parer le message de "
@@ -23661,7 +23502,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:321
-#, fuzzy, no-wrap
+#, no-wrap
msgid "--no-status"
msgstr "--no-status"
@@ -23672,8 +23513,8 @@ msgid ""
"template when using an editor to prepare the default commit message."
msgstr ""
"Ne pas inclure la sortie de linkgit:git-status[1] dans le mod챔le de message "
-"de validation lors de l'utilisation d'un 챕diteur pour pr챕parer le message de "
-"validation par d챕faut."
+"de validation lors de l'utilisation d'un 챕diteur pour pr챕parer le message de"
+" validation par d챕faut."
#. type: Plain text
#: en/git-commit.txt:335
@@ -23700,31 +23541,31 @@ msgid ""
msgstr ""
"Quand des chemins sont fournis sur la ligne de commande, la commande valide "
"le contenu des fichiers sp챕cifi챕s, sans enregistrer les modifications d챕j횪 "
-"index챕es. Le contenu de ces fichiers est aussi index챕 pour le commit suivant "
-"par-dessus ce qui a 챕t챕 index챕 auparavant."
+"index챕es. Le contenu de ces fichiers est aussi index챕 pour le commit suivant"
+" par-dessus ce qui a 챕t챕 index챕 auparavant."
#. type: Plain text
#: en/git-commit.txt:362
msgid ""
-"When recording your own work, the contents of modified files in your working "
-"tree are temporarily stored to a staging area called the \"index\" with 'git "
-"add'. A file can be reverted back, only in the index but not in the working "
-"tree, to that of the last commit with `git reset HEAD -- <file>`, which "
-"effectively reverts 'git add' and prevents the changes to this file from "
-"participating in the next commit. After building the state to be committed "
-"incrementally with these commands, `git commit` (without any pathname "
-"parameter) is used to record what has been staged so far. This is the most "
-"basic form of the command. An example:"
+"When recording your own work, the contents of modified files in your working"
+" tree are temporarily stored to a staging area called the \"index\" with "
+"'git add'. A file can be reverted back, only in the index but not in the "
+"working tree, to that of the last commit with `git reset HEAD -- <file>`, "
+"which effectively reverts 'git add' and prevents the changes to this file "
+"from participating in the next commit. After building the state to be "
+"committed incrementally with these commands, `git commit` (without any "
+"pathname parameter) is used to record what has been staged so far. This is "
+"the most basic form of the command. An example:"
msgstr ""
"Lors de l'enregistrement de votre propre travail, le contenu des fichiers "
"modifi챕s dans votre arbre de travail est temporairement stock챕 au moyen de "
"`git add` dans une zone de stockage interm챕diaire appel챕e 짬혻l'index혻쨩. Un "
"fichier peut n'챗tre ramen챕 횪 son contenu correspondant au dernier commit "
"seulement dans l'index mais pas dans l'arbre de travail gr창ce 횪 `git reset "
-"HEAD -- <fichier>`, ce qui inverse effectivement le 'git add' et emp챗che les "
-"modifications de ce fichier de participer 횪 la prochaine validation. Apr챔s "
-"avoir construit l'챕tat 횪 valider de mani챔re incr챕mentale avec ces commandes, "
-"`git commit` (sans aucun nom de chemin en param챔tre) sert 횪 enregistrer ce "
+"HEAD -- <fichier>`, ce qui inverse effectivement le 'git add' et emp챗che les"
+" modifications de ce fichier de participer 횪 la prochaine validation. Apr챔s "
+"avoir construit l'챕tat 횪 valider de mani챔re incr챕mentale avec ces commandes,"
+" `git commit` (sans aucun nom de chemin en param챔tre) sert 횪 enregistrer ce "
"qui a 챕t챕 pr챕par챕 jusqu'ici. C'est la forme la plus simple de la commande. "
"Par exemple혻:"
@@ -23747,8 +23588,8 @@ msgstr ""
msgid ""
"Instead of staging files after each individual change, you can tell `git "
"commit` to notice the changes to the files whose contents are tracked in "
-"your working tree and do corresponding `git add` and `git rm` for you. That "
-"is, this example does the same as the earlier example if there is no other "
+"your working tree and do corresponding `git add` and `git rm` for you. That"
+" is, this example does the same as the earlier example if there is no other "
"change in your working tree:"
msgstr ""
"Au lieu d'indexer les fichiers apr챔s chaque modification individuelle, vous "
@@ -23774,8 +23615,8 @@ msgstr ""
#: en/git-commit.txt:386
msgid ""
"The command `git commit -a` first looks at your working tree, notices that "
-"you have modified hello.c and removed goodbye.c, and performs necessary `git "
-"add` and `git rm` for you."
+"you have modified hello.c and removed goodbye.c, and performs necessary `git"
+" add` and `git rm` for you."
msgstr ""
"La commande `git commit -a` observe votre arbre de travail, remarque que "
"vous avez modifi챕 hello.c et supprim챕 goodbye.c, puis r챕alise les `git add` "
@@ -23784,10 +23625,10 @@ msgstr ""
#. type: Plain text
#: en/git-commit.txt:391
msgid ""
-"After staging changes to many files, you can alter the order the changes are "
-"recorded in, by giving pathnames to `git commit`. When pathnames are given, "
-"the command makes a commit that only records the changes made to the named "
-"paths:"
+"After staging changes to many files, you can alter the order the changes are"
+" recorded in, by giving pathnames to `git commit`. When pathnames are "
+"given, the command makes a commit that only records the changes made to the "
+"named paths:"
msgstr ""
"Apr챔s l'indexation des modifications de nombreux fichiers, vous pouvez "
"modifier l'ordre dans lequel les modifications sont enregistr챕es, en "
@@ -23813,13 +23654,13 @@ msgstr ""
#: en/git-commit.txt:404
msgid ""
"This makes a commit that records the modification to `Makefile`. The "
-"changes staged for `hello.c` and `hello.h` are not included in the resulting "
-"commit. However, their changes are not lost -- they are still staged and "
+"changes staged for `hello.c` and `hello.h` are not included in the resulting"
+" commit. However, their changes are not lost -- they are still staged and "
"merely held back. After the above sequence, if you do:"
msgstr ""
"Ceci cr챕e un commit qui enregistre les modifications de `Makefile`. Les "
-"modifications index챕es pour `hello.c` et `hello.h` ne sont pas incluses dans "
-"le commit r챕sultant. Cependant, leurs modifications ne sont pas perdues -- "
+"modifications index챕es pour `hello.c` et `hello.h` ne sont pas incluses dans"
+" le commit r챕sultant. Cependant, leurs modifications ne sont pas perdues -- "
"elles sont toujours index챕es et simplement suspendues. Apr챔s la s챕quence ci-"
"dessus, si vous faites혻:"
@@ -23845,8 +23686,8 @@ msgid ""
"conflicts, cleanly merged paths are already staged to be committed for you, "
"and paths that conflicted are left in unmerged state. You would have to "
"first check which paths are conflicting with 'git status' and after fixing "
-"them manually in your working tree, you would stage the result as usual with "
-"'git add':"
+"them manually in your working tree, you would stage the result as usual with"
+" 'git add':"
msgstr ""
"Apr챔s l'arr챗t d'une fusion (commenc챕e avec `git merge` ou `git pull`) pour "
"cause de conflit, les chemins fusionn챕s proprement sont d챕j횪 index챕s pour "
@@ -23873,8 +23714,8 @@ msgstr ""
#: en/git-commit.txt:430
msgid ""
"After resolving conflicts and staging the result, `git ls-files -u` would "
-"stop mentioning the conflicted path. When you are done, run `git commit` to "
-"finally record the merge:"
+"stop mentioning the conflicted path. When you are done, run `git commit` to"
+" finally record the merge:"
msgstr ""
"Apr챔s avoir r챕solu les conflits et index챕 le r챕sultat, `git ls-files -u` "
"arr챗terait de mentionner les chemins en conflit. Quand vous avez termin챕, "
@@ -23883,14 +23724,14 @@ msgstr ""
#. type: Plain text
#: en/git-commit.txt:441
msgid ""
-"As with the case to record your own changes, you can use `-a` option to save "
-"typing. One difference is that during a merge resolution, you cannot use "
+"As with the case to record your own changes, you can use `-a` option to save"
+" typing. One difference is that during a merge resolution, you cannot use "
"`git commit` with pathnames to alter the order the changes are committed, "
"because the merge should be recorded as a single commit. In fact, the "
"command refuses to run when given pathnames (but see `-i` option)."
msgstr ""
-"Comme dans le cas de la validation de vos propres modifications, vous pouvez "
-"utiliser l'option `-a` pour vous 챕pargner de la frappe. Une diff챕rence est "
+"Comme dans le cas de la validation de vos propres modifications, vous pouvez"
+" utiliser l'option `-a` pour vous 챕pargner de la frappe. Une diff챕rence est "
"que pendant la r챕solution de fusion, vous ne pouvez pas utiliser `git "
"commit` avec des noms de chemin pour changer l'ordre des modifications 횪 "
"valider, parce que la fusion doit 챗tre enregistr챕e comme un commit unique. "
@@ -23904,9 +23745,9 @@ msgid ""
"single short (less than 50 character) line summarizing the change, followed "
"by a blank line and then a more thorough description. The text up to the "
"first blank line in a commit message is treated as the commit title, and "
-"that title is used throughout Git. For example, linkgit:git-format-patch[1] "
-"turns a commit into email, and it uses the title on the Subject line and the "
-"rest of the commit in the body."
+"that title is used throughout Git. For example, linkgit:git-format-patch[1]"
+" turns a commit into email, and it uses the title on the Subject line and "
+"the rest of the commit in the body."
msgstr ""
"Bien que 챌a ne soit pas requis, c'est une bonne pratique de commencer les "
"messages de validation avec une courte ligne seule (moins de 50 caract챔res) "
@@ -23940,8 +23781,8 @@ msgstr ""
#. type: Plain text
#: en/git-commit.txt:468
msgid ""
-"This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-"
-"commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more "
+"This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, "
+"`post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more "
"information."
msgstr ""
"Cette commande peut lancer les crochets `commit-msg`, `prepare-commit-msg`, "
@@ -23969,7 +23810,6 @@ msgstr ""
"disponible dans ce fichier, mais sera 챕cras챕 par l'invocation suivante de "
"`git commit`."
-#
#. type: Plain text
#: en/git-commit.txt:486
msgid ""
@@ -23981,10 +23821,9 @@ msgstr ""
#. type: Title =
#: en/git-config.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-config(1)"
-msgstr "git-commit(1)"
+msgstr "git-config(1)"
#. type: Plain text
#: en/git-config.txt:7
@@ -24027,10 +23866,10 @@ msgstr ""
msgid ""
"Multiple lines can be added to an option by using the `--add` option. If "
"you want to update or unset an option which can occur on multiple lines, a "
-"POSIX regexp `value_regex` needs to be given. Only the existing values that "
-"match the regexp are updated or unset. If you want to handle the lines that "
-"do *not* match the regex, just prepend a single exclamation mark in front "
-"(see also <<EXAMPLES>>)."
+"POSIX regexp `value_regex` needs to be given. Only the existing values that"
+" match the regexp are updated or unset. If you want to handle the lines "
+"that do *not* match the regex, just prepend a single exclamation mark in "
+"front (see also <<EXAMPLES>>)."
msgstr ""
#. type: Plain text
@@ -24048,24 +23887,25 @@ msgstr ""
#: en/git-config.txt:52
msgid ""
"When reading, the values are read from the system, global and repository "
-"local configuration files by default, and options `--system`, `--global`, `--"
-"local` and `--file <filename>` can be used to tell the command to read from "
-"only that location (see <<FILES>>)."
+"local configuration files by default, and options `--system`, `--global`, "
+"`--local` and `--file <filename>` can be used to tell the command to read "
+"from only that location (see <<FILES>>)."
msgstr ""
#. type: Plain text
#: en/git-config.txt:57
msgid ""
-"When writing, the new value is written to the repository local configuration "
-"file by default, and options `--system`, `--global`, `--file <filename>` can "
-"be used to tell the command to write to that location (you can say `--local` "
-"but that is the default)."
+"When writing, the new value is written to the repository local configuration"
+" file by default, and options `--system`, `--global`, `--file <filename>` "
+"can be used to tell the command to write to that location (you can say "
+"`--local` but that is the default)."
msgstr ""
#. type: Plain text
#: en/git-config.txt:60
msgid ""
-"This command will fail with non-zero status upon error. Some exit codes are:"
+"This command will fail with non-zero status upon error. Some exit codes "
+"are:"
msgstr ""
#. type: Plain text
@@ -24113,7 +23953,7 @@ msgstr ""
#: en/git-config.txt:74
#, no-wrap
msgid "--replace-all"
-msgstr ""
+msgstr "--replace-all"
#. type: Plain text
#: en/git-config.txt:77
@@ -24126,20 +23966,20 @@ msgstr ""
#: en/git-config.txt:78 en/git-update-index.txt:42
#, no-wrap
msgid "--add"
-msgstr ""
+msgstr "--add"
#. type: Plain text
#: en/git-config.txt:82
msgid ""
-"Adds a new line to the option without altering any existing values. This is "
-"the same as providing '^$' as the value_regex in `--replace-all`."
+"Adds a new line to the option without altering any existing values. This is"
+" the same as providing '^$' as the value_regex in `--replace-all`."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:83
#, no-wrap
msgid "--get"
-msgstr ""
+msgstr "--get"
#. type: Plain text
#: en/git-config.txt:87
@@ -24153,7 +23993,7 @@ msgstr ""
#: en/git-config.txt:88
#, no-wrap
msgid "--get-all"
-msgstr ""
+msgstr "--get-all"
#. type: Plain text
#: en/git-config.txt:90
@@ -24164,7 +24004,7 @@ msgstr ""
#: en/git-config.txt:91
#, no-wrap
msgid "--get-regexp"
-msgstr ""
+msgstr "--get-regexp"
#. type: Plain text
#: en/git-config.txt:97
@@ -24195,7 +24035,7 @@ msgstr ""
#: en/git-config.txt:106
#, no-wrap
msgid "--global"
-msgstr ""
+msgstr "--global"
#. type: Plain text
#: en/git-config.txt:111
@@ -24208,8 +24048,8 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:114
msgid ""
-"For reading options: read only from global `~/.gitconfig` and from `"
-"$XDG_CONFIG_HOME/git/config` rather than from all available files."
+"For reading options: read only from global `~/.gitconfig` and from "
+"`$XDG_CONFIG_HOME/git/config` rather than from all available files."
msgstr ""
#. type: Plain text
@@ -24222,7 +24062,7 @@ msgstr ""
#: en/git-config.txt:117
#, no-wrap
msgid "--system"
-msgstr ""
+msgstr "--system"
#. type: Plain text
#: en/git-config.txt:121
@@ -24241,15 +24081,15 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:130
msgid ""
-"For writing options: write to the repository `.git/config` file. This is"
-"\tthe default behavior."
+"For writing options: write to the repository `.git/config` file. This "
+"is\tthe default behavior."
msgstr ""
#. type: Plain text
#: en/git-config.txt:133
msgid ""
-"For reading options: read only from the repository `.git/config` rather than "
-"from all available files."
+"For reading options: read only from the repository `.git/config` rather than"
+" from all available files."
msgstr ""
#. type: Labeled list
@@ -24280,22 +24120,23 @@ msgstr ""
msgid ""
"Similar to `--file` but use the given blob instead of a file. E.g. you can "
"use 'master:.gitmodules' to read values from the file '.gitmodules' in the "
-"master branch. See \"SPECIFYING REVISIONS\" section in linkgit:"
-"gitrevisions[7] for a more complete list of ways to spell blob names."
+"master branch. See \"SPECIFYING REVISIONS\" section in "
+"linkgit:gitrevisions[7] for a more complete list of ways to spell blob "
+"names."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:147
#, no-wrap
msgid "--remove-section"
-msgstr ""
+msgstr "--remove-section"
#. type: Plain text
#: en/git-config.txt:149
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid "Remove the given section from the configuration file."
msgstr ""
"en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et "
@@ -24305,7 +24146,7 @@ msgstr ""
#: en/git-config.txt:150
#, no-wrap
msgid "--rename-section"
-msgstr ""
+msgstr "--rename-section"
#. type: Plain text
#: en/git-config.txt:152
@@ -24316,7 +24157,7 @@ msgstr ""
#: en/git-config.txt:153
#, no-wrap
msgid "--unset"
-msgstr ""
+msgstr "--unset"
#. type: Plain text
#: en/git-config.txt:155
@@ -24327,7 +24168,7 @@ msgstr ""
#: en/git-config.txt:156
#, no-wrap
msgid "--unset-all"
-msgstr ""
+msgstr "--unset-all"
#. type: Plain text
#: en/git-config.txt:158
@@ -24343,7 +24184,7 @@ msgstr ""
#: en/git-config.txt:163
#, no-wrap
msgid "--bool"
-msgstr ""
+msgstr "--bool"
#. type: Plain text
#: en/git-config.txt:165
@@ -24354,7 +24195,7 @@ msgstr ""
#: en/git-config.txt:166
#, no-wrap
msgid "--int"
-msgstr ""
+msgstr "--int"
#. type: Plain text
#: en/git-config.txt:171
@@ -24368,28 +24209,28 @@ msgstr ""
#: en/git-config.txt:172
#, no-wrap
msgid "--bool-or-int"
-msgstr ""
+msgstr "--bool-or-int"
#. type: Plain text
#: en/git-config.txt:175
msgid ""
-"'git config' will ensure that the output matches the format of either --bool "
-"or --int, as described above."
+"'git config' will ensure that the output matches the format of either --bool"
+" or --int, as described above."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:176 en/git-hash-object.txt:41
#, no-wrap
msgid "--path"
-msgstr ""
+msgstr "--path"
#. type: Plain text
#: en/git-config.txt:182
msgid ""
"'git-config' will expand leading '{tilde}' to the value of '$HOME', and "
-"'{tilde}user' to the home directory for the specified user. This option has "
-"no effect when setting the value (but you can use 'git config bla {tilde}/' "
-"from the command line to let your shell do the expansion)."
+"'{tilde}user' to the home directory for the specified user. This option has"
+" no effect when setting the value (but you can use 'git config bla {tilde}/'"
+" from the command line to let your shell do the expansion)."
msgstr ""
#. type: Plain text
@@ -24411,14 +24252,14 @@ msgstr ""
#: en/git-config.txt:196
#, no-wrap
msgid "--show-origin"
-msgstr ""
+msgstr "--show-origin"
#. type: Plain text
#: en/git-config.txt:201
msgid ""
-"Augment the output of all queried config options with the origin type (file, "
-"standard input, blob, command line) and the actual origin (config file path, "
-"ref, or blob id if applicable)."
+"Augment the output of all queried config options with the origin type (file,"
+" standard input, blob, command line) and the actual origin (config file "
+"path, ref, or blob id if applicable)."
msgstr ""
#. type: Labeled list
@@ -24430,8 +24271,8 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:212
msgid ""
-"Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or "
-"\"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is "
+"Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or"
+" \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is "
"taken into account when configuration says \"auto\". If `stdout-is-tty` is "
"missing, then checks the standard output of the command itself, and exits "
"with status 0 if color is to be used, or exits with status 1 otherwise. "
@@ -24457,29 +24298,29 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:224
msgid ""
-"Opens an editor to modify the specified config file; either `--system`, `--"
-"global`, or repository (default)."
+"Opens an editor to modify the specified config file; either `--system`, "
+"`--global`, or repository (default)."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
#, no-wrap
msgid "--[no-]includes"
-msgstr ""
+msgstr "--[no-]includes"
#. type: Plain text
#: en/git-config.txt:230
msgid ""
"Respect `include.*` directives in config files when looking up values. "
-"Defaults to `off` when a specific file is given (e.g., using `--file`, `--"
-"global`, etc) and `on` when searching all config files."
+"Defaults to `off` when a specific file is given (e.g., using `--file`, "
+"`--global`, etc) and `on` when searching all config files."
msgstr ""
#. type: Plain text
#: en/git-config.txt:237
msgid ""
-"If not set explicitly with `--file`, there are four files where 'git config' "
-"will search for configuration options:"
+"If not set explicitly with `--file`, there are four files where 'git config'"
+" will search for configuration options:"
msgstr ""
#. type: Labeled list
@@ -24532,8 +24373,8 @@ msgstr ""
#: en/git-config.txt:255
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid "Repository specific configuration file."
msgstr ""
"en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et "
@@ -24544,8 +24385,8 @@ msgstr ""
msgid ""
"If no further options are given, all reading options will read all of these "
"files that are available. If the global or the system-wide configuration "
-"file are not available they will be ignored. If the repository configuration "
-"file is not available or readable, 'git config' will exit with a non-zero "
+"file are not available they will be ignored. If the repository configuration"
+" file is not available or readable, 'git config' will exit with a non-zero "
"error code. However, in neither case will an error message be issued."
msgstr ""
@@ -24568,8 +24409,8 @@ msgstr ""
#: en/git-config.txt:272
msgid ""
"All writing options will per default write to the repository specific "
-"configuration file. Note that this also affects options like `--replace-all` "
-"and `--unset`. *'git config' will only ever change one file at a time*."
+"configuration file. Note that this also affects options like `--replace-all`"
+" and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
#. type: Plain text
@@ -24612,8 +24453,8 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:290
msgid ""
-"Whether to skip reading settings from the system-wide $(prefix)/etc/"
-"gitconfig file. See linkgit:git[1] for details."
+"Whether to skip reading settings from the system-wide "
+"$(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
@@ -24853,10 +24694,9 @@ msgstr ""
#. type: Title =
#: en/git-count-objects.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-count-objects(1)"
-msgstr "git-commit(1)"
+msgstr "git-count-objects(1)"
#. type: Plain text
#: en/git-count-objects.txt:7
@@ -24917,8 +24757,8 @@ msgstr ""
#. type: Plain text
#: en/git-count-objects.txt:38
msgid ""
-"garbage: the number of files in object database that are neither valid loose "
-"objects nor valid packs"
+"garbage: the number of files in object database that are neither valid loose"
+" objects nor valid packs"
msgstr ""
#. type: Plain text
@@ -24947,7 +24787,7 @@ msgstr ""
#: en/git-count-objects.txt:48
#, no-wrap
msgid "--human-readable"
-msgstr ""
+msgstr "--human-readable"
#. type: Plain text
#: en/git-count-objects.txt:51
@@ -24958,7 +24798,7 @@ msgstr ""
#: en/git-credential-cache--daemon.txt:2
#, no-wrap
msgid "git-credential-cache--daemon(1)"
-msgstr ""
+msgstr "git-credential-cache--daemon(1)"
#. type: Plain text
#: en/git-credential-cache--daemon.txt:7
@@ -25000,7 +24840,7 @@ msgstr ""
#: en/git-credential-cache.txt:2
#, no-wrap
msgid "git-credential-cache(1)"
-msgstr ""
+msgstr "git-credential-cache(1)"
#. type: Plain text
#: en/git-credential-cache.txt:7
@@ -25026,8 +24866,8 @@ msgstr ""
#: en/git-credential-cache.txt:25
msgid ""
"You probably don't want to invoke this command directly; it is meant to be "
-"used as a credential helper by other parts of Git. See linkgit:"
-"gitcredentials[7] or `EXAMPLES` below."
+"used as a credential helper by other parts of Git. See "
+"linkgit:gitcredentials[7] or `EXAMPLES` below."
msgstr ""
#. type: Labeled list
@@ -25079,8 +24919,8 @@ msgstr "git-commit(1)"
#. type: Plain text
#: en/git-credential-cache.txt:56 en/git-credential-store.txt:75
msgid ""
-"The point of this helper is to reduce the number of times you must type your "
-"username or password. For example:"
+"The point of this helper is to reduce the number of times you must type your"
+" username or password. For example:"
msgstr ""
#. type: delimited block -
@@ -25119,7 +24959,7 @@ msgstr ""
#: en/git-credential-store.txt:2
#, no-wrap
msgid "git-credential-store(1)"
-msgstr ""
+msgstr "git-credential-store(1)"
#. type: Plain text
#: en/git-credential-store.txt:7
@@ -25152,8 +24992,8 @@ msgstr ""
#: en/git-credential-store.txt:28
msgid ""
"You probably don't want to invoke this command directly; it is meant to be "
-"used as a credential helper by other parts of git. See linkgit:"
-"gitcredentials[7] or `EXAMPLES` below."
+"used as a credential helper by other parts of git. See "
+"linkgit:gitcredentials[7] or `EXAMPLES` below."
msgstr ""
#. type: Labeled list
@@ -25167,12 +25007,12 @@ msgstr "patch"
#: en/git-credential-store.txt:42
msgid ""
"Use `<path>` to lookup and store credentials. The file will have its "
-"filesystem permissions set to prevent other users on the system from reading "
-"it, but will not be encrypted or otherwise protected. If not specified, "
-"credentials will be searched for from `~/.git-credentials` and `"
-"$XDG_CONFIG_HOME/git/credentials`, and credentials will be written to `~/."
-"git-credentials` if it exists, or `$XDG_CONFIG_HOME/git/credentials` if it "
-"exists and the former does not. See also <<FILES>>."
+"filesystem permissions set to prevent other users on the system from reading"
+" it, but will not be encrypted or otherwise protected. If not specified, "
+"credentials will be searched for from `~/.git-credentials` and "
+"`$XDG_CONFIG_HOME/git/credentials`, and credentials will be written to "
+"`~/.git-credentials` if it exists, or `$XDG_CONFIG_HOME/git/credentials` if "
+"it exists and the former does not. See also <<FILES>>."
msgstr ""
#. type: Plain text
@@ -25214,22 +25054,23 @@ msgstr ""
#: en/git-credential-store.txt:63
msgid ""
"For credential lookups, the files are read in the order given above, with "
-"the first matching credential found taking precedence over credentials found "
-"in files further down the list."
+"the first matching credential found taking precedence over credentials found"
+" in files further down the list."
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:67
msgid ""
"Credential storage will by default write to the first existing file in the "
-"list. If none of these files exist, `~/.git-credentials` will be created and "
-"written to."
+"list. If none of these files exist, `~/.git-credentials` will be created and"
+" written to."
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:69
msgid ""
-"When erasing credentials, matching credentials will be erased from all files."
+"When erasing credentials, matching credentials will be erased from all "
+"files."
msgstr ""
#. type: delimited block -
@@ -25274,19 +25115,18 @@ msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:103
msgid ""
-"When Git needs authentication for a particular URL context, credential-store "
-"will consider that context a pattern to match against each entry in the "
+"When Git needs authentication for a particular URL context, credential-store"
+" will consider that context a pattern to match against each entry in the "
"credentials file. If the protocol, hostname, and username (if we already "
-"have one) match, then the password is returned to Git. See the discussion of "
-"configuration in linkgit:gitcredentials[7] for more information."
+"have one) match, then the password is returned to Git. See the discussion of"
+" configuration in linkgit:gitcredentials[7] for more information."
msgstr ""
#. type: Title =
#: en/git-credential.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-credential(1)"
-msgstr "git-commit(1)"
+msgstr "git-credential(1)"
#. type: Plain text
#: en/git-credential.txt:7
@@ -25306,8 +25146,8 @@ msgid ""
"system-specific helpers, as well as prompting the user for usernames and "
"passwords. The git-credential command exposes this interface to scripts "
"which may want to retrieve, store, or prompt for credentials in the same "
-"manner as Git. The design of this scriptable interface models the internal C "
-"API; see link:technical/api-credentials.html[the Git credential API] for "
+"manner as Git. The design of this scriptable interface models the internal C"
+" API; see link:technical/api-credentials.html[the Git credential API] for "
"more background on the concepts."
msgstr ""
@@ -25322,8 +25162,8 @@ msgstr ""
#. type: Plain text
#: en/git-credential.txt:36
msgid ""
-"If the action is `fill`, git-credential will attempt to add \"username\" and "
-"\"password\" attributes to the description by reading config files, by "
+"If the action is `fill`, git-credential will attempt to add \"username\" and"
+" \"password\" attributes to the description by reading config files, by "
"contacting any configured credential helpers, or by prompting the user. The "
"username and password attributes of the credential description are then "
"printed to stdout together with the attributes already provided."
@@ -25408,8 +25248,8 @@ msgstr ""
#. type: Plain text
#: en/git-credential.txt:80
msgid ""
-"In most cases, this means the attributes given in the input will be repeated "
-"in the output, but Git may also modify the credential description, for "
+"In most cases, this means the attributes given in the input will be repeated"
+" in the output, but Git may also modify the credential description, for "
"example by removing the `path` attribute when the protocol is HTTP(s) and "
"`credential.useHttpPath` is false."
msgstr ""
@@ -25426,8 +25266,8 @@ msgstr ""
#. type: Plain text
#: en/git-credential.txt:89
msgid ""
-"Use the credential (e.g., access the URL with the username and password from "
-"step (2)), and see if it's accepted."
+"Use the credential (e.g., access the URL with the username and password from"
+" step (2)), and see if it's accepted."
msgstr ""
#. type: Plain text
@@ -25438,8 +25278,8 @@ msgid ""
"\"approve\" action to tell `git credential` to reuse it in its next "
"invocation. If the credential was rejected during the operation, use the "
"\"reject\" action so that `git credential` will ask for a new password in "
-"its next invocation. In either case, `git credential` should be fed with the "
-"credential description obtained from step (2) (which also contain the ones "
+"its next invocation. In either case, `git credential` should be fed with the"
+" credential description obtained from step (2) (which also contain the ones "
"provided in step (1))."
msgstr ""
@@ -25454,8 +25294,8 @@ msgstr ""
msgid ""
"`git credential` reads and/or writes (depending on the action used) "
"credential information in its standard input/output. This information can "
-"correspond either to keys for which `git credential` will obtain the login/"
-"password information (e.g. host, protocol, path), or to the actual "
+"correspond either to keys for which `git credential` will obtain the "
+"login/password information (e.g. host, protocol, path), or to the actual "
"credential data to be obtained (login/password)."
msgstr ""
@@ -25540,22 +25380,21 @@ msgstr ""
#. type: Plain text
#: en/git-credential.txt:154
msgid ""
-"When this special attribute is read by `git credential`, the value is parsed "
-"as a URL and treated as if its constituent parts were read (e.g., "
+"When this special attribute is read by `git credential`, the value is parsed"
+" as a URL and treated as if its constituent parts were read (e.g., "
"`url=https://example.com` would behave as if `protocol=https` and "
"`host=example.com` had been provided). This can help callers avoid parsing "
-"URLs themselves. Note that any components which are missing from the URL (e."
-"g., there is no username in the example above) will be set to empty; if you "
-"want to provide a URL and override some attributes, provide the URL "
+"URLs themselves. Note that any components which are missing from the URL "
+"(e.g., there is no username in the example above) will be set to empty; if "
+"you want to provide a URL and override some attributes, provide the URL "
"attribute first, followed by any overrides."
msgstr ""
#. type: Title =
#: en/git-cvsexportcommit.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-cvsexportcommit(1)"
-msgstr "git-commit(1)"
+msgstr "git-cvsexportcommit(1)"
#. type: Plain text
#: en/git-cvsexportcommit.txt:7
@@ -25609,8 +25448,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:40
msgid ""
-"Commit automatically if the patch applied cleanly. It will not commit if any "
-"hunks fail to apply or there were other problems."
+"Commit automatically if the patch applied cleanly. It will not commit if any"
+" hunks fail to apply or there were other problems."
msgstr ""
#. type: Plain text
@@ -25673,9 +25512,9 @@ msgstr ""
#: en/git-cvsexportcommit.txt:76
msgid ""
"Specify the location of the CVS checkout to use for the export. This option "
-"does not require GIT_DIR to be set before execution if the current directory "
-"is within a Git repository. The default is the value of 'cvsexportcommit."
-"cvsdir'."
+"does not require GIT_DIR to be set before execution if the current directory"
+" is within a Git repository. The default is the value of "
+"'cvsexportcommit.cvsdir'."
msgstr ""
#. type: Plain text
@@ -25722,7 +25561,9 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsexportcommit.txt:102
#, no-wrap
-msgid "Merge one patch into CVS (-c and -w options). The working directory is within the Git Repo"
+msgid ""
+"Merge one patch into CVS (-c and -w options). The working directory is "
+"within the Git Repo"
msgstr ""
#. type: delimited block -
@@ -25734,7 +25575,9 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsexportcommit.txt:108
#, no-wrap
-msgid "Merge pending patches into CVS automatically -- only if you really know what you are doing"
+msgid ""
+"Merge pending patches into CVS automatically -- only if you really know what"
+" you are doing"
msgstr ""
#. type: delimited block -
@@ -25748,10 +25591,9 @@ msgstr ""
#. type: Title =
#: en/git-cvsimport.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-cvsimport(1)"
-msgstr "git-commit(1)"
+msgstr "git-cvsimport(1)"
#. type: Plain text
#: en/git-cvsimport.txt:7
@@ -25808,10 +25650,10 @@ msgstr ""
msgid ""
"You should *never* do any work of your own on the branches that are created "
"by 'git cvsimport'. By default initial import will create and populate a "
-"\"master\" branch from the CVS repository's main branch which you're free to "
-"work with; after that, you need to 'git merge' incremental imports, or any "
-"CVS branches, yourself. It is advisable to specify a named remote via -r to "
-"separate and protect the incoming branches."
+"\"master\" branch from the CVS repository's main branch which you're free to"
+" work with; after that, you need to 'git merge' incremental imports, or any "
+"CVS branches, yourself. It is advisable to specify a named remote via -r to"
+" separate and protect the incoming branches."
msgstr ""
#. type: Plain text
@@ -25839,8 +25681,8 @@ msgstr ""
msgid ""
"The root of the CVS archive. May be local (a simple path) or remote; "
"currently, only the :local:, :ext: and :pserver: access methods are "
-"supported. If not given, 'git cvsimport' will try to read it from `CVS/"
-"Root`. If no such file exists, it checks for the `CVSROOT` environment "
+"supported. If not given, 'git cvsimport' will try to read it from "
+"`CVS/Root`. If no such file exists, it checks for the `CVSROOT` environment "
"variable."
msgstr ""
@@ -25916,8 +25758,8 @@ msgstr ""
#: en/git-cvsimport.txt:92
msgid ""
"Import-only: don't perform a checkout after importing. This option ensures "
-"the working directory and index remain untouched and will not create them if "
-"they do not exist."
+"the working directory and index remain untouched and will not create them if"
+" they do not exist."
msgstr ""
#. type: Plain text
@@ -26005,9 +25847,9 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:127
msgid ""
-"Attempt to detect merges based on the commit message with a custom regex. It "
-"can be used with `-m` to enable the default regexes as well. You must escape "
-"forward slashes."
+"Attempt to detect merges based on the commit message with a custom regex. It"
+" can be used with `-m` to enable the default regexes as well. You must "
+"escape forward slashes."
msgstr ""
#. type: Plain text
@@ -26078,8 +25920,8 @@ msgstr ""
#: en/git-cvsimport.txt:159
msgid ""
"'git cvsimport' will make it appear as those authors had their "
-"GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly all along. If a time zone "
-"is specified, GIT_AUTHOR_DATE will have the corresponding offset applied."
+"GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly all along. If a time zone"
+" is specified, GIT_AUTHOR_DATE will have the corresponding offset applied."
msgstr ""
#. type: Plain text
@@ -26102,8 +25944,8 @@ msgstr ""
msgid ""
"Generate a `$GIT_DIR/cvs-revisions` file containing a mapping from CVS "
"revision numbers to newly-created Git commit IDs. The generated file will "
-"contain one line for each (filename, revision) pair imported; each line will "
-"look like"
+"contain one line for each (filename, revision) pair imported; each line will"
+" look like"
msgstr ""
#. type: delimited block -
@@ -26115,8 +25957,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:180
msgid ""
-"The revision data is appended to the file if it already exists, for use when "
-"doing incremental imports."
+"The revision data is appended to the file if it already exists, for use when"
+" doing incremental imports."
msgstr ""
#. type: Plain text
@@ -26164,8 +26006,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:204
msgid ""
-"If any files were ever \"cvs import\"ed more than once (e.g., import of more "
-"than one vendor release) the HEAD contains the wrong content."
+"If any files were ever \"cvs import\"ed more than once (e.g., import of more"
+" than one vendor release) the HEAD contains the wrong content."
msgstr ""
#. type: Plain text
@@ -26188,8 +26030,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:213
msgid ""
-"All files from the branching point are added to a branch even if never added "
-"in CVS."
+"All files from the branching point are added to a branch even if never added"
+" in CVS."
msgstr ""
#. type: Plain text
@@ -26213,8 +26055,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:223
msgid ""
-"If you suspect that any of these issues may apply to the repository you want "
-"to import, consider using cvs2git:"
+"If you suspect that any of these issues may apply to the repository you want"
+" to import, consider using cvs2git:"
msgstr ""
#. type: Plain text
@@ -26226,7 +26068,7 @@ msgstr ""
#: en/git-cvsserver.txt:2
#, no-wrap
msgid "git-cvsserver(1)"
-msgstr ""
+msgstr "git-cvsserver(1)"
#. type: Plain text
#: en/git-cvsserver.txt:7
@@ -26254,7 +26096,9 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:21
#, no-wrap
-msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
+msgid ""
+"cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver "
+"pserver\n"
msgstr ""
#. type: Plain text
@@ -26271,9 +26115,9 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:33
msgid ""
-"All these options obviously only make sense if enforced by the server side. "
-"They have been implemented to resemble the linkgit:git-daemon[1] options as "
-"closely as possible."
+"All these options obviously only make sense if enforced by the server side."
+" They have been implemented to resemble the linkgit:git-daemon[1] options "
+"as closely as possible."
msgstr ""
#. type: Labeled list
@@ -26291,7 +26135,7 @@ msgstr ""
#: en/git-cvsserver.txt:37 en/git-daemon.txt:48
#, no-wrap
msgid "--strict-paths"
-msgstr ""
+msgstr "--strict-paths"
#. type: Plain text
#: en/git-cvsserver.txt:39
@@ -26302,7 +26146,7 @@ msgstr ""
#: en/git-cvsserver.txt:40 en/git-daemon.txt:77
#, no-wrap
msgid "--export-all"
-msgstr ""
+msgstr "--export-all"
#. type: Plain text
#: en/git-cvsserver.txt:43
@@ -26321,7 +26165,7 @@ msgstr ""
#: en/git-cvsserver.txt:45 en/git.txt:534
#, no-wrap
msgid "--version"
-msgstr ""
+msgstr "--version"
#. type: Plain text
#: en/git-cvsserver.txt:47
@@ -26332,7 +26176,7 @@ msgstr ""
#: en/git-cvsserver.txt:50 en/git.txt:537
#, no-wrap
msgid "--help"
-msgstr ""
+msgstr "--help"
#. type: Plain text
#: en/git-cvsserver.txt:52
@@ -26382,8 +26226,8 @@ msgstr ""
#: en/git-cvsserver.txt:80
msgid ""
"'git-cvsserver' maps Git branches to CVS modules. This is very different "
-"from what most CVS users would expect since in CVS modules usually represent "
-"one or more directories."
+"from what most CVS users would expect since in CVS modules usually represent"
+" one or more directories."
msgstr ""
#. type: Title -
@@ -26395,8 +26239,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:86
msgid ""
-"If you are going to offer CVS access via pserver, add a line in /etc/inetd."
-"conf like"
+"If you are going to offer CVS access via pserver, add a line in "
+"/etc/inetd.conf like"
msgstr ""
#. type: delimited block -
@@ -26417,7 +26261,9 @@ msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:99
#, no-wrap
-msgid " cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
+msgid ""
+" cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver "
+"pserver\n"
msgstr ""
#. type: Plain text
@@ -26469,7 +26315,9 @@ msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:127
#, no-wrap
-msgid " perl -e 'my ($user, $pass) = @ARGV; printf \"%s:%s\\n\", $user, crypt($user, $pass)' $USER password\n"
+msgid ""
+" perl -e 'my ($user, $pass) = @ARGV; printf \"%s:%s\\n\", $user, "
+"crypt($user, $pass)' $USER password\n"
msgstr ""
#. type: Plain text
@@ -26480,7 +26328,9 @@ msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:132
#, no-wrap
-msgid " cvs -d:pserver:someuser:somepassword <at> server/path/repo.git co <HEAD_name>\n"
+msgid ""
+" cvs -d:pserver:someuser:somepassword <at> server/path/repo.git co "
+"<HEAD_name>\n"
msgstr ""
#. type: Plain text
@@ -26501,7 +26351,9 @@ msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:142
#, no-wrap
-msgid "cvs -d \":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git\" co <HEAD_name>\n"
+msgid ""
+"cvs -d \":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git\" co "
+"<HEAD_name>\n"
msgstr ""
#. type: Plain text
@@ -26536,9 +26388,9 @@ msgstr ""
#: en/git-cvsserver.txt:164
msgid ""
"Note: you need to ensure each user that is going to invoke 'git-cvsserver' "
-"has write access to the log file and to the database (see <<dbbackend,"
-"Database Backend>>. If you want to offer write access over SSH, the users of "
-"course also need write access to the Git repository itself."
+"has write access to the log file and to the database (see "
+"<<dbbackend,Database Backend>>. If you want to offer write access over SSH, "
+"the users of course also need write access to the Git repository itself."
msgstr ""
#. type: Plain text
@@ -26552,8 +26404,8 @@ msgstr ""
#: en/git-cvsserver.txt:173
msgid ""
"All configuration variables can also be overridden for a specific method of "
-"access. Valid method names are \"ext\" (for SSH access) and \"pserver\". The "
-"following example configuration would disable pserver access while still "
+"access. Valid method names are \"ext\" (for SSH access) and \"pserver\". The"
+" following example configuration would disable pserver access while still "
"allowing access over SSH."
msgstr ""
@@ -26580,8 +26432,8 @@ msgid ""
"command, automatically saving it in your 'CVS/Root' files, then you need to "
"set them explicitly in your environment. CVSROOT should be set as per "
"normal, but the directory should point at the appropriate Git repo. As "
-"above, for SSH clients _not_ restricted to 'git-shell', CVS_SERVER should be "
-"set to 'git-cvsserver'."
+"above, for SSH clients _not_ restricted to 'git-shell', CVS_SERVER should be"
+" set to 'git-cvsserver'."
msgstr ""
#. type: delimited block -
@@ -26595,9 +26447,9 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:198
msgid ""
-"For SSH clients that will make commits, make sure their server-side .ssh/"
-"environment files (or .bashrc, etc., according to their specific shell) "
-"export appropriate values for GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, "
+"For SSH clients that will make commits, make sure their server-side "
+".ssh/environment files (or .bashrc, etc., according to their specific shell)"
+" export appropriate values for GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, "
"GIT_COMMITTER_NAME, and GIT_COMMITTER_EMAIL. For SSH clients whose login "
"shell is bash, .bashrc may be a reasonable alternative."
msgstr ""
@@ -26645,19 +26497,19 @@ msgstr ""
#: en/git-cvsserver.txt:227
msgid ""
"That means that even if you offer only read access (e.g. by using the "
-"pserver method), 'git-cvsserver' should have write access to the database to "
-"work reliably (otherwise you need to make sure that the database is up-to-"
+"pserver method), 'git-cvsserver' should have write access to the database to"
+" work reliably (otherwise you need to make sure that the database is up-to-"
"date any time 'git-cvsserver' is executed)."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:234
msgid ""
-"By default it uses SQLite databases in the Git directory, named `gitcvs."
-"<module_name>.sqlite`. Note that the SQLite backend creates temporary files "
-"in the same directory as the database file on write so it might not be "
-"enough to grant the users using 'git-cvsserver' write access to the database "
-"file without granting them write access to the directory, too."
+"By default it uses SQLite databases in the Git directory, named "
+"`gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates "
+"temporary files in the same directory as the database file on write so it "
+"might not be enough to grant the users using 'git-cvsserver' write access to"
+" the database file without granting them write access to the directory, too."
msgstr ""
#. type: Plain text
@@ -26665,12 +26517,12 @@ msgstr ""
msgid ""
"The database can not be reliably regenerated in a consistent form after the "
"branch it is tracking has changed. Example: For merged branches, 'git-"
-"cvsserver' only tracks one branch of development, and after a 'git merge' an "
-"incrementally updated database may track a different branch than a database "
-"regenerated from scratch, causing inconsistent CVS revision numbers. `git-"
-"cvsserver` has no way of knowing which branch it would have picked if it had "
-"been run incrementally pre-merge. So if you have to fully or partially (from "
-"old backup) regenerate the database, you should be suspicious of pre-"
+"cvsserver' only tracks one branch of development, and after a 'git merge' an"
+" incrementally updated database may track a different branch than a database"
+" regenerated from scratch, causing inconsistent CVS revision numbers. `git-"
+"cvsserver` has no way of knowing which branch it would have picked if it had"
+" been run incrementally pre-merge. So if you have to fully or partially "
+"(from old backup) regenerate the database, you should be suspicious of pre-"
"existing CVS sandboxes."
msgstr ""
@@ -26690,8 +26542,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:256
msgid ""
-"'git-cvsserver' uses the Perl DBI module. Please also read its documentation "
-"if changing these variables, especially about `DBI->connect()`."
+"'git-cvsserver' uses the Perl DBI module. Please also read its documentation"
+" if changing these variables, especially about `DBI->connect()`."
msgstr ""
#. type: Plain text
@@ -26707,8 +26559,8 @@ msgstr ""
msgid ""
"Used DBI driver. You can specify any available driver for this here, but it "
"might not work. cvsserver is tested with 'DBD::SQLite', reported to work "
-"with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Please regard "
-"this as an experimental feature. May not contain colons (`:`). Default: "
+"with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Please regard"
+" this as an experimental feature. May not contain colons (`:`). Default: "
"'SQLite'"
msgstr ""
@@ -26748,8 +26600,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:288
msgid ""
-"All variables can also be set per access method, see <<configaccessmethod,"
-"above>>."
+"All variables can also be set per access method, see "
+"<<configaccessmethod,above>>."
msgstr ""
#. type: Title ^
@@ -26783,8 +26635,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:300
msgid ""
-"Git directory name, where all characters except for alpha-numeric ones, `.`, "
-"and `-` are replaced with `_` (this should make it easier to use the "
+"Git directory name, where all characters except for alpha-numeric ones, `.`,"
+" and `-` are replaced with `_` (this should make it easier to use the "
"directory name in a filename if wanted)"
msgstr ""
@@ -26819,8 +26671,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:308
msgid ""
-"Name of the user running 'git-cvsserver'. If no name can be determined, the "
-"numeric uid is used."
+"Name of the user running 'git-cvsserver'. If no name can be determined, the"
+" numeric uid is used."
msgstr ""
#. type: Plain text
@@ -26832,15 +26684,16 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:316
-msgid "GIT_CVSSERVER_BASE_PATH takes the place of the argument to --base-path."
+msgid ""
+"GIT_CVSSERVER_BASE_PATH takes the place of the argument to --base-path."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:320
msgid ""
"GIT_CVSSERVER_ROOT specifies a single-directory whitelist. The repository "
-"must still be configured to allow access through git-cvsserver, as described "
-"above."
+"must still be configured to allow access through git-cvsserver, as described"
+" above."
msgstr ""
#. type: Plain text
@@ -26949,12 +26802,12 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:371
msgid ""
-"Most CVS command arguments that read CVS tags or revision numbers (typically "
-"-r) work, and also support any git refspec (tag, branch, commit ID, etc). "
+"Most CVS command arguments that read CVS tags or revision numbers (typically"
+" -r) work, and also support any git refspec (tag, branch, commit ID, etc). "
"However, CVS revision numbers for non-default branches are not well "
"emulated, and cvs log does not show tags or branches at all. (Non-main-"
-"branch CVS revision numbers superficially resemble CVS revision numbers, but "
-"they actually encode a git commit ID directly, rather than represent the "
+"branch CVS revision numbers superficially resemble CVS revision numbers, but"
+" they actually encode a git commit ID directly, rather than represent the "
"number of revisions since the branch point.)"
msgstr ""
@@ -26978,8 +26831,8 @@ msgstr ""
#: en/git-cvsserver.txt:398
msgid ""
"If you want to refer to a git refspec that has characters that are not "
-"allowed by CVS, you have two options. First, it may just work to supply the "
-"git refspec directly to the appropriate CVS -r argument; some CVS clients "
+"allowed by CVS, you have two options. First, it may just work to supply the"
+" git refspec directly to the appropriate CVS -r argument; some CVS clients "
"don't seem to do much sanity checking of the argument. Second, if that "
"fails, you can use a special character escape mechanism that only uses "
"characters that are valid in CVS tags. A sequence of 4 or 5 characters of "
@@ -27007,16 +26860,16 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:408
msgid ""
-"By default the server leaves the `-k` mode blank for all files, which causes "
-"the CVS client to treat them as a text files, subject to end-of-line "
+"By default the server leaves the `-k` mode blank for all files, which causes"
+" the CVS client to treat them as a text files, subject to end-of-line "
"conversion on some platforms."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:413
msgid ""
-"You can make the server use the end-of-line conversion attributes to set the "
-"`-k` modes for files by setting the `gitcvs.usecrlfattr` config variable. "
+"You can make the server use the end-of-line conversion attributes to set the"
+" `-k` modes for files by setting the `gitcvs.usecrlfattr` config variable. "
"See linkgit:gitattributes[5] for more information about end-of-line "
"conversion."
msgstr ""
@@ -27026,11 +26879,11 @@ msgstr ""
msgid ""
"Alternatively, if `gitcvs.usecrlfattr` config is not enabled or the "
"attributes do not allow automatic detection for a filename, then the server "
-"uses the `gitcvs.allBinary` config for the default setting. If `gitcvs."
-"allBinary` is set, then file not otherwise specified will default to '-kb' "
-"mode. Otherwise the `-k` mode is left blank. But if `gitcvs.allBinary` is "
-"set to \"guess\", then the correct `-k` mode will be guessed based on the "
-"contents of the file."
+"uses the `gitcvs.allBinary` config for the default setting. If "
+"`gitcvs.allBinary` is set, then file not otherwise specified will default to"
+" '-kb' mode. Otherwise the `-k` mode is left blank. But if "
+"`gitcvs.allBinary` is set to \"guess\", then the correct `-k` mode will be "
+"guessed based on the contents of the file."
msgstr ""
#. type: Plain text
@@ -27054,10 +26907,9 @@ msgstr ""
#. type: Title =
#: en/git-daemon.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-daemon(1)"
-msgstr "git-add(1)"
+msgstr "git-daemon(1)"
#. type: Plain text
#: en/git-daemon.txt:7
@@ -27126,8 +26978,8 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:53
msgid ""
-"Match paths exactly (i.e. don't allow \"/foo/repo\" when the real path is \"/"
-"foo/repo.git\" or \"/foo/repo/.git\") and don't do user-relative paths. "
+"Match paths exactly (i.e. don't allow \"/foo/repo\" when the real path is "
+"\"/foo/repo.git\" or \"/foo/repo/.git\") and don't do user-relative paths. "
"'git daemon' will refuse to start when this option is enabled and no "
"whitelist is specified."
msgstr ""
@@ -27151,7 +27003,7 @@ msgstr ""
#: en/git-daemon.txt:61
#, no-wrap
msgid "--base-path-relaxed"
-msgstr ""
+msgstr "--base-path-relaxed"
#. type: Plain text
#: en/git-daemon.txt:66
@@ -27182,8 +27034,8 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:81
msgid ""
-"Allow pulling from all directories that look like Git repositories (have the "
-"'objects' and 'refs' subdirectories), even if they do not have the 'git-"
+"Allow pulling from all directories that look like Git repositories (have the"
+" 'objects' and 'refs' subdirectories), even if they do not have the 'git-"
"daemon-export-ok' file."
msgstr ""
@@ -27191,7 +27043,7 @@ msgstr ""
#: en/git-daemon.txt:82
#, no-wrap
msgid "--inetd"
-msgstr ""
+msgstr "--inetd"
#. type: Plain text
#: en/git-daemon.txt:86
@@ -27264,28 +27116,28 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:111
msgid ""
-"Maximum number of concurrent clients, defaults to 32. Set it to zero for no "
-"limit."
+"Maximum number of concurrent clients, defaults to 32. Set it to zero for no"
+" limit."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:112
#, no-wrap
msgid "--syslog"
-msgstr ""
+msgstr "--syslog"
#. type: Plain text
#: en/git-daemon.txt:115
msgid ""
-"Log to syslog instead of stderr. Note that this option does not imply --"
-"verbose, thus by default only error conditions will be logged."
+"Log to syslog instead of stderr. Note that this option does not imply "
+"--verbose, thus by default only error conditions will be logged."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:116
#, no-wrap
msgid "--user-path"
-msgstr ""
+msgstr "--user-path"
#. type: Labeled list
#: en/git-daemon.txt:117
@@ -27312,7 +27164,7 @@ msgstr ""
#: en/git-daemon.txt:129
#, no-wrap
msgid "--reuseaddr"
-msgstr ""
+msgstr "--reuseaddr"
#. type: Plain text
#: en/git-daemon.txt:133
@@ -27335,8 +27187,8 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:140
msgid ""
-"Save the process id in 'file'. Ignored when the daemon is run under `--"
-"inetd`."
+"Save the process id in 'file'. Ignored when the daemon is run under "
+"`--inetd`."
msgstr ""
#. type: Labeled list
@@ -27354,10 +27206,10 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:148
msgid ""
-"Change daemon's uid and gid before entering the service loop. When only `--"
-"user` is given without `--group`, the primary group ID for the user is "
-"used. The values of the option are given to `getpwnam(3)` and `getgrnam(3)` "
-"and numeric IDs are not supported."
+"Change daemon's uid and gid before entering the service loop. When only "
+"`--user` is given without `--group`, the primary group ID for the user is "
+"used. The values of the option are given to `getpwnam(3)` and `getgrnam(3)`"
+" and numeric IDs are not supported."
msgstr ""
#. type: Plain text
@@ -27395,7 +27247,8 @@ msgstr ""
msgid ""
"Enable/disable the service site-wide per default. Note that a service "
"disabled site-wide can still be enabled per repository if it is marked "
-"overridable and the repository enables the service with a configuration item."
+"overridable and the repository enables the service with a configuration "
+"item."
msgstr ""
#. type: Labeled list
@@ -27421,14 +27274,14 @@ msgstr ""
#: en/git-daemon.txt:174
#, no-wrap
msgid "--[no-]informative-errors"
-msgstr ""
+msgstr "--[no-]informative-errors"
#. type: Plain text
#: en/git-daemon.txt:182
msgid ""
"When informative errors are turned on, git-daemon will report more verbose "
-"errors to the client, differentiating conditions like \"no such repository\" "
-"from \"repository not exported\". This is more convenient for clients, but "
+"errors to the client, differentiating conditions like \"no such repository\""
+" from \"repository not exported\". This is more convenient for clients, but "
"may leak information about the existence of unexported repositories. When "
"informative errors are not enabled, all errors report \"access denied\" to "
"the client. The default is --no-informative-errors."
@@ -27443,14 +27296,14 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:193
msgid ""
-"Every time a client connects, first run an external command specified by the "
-"<path> with service name (e.g. \"upload-pack\"), path to the repository, "
-"hostname (%H), canonical hostname (%CH), IP address (%IP), and TCP port (%P) "
-"as its command-line arguments. The external command can decide to decline "
+"Every time a client connects, first run an external command specified by the"
+" <path> with service name (e.g. \"upload-pack\"), path to the repository, "
+"hostname (%H), canonical hostname (%CH), IP address (%IP), and TCP port (%P)"
+" as its command-line arguments. The external command can decide to decline "
"the service by exiting with a non-zero status (or to allow it by exiting "
-"with a zero status). It can also look at the $REMOTE_ADDR and `"
-"$REMOTE_PORT` environment variables to learn about the requestor when making "
-"this decision."
+"with a zero status). It can also look at the $REMOTE_ADDR and "
+"`$REMOTE_PORT` environment variables to learn about the requestor when "
+"making this decision."
msgstr ""
#. type: Plain text
@@ -27479,8 +27332,8 @@ msgstr ""
#: en/git-daemon.txt:212
msgid ""
"These services can be globally enabled/disabled using the command-line "
-"options of this command. If finer-grained control is desired (e.g. to allow "
-"'git archive' to be run against only in a few selected repositories the "
+"options of this command. If finer-grained control is desired (e.g. to allow"
+" 'git archive' to be run against only in a few selected repositories the "
"daemon serves), the per-repository configuration file can be used to enable "
"or disable them."
msgstr ""
@@ -27529,8 +27382,8 @@ msgid ""
"disabled by default, as there is _no_ authentication in the protocol (in "
"other words, anybody can push anything into the repository, including "
"removal of refs). This is solely meant for a closed LAN setting where "
-"everybody is friendly. This service can be enabled by setting `daemon."
-"receivepack` configuration item to `true`."
+"everybody is friendly. This service can be enabled by setting "
+"`daemon.receivepack` configuration item to `true`."
msgstr ""
#. type: Labeled list
@@ -27556,8 +27409,8 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:248
msgid ""
-"To set up 'git daemon' as an inetd service that handles any repository under "
-"the whitelisted set of directories, /pub/foo and /pub/bar, place an entry "
+"To set up 'git daemon' as an inetd service that handles any repository under"
+" the whitelisted set of directories, /pub/foo and /pub/bar, place an entry "
"like the following into /etc/inetd all on one line:"
msgstr ""
@@ -27599,8 +27452,8 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:277
msgid ""
-"In this example, the root-level directory `/pub` will contain a subdirectory "
-"for each virtual host name supported. Further, both hosts advertise "
+"In this example, the root-level directory `/pub` will contain a subdirectory"
+" for each virtual host name supported. Further, both hosts advertise "
"repositories simply as `git://www.example.com/software/repo.git`. For "
"pre-1.4.0 clients, a symlink from `/software` into the appropriate default "
"repository could be made as well."
@@ -27633,8 +27486,8 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:295
msgid ""
-"In this example, the root-level directory `/pub` will contain a subdirectory "
-"for each virtual host IP address supported. Repositories can still be "
+"In this example, the root-level directory `/pub` will contain a subdirectory"
+" for each virtual host IP address supported. Repositories can still be "
"accessed by hostname though, assuming they correspond to these IP addresses."
msgstr ""
@@ -27671,10 +27524,9 @@ msgstr ""
#. type: Title =
#: en/git-describe.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-describe(1)"
-msgstr "git-commit(1)"
+msgstr "git-describe(1)"
#. type: Plain text
#: en/git-describe.txt:7
@@ -27727,8 +27579,8 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:36
msgid ""
-"Describe the working tree. It means describe HEAD and appends <mark> (`-"
-"dirty` by default) if the working tree is dirty."
+"Describe the working tree. It means describe HEAD and appends <mark> "
+"(`-dirty` by default) if the working tree is dirty."
msgstr ""
#. type: Plain text
@@ -27750,13 +27602,13 @@ msgstr ""
#: en/git-describe.txt:47
#, no-wrap
msgid "--contains"
-msgstr ""
+msgstr "--contains"
#. type: Plain text
#: en/git-describe.txt:51
msgid ""
-"Instead of finding the tag that predates the commit, find the tag that comes "
-"after the commit, and thus contains it. Automatically implies --tags."
+"Instead of finding the tag that predates the commit, find the tag that comes"
+" after the commit, and thus contains it. Automatically implies --tags."
msgstr ""
#. type: Plain text
@@ -27777,16 +27629,16 @@ msgstr ""
#: en/git-describe.txt:64
msgid ""
"Instead of considering only the 10 most recent tags as candidates to "
-"describe the input commit-ish consider up to <n> candidates. Increasing <n> "
-"above 10 will take slightly longer but may produce a more accurate result. "
-"An <n> of 0 will cause only exact matches to be output."
+"describe the input commit-ish consider up to <n> candidates. Increasing <n>"
+" above 10 will take slightly longer but may produce a more accurate result."
+" An <n> of 0 will cause only exact matches to be output."
msgstr ""
#. type: Labeled list
#: en/git-describe.txt:65
#, no-wrap
msgid "--exact-match"
-msgstr ""
+msgstr "--exact-match"
#. type: Plain text
#: en/git-describe.txt:68
@@ -27799,13 +27651,13 @@ msgstr ""
#: en/git-describe.txt:69 en/git-ls-files.txt:151
#, no-wrap
msgid "--debug"
-msgstr ""
+msgstr "--debug"
#. type: Plain text
#: en/git-describe.txt:73
msgid ""
-"Verbosely display information about the searching strategy being employed to "
-"standard error. The tag name will still be printed to standard out."
+"Verbosely display information about the searching strategy being employed to"
+" standard error. The tag name will still be printed to standard out."
msgstr ""
#. type: Plain text
@@ -27813,10 +27665,11 @@ msgstr ""
msgid ""
"Always output the long format (the tag, the number of commits and the "
"abbreviated commit name) even when it matches a tag. This is useful when "
-"you want to see parts of the commit object name in \"describe\" output, even "
-"when the commit in question happens to be a tagged version. Instead of just "
-"emitting the tag name, it will describe such a commit as v1.2-0-gdeadbee "
-"(0th commit since tag v1.2 that points at object deadbee....)."
+"you want to see parts of the commit object name in \"describe\" output, even"
+" when the commit in question happens to be a tagged version. Instead of "
+"just emitting the tag name, it will describe such a commit as "
+"v1.2-0-gdeadbee (0th commit since tag v1.2 that points at object "
+"deadbee....)."
msgstr ""
#. type: Labeled list
@@ -27846,18 +27699,18 @@ msgstr ""
msgid ""
"Do not consider tags matching the given `glob(7)` pattern, excluding the "
"\"refs/tags/\" prefix. This can be used to narrow the tag space and find "
-"only tags matching some meaningful criteria. If given multiple times, a list "
-"of patterns will be accumulated and tags matching any of the patterns will "
+"only tags matching some meaningful criteria. If given multiple times, a list"
+" of patterns will be accumulated and tags matching any of the patterns will "
"be excluded. When combined with --match a tag will be considered when it "
-"matches at least one --match pattern and does not match any of the --exclude "
-"patterns. Use `--no-exclude` to clear and reset the list of patterns."
+"matches at least one --match pattern and does not match any of the --exclude"
+" patterns. Use `--no-exclude` to clear and reset the list of patterns."
msgstr ""
#. type: Labeled list
#: en/git-describe.txt:101 en/git-diff-tree.txt:111 en/git-name-rev.txt:61
#, no-wrap
msgid "--always"
-msgstr ""
+msgstr "--always"
#. type: Plain text
#: en/git-describe.txt:103 en/git-name-rev.txt:63
@@ -27868,7 +27721,7 @@ msgstr ""
#: en/git-describe.txt:104 en/rev-list-options.txt:121
#, no-wrap
msgid "--first-parent"
-msgstr ""
+msgstr "--first-parent"
#. type: Plain text
#: en/git-describe.txt:108
@@ -27904,8 +27757,8 @@ msgstr ""
#: en/git-describe.txt:130
msgid ""
"The number of additional commits is the number of commits which would be "
-"displayed by \"git log v1.0.4..parent\". The hash suffix is \"-g\" + 7-char "
-"abbreviation for the tip commit of parent (which was "
+"displayed by \"git log v1.0.4..parent\". The hash suffix is \"-g\" + 7-char"
+" abbreviation for the tip commit of parent (which was "
"`2414721b194453f058079d897d13c4e377f92dc6`). The \"g\" prefix stands for "
"\"git\" and is used to allow describing the version of a software depending "
"on the SCM the software is managed with. This is useful in an environment "
@@ -27967,10 +27820,10 @@ msgstr ""
#: en/git-describe.txt:156
msgid ""
"Note that the suffix you get if you type these commands today may be longer "
-"than what Linus saw above when he ran these commands, as your Git repository "
-"may have new commits whose object names begin with 975b that did not exist "
-"back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate "
-"these commits."
+"than what Linus saw above when he ran these commands, as your Git repository"
+" may have new commits whose object names begin with 975b that did not exist "
+"back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate"
+" these commits."
msgstr ""
#. type: Title -
@@ -27982,8 +27835,8 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:166
msgid ""
-"For each commit-ish supplied, 'git describe' will first look for a tag which "
-"tags exactly that commit. Annotated tags will always be preferred over "
+"For each commit-ish supplied, 'git describe' will first look for a tag which"
+" tags exactly that commit. Annotated tags will always be preferred over "
"lightweight tags, and tags with newer dates will always be preferred over "
"tags with older dates. If an exact match is found, its name will be output "
"and searching will stop."
@@ -27994,9 +27847,9 @@ msgstr ""
msgid ""
"If an exact match was not found, 'git describe' will walk back through the "
"commit history to locate an ancestor commit which has been tagged. The "
-"ancestor's tag will be output along with an abbreviation of the input commit-"
-"ish's SHA-1. If `--first-parent` was specified then the walk will only "
-"consider the first parent of each commit."
+"ancestor's tag will be output along with an abbreviation of the input "
+"commit-ish's SHA-1. If `--first-parent` was specified then the walk will "
+"only consider the first parent of each commit."
msgstr ""
#. type: Plain text
@@ -28013,14 +27866,14 @@ msgstr ""
#: en/git-diff-files.txt:2
#, no-wrap
msgid "git-diff-files(1)"
-msgstr ""
+msgstr "git-diff-files(1)"
#. type: Plain text
#: en/git-diff-files.txt:7
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid "git-diff-files - Compares files in the working tree and the index"
msgstr ""
"en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et "
@@ -28029,7 +27882,9 @@ msgstr ""
#. type: Plain text
#: en/git-diff-files.txt:13
#, no-wrap
-msgid "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]\n"
+msgid ""
+"'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] "
+"[<path>...]\n"
msgstr ""
#. type: Plain text
@@ -28079,7 +27934,7 @@ msgstr ""
#: en/rev-list-options.txt:873
#, no-wrap
msgid "--cc"
-msgstr ""
+msgstr "--cc"
#. type: Plain text
#: en/git-diff-files.txt:43
@@ -28096,12 +27951,10 @@ msgstr ""
#. type: Title =
#: en/git-diff-index.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-diff-index(1)"
-msgstr "git-add(1)"
+msgstr "git-diff-index(1)"
-#
#. type: Plain text
#: en/git-diff-index.txt:7
#, fuzzy
@@ -28112,7 +27965,9 @@ msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index"
#. type: Plain text
#: en/git-diff-index.txt:13
#, no-wrap
-msgid "'git diff-index' [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]\n"
+msgid ""
+"'git diff-index' [-m] [--cached] [<common diff options>] <tree-ish> "
+"[<path>...]\n"
msgstr ""
#. type: Plain text
@@ -28219,8 +28074,8 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:75
msgid ""
-"In fact, `git diff-index --cached` *should* always be entirely equivalent to "
-"actually doing a 'git write-tree' and comparing that. Except this one is "
+"In fact, `git diff-index --cached` *should* always be entirely equivalent to"
+" actually doing a 'git write-tree' and comparing that. Except this one is "
"much nicer for the case where you just want to check where you are."
msgstr ""
@@ -28228,8 +28083,8 @@ msgstr ""
#: en/git-diff-index.txt:79
msgid ""
"So doing a `git diff-index --cached` is basically very useful when you are "
-"asking yourself \"what have I already marked for being committed, and what's "
-"the difference to a previous tree\"."
+"asking yourself \"what have I already marked for being committed, and what's"
+" the difference to a previous tree\"."
msgstr ""
#. type: Title -
@@ -28243,8 +28098,8 @@ msgstr ""
msgid ""
"The \"non-cached\" mode takes a different approach, and is potentially the "
"more useful of the two in that what it does can't be emulated with a 'git "
-"write-tree' + 'git diff-tree'. Thus that's the default mode. The non-cached "
-"version asks the question:"
+"write-tree' + 'git diff-tree'. Thus that's the default mode. The non-cached"
+" version asks the question:"
msgstr ""
#. type: Plain text
@@ -28258,9 +28113,9 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:93
msgid ""
-"which is obviously a very useful question too, since that tells you what you "
-"*could* commit. Again, the output matches the 'git diff-tree -r' output to a "
-"tee, but with a twist."
+"which is obviously a very useful question too, since that tells you what you"
+" *could* commit. Again, the output matches the 'git diff-tree -r' output to "
+"a tee, but with a twist."
msgstr ""
#. type: Plain text
@@ -28293,8 +28148,8 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:113
msgid ""
-"As with other commands of this type, 'git diff-index' does not actually look "
-"at the contents of the file at all. So maybe `kernel/sched.c` hasn't "
+"As with other commands of this type, 'git diff-index' does not actually look"
+" at the contents of the file at all. So maybe `kernel/sched.c` hasn't "
"actually changed, and it's just that you touched it. In either case, it's a "
"note that you need to 'git update-index' it to make the index be in sync."
msgstr ""
@@ -28311,10 +28166,9 @@ msgstr ""
#. type: Title =
#: en/git-difftool.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-difftool(1)"
-msgstr "git-commit(1)"
+msgstr "git-difftool(1)"
#. type: Plain text
#: en/git-difftool.txt:7
@@ -28340,26 +28194,26 @@ msgstr ""
#: en/git-difftool.txt:23
#, no-wrap
msgid "--dir-diff"
-msgstr ""
+msgstr "--dir-diff"
#. type: Plain text
#: en/git-difftool.txt:27
msgid ""
-"Copy the modified files to a temporary location and perform a directory diff "
-"on them. This mode never prompts before launching the diff tool."
+"Copy the modified files to a temporary location and perform a directory diff"
+" on them. This mode never prompts before launching the diff tool."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:28 en/git-mergetool.txt:70
#, no-wrap
msgid "-y"
-msgstr ""
+msgstr "-y"
#. type: Labeled list
#: en/git-difftool.txt:29 en/git-mergetool.txt:71
#, no-wrap
msgid "--no-prompt"
-msgstr ""
+msgstr "--no-prompt"
#. type: Plain text
#: en/git-difftool.txt:31
@@ -28370,7 +28224,7 @@ msgstr ""
#: en/git-difftool.txt:32 en/git-mergetool.txt:78
#, no-wrap
msgid "--prompt"
-msgstr ""
+msgstr "--prompt"
#. type: Plain text
#: en/git-difftool.txt:36
@@ -28404,8 +28258,8 @@ msgstr ""
#: en/git-difftool.txt:47
msgid ""
"If a diff tool is not specified, 'git difftool' will use the configuration "
-"variable `diff.tool`. If the configuration variable `diff.tool` is not set, "
-"'git difftool' will pick a suitable default."
+"variable `diff.tool`. If the configuration variable `diff.tool` is not set,"
+" 'git difftool' will pick a suitable default."
msgstr ""
#. type: Plain text
@@ -28428,21 +28282,21 @@ msgstr ""
#. type: Plain text
#: en/git-difftool.txt:68
msgid ""
-"When 'git difftool' is invoked with this tool (either through the `-t` or `--"
-"tool` option or the `diff.tool` configuration variable) the configured "
-"command line will be invoked with the following variables available: `"
-"$LOCAL` is set to the name of the temporary file containing the contents of "
-"the diff pre-image and `$REMOTE` is set to the name of the temporary file "
+"When 'git difftool' is invoked with this tool (either through the `-t` or "
+"`--tool` option or the `diff.tool` configuration variable) the configured "
+"command line will be invoked with the following variables available: "
+"`$LOCAL` is set to the name of the temporary file containing the contents of"
+" the diff pre-image and `$REMOTE` is set to the name of the temporary file "
"containing the contents of the diff post-image. `$MERGED` is the name of "
-"the file which is being compared. `$BASE` is provided for compatibility with "
-"custom merge tool commands and has the same value as `$MERGED`."
+"the file which is being compared. `$BASE` is provided for compatibility with"
+" custom merge tool commands and has the same value as `$MERGED`."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:69 en/git-mergetool.txt:67
#, no-wrap
msgid "--tool-help"
-msgstr ""
+msgstr "--tool-help"
#. type: Plain text
#: en/git-difftool.txt:71
@@ -28453,7 +28307,7 @@ msgstr ""
#: en/git-difftool.txt:72
#, no-wrap
msgid "--[no-]symlinks"
-msgstr ""
+msgstr "--[no-]symlinks"
#. type: Plain text
#: en/git-difftool.txt:77
@@ -28496,13 +28350,13 @@ msgstr ""
#: en/git-update-index.txt:114 en/rev-list-options.txt:245
#, no-wrap
msgid "-g"
-msgstr ""
+msgstr "-g"
#. type: Labeled list
#: en/git-difftool.txt:89
#, no-wrap
msgid "--[no-]gui"
-msgstr ""
+msgstr "--[no-]gui"
#. type: Plain text
#: en/git-difftool.txt:94
@@ -28516,7 +28370,7 @@ msgstr ""
#: en/git-difftool.txt:95
#, no-wrap
msgid "--[no-]trust-exit-code"
-msgstr ""
+msgstr "--[no-]trust-exit-code"
#. type: Plain text
#: en/git-difftool.txt:100
@@ -28559,10 +28413,9 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:114
-#, fuzzy, no-wrap
-#| msgid "diff"
+#, no-wrap
msgid "diff.guitool"
-msgstr "diff"
+msgstr "diff.guitool"
#. type: Plain text
#: en/git-difftool.txt:116
@@ -28612,10 +28465,9 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-diff-tree(1)"
-msgstr "git-commit(1)"
+msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
@@ -28692,8 +28544,8 @@ msgstr ""
msgid ""
"When `--stdin` is specified, the command does not take <tree-ish> arguments "
"from the command line. Instead, it reads lines containing either two "
-"<tree>, one <commit>, or a list of <commit> from its standard input. (Use a "
-"single space as separator.)"
+"<tree>, one <commit>, or a list of <commit> from its standard input. (Use a"
+" single space as separator.)"
msgstr ""
#. type: Plain text
@@ -28746,10 +28598,9 @@ msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:87
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--no-commit-id"
-msgstr "git-commit(1)"
+msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:90
@@ -28784,8 +28635,8 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:114
msgid ""
-"Show the commit itself and the commit log message even if the diff itself is "
-"empty."
+"Show the commit itself and the commit log message even if the diff itself is"
+" empty."
msgstr ""
#. type: Title -
@@ -28890,10 +28741,9 @@ msgstr ""
#. type: Title =
#: en/git-diff.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-diff(1)"
-msgstr "git-add(1)"
+msgstr "git-diff(1)"
#. type: Plain text
#: en/git-diff.txt:7
@@ -28915,8 +28765,8 @@ msgstr ""
#: en/git-diff.txt:23
msgid ""
"Show changes between the working tree and the index or a tree, changes "
-"between the index and a tree, changes between two trees, changes between two "
-"blob objects, or changes between two files on disk."
+"between the index and a tree, changes between two trees, changes between two"
+" blob objects, or changes between two files on disk."
msgstr ""
#. type: Labeled list
@@ -28930,8 +28780,8 @@ msgstr ""
msgid ""
"This form is to view the changes you made relative to the index (staging "
"area for the next commit). In other words, the differences are what you "
-"_could_ tell Git to further add to the index but you still haven't. You can "
-"stage these changes by using linkgit:git-add[1]."
+"_could_ tell Git to further add to the index but you still haven't. You can"
+" stage these changes by using linkgit:git-add[1]."
msgstr ""
#. type: Labeled list
@@ -28943,8 +28793,8 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:40
msgid ""
-"This form is to compare the given two paths on the filesystem. You can omit "
-"the `--no-index` option when running the command in a working tree "
+"This form is to compare the given two paths on the filesystem. You can omit"
+" the `--no-index` option when running the command in a working tree "
"controlled by Git and at least one of the paths points outside the working "
"tree, or when running the command outside a working tree controlled by Git."
msgstr ""
@@ -29013,8 +28863,8 @@ msgstr ""
#: en/git-diff.txt:77
msgid ""
"This form is to view the changes on the branch containing and up to the "
-"second <commit>, starting at a common ancestor of both <commit>. \"git diff "
-"A\\...B\" is equivalent to \"git diff $(git-merge-base A B) B\". You can "
+"second <commit>, starting at a common ancestor of both <commit>. \"git diff"
+" A\\...B\" is equivalent to \"git diff $(git-merge-base A B) B\". You can "
"omit any one of <commit>, which has the same effect as using HEAD instead."
msgstr ""
@@ -29031,9 +28881,9 @@ msgstr ""
msgid ""
"For a more complete list of ways to spell <commit>, see \"SPECIFYING "
"REVISIONS\" section in linkgit:gitrevisions[7]. However, \"diff\" is about "
-"comparing two _endpoints_, not ranges, and the range notations (\"<commit>.."
-"<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in "
-"the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
+"comparing two _endpoints_, not ranges, and the range notations "
+"(\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range "
+"as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Labeled list
@@ -29075,8 +28925,8 @@ msgstr ""
#: en/git-diff.txt:120
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid "Changes in the working tree not yet staged for the next commit."
msgstr ""
"en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et "
@@ -29085,8 +28935,8 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:122
msgid ""
-"Changes between the index and your last commit; what you would be committing "
-"if you run \"git commit\" without \"-a\" option."
+"Changes between the index and your last commit; what you would be committing"
+" if you run \"git commit\" without \"-a\" option."
msgstr ""
#. type: Plain text
@@ -29180,7 +29030,8 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:163
-msgid "Show only modification, rename, and copy, but not addition or deletion."
+msgid ""
+"Show only modification, rename, and copy, but not addition or deletion."
msgstr ""
#. type: Plain text
@@ -29219,7 +29070,6 @@ msgstr ""
msgid "Output diff in reverse."
msgstr ""
-#
#. type: Plain text
#: en/git-diff.txt:186
#, fuzzy
@@ -29227,8 +29077,8 @@ msgstr ""
#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
#| "merge[1], linkgit:git-commit-tree[1]"
msgid ""
-"diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:"
-"gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
+"diff(1), linkgit:git-difftool[1], linkgit:git-log[1], "
+"linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
msgstr ""
"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
"merge[1], linkgit:git-commit-tree[1]"
@@ -29237,7 +29087,7 @@ msgstr ""
#: en/git-fast-export.txt:2
#, no-wrap
msgid "git-fast-export(1)"
-msgstr ""
+msgstr "git-fast-export(1)"
#. type: Plain text
#: en/git-fast-export.txt:7
@@ -29296,9 +29146,9 @@ msgstr ""
msgid ""
"When asking to 'abort' (which is the default), this program will die when "
"encountering a signed tag. With 'strip', the tags will silently be made "
-"unsigned, with 'warn-strip' they will be made unsigned but a warning will be "
-"displayed, with 'verbatim', they will be silently exported and with 'warn', "
-"they will be exported, but you will see a warning."
+"unsigned, with 'warn-strip' they will be made unsigned but a warning will be"
+" displayed, with 'verbatim', they will be silently exported and with 'warn',"
+" they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
@@ -29321,8 +29171,8 @@ msgid ""
"When asking to 'abort' (which is the default), this program will die when "
"encountering such a tag. With 'drop' it will omit such tags from the "
"output. With 'rewrite', if the tagged object is a commit, it will rewrite "
-"the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-"
-"list[1])"
+"the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-"
+"rev-list[1])"
msgstr ""
#. type: Labeled list
@@ -29357,11 +29207,11 @@ msgstr ""
msgid ""
"Dumps the internal marks table to <file> when complete. Marks are written "
"one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks "
-"for blobs are ignored. Backends can use this file to validate imports after "
-"they have been completed, or to save the marks table across incremental "
+"for blobs are ignored. Backends can use this file to validate imports after"
+" they have been completed, or to save the marks table across incremental "
"runs. As <file> is only opened and truncated at completion, the same path "
-"can also be safely given to --import-marks. The file will not be written if "
-"no new object has been marked/exported."
+"can also be safely given to --import-marks. The file will not be written if"
+" no new object has been marked/exported."
msgstr ""
#. type: Labeled list
@@ -29391,7 +29241,7 @@ msgstr ""
#: en/git-fast-export.txt:84
#, no-wrap
msgid "--fake-missing-tagger"
-msgstr ""
+msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:89
@@ -29405,7 +29255,7 @@ msgstr ""
#: en/git-fast-export.txt:90
#, no-wrap
msgid "--use-done-feature"
-msgstr ""
+msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:93
@@ -29418,7 +29268,7 @@ msgstr ""
#: en/git-fast-export.txt:94
#, no-wrap
msgid "--no-data"
-msgstr ""
+msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:101
@@ -29434,7 +29284,7 @@ msgstr ""
#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
#, no-wrap
msgid "--full-tree"
-msgstr ""
+msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:107
@@ -29449,7 +29299,7 @@ msgstr ""
#: en/git-fast-export.txt:108
#, no-wrap
msgid "--anonymize"
-msgstr ""
+msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:112
@@ -29462,7 +29312,7 @@ msgstr ""
#: en/git-fast-export.txt:113
#, no-wrap
msgid "--refspec"
-msgstr ""
+msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:116
@@ -29483,8 +29333,8 @@ msgstr "<git-rev-list-args>"
msgid ""
"A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that "
"specifies the specific objects and references to export. For example, "
-"`master~10..master` causes the current master reference to be exported along "
-"with all objects added since its 10th ancestor commit."
+"`master~10..master` causes the current master reference to be exported along"
+" with all objects added since its 10th ancestor commit."
msgstr ""
#. type: delimited block -
@@ -29520,8 +29370,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:147
msgid ""
-"Note that this assumes that none of the blobs and commit messages referenced "
-"by that revision range contains the string 'refs/heads/master'."
+"Note that this assumes that none of the blobs and commit messages referenced"
+" by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
@@ -29622,8 +29472,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:211
msgid ""
-"Since 'git fast-import' cannot tag trees, you will not be able to export the "
-"linux.git repository completely, as it contains a tag referencing a tree "
+"Since 'git fast-import' cannot tag trees, you will not be able to export the"
+" linux.git repository completely, as it contains a tag referencing a tree "
"instead of a commit."
msgstr ""
@@ -29631,7 +29481,7 @@ msgstr ""
#: en/git-fast-import.txt:2
#, no-wrap
msgid "git-fast-import(1)"
-msgstr ""
+msgstr "git-fast-import(1)"
#. type: Plain text
#: en/git-fast-import.txt:7
@@ -29656,8 +29506,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
msgid ""
-"fast-import reads a mixed command/data stream from standard input and writes "
-"one or more packfiles directly into the current repository. When EOF is "
+"fast-import reads a mixed command/data stream from standard input and writes"
+" one or more packfiles directly into the current repository. When EOF is "
"received on standard input, fast import writes out updated branch and tag "
"refs, fully updating the current repository with the newly imported data."
msgstr ""
@@ -29665,8 +29515,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
msgid ""
-"The fast-import backend itself can import into an empty repository (one that "
-"has already been initialized by 'git init') or incrementally update an "
+"The fast-import backend itself can import into an empty repository (one that"
+" has already been initialized by 'git init') or incrementally update an "
"existing populated repository. Whether or not incremental imports are "
"supported from a particular foreign source depends on the frontend program "
"in use."
@@ -29688,18 +29538,17 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:47
-#, fuzzy, no-wrap
-#| msgid "status"
+#, no-wrap
msgid "--stats"
-msgstr "status"
+msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:52
msgid ""
-"Display some basic statistics about the objects fast-import has created, the "
-"packfiles they were stored into, and the memory used by fast-import during "
-"this run. Showing this output is currently the default, but can be disabled "
-"with --quiet."
+"Display some basic statistics about the objects fast-import has created, the"
+" packfiles they were stored into, and the memory used by fast-import during "
+"this run. Showing this output is currently the default, but can be disabled"
+" with --quiet."
msgstr ""
#. type: Title ~
@@ -29732,22 +29581,22 @@ msgstr ""
#: en/git-fast-import.txt:67
msgid ""
"Specify the type of dates the frontend will supply to fast-import within "
-"`author`, `committer` and `tagger` commands. See ``Date Formats'' below for "
-"details about which formats are supported, and their syntax."
+"`author`, `committer` and `tagger` commands. See ``Date Formats'' below for"
+" details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:68
#, no-wrap
msgid "--done"
-msgstr ""
+msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:73
msgid ""
-"Terminate with error if there is no `done` command at the end of the "
-"stream. This option might be useful for detecting errors that cause the "
-"frontend to terminate before it has started to write a stream."
+"Terminate with error if there is no `done` command at the end of the stream."
+" This option might be useful for detecting errors that cause the frontend "
+"to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
@@ -29771,8 +29620,9 @@ msgstr ""
msgid ""
"Before processing any input, load the marks specified in <file>. The input "
"file must exist, must be readable, and must use the same format as produced "
-"by --export-marks. Multiple options may be supplied to import more than one "
-"set of marks. If a mark is defined to different values, the last file wins."
+"by --export-marks. Multiple options may be supplied to import more than one"
+" set of marks. If a mark is defined to different values, the last file "
+"wins."
msgstr ""
#. type: Labeled list
@@ -29792,7 +29642,7 @@ msgstr ""
#: en/git-fast-import.txt:98
#, no-wrap
msgid "--[no-]relative-marks"
-msgstr ""
+msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:105
@@ -29807,8 +29657,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:108
msgid ""
-"Relative and non-relative marks may be combined by interweaving --(no-)-"
-"relative-marks with the --(import|export)-marks= options."
+"Relative and non-relative marks may be combined by interweaving "
+"--(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
@@ -29840,8 +29690,8 @@ msgstr ""
#: en/git-fast-import.txt:121
msgid ""
"Maximum size of a blob that fast-import will attempt to create a delta for, "
-"expressed in bytes. The default is 512m (512 MiB). Some importers may wish "
-"to lower this on systems with constrained memory."
+"expressed in bytes. The default is 512m (512 MiB). Some importers may wish"
+" to lower this on systems with constrained memory."
msgstr ""
#. type: Labeled list
@@ -29866,14 +29716,15 @@ msgstr ""
#: en/git-fast-import.txt:134
msgid ""
"After creating a packfile, print a line of data to <file> listing the "
-"filename of the packfile and the last commit on each branch that was written "
-"to that packfile. This information may be useful after importing projects "
+"filename of the packfile and the last commit on each branch that was written"
+" to that packfile. This information may be useful after importing projects "
"whose total object set exceeds the 4 GiB packfile limit, as these commits "
"can be used as edge points during calls to 'git pack-objects'."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:135 en/git-pack-objects.txt:110 en/git-repack.txt:108
+#: en/git-fast-import.txt:135 en/git-pack-objects.txt:110
+#: en/git-repack.txt:108
#, no-wrap
msgid "--max-pack-size=<n>"
msgstr ""
@@ -29904,18 +29755,18 @@ msgid ""
"amount of memory usage and processing time. Assuming the frontend is able "
"to keep up with fast-import and feed it a constant stream of data, import "
"times for projects holding 10+ years of history and containing 100,000+ "
-"individual commits are generally completed in just 1-2 hours on quite modest "
-"(~$2,000 USD) hardware."
+"individual commits are generally completed in just 1-2 hours on quite modest"
+" (~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:156
msgid ""
-"Most bottlenecks appear to be in foreign source data access (the source just "
-"cannot extract revisions fast enough) or disk IO (fast-import writes as fast "
-"as the disk will take the data). Imports will run faster if the source data "
-"is stored on a different drive than the destination Git repository (due to "
-"less IO contention)."
+"Most bottlenecks appear to be in foreign source data access (the source just"
+" cannot extract revisions fast enough) or disk IO (fast-import writes as "
+"fast as the disk will take the data). Imports will run faster if the source"
+" data is stored on a different drive than the destination Git repository "
+"(due to less IO contention)."
msgstr ""
#. type: Title -
@@ -29956,11 +29807,11 @@ msgid ""
"fast-import does not lock the branch or tag refs it is actively importing. "
"After the import, during its ref update phase, fast-import tests each "
"existing branch ref to verify the update will be a fast-forward update (the "
-"commit stored in the ref is contained in the new history of the commit to be "
-"written). If the update is not a fast-forward update, fast-import will skip "
-"updating that ref and instead prints a warning message. fast-import will "
-"always attempt to update all branch refs, and does not stop on the first "
-"failure."
+"commit stored in the ref is contained in the new history of the commit to be"
+" written). If the update is not a fast-forward update, fast-import will "
+"skip updating that ref and instead prints a warning message. fast-import "
+"will always attempt to update all branch refs, and does not stop on the "
+"first failure."
msgstr ""
#. type: Plain text
@@ -29991,8 +29842,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:206
msgid ""
-"fast-import does not use or alter the current working directory, or any file "
-"within it. (It does however update the current Git repository, as "
+"fast-import does not use or alter the current working directory, or any file"
+" within it. (It does however update the current Git repository, as "
"referenced by `GIT_DIR`.) Therefore an import frontend may use the working "
"directory for its own purposes, such as extracting file revisions from the "
"foreign source. This ignorance of the working directory also allows fast-"
@@ -30010,10 +29861,10 @@ msgstr "Configuration"
#. type: Plain text
#: en/git-fast-import.txt:214
msgid ""
-"With the exception of raw file data (which Git does not interpret) the fast-"
-"import input format is text (ASCII) based. This text based format "
-"simplifies development and debugging of frontend programs, especially when a "
-"higher level language such as Perl, Python or Ruby is being used."
+"With the exception of raw file data (which Git does not interpret) the "
+"fast-import input format is text (ASCII) based. This text based format "
+"simplifies development and debugging of frontend programs, especially when a"
+" higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
@@ -30022,9 +29873,9 @@ msgid ""
"fast-import is very strict about its input. Where we say SP below we mean "
"*exactly* one space. Likewise LF means one (and only one) linefeed and HT "
"one (and only one) horizontal tab. Supplying additional whitespace "
-"characters will cause unexpected results, such as branch names or file names "
-"with leading or trailing spaces in their name, or early termination of fast-"
-"import when it encounters unexpected input."
+"characters will cause unexpected results, such as branch names or file names"
+" with leading or trailing spaces in their name, or early termination of "
+"fast-import when it encounters unexpected input."
msgstr ""
#. type: Title ~
@@ -30076,18 +29927,18 @@ msgstr ""
#: en/git-fast-import.txt:246
msgid ""
"The time of the event is specified by `<time>` as the number of seconds "
-"since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII "
-"decimal integer."
+"since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII"
+" decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:252
msgid ""
-"The local offset is specified by `<offutc>` as a positive or negative offset "
-"from UTC. For example EST (which is 5 hours behind UTC) would be expressed "
-"in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not "
-"affect `<time>`; it is used only as an advisement to help formatting "
-"routines display the timestamp."
+"The local offset is specified by `<offutc>` as a positive or negative offset"
+" from UTC. For example EST (which is 5 hours behind UTC) would be "
+"expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset "
+"does not affect `<time>`; it is used only as an advisement to help "
+"formatting routines display the timestamp."
msgstr ""
#. type: Plain text
@@ -30095,8 +29946,8 @@ msgstr ""
msgid ""
"If the local offset is not available in the source material, use ``+0000'', "
"or the most common local offset. For example many organizations have a CVS "
-"repository which has only ever been accessed by users who are located in the "
-"same location and time zone. In this case a reasonable offset from UTC "
+"repository which has only ever been accessed by users who are located in the"
+" same location and time zone. In this case a reasonable offset from UTC "
"could be assumed."
msgstr ""
@@ -30117,8 +29968,8 @@ msgstr ""
#: en/git-fast-import.txt:264
#, fuzzy
#| msgid ""
-#| "The standard email format as described by RFC 2822, for example `Thu, 07 "
-#| "Apr 2005 22:13:13 +0200`."
+#| "The standard email format as described by RFC 2822, for example `Thu, 07 Apr"
+#| " 2005 22:13:13 +0200`."
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
"Le standard de format des courriel tel que d챕crit par la RFC 2822, par "
@@ -30137,16 +29988,17 @@ msgstr ""
msgid ""
"Some malformed strings may be accepted as valid dates. In some of these "
"cases Git will still be able to obtain the correct date from the malformed "
-"string. There are also some types of malformed strings which Git will parse "
-"wrong, and yet consider valid. Seriously malformed strings will be rejected."
+"string. There are also some types of malformed strings which Git will parse"
+" wrong, and yet consider valid. Seriously malformed strings will be "
+"rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:280
msgid ""
"Unlike the `raw` format above, the time zone/UTC offset information "
-"contained in an RFC 2822 date string is used to adjust the date value to UTC "
-"prior to storage. Therefore it is important that this information be as "
+"contained in an RFC 2822 date string is used to adjust the date value to UTC"
+" prior to storage. Therefore it is important that this information be as "
"accurate as possible."
msgstr ""
@@ -30161,9 +30013,9 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:290
msgid ""
-"Frontends should prefer the `raw` format if the source material already uses "
-"UNIX-epoch format, can be coaxed to give dates in that format, or its format "
-"is easily convertible to it, as there is no ambiguity in parsing."
+"Frontends should prefer the `raw` format if the source material already uses"
+" UNIX-epoch format, can be coaxed to give dates in that format, or its "
+"format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
@@ -30175,8 +30027,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:294
msgid ""
-"Always use the current time and time zone. The literal `now` must always be "
-"supplied for `<when>`."
+"Always use the current time and time zone. The literal `now` must always be"
+" supplied for `<when>`."
msgstr ""
#. type: Plain text
@@ -30199,8 +30051,8 @@ msgstr ""
#: en/git-fast-import.txt:311
msgid ""
"If separate `author` and `committer` commands are used in a `commit` the "
-"timestamps may not match, as the system clock will be polled twice (once for "
-"each command). The only way to ensure that both author and committer "
+"timestamps may not match, as the system clock will be polled twice (once for"
+" each command). The only way to ensure that both author and committer "
"identity information has the same timestamp is to omit `author` (thus "
"copying from `committer`) or to use a date format other than `now`."
msgstr ""
@@ -30296,8 +30148,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:349
msgid ""
-"Causes fast-import to echo the entire line to its own standard output. This "
-"command is optional and is not needed to perform an import."
+"Causes fast-import to echo the entire line to its own standard output. This"
+" command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
@@ -30349,8 +30201,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:369
msgid ""
-"Causes fast-import to print a line describing a directory entry in 'ls-tree' "
-"format to the file descriptor set with `--cat-blob-fd` or `stdout` if "
+"Causes fast-import to print a line describing a directory entry in 'ls-tree'"
+" format to the file descriptor set with `--cat-blob-fd` or `stdout` if "
"unspecified."
msgstr ""
@@ -30384,8 +30236,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:383
msgid ""
-"Create or update a branch with a new commit, recording one logical change to "
-"the project."
+"Create or update a branch with a new commit, recording one logical change to"
+" the project."
msgstr ""
#. type: delimited block .
@@ -30427,11 +30279,11 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:414
msgid ""
-"The `data` command following `committer` must supply the commit message (see "
-"below for `data` command syntax). To import an empty commit message use a 0 "
-"length data. Commit messages are free-form and are not interpreted by Git. "
-"Currently they must be encoded in UTF-8, as fast-import does not permit "
-"other encodings to be specified."
+"The `data` command following `committer` must supply the commit message (see"
+" below for `data` command syntax). To import an empty commit message use a "
+"0 length data. Commit messages are free-form and are not interpreted by "
+"Git. Currently they must be encoded in UTF-8, as fast-import does not "
+"permit other encodings to be specified."
msgstr ""
#. type: Plain text
@@ -30485,11 +30337,11 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:445
msgid ""
-"Here `<name>` is the person's display name (for example ``Com M Itter'') and "
-"`<email>` is the person's email address (``\\cm@example.com''). `LT` and "
+"Here `<name>` is the person's display name (for example ``Com M Itter'') and"
+" `<email>` is the person's email address (``\\cm@example.com''). `LT` and "
"`GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. "
-"These are required to delimit the email address from the other fields in the "
-"line. Note that `<name>` and `<email>` are free-form and may contain any "
+"These are required to delimit the email address from the other fields in the"
+" line. Note that `<name>` and `<email>` are free-form and may contain any "
"sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 "
"encoded."
msgstr ""
@@ -30521,13 +30373,13 @@ msgstr ""
#: en/git-fast-import.txt:468
msgid ""
"Omitting the `from` command in the first commit of a new branch will cause "
-"fast-import to create that commit with no ancestor. This tends to be desired "
-"only for the initial commit of a project. If the frontend creates all files "
-"from scratch when making a new branch, a `merge` command may be used instead "
-"of `from` to start the commit with an empty tree. Omitting the `from` "
-"command on existing branches is usually desired, as the current commit on "
-"that branch is automatically assumed to be the first ancestor of the new "
-"commit."
+"fast-import to create that commit with no ancestor. This tends to be desired"
+" only for the initial commit of a project. If the frontend creates all "
+"files from scratch when making a new branch, a `merge` command may be used "
+"instead of `from` to start the commit with an empty tree. Omitting the "
+"`from` command on existing branches is usually desired, as the current "
+"commit on that branch is automatically assumed to be the first ancestor of "
+"the new commit."
msgstr ""
#. type: Plain text
@@ -30558,10 +30410,10 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:485
msgid ""
-"The reason fast-import uses `:` to denote a mark reference is this character "
-"is not legal in a Git branch name. The leading `:` makes it easy to "
-"distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/"
-"heads/42`), or an abbreviated SHA-1 which happened to consist only of "
+"The reason fast-import uses `:` to denote a mark reference is this character"
+" is not legal in a Git branch name. The leading `:` makes it easy to "
+"distinguish between the mark 42 (`:42`) and the branch 42 (`42` or "
+"`refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of "
"base-10 digits."
msgstr ""
@@ -30585,14 +30437,15 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:495
msgid ""
-"The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
+"The special null SHA-1 (40 zeros) specifies that the branch is to be "
+"removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:498
msgid ""
-"The special case of restarting an incremental import from the current branch "
-"value should be written as:"
+"The special case of restarting an incremental import from the current branch"
+" value should be written as:"
msgstr ""
#. type: delimited block -
@@ -30623,8 +30476,8 @@ msgstr "git-commit(1)"
msgid ""
"Includes one additional ancestor commit. The additional ancestry link does "
"not change the way the tree state is built at this commit. If the `from` "
-"command is omitted when creating a new branch, the first `merge` commit will "
-"be the first ancestor of the current commit, and the branch will start out "
+"command is omitted when creating a new branch, the first `merge` commit will"
+" be the first ancestor of the current commit, and the branch will start out "
"with no files. An unlimited number of `merge` commands per commit are "
"permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
@@ -30645,8 +30498,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:526
msgid ""
-"Included in a `commit` command to add a new file or change the content of an "
-"existing file. This command has two different means of specifying the "
+"Included in a `commit` command to add a new file or change the content of an"
+" existing file. This command has two different means of specifying the "
"content of the file."
msgstr ""
@@ -30690,8 +30543,8 @@ msgstr "Format interne de Git"
#. type: Plain text
#: en/git-fast-import.txt:545
msgid ""
-"The data content for the file has not been supplied yet. The frontend wants "
-"to supply it as part of this modify command."
+"The data content for the file has not been supplied yet. The frontend wants"
+" to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
@@ -30710,15 +30563,15 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:555
msgid ""
-"In both formats `<mode>` is the type of file entry, specified in octal. Git "
-"only supports the following modes:"
+"In both formats `<mode>` is the type of file entry, specified in octal. Git"
+" only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:559
msgid ""
-"`100644` or `644`: A normal (not-executable) file. The majority of files in "
-"most projects use this mode. If in doubt, this is what you want."
+"`100644` or `644`: A normal (not-executable) file. The majority of files in"
+" most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
@@ -30735,8 +30588,8 @@ msgstr ""
#: en/git-fast-import.txt:564
msgid ""
"`160000`: A gitlink, SHA-1 of the object refers to a commit in another "
-"repository. Git links can only be specified by SHA or through a commit mark. "
-"They are used to implement submodules."
+"repository. Git links can only be specified by SHA or through a commit mark."
+" They are used to implement submodules."
msgstr ""
#. type: Plain text
@@ -30756,8 +30609,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:573
msgid ""
-"A `<path>` string must use UNIX-style directory separators (forward slash `/"
-"`), may contain any byte other than `LF`, and must not start with double "
+"A `<path>` string must use UNIX-style directory separators (forward slash "
+"`/`), may contain any byte other than `LF`, and must not start with double "
"quote (`\"`)."
msgstr ""
@@ -30765,11 +30618,11 @@ msgstr ""
#: en/git-fast-import.txt:580
msgid ""
"A path can use C-style string quoting; this is accepted in all cases and "
-"mandatory if the filename starts with double quote or contains `LF`. In C-"
-"style quoting, the complete name should be surrounded with double quotes, "
+"mandatory if the filename starts with double quote or contains `LF`. In "
+"C-style quoting, the complete name should be surrounded with double quotes, "
"and any `LF`, backslash, or double quote characters must be escaped by "
-"preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it"
-"\"`)."
+"preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in "
+"it\"`)."
msgstr ""
#. type: Plain text
@@ -30795,13 +30648,14 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:588
msgid ""
-"contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` "
-"are invalid)."
+"contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar`"
+" are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:590
-msgid "The root of the tree can be represented by an empty string as `<path>`."
+msgid ""
+"The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
@@ -30834,8 +30688,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:608
msgid ""
-"here `<path>` is the complete path of the file or subdirectory to be removed "
-"from the branch. See `filemodify` above for a detailed description of "
+"here `<path>` is the complete path of the file or subdirectory to be removed"
+" from the branch. See `filemodify` above for a detailed description of "
"`<path>`."
msgstr ""
@@ -30850,8 +30704,8 @@ msgstr ""
msgid ""
"Recursively copies an existing file or subdirectory to a different location "
"within the branch. The existing file or directory must exist. If the "
-"destination exists it will be completely replaced by the content copied from "
-"the source."
+"destination exists it will be completely replaced by the content copied from"
+" the source."
msgstr ""
#. type: delimited block .
@@ -30865,15 +30719,15 @@ msgstr ""
msgid ""
"here the first `<path>` is the source location and the second `<path>` is "
"the destination. See `filemodify` above for a detailed description of what "
-"`<path>` may look like. To use a source path that contains SP the path must "
-"be quoted."
+"`<path>` may look like. To use a source path that contains SP the path must"
+" be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:629
msgid ""
-"A `filecopy` command takes effect immediately. Once the source location has "
-"been copied to the destination any future commands applied to the source "
+"A `filecopy` command takes effect immediately. Once the source location has"
+" been copied to the destination any future commands applied to the source "
"location will not impact the destination of the copy."
msgstr ""
@@ -30952,10 +30806,10 @@ msgstr ""
msgid ""
"Issuing a `filedeleteall` followed by the needed `filemodify` commands to "
"set the correct content will produce the same results as sending only the "
-"needed `filemodify` and `filedelete` commands. The `filedeleteall` approach "
-"may however require fast-import to use slightly more memory per active "
-"branch (less than 1 MiB for even most large projects); so frontends that can "
-"easily obtain only the affected paths for a commit are encouraged to do so."
+"needed `filemodify` and `filedelete` commands. The `filedeleteall` approach"
+" may however require fast-import to use slightly more memory per active "
+"branch (less than 1 MiB for even most large projects); so frontends that can"
+" easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
@@ -30968,8 +30822,8 @@ msgstr ""
#: en/git-fast-import.txt:693
msgid ""
"Included in a `commit` `<notes_ref>` command to add a new note annotating a "
-"`<commit-ish>` or change this annotation contents. Internally it is similar "
-"to filemodify 100644 on `<commit-ish>` path (maybe split into "
+"`<commit-ish>` or change this annotation contents. Internally it is similar"
+" to filemodify 100644 on `<commit-ish>` path (maybe split into "
"subdirectories). It's not advised to use any other commands to write to the "
"`<notes_ref>` tree except `filedeleteall` to delete all existing notes in "
"this tree. This command has two different means of specifying the content "
@@ -30993,15 +30847,15 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:706
msgid ""
-"Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior "
-"`blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
+"Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior"
+" `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:711
msgid ""
-"The data content for the note has not been supplied yet. The frontend wants "
-"to supply it as part of this modify command."
+"The data content for the note has not been supplied yet. The frontend wants"
+" to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
@@ -31028,11 +30882,11 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:729
msgid ""
-"Arranges for fast-import to save a reference to the current object, allowing "
-"the frontend to recall this object at a future point in time, without "
+"Arranges for fast-import to save a reference to the current object, allowing"
+" the frontend to recall this object at a future point in time, without "
"knowing its SHA-1. Here the current object is the object creation command "
-"the `mark` command appears within. This can be `commit`, `tag`, and `blob`, "
-"but `commit` is the most common usage."
+"the `mark` command appears within. This can be `commit`, `tag`, and `blob`,"
+" but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
@@ -31045,16 +30899,16 @@ msgstr ""
#: en/git-fast-import.txt:738
msgid ""
"where `<idnum>` is the number assigned by the frontend to this mark. The "
-"value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is "
-"reserved and cannot be used as a mark. Only values greater than or equal to "
-"1 may be used as marks."
+"value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is"
+" reserved and cannot be used as a mark. Only values greater than or equal "
+"to 1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:742
msgid ""
-"New marks are created automatically. Existing marks can be moved to another "
-"object simply by reusing the same `<idnum>` in another `mark` command."
+"New marks are created automatically. Existing marks can be moved to another"
+" object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Plain text
@@ -31114,9 +30968,9 @@ msgstr ""
#: en/git-fast-import.txt:777
msgid ""
"The `data` command following `tagger` must supply the annotated tag message "
-"(see below for `data` command syntax). To import an empty tag message use a "
-"0 length data. Tag messages are free-form and are not interpreted by Git. "
-"Currently they must be encoded in UTF-8, as fast-import does not permit "
+"(see below for `data` command syntax). To import an empty tag message use a"
+" 0 length data. Tag messages are free-form and are not interpreted by Git."
+" Currently they must be encoded in UTF-8, as fast-import does not permit "
"other encodings to be specified."
msgstr ""
@@ -31124,20 +30978,21 @@ msgstr ""
#: en/git-fast-import.txt:785
msgid ""
"Signing annotated tags during import from within fast-import is not "
-"supported. Trying to include your own PGP/GPG signature is not recommended, "
-"as the frontend does not (easily) have access to the complete set of bytes "
+"supported. Trying to include your own PGP/GPG signature is not recommended,"
+" as the frontend does not (easily) have access to the complete set of bytes "
"which normally goes into such a signature. If signing is required, create "
"lightweight tags from within fast-import with `reset`, then create the "
-"annotated versions of those tags offline with the standard 'git tag' process."
+"annotated versions of those tags offline with the standard 'git tag' "
+"process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:792
msgid ""
-"Creates (or recreates) the named branch, optionally starting from a specific "
-"revision. The reset command allows a frontend to issue a new `from` command "
-"for an existing branch, or to create a new branch from an existing commit "
-"without creating a new commit."
+"Creates (or recreates) the named branch, optionally starting from a specific"
+" revision. The reset command allows a frontend to issue a new `from` "
+"command for an existing branch, or to create a new branch from an existing "
+"commit without creating a new commit."
msgstr ""
#. type: delimited block .
@@ -31199,8 +31054,8 @@ msgstr ""
#: en/git-fast-import.txt:832
msgid ""
"The mark command is optional here as some frontends have chosen to generate "
-"the Git SHA-1 for the blob on their own, and feed that directly to "
-"`commit`. This is typically more work than it's worth however, as marks are "
+"the Git SHA-1 for the blob on their own, and feed that directly to `commit`."
+" This is typically more work than it's worth however, as marks are "
"inexpensive to store and easy to use."
msgstr ""
@@ -31214,8 +31069,8 @@ msgstr ""
#: en/git-fast-import.txt:841
msgid ""
"Supplies raw data (for use as blob/file content, commit messages, or "
-"annotated tag messages) to fast-import. Data can be supplied using an exact "
-"byte count or delimited with a terminating line. Real frontends intended "
+"annotated tag messages) to fast-import. Data can be supplied using an exact"
+" byte count or delimited with a terminating line. Real frontends intended "
"for production-quality conversions should always use the exact byte count "
"format, as it is more robust and performs better. The delimited format is "
"intended primarily for testing fast-import."
@@ -31254,17 +31109,17 @@ msgstr ""
msgid ""
"where `<count>` is the exact number of bytes appearing within `<raw>`. The "
"value of `<count>` is expressed as an ASCII decimal integer. The `LF` on "
-"either side of `<raw>` is not included in `<count>` and will not be included "
-"in the imported data."
+"either side of `<raw>` is not included in `<count>` and will not be included"
+" in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:864
msgid ""
-"The `LF` after `<raw>` is optional (it used to be required) but "
-"recommended. Always including it makes debugging a fast-import stream "
-"easier as the next command always starts in column 0 of the next line, even "
-"if `<raw>` did not end with an `LF`."
+"The `LF` after `<raw>` is optional (it used to be required) but recommended."
+" Always including it makes debugging a fast-import stream easier as the "
+"next command always starts in column 0 of the next line, even if `<raw>` did"
+" not end with an `LF`."
msgstr ""
#. type: Labeled list
@@ -31278,8 +31133,8 @@ msgstr "Format interne de Git"
#: en/git-fast-import.txt:870
msgid ""
"A delimiter string is used to mark the end of the data. fast-import will "
-"compute the length by searching for the delimiter. This format is primarily "
-"useful for testing and is not recommended for real data."
+"compute the length by searching for the delimiter. This format is primarily"
+" useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
@@ -31296,8 +31151,8 @@ msgstr ""
#: en/git-fast-import.txt:884
msgid ""
"where `<delim>` is the chosen delimiter string. The string `<delim>` must "
-"not appear on a line by itself within `<raw>`, as otherwise fast-import will "
-"think the data ends earlier than it really does. The `LF` immediately "
+"not appear on a line by itself within `<raw>`, as otherwise fast-import will"
+" think the data ends earlier than it really does. The `LF` immediately "
"trailing `<raw>` is part of `<raw>`. This is one of the limitations of the "
"delimited format, it is impossible to supply a data chunk which does not "
"have an LF as its last byte."
@@ -31372,9 +31227,9 @@ msgstr ""
#: en/git-fast-import.txt:931
msgid ""
"The `<any>` part of the command may contain any sequence of bytes that does "
-"not contain `LF`. The `LF` after the command is optional. Callers may wish "
-"to process the output through a tool such as sed to remove the leading part "
-"of the line, for example:"
+"not contain `LF`. The `LF` after the command is optional. Callers may wish"
+" to process the output through a tool such as sed to remove the leading part"
+" of the line, for example:"
msgstr ""
#. type: delimited block =
@@ -31387,8 +31242,8 @@ msgstr ""
#: en/git-fast-import.txt:939
msgid ""
"Placing a `progress` command immediately after a `checkpoint` will inform "
-"the reader when the `checkpoint` has been completed and it can safely access "
-"the refs that fast-import updated."
+"the reader when the `checkpoint` has been completed and it can safely access"
+" the refs that fast-import updated."
msgstr ""
#. type: Plain text
@@ -31410,9 +31265,9 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:955
msgid ""
-"This command can be used anywhere in the stream that comments are accepted. "
-"In particular, the `get-mark` command can be used in the middle of a commit "
-"but not in the middle of a `data` command."
+"This command can be used anywhere in the stream that comments are accepted."
+" In particular, the `get-mark` command can be used in the middle of a "
+"commit but not in the middle of a `data` command."
msgstr ""
#. type: Plain text
@@ -31461,17 +31316,17 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:985
msgid ""
-"This command can be used anywhere in the stream that comments are accepted. "
-"In particular, the `cat-blob` command can be used in the middle of a commit "
-"but not in the middle of a `data` command."
+"This command can be used anywhere in the stream that comments are accepted."
+" In particular, the `cat-blob` command can be used in the middle of a "
+"commit but not in the middle of a `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:996
msgid ""
"Prints information about the object at a path to a file descriptor "
-"previously arranged with the `--cat-blob-fd` argument. This allows printing "
-"a blob from the active commit (with `cat-blob`) or copying a blob or tree "
+"previously arranged with the `--cat-blob-fd` argument. This allows printing"
+" a blob from the active commit (with `cat-blob`) or copying a blob or tree "
"from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
@@ -31492,8 +31347,8 @@ msgstr ""
#: en/git-fast-import.txt:1004
msgid ""
"This form can only be used in the middle of a `commit`. The path names a "
-"directory entry within fast-import's active commit. The path must be quoted "
-"in this case."
+"directory entry within fast-import's active commit. The path must be quoted"
+" in this case."
msgstr ""
#. type: delimited block .
@@ -31562,8 +31417,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1046
msgid ""
-"Require that fast-import supports the specified feature, or abort if it does "
-"not."
+"Require that fast-import supports the specified feature, or abort if it does"
+" not."
msgstr ""
#. type: delimited block .
@@ -31629,12 +31484,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1071
msgid ""
-"Like --import-marks except in two respects: first, only one \"feature import-"
-"marks\" or \"feature import-marks-if-exists\" command is allowed per stream; "
-"second, an --import-marks= or --import-marks-if-exists command-line option "
-"overrides any of these \"feature\" commands in the stream; third, \"feature "
-"import-marks-if-exists\" like a corresponding command-line option silently "
-"skips a nonexistent file."
+"Like --import-marks except in two respects: first, only one \"feature "
+"import-marks\" or \"feature import-marks-if-exists\" command is allowed per "
+"stream; second, an --import-marks= or --import-marks-if-exists command-line "
+"option overrides any of these \"feature\" commands in the stream; third, "
+"\"feature import-marks-if-exists\" like a corresponding command-line option "
+"silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
@@ -31658,11 +31513,11 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1082
msgid ""
-"Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command "
-"respectively. Versions of fast-import not supporting the specified command "
-"will exit with a message indicating so. This lets the import error out "
-"early with a clear message, rather than wasting time on the early part of an "
-"import before the unsupported command is detected."
+"Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command"
+" respectively. Versions of fast-import not supporting the specified command"
+" will exit with a message indicating so. This lets the import error out "
+"early with a clear message, rather than wasting time on the early part of an"
+" import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
@@ -31698,9 +31553,10 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1103
msgid ""
-"Processes the specified option so that git fast-import behaves in a way that "
-"suits the frontend's needs. Note that options specified by the frontend are "
-"overridden by any options the user may specify to git fast-import itself."
+"Processes the specified option so that git fast-import behaves in a way that"
+" suits the frontend's needs. Note that options specified by the frontend "
+"are overridden by any options the user may specify to git fast-import "
+"itself."
msgstr ""
#. type: delimited block .
@@ -31713,23 +31569,23 @@ msgstr ""
#: en/git-fast-import.txt:1111
msgid ""
"The `<option>` part of the command may contain any of the options listed in "
-"the OPTIONS section that do not change import semantics, without the leading "
-"`--` and is treated in the same way."
+"the OPTIONS section that do not change import semantics, without the leading"
+" `--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1115
msgid ""
"Option commands must be the first commands on the input (not counting "
-"feature commands), to give an option command after any non-option command is "
-"an error."
+"feature commands), to give an option command after any non-option command is"
+" an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1118
msgid ""
-"The following command-line options change import semantics and may therefore "
-"not be passed as option:"
+"The following command-line options change import semantics and may therefore"
+" not be passed as option:"
msgstr ""
#. type: Plain text
@@ -31747,8 +31603,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1133
msgid ""
-"If the `--done` command-line option or `feature done` command is in use, the "
-"`done` command is mandatory and marks the end of the stream."
+"If the `--done` command-line option or `feature done` command is in use, the"
+" `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
@@ -31760,8 +31616,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1142
msgid ""
-"New objects written by fast-import are not available immediately. Most fast-"
-"import commands have no visible effect until the next checkpoint (or "
+"New objects written by fast-import are not available immediately. Most "
+"fast-import commands have no visible effect until the next checkpoint (or "
"completion). The frontend can send commands to fill fast-import's input "
"pipe without worrying about how quickly they will take effect, which "
"improves performance by simplifying scheduling."
@@ -31796,8 +31652,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1162
msgid ""
-"To avoid deadlock, such frontends must completely consume any pending output "
-"from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes "
+"To avoid deadlock, such frontends must completely consume any pending output"
+" from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes "
"to fast-import that might block."
msgstr ""
@@ -31811,8 +31667,8 @@ msgstr ""
#: en/git-fast-import.txt:1170
msgid ""
"If fast-import is supplied invalid input it will terminate with a non-zero "
-"exit status and create a crash report in the top level of the Git repository "
-"it was importing into. Crash reports contain a snapshot of the internal "
+"exit status and create a crash report in the top level of the Git repository"
+" it was importing into. Crash reports contain a snapshot of the internal "
"fast-import state as well as the most recent commands that lead up to the "
"crash."
msgstr ""
@@ -31830,12 +31686,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1185
msgid ""
-"After writing a crash report fast-import will close the current packfile and "
-"export the marks table. This allows the frontend developer to inspect the "
-"repository state and resume the import from the point where it crashed. The "
-"modified branches and tags are not updated during a crash, as the import did "
-"not complete successfully. Branch and tag information can be found in the "
-"crash report and must be applied manually if the update is needed."
+"After writing a crash report fast-import will close the current packfile and"
+" export the marks table. This allows the frontend developer to inspect the "
+"repository state and resume the import from the point where it crashed. The"
+" modified branches and tags are not updated during a crash, as the import "
+"did not complete successfully. Branch and tag information can be found in "
+"the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
@@ -31969,8 +31825,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1254
msgid ""
-"The following tips and tricks have been collected from various users of fast-"
-"import, and are offered here as suggestions."
+"The following tips and tricks have been collected from various users of "
+"fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
@@ -31982,20 +31838,20 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1264
msgid ""
-"When doing a repository conversion, use a unique mark per commit (`mark :"
-"<n>`) and supply the --export-marks option on the command line. fast-import "
-"will dump a file which lists every mark and the Git object SHA-1 that "
-"corresponds to it. If the frontend can tie the marks back to the source "
-"repository, it is easy to verify the accuracy and completeness of the import "
-"by comparing each Git commit to the corresponding source revision."
+"When doing a repository conversion, use a unique mark per commit (`mark "
+":<n>`) and supply the --export-marks option on the command line. fast-"
+"import will dump a file which lists every mark and the Git object SHA-1 that"
+" corresponds to it. If the frontend can tie the marks back to the source "
+"repository, it is easy to verify the accuracy and completeness of the import"
+" by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1268
msgid ""
"Coming from a system such as Perforce or Subversion this should be quite "
-"simple, as the fast-import mark can also be the Perforce changeset number or "
-"the Subversion revision number."
+"simple, as the fast-import mark can also be the Perforce changeset number or"
+" the Subversion revision number."
msgstr ""
#. type: Title ~
@@ -32017,8 +31873,8 @@ msgstr ""
#: en/git-fast-import.txt:1279
msgid ""
"The branch LRU builtin to fast-import tends to behave very well, and the "
-"cost of activating an inactive branch is so low that bouncing around between "
-"branches has virtually no impact on import performance."
+"cost of activating an inactive branch is so low that bouncing around between"
+" branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
@@ -32054,8 +31910,8 @@ msgstr ""
msgid ""
"Importing these tags as-is in Git is impossible without making at least one "
"commit which ``fixes up'' the files to match the content of the tag. Use "
-"fast-import's `reset` command to reset a dummy branch outside of your normal "
-"branch space to the base commit for the tag, then commit one or more file "
+"fast-import's `reset` command to reset a dummy branch outside of your normal"
+" branch space to the base commit for the tag, then commit one or more file "
"fixup commits, and finally tag the dummy branch."
msgstr ""
@@ -32065,24 +31921,24 @@ msgid ""
"For example since all normal branches are stored under `refs/heads/` name "
"the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup "
"branch used by the importer to have namespace conflicts with real branches "
-"imported from the source (the name `TAG_FIXUP` is not `refs/heads/"
-"TAG_FIXUP`)."
+"imported from the source (the name `TAG_FIXUP` is not "
+"`refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1311
msgid ""
"When committing fixups, consider using `merge` to connect the commit(s) "
-"which are supplying file revisions to the fixup branch. Doing so will allow "
-"tools such as 'git blame' to track through the real commit history and "
+"which are supplying file revisions to the fixup branch. Doing so will allow"
+" tools such as 'git blame' to track through the real commit history and "
"properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1314
msgid ""
-"After fast-import terminates the frontend will need to do `rm .git/"
-"TAG_FIXUP` to remove the dummy branch."
+"After fast-import terminates the frontend will need to do `rm "
+".git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
@@ -32127,11 +31983,11 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1341
msgid ""
-"If you are repacking very old imported data (e.g. older than the last year), "
-"consider expending some extra CPU time and supplying --window=50 (or higher) "
-"when you run 'git repack'. This will take longer, but will also produce a "
-"smaller packfile. You only need to expend the effort once, and everyone "
-"using your project will benefit from the smaller repository."
+"If you are repacking very old imported data (e.g. older than the last year),"
+" consider expending some extra CPU time and supplying --window=50 (or "
+"higher) when you run 'git repack'. This will take longer, but will also "
+"produce a smaller packfile. You only need to expend the effort once, and "
+"everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
@@ -32169,20 +32025,20 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1367
msgid ""
-"Frontends which have efficient access to all revisions of a single file (for "
-"example reading an RCS/CVS ,v file) can choose to supply all revisions of "
+"Frontends which have efficient access to all revisions of a single file (for"
+" example reading an RCS/CVS ,v file) can choose to supply all revisions of "
"that file as a sequence of consecutive `blob` commands. This allows fast-"
"import to deltify the different file revisions against each other, saving "
-"space in the final packfile. Marks can be used to later identify individual "
-"file revisions during a sequence of `commit` commands."
+"space in the final packfile. Marks can be used to later identify individual"
+" file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1374
msgid ""
"The packfile(s) created by fast-import do not encourage good disk access "
-"patterns. This is caused by fast-import writing the data in the order it is "
-"received on standard input, while Git typically organizes data within "
+"patterns. This is caused by fast-import writing the data in the order it is"
+" received on standard input, while Git typically organizes data within "
"packfiles to make the most recent (current tip) data appear before "
"historical data. Git also clusters commits together, speeding up revision "
"traversal through better cache locality."
@@ -32195,8 +32051,8 @@ msgid ""
"with `git repack -a -d` after fast-import completes, allowing Git to "
"reorganize the packfiles for faster data access. If blob deltas are "
"suboptimal (see above) then also adding the `-f` option to force "
-"recomputation of all deltas can significantly reduce the final packfile size "
-"(30-50% smaller can be quite typical)."
+"recomputation of all deltas can significantly reduce the final packfile size"
+" (30-50% smaller can be quite typical)."
msgstr ""
#. type: Title -
@@ -32211,8 +32067,8 @@ msgid ""
"There are a number of factors which affect how much memory fast-import "
"requires to perform an import. Like critical sections of core Git, fast-"
"import uses its own memory allocators to amortize any overheads associated "
-"with malloc. In practice fast-import tends to amortize any malloc overheads "
-"to 0, due to its use of large block allocations."
+"with malloc. In practice fast-import tends to amortize any malloc overheads"
+" to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
@@ -32226,9 +32082,9 @@ msgstr ""
msgid ""
"fast-import maintains an in-memory structure for every object written in "
"this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit "
-"system the structure is 40 bytes (due to the larger pointer sizes). Objects "
-"in the table are not deallocated until fast-import terminates. Importing 2 "
-"million objects on a 32 bit system will require approximately 64 MiB of "
+"system the structure is 40 bytes (due to the larger pointer sizes). Objects"
+" in the table are not deallocated until fast-import terminates. Importing 2"
+" million objects on a 32 bit system will require approximately 64 MiB of "
"memory."
msgstr ""
@@ -32266,8 +32122,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1418
msgid ""
-"Branches are classified as active and inactive. The memory usage of the two "
-"classes is significantly different."
+"Branches are classified as active and inactive. The memory usage of the two"
+" classes is significantly different."
msgstr ""
#. type: Plain text
@@ -32283,11 +32139,11 @@ msgstr ""
#: en/git-fast-import.txt:1431
msgid ""
"Active branches have the same overhead as inactive branches, but also "
-"contain copies of every tree that has been recently modified on that "
-"branch. If subtree `include` has not been modified since the branch became "
-"active, its contents will not be loaded into memory, but if subtree `src` "
-"has been modified by a commit since the branch became active, then its "
-"contents will be loaded in memory."
+"contain copies of every tree that has been recently modified on that branch."
+" If subtree `include` has not been modified since the branch became active,"
+" its contents will not be loaded into memory, but if subtree `src` has been "
+"modified by a commit since the branch became active, then its contents will "
+"be loaded in memory."
msgstr ""
#. type: Plain text
@@ -32302,8 +32158,8 @@ msgstr ""
msgid ""
"fast-import automatically moves active branches to inactive status based on "
"a simple least-recently-used algorithm. The LRU chain is updated on each "
-"`commit` command. The maximum number of active branches can be increased or "
-"decreased on the command line with --active-branches=."
+"`commit` command. The maximum number of active branches can be increased or"
+" decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
@@ -32333,8 +32189,8 @@ msgstr "Mode interactif"
#: en/git-fast-import.txt:1455
msgid ""
"Files (and pointers to subtrees) within active trees require 52 or 64 bytes "
-"(32/64 bit platforms) per entry. To conserve space, file and tree names are "
-"pooled in a common string table, allowing the filename ``Makefile'' to use "
+"(32/64 bit platforms) per entry. To conserve space, file and tree names are"
+" pooled in a common string table, allowing the filename ``Makefile'' to use "
"just 16 bytes (after including the string header overhead) no matter how "
"many times it occurs within the project."
msgstr ""
@@ -32357,17 +32213,17 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1468
msgid ""
-"Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile "
-"early, simulating a `checkpoint` command. The impatient operator can use "
-"this facility to peek at the objects and refs from an import in progress, at "
-"the cost of some added running time and worse compression."
+"Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile"
+" early, simulating a `checkpoint` command. The impatient operator can use "
+"this facility to peek at the objects and refs from an import in progress, at"
+" the cost of some added running time and worse compression."
msgstr ""
#. type: Title =
#: en/git-fetch-pack.txt:2
#, no-wrap
msgid "git-fetch-pack(1)"
-msgstr ""
+msgstr "git-fetch-pack(1)"
#. type: Plain text
#: en/git-fetch-pack.txt:7
@@ -32419,15 +32275,15 @@ msgstr ""
#: en/git-fetch-pack.txt:43 en/git-send-pack.txt:46
msgid ""
"Take the list of refs from stdin, one per line. If there are refs specified "
-"on the command line in addition to this option, then the refs from stdin are "
-"processed after those on the command line."
+"on the command line in addition to this option, then the refs from stdin are"
+" processed after those on the command line."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:47 en/git-send-pack.txt:50
msgid ""
-"If `--stateless-rpc` is specified together with this option then the list of "
-"refs must be in packet format (pkt-line). Each ref must be in a separate "
+"If `--stateless-rpc` is specified together with this option then the list of"
+" refs must be in packet format (pkt-line). Each ref must be in a separate "
"packet, and the list must end with a flush packet."
msgstr ""
@@ -32442,15 +32298,16 @@ msgstr ""
#: en/git-fetch-pack.txt:59
msgid ""
"Do not invoke 'git unpack-objects' on received data, but create a single "
-"packfile out of it instead, and store it in the object database. If provided "
-"twice then the pack is locked against repacking."
+"packfile out of it instead, and store it in the object database. If provided"
+" twice then the pack is locked against repacking."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:60 en/git-pack-objects.txt:184 en/git-send-pack.txt:64
+#: en/git-fetch-pack.txt:60 en/git-pack-objects.txt:184
+#: en/git-send-pack.txt:64
#, no-wrap
msgid "--thin"
-msgstr ""
+msgstr "--thin"
#. type: Plain text
#: en/git-fetch-pack.txt:63
@@ -32463,15 +32320,15 @@ msgstr ""
#: en/git-fetch-pack.txt:64 en/git-pack-objects.txt:81
#, no-wrap
msgid "--include-tag"
-msgstr ""
+msgstr "--include-tag"
#. type: Plain text
#: en/git-fetch-pack.txt:69
msgid ""
-"If the remote side supports it, annotated tags objects will be downloaded on "
-"the same connection as the other objects if the object the tag references is "
-"downloaded. The caller must otherwise determine the tags this option made "
-"available."
+"If the remote side supports it, annotated tags objects will be downloaded on"
+" the same connection as the other objects if the object the tag references "
+"is downloaded. The caller must otherwise determine the tags this option "
+"made available."
msgstr ""
#. type: Labeled list
@@ -32510,8 +32367,8 @@ msgstr ""
#: en/git-fetch-pack.txt:89
msgid ""
"Limit fetching to ancestor-chains not longer than n. 'git-upload-pack' "
-"treats the special depth 2147483647 as infinite even if there is an ancestor-"
-"chain that long."
+"treats the special depth 2147483647 as infinite even if there is an "
+"ancestor-chain that long."
msgstr ""
#. type: Plain text
@@ -32525,7 +32382,7 @@ msgstr ""
#: en/git-fetch-pack.txt:99
#, no-wrap
msgid "--deepen-relative"
-msgstr ""
+msgstr "--deepen-relative"
#. type: Plain text
#: en/git-fetch-pack.txt:103
@@ -32538,7 +32395,7 @@ msgstr ""
#: en/git-fetch-pack.txt:104 en/merge-options.txt:113
#, no-wrap
msgid "--no-progress"
-msgstr ""
+msgstr "--no-progress"
#. type: Plain text
#: en/git-fetch-pack.txt:106
@@ -32549,7 +32406,7 @@ msgstr ""
#: en/git-fetch-pack.txt:107 en/git-index-pack.txt:77
#, no-wrap
msgid "--check-self-contained-and-connected"
-msgstr ""
+msgstr "--check-self-contained-and-connected"
#. type: Plain text
#: en/git-fetch-pack.txt:110
@@ -32587,9 +32444,9 @@ msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:121
msgid ""
-"The remote heads to update from. This is relative to $GIT_DIR (e.g. \"HEAD"
-"\", \"refs/heads/master\"). When unspecified, update from all heads the "
-"remote side has."
+"The remote heads to update from. This is relative to $GIT_DIR (e.g. "
+"\"HEAD\", \"refs/heads/master\"). When unspecified, update from all heads "
+"the remote side has."
msgstr ""
#. type: Plain text
@@ -32602,10 +32459,9 @@ msgstr ""
#. type: Title =
#: en/git-fetch.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-fetch(1)"
-msgstr "git-commit(1)"
+msgstr "git-fetch(1)"
#. type: Plain text
#: en/git-fetch.txt:7
@@ -32628,9 +32484,9 @@ msgstr ""
#: en/git-fetch.txt:24
msgid ""
"Fetch branches and/or tags (collectively, \"refs\") from one or more other "
-"repositories, along with the objects necessary to complete their histories. "
-"Remote-tracking branches are updated (see the description of <refspec> below "
-"for ways to control this behavior)."
+"repositories, along with the objects necessary to complete their histories."
+" Remote-tracking branches are updated (see the description of <refspec> "
+"below for ways to control this behavior)."
msgstr ""
#. type: Plain text
@@ -32648,8 +32504,9 @@ msgstr ""
#: en/git-fetch.txt:37
msgid ""
"'git fetch' can fetch from either a single named repository or URL, or from "
-"several repositories at once if <group> is given and there is a remotes."
-"<group> entry in the configuration file. (See linkgit:git-config[1])."
+"several repositories at once if <group> is given and there is a "
+"remotes.<group> entry in the configuration file. (See linkgit:git-"
+"config[1])."
msgstr ""
#. type: Plain text
@@ -32663,8 +32520,8 @@ msgstr ""
#: en/git-fetch.txt:44
msgid ""
"The names of refs that are fetched, together with the object names they "
-"point at, are written to `.git/FETCH_HEAD`. This information may be used by "
-"scripts or other git commands, such as linkgit:git-pull[1]."
+"point at, are written to `.git/FETCH_HEAD`. This information may be used by"
+" scripts or other git commands, such as linkgit:git-pull[1]."
msgstr ""
#. type: Title -
@@ -32677,9 +32534,9 @@ msgstr ""
#: en/git-fetch.txt:61
msgid ""
"You often interact with the same remote repository by regularly and "
-"repeatedly fetching from it. In order to keep track of the progress of such "
-"a remote repository, `git fetch` allows you to configure `remote."
-"<repository>.fetch` configuration variables."
+"repeatedly fetching from it. In order to keep track of the progress of such"
+" a remote repository, `git fetch` allows you to configure "
+"`remote.<repository>.fetch` configuration variables."
msgstr ""
#. type: Plain text
@@ -32704,12 +32561,12 @@ msgstr ""
#: en/git-fetch.txt:80
msgid ""
"When `git fetch` is run without specifying what branches and/or tags to "
-"fetch on the command line, e.g. `git fetch origin` or `git fetch`, `remote."
-"<repository>.fetch` values are used as the refspecs--they specify which refs "
-"to fetch and which local refs to update. The example above will fetch all "
-"branches that exist in the `origin` (i.e. any ref that matches the left-hand "
-"side of the value, `refs/heads/*`) and update the corresponding remote-"
-"tracking branches in the `refs/remotes/origin/*` hierarchy."
+"fetch on the command line, e.g. `git fetch origin` or `git fetch`, "
+"`remote.<repository>.fetch` values are used as the refspecs--they specify "
+"which refs to fetch and which local refs to update. The example above will "
+"fetch all branches that exist in the `origin` (i.e. any ref that matches the"
+" left-hand side of the value, `refs/heads/*`) and update the corresponding "
+"remote-tracking branches in the `refs/remotes/origin/*` hierarchy."
msgstr ""
#. type: Plain text
@@ -32717,8 +32574,8 @@ msgstr ""
msgid ""
"When `git fetch` is run with explicit branches and/or tags to fetch on the "
"command line, e.g. `git fetch origin master`, the <refspec>s given on the "
-"command line determine what are to be fetched (e.g. `master` in the example, "
-"which is a short-hand for `master:`, which in turn means \"fetch the "
+"command line determine what are to be fetched (e.g. `master` in the example,"
+" which is a short-hand for `master:`, which in turn means \"fetch the "
"'master' branch but I do not explicitly say what remote-tracking branch to "
"update with it from the command line\"), and the example command will fetch "
"_only_ the 'master' branch. The `remote.<repository>.fetch` values "
@@ -32767,9 +32624,9 @@ msgstr ""
#: en/git-fetch.txt:123
msgid ""
"In compact output mode, specified with configuration variable fetch.output, "
-"if either entire `<from>` or `<to>` is found in the other string, it will be "
-"substituted with `*` in the other string. For example, `master -> origin/"
-"master` becomes `master -> origin/*`."
+"if either entire `<from>` or `<to>` is found in the other string, it will be"
+" substituted with `*` in the other string. For example, `master -> "
+"origin/master` becomes `master -> origin/*`."
msgstr ""
#. type: Labeled list
@@ -32809,7 +32666,7 @@ msgstr ""
#: en/git-fetch.txt:128 en/git-push.txt:332
#, no-wrap
msgid "`-`"
-msgstr ""
+msgstr "`-`"
#. type: Plain text
#: en/git-fetch.txt:129
@@ -32910,7 +32767,8 @@ msgstr ""
#: en/git-fetch.txt:153
msgid ""
"A human-readable explanation. In the case of successfully fetched refs, no "
-"explanation is needed. For a failed ref, the reason for failure is described."
+"explanation is needed. For a failed ref, the reason for failure is "
+"described."
msgstr ""
#. type: Plain text
@@ -32948,16 +32806,16 @@ msgstr "$ git commit\n"
#. type: Plain text
#: en/git-fetch.txt:177
msgid ""
-"This updates (or creates, as necessary) branches `pu` and `tmp` in the local "
-"repository by fetching from the branches (respectively) `pu` and `maint` "
+"This updates (or creates, as necessary) branches `pu` and `tmp` in the local"
+" repository by fetching from the branches (respectively) `pu` and `maint` "
"from the remote repository."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:180
msgid ""
-"The `pu` branch will be updated even if it is does not fast-forward, because "
-"it is prefixed with a plus sign; `tmp` will not be."
+"The `pu` branch will be updated even if it is does not fast-forward, because"
+" it is prefixed with a plus sign; `tmp` will not be."
msgstr ""
#. type: Plain text
@@ -32978,10 +32836,11 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:194
msgid ""
-"The first command fetches the `maint` branch from the repository at `git://"
-"git.kernel.org/pub/scm/git/git.git` and the second command uses `FETCH_HEAD` "
-"to examine the branch with linkgit:git-log[1]. The fetched objects will "
-"eventually be removed by git's built-in housekeeping (see linkgit:git-gc[1])."
+"The first command fetches the `maint` branch from the repository at "
+"`git://git.kernel.org/pub/scm/git/git.git` and the second command uses "
+"`FETCH_HEAD` to examine the branch with linkgit:git-log[1]. The fetched "
+"objects will eventually be removed by git's built-in housekeeping (see "
+"linkgit:git-gc[1])."
msgstr ""
#. type: Title -
@@ -32995,18 +32854,18 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:205 en/git-pull.txt:250
msgid ""
-"Using --recurse-submodules can only fetch new commits in already checked out "
-"submodules right now. When e.g. upstream added a new submodule in the just "
-"fetched commits of the superproject the submodule itself can not be fetched, "
-"making it impossible to check out that submodule later without having to do "
-"a fetch again. This is expected to be fixed in a future Git version."
+"Using --recurse-submodules can only fetch new commits in already checked out"
+" submodules right now. When e.g. upstream added a new submodule in the just "
+"fetched commits of the superproject the submodule itself can not be fetched,"
+" making it impossible to check out that submodule later without having to do"
+" a fetch again. This is expected to be fixed in a future Git version."
msgstr ""
#. type: Title =
#: en/git-filter-branch.txt:2
#, no-wrap
msgid "git-filter-branch(1)"
-msgstr ""
+msgstr "git-filter-branch(1)"
#. type: Plain text
#: en/git-filter-branch.txt:7
@@ -33029,11 +32888,11 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:27
msgid ""
-"Lets you rewrite Git revision history by rewriting the branches mentioned in "
-"the <rev-list options>, applying custom filters on each revision. Those "
-"filters can modify each tree (e.g. removing a file or running a perl rewrite "
-"on all files) or information about each commit. Otherwise, all information "
-"(including original commit times or merge information) will be preserved."
+"Lets you rewrite Git revision history by rewriting the branches mentioned in"
+" the <rev-list options>, applying custom filters on each revision. Those "
+"filters can modify each tree (e.g. removing a file or running a perl rewrite"
+" on all files) or information about each commit. Otherwise, all information"
+" (including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
@@ -33041,9 +32900,10 @@ msgstr ""
msgid ""
"The command will only rewrite the _positive_ refs mentioned in the command "
"line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify "
-"no filters, the commits will be recommitted without any changes, which would "
-"normally have no effect. Nevertheless, this may be useful in the future for "
-"compensating for some Git bugs or such, therefore such a usage is permitted."
+"no filters, the commits will be recommitted without any changes, which would"
+" normally have no effect. Nevertheless, this may be useful in the future "
+"for compensating for some Git bugs or such, therefore such a usage is "
+"permitted."
msgstr ""
#. type: Plain text
@@ -33074,16 +32934,16 @@ msgstr ""
#: en/git-filter-branch.txt:52
msgid ""
"Always verify that the rewritten version is correct: The original refs, if "
-"different from the rewritten ones, will be stored in the namespace 'refs/"
-"original/'."
+"different from the rewritten ones, will be stored in the namespace "
+"'refs/original/'."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:56
msgid ""
"Note that since this operation is very I/O expensive, it might be a good "
-"idea to redirect the temporary directory off-disk with the `-d` option, e.g. "
-"on tmpfs. Reportedly the speedup is very noticeable."
+"idea to redirect the temporary directory off-disk with the `-d` option, e.g."
+" on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
@@ -33098,11 +32958,11 @@ msgid ""
"The filters are applied in the order as listed below. The <command> "
"argument is always evaluated in the shell context using the 'eval' command "
"(with the notable exception of the commit filter, for technical reasons). "
-"Prior to that, the `$GIT_COMMIT` environment variable will be set to contain "
-"the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, "
+"Prior to that, the `$GIT_COMMIT` environment variable will be set to contain"
+" the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, "
"GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, "
-"and GIT_COMMITTER_DATE are taken from the current commit and exported to the "
-"environment, in order to affect the author and committer identities of the "
+"and GIT_COMMITTER_DATE are taken from the current commit and exported to the"
+" environment, in order to affect the author and committer identities of the "
"replacement commit created by linkgit:git-commit-tree[1] after the filters "
"have run."
msgstr ""
@@ -33119,8 +32979,9 @@ msgstr ""
msgid ""
"A 'map' function is available that takes an \"original sha1 id\" argument "
"and outputs a \"rewritten sha1 id\" if the commit has been already "
-"rewritten, and \"original sha1 id\" otherwise; the 'map' function can return "
-"several ids on separate lines if your commit filter emitted multiple commits."
+"rewritten, and \"original sha1 id\" otherwise; the 'map' function can return"
+" several ids on separate lines if your commit filter emitted multiple "
+"commits."
msgstr ""
#. type: Labeled list
@@ -33147,11 +33008,11 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:99
msgid ""
-"This is the filter for rewriting the tree and its contents. The argument is "
-"evaluated in shell with the working directory set to the root of the checked "
-"out tree. The new tree is then used as-is (new files are auto-added, "
-"disappeared files are auto-removed - neither .gitignore files nor any other "
-"ignore rules *HAVE ANY EFFECT*!)."
+"This is the filter for rewriting the tree and its contents. The argument is"
+" evaluated in shell with the working directory set to the root of the "
+"checked out tree. The new tree is then used as-is (new files are auto-"
+"added, disappeared files are auto-removed - neither .gitignore files nor any"
+" other ignore rules *HAVE ANY EFFECT*!)."
msgstr ""
#. type: Labeled list
@@ -33179,10 +33040,10 @@ msgstr ""
#: en/git-filter-branch.txt:114
msgid ""
"This is the filter for rewriting the commit's parent list. It will receive "
-"the parent string on stdin and shall output the new parent string on "
-"stdout. The parent string is in the format described in linkgit:git-commit-"
-"tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and "
-"\"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
+"the parent string on stdin and shall output the new parent string on stdout."
+" The parent string is in the format described in linkgit:git-commit-"
+"tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and"
+" \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
@@ -33269,8 +33130,8 @@ msgid ""
"Nearly proper rewriting of tag objects is supported. If the tag has a "
"message attached, a new tag object will be created with the same message, "
"author, and timestamp. If the tag has a signature attached, the signature "
-"will be stripped. It is by definition impossible to preserve signatures. The "
-"reason this is \"nearly\" proper, is because ideally if the tag did not "
+"will be stripped. It is by definition impossible to preserve signatures. The"
+" reason this is \"nearly\" proper, is because ideally if the tag did not "
"change (points to the same object, has the same name, etc.) it should "
"retain any signature. That is not the case, signatures will always be "
"removed, buyer beware. There is also no support for changing the author or "
@@ -33296,7 +33157,7 @@ msgstr ""
#: en/git-filter-branch.txt:169
#, no-wrap
msgid "--prune-empty"
-msgstr ""
+msgstr "--prune-empty"
#. type: Plain text
#: en/git-filter-branch.txt:176
@@ -33341,8 +33202,8 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:194
msgid ""
-"'git filter-branch' refuses to start with an existing temporary directory or "
-"when there are already refs starting with 'refs/original/', unless forced."
+"'git filter-branch' refuses to start with an existing temporary directory or"
+" when there are already refs starting with 'refs/original/', unless forced."
msgstr ""
#. type: Labeled list
@@ -33400,17 +33261,19 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:232
msgid ""
-"Using `--index-filter` with 'git rm' yields a significantly faster version. "
-"Like with using `rm filename`, `git rm --cached filename` will fail if the "
-"file is absent from the tree of a commit. If you want to \"completely forget"
-"\" a file, it does not matter when it entered history, so we also add `--"
-"ignore-unmatch`:"
+"Using `--index-filter` with 'git rm' yields a significantly faster version."
+" Like with using `rm filename`, `git rm --cached filename` will fail if the"
+" file is absent from the tree of a commit. If you want to \"completely "
+"forget\" a file, it does not matter when it entered history, so we also add "
+"`--ignore-unmatch`:"
msgstr ""
#. type: delimited block -
#: en/git-filter-branch.txt:235
#, no-wrap
-msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
+msgid ""
+"git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename'"
+" HEAD\n"
msgstr ""
#. type: Plain text
@@ -33421,8 +33284,8 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:241
msgid ""
-"To rewrite the repository to look as if `foodir/` had been its project root, "
-"and discard all other history:"
+"To rewrite the repository to look as if `foodir/` had been its project root,"
+" and discard all other history:"
msgstr ""
#. type: delimited block -
@@ -33442,8 +33305,8 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:253
msgid ""
-"To set a commit (which typically is at the tip of another history) to be the "
-"parent of the current initial commit, in order to paste the other history "
+"To set a commit (which typically is at the tip of another history) to be the"
+" parent of the current initial commit, in order to paste the other history "
"behind the current history:"
msgstr ""
@@ -33706,9 +33569,9 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:414
msgid ""
-"Clone it with `git clone file:///path/to/repo`. The clone will not have the "
-"removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain "
-"path just hardlinks everything!)"
+"Clone it with `git clone file:///path/to/repo`. The clone will not have the"
+" removed objects. See linkgit:git-clone[1]. (Note that cloning with a "
+"plain path just hardlinks everything!)"
msgstr ""
#. type: Plain text
@@ -33716,7 +33579,8 @@ msgstr ""
msgid ""
"If you really don't want to clone it, for whatever reasons, check the "
"following points instead (in this order). This is a very destructive "
-"approach, so *make a backup* or go back to cloning it. You have been warned."
+"approach, so *make a backup* or go back to cloning it. You have been "
+"warned."
msgstr ""
#. type: Plain text
@@ -33742,13 +33606,13 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:441
msgid ""
-"git-filter-branch allows you to make complex shell-scripted rewrites of your "
-"Git history, but you probably don't need this flexibility if you're simply "
+"git-filter-branch allows you to make complex shell-scripted rewrites of your"
+" Git history, but you probably don't need this flexibility if you're simply "
"_removing unwanted data_ like large files or passwords. For those "
-"operations you may want to consider http://rtyley.github.io/bfg-repo-cleaner/"
-"[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-branch, "
-"typically at least 10-50x faster for those use-cases, and with quite "
-"different characteristics:"
+"operations you may want to consider http://rtyley.github.io/bfg-repo-"
+"cleaner/[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-"
+"branch, typically at least 10-50x faster for those use-cases, and with quite"
+" different characteristics:"
msgstr ""
#. type: Plain text
@@ -33766,10 +33630,10 @@ msgstr ""
#: en/git-filter-branch.txt:455
msgid ""
"By default The BFG takes full advantage of multi-core machines, cleansing "
-"commit file-trees in parallel. git-filter-branch cleans commits sequentially "
-"(i.e. in a single-threaded manner), though it _is_ possible to write filters "
-"that include their own parallelism, in the scripts executed against each "
-"commit."
+"commit file-trees in parallel. git-filter-branch cleans commits sequentially"
+" (i.e. in a single-threaded manner), though it _is_ possible to write "
+"filters that include their own parallelism, in the scripts executed against "
+"each commit."
msgstr ""
#. type: Plain text
@@ -33784,7 +33648,7 @@ msgstr ""
#: en/git-fmt-merge-msg.txt:2
#, no-wrap
msgid "git-fmt-merge-msg(1)"
-msgstr ""
+msgstr "git-fmt-merge-msg(1)"
#. type: Plain text
#: en/git-fmt-merge-msg.txt:7
@@ -33803,8 +33667,8 @@ msgstr ""
#: en/git-fmt-merge-msg.txt:20
msgid ""
"Takes the list of merged objects on stdin and produces a suitable commit "
-"message to be used for the merge commit, usually to be passed as the '<merge-"
-"message>' argument of 'git merge'."
+"message to be used for the merge commit, usually to be passed as the "
+"'<merge-message>' argument of 'git merge'."
msgstr ""
#. type: Plain text
@@ -33833,18 +33697,19 @@ msgstr ""
#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:46
#, no-wrap
msgid "--no-log"
-msgstr ""
+msgstr "--no-log"
#. type: Plain text
#: en/git-fmt-merge-msg.txt:37
-msgid "Do not list one-line descriptions from the actual commits being merged."
+msgid ""
+"Do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:38
#, no-wrap
msgid "--[no-]summary"
-msgstr ""
+msgstr "--[no-]summary"
#. type: Plain text
#: en/git-fmt-merge-msg.txt:41
@@ -33896,7 +33761,8 @@ msgstr ""
#. type: Plain text
#: en/git-fmt-merge-msg.txt:59
msgid ""
-"Synonym to `merge.log`; this is deprecated and will be removed in the future."
+"Synonym to `merge.log`; this is deprecated and will be removed in the "
+"future."
msgstr ""
#. type: delimited block -
@@ -33918,9 +33784,8 @@ msgstr ""
#: en/git-for-each-ref.txt:2
#, no-wrap
msgid "git-for-each-ref(1)"
-msgstr ""
+msgstr "git-for-each-ref(1)"
-#
#. type: Plain text
#: en/git-for-each-ref.txt:7
#, fuzzy
@@ -33942,10 +33807,11 @@ msgstr ""
#: en/git-for-each-ref.txt:25
msgid ""
"Iterate over all refs that match `<pattern>` and show them according to the "
-"given `<format>`, after sorting them according to the given set of `<key>`. "
-"If `<count>` is given, stop after showing that many refs. The interpolated "
-"values in `<format>` can optionally be quoted as string literals in the "
-"specified host language allowing their direct evaluation in that language."
+"given `<format>`, after sorting them according to the given set of `<key>`."
+" If `<count>` is given, stop after showing that many refs. The "
+"interpolated values in `<format>` can optionally be quoted as string "
+"literals in the specified host language allowing their direct evaluation in "
+"that language."
msgstr ""
#. type: Labeled list
@@ -33987,10 +33853,10 @@ msgstr "Configuration"
msgid ""
"A string that interpolates `%(fieldname)` from the object pointed at by a "
"ref being shown. If `fieldname` is prefixed with an asterisk (`*`) and the "
-"ref points at a tag object, the value for the field in the object tag refers "
-"is used. When unspecified, defaults to `%(objectname) SPC %(objecttype) TAB "
-"%(refname)`. It also interpolates `%%` to `%`, and `%xx` where `xx` are hex "
-"digits interpolates to character with hex code `xx`; for example `%00` "
+"ref points at a tag object, the value for the field in the object tag refers"
+" is used. When unspecified, defaults to `%(objectname) SPC %(objecttype) "
+"TAB %(refname)`. It also interpolates `%%` to `%`, and `%xx` where `xx` are"
+" hex digits interpolates to character with hex code `xx`; for example `%00` "
"interpolates to `\\0` (NUL), `%09` to `\\t` (TAB) and `%0a` to `\\n` (LF)."
msgstr ""
@@ -34003,35 +33869,34 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:57
msgid ""
-"If one or more patterns are given, only refs are shown that match against at "
-"least one pattern, either using fnmatch(3) or literally, in the latter case "
-"matching completely or from the beginning up to a slash."
+"If one or more patterns are given, only refs are shown that match against at"
+" least one pattern, either using fnmatch(3) or literally, in the latter case"
+" matching completely or from the beginning up to a slash."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:58
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "--shell"
-msgstr "git-add(1)"
+msgstr "--shell"
#. type: Labeled list
#: en/git-for-each-ref.txt:59
#, no-wrap
msgid "--perl"
-msgstr ""
+msgstr "--perl"
#. type: Labeled list
#: en/git-for-each-ref.txt:60
#, no-wrap
msgid "--python"
-msgstr ""
+msgstr "--python"
#. type: Labeled list
#: en/git-for-each-ref.txt:61
#, no-wrap
msgid "--tcl"
-msgstr ""
+msgstr "--tcl"
#. type: Plain text
#: en/git-for-each-ref.txt:66
@@ -34119,15 +33984,16 @@ msgid ""
"The name of the ref (the part after $GIT_DIR/). For a non-ambiguous short "
"name of the ref append `:short`. The option core.warnAmbiguousRefs is used "
"to select the strict abbreviation mode. If `lstrip=<N>` (`rstrip=<N>`) is "
-"appended, strips `<N>` slash-separated path components from the front (back) "
-"of the refname (e.g. `%(refname:lstrip=2)` turns `refs/tags/foo` into `foo` "
-"and `%(refname:rstrip=2)` turns `refs/tags/foo` into `refs`). If `<N>` is a "
-"negative number, strip as many path components as necessary from the "
+"appended, strips `<N>` slash-separated path components from the front (back)"
+" of the refname (e.g. `%(refname:lstrip=2)` turns `refs/tags/foo` into `foo`"
+" and `%(refname:rstrip=2)` turns `refs/tags/foo` into `refs`). If `<N>` is "
+"a negative number, strip as many path components as necessary from the "
"specified end to leave `-<N>` path components (e.g. `%(refname:lstrip=-2)` "
-"turns `refs/tags/foo` into `tags/foo` and `%(refname:rstrip=-1)` turns `refs/"
-"tags/foo` into `refs`). When the ref does not have enough components, the "
-"result becomes an empty string if stripping with positive <N>, or it becomes "
-"the full refname if stripping with negative <N>. Neither is an error."
+"turns `refs/tags/foo` into `tags/foo` and `%(refname:rstrip=-1)` turns "
+"`refs/tags/foo` into `refs`). When the ref does not have enough components, "
+"the result becomes an empty string if stripping with positive <N>, or it "
+"becomes the full refname if stripping with negative <N>. Neither is an "
+"error."
msgstr ""
#. type: Plain text
@@ -34166,10 +34032,10 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:125
msgid ""
-"The object name (aka SHA-1). For a non-ambiguous abbreviation of the object "
-"name append `:short`. For an abbreviation of the object name with desired "
-"length append `:short=<length>`, where the minimum length is MINIMUM_ABBREV. "
-"The length may be exceeded to ensure unique object names."
+"The object name (aka SHA-1). For a non-ambiguous abbreviation of the object"
+" name append `:short`. For an abbreviation of the object name with desired "
+"length append `:short=<length>`, where the minimum length is MINIMUM_ABBREV."
+" The length may be exceeded to ensure unique object names."
msgstr ""
#. type: Labeled list
@@ -34182,15 +34048,15 @@ msgstr ""
#: en/git-for-each-ref.txt:140
msgid ""
"The name of a local ref which can be considered ``upstream'' from the "
-"displayed ref. Respects `:short`, `:lstrip` and `:rstrip` in the same way as "
-"`refname` above. Additionally respects `:track` to show \"[ahead N, behind "
-"M]\" and `:trackshort` to show the terse version: \">\" (ahead), \"<"
-"\" (behind), \"<>\" (ahead and behind), or \"=\" (in sync). `:track` also "
-"prints \"[gone]\" whenever unknown upstream ref is encountered. Append `:"
-"track,nobracket` to show tracking information without brackets (i.e \"ahead "
-"N, behind M\"). Has no effect if the ref does not have tracking information "
-"associated with it. All the options apart from `nobracket` are mutually "
-"exclusive, but if used together the last option is selected."
+"displayed ref. Respects `:short`, `:lstrip` and `:rstrip` in the same way as"
+" `refname` above. Additionally respects `:track` to show \"[ahead N, behind"
+" M]\" and `:trackshort` to show the terse version: \">\" (ahead), \"<\" "
+"(behind), \"<>\" (ahead and behind), or \"=\" (in sync). `:track` also "
+"prints \"[gone]\" whenever unknown upstream ref is encountered. Append "
+"`:track,nobracket` to show tracking information without brackets (i.e "
+"\"ahead N, behind M\"). Has no effect if the ref does not have tracking "
+"information associated with it. All the options apart from `nobracket` are "
+"mutually exclusive, but if used together the last option is selected."
msgstr ""
#. type: Labeled list
@@ -34203,8 +34069,8 @@ msgstr ""
#: en/git-for-each-ref.txt:147
msgid ""
"The name of a local ref which represents the `@{push}` location for the "
-"displayed ref. Respects `:short`, `:lstrip`, `:rstrip`, `:track`, and `:"
-"trackshort` options as `upstream` does. Produces an empty string if no "
+"displayed ref. Respects `:short`, `:lstrip`, `:rstrip`, `:track`, and "
+"`:trackshort` options as `upstream` does. Produces an empty string if no "
"`@{push}` ref is configured."
msgstr ""
@@ -34238,13 +34104,13 @@ msgstr ""
msgid ""
"Left-, middle-, or right-align the content between %(align:...) and %(end). "
"The \"align:\" is followed by `width=<width>` and `position=<position>` in "
-"any order separated by a comma, where the `<position>` is either left, right "
-"or middle, default being left and `<width>` is the total length of the "
+"any order separated by a comma, where the `<position>` is either left, right"
+" or middle, default being left and `<width>` is the total length of the "
"content with alignment. For brevity, the \"width=\" and/or \"position=\" "
"prefixes may be omitted, and bare <width> and <position> used instead. For "
-"instance, `%(align:<width>,<position>)`. If the contents length is more than "
-"the width then no alignment is performed. If used with `--quote` everything "
-"in between %(align:...) and %(end) is quoted, but if nested then only the "
+"instance, `%(align:<width>,<position>)`. If the contents length is more than"
+" the width then no alignment is performed. If used with `--quote` everything"
+" in between %(align:...) and %(end) is quoted, but if nested then only the "
"topmost level performs quoting."
msgstr ""
@@ -34262,10 +34128,10 @@ msgid ""
"there is an atom with value or string literal after the %(if) then "
"everything after the %(then) is printed, else if the %(else) atom is used, "
"then everything after %(else) is printed. We ignore space when evaluating "
-"the string before %(then), this is useful when we use the %(HEAD) atom which "
-"prints either \"*\" or \" \" and we want to apply the 'if' condition only on "
-"the 'HEAD' ref. Append \":equals=<string>\" or \":notequals=<string>\" to "
-"compare the value between the %(if:...) and %(then) atoms with the given "
+"the string before %(then), this is useful when we use the %(HEAD) atom which"
+" prints either \"*\" or \" \" and we want to apply the 'if' condition only "
+"on the 'HEAD' ref. Append \":equals=<string>\" or \":notequals=<string>\" "
+"to compare the value between the %(if:...) and %(then) atoms with the given "
"string."
msgstr ""
@@ -34286,8 +34152,8 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:193
msgid ""
-"In addition to the above, for commit and tag objects, the header field names "
-"(`tree`, `parent`, `object`, `type`, and `tag`) can be used to specify the "
+"In addition to the above, for commit and tag objects, the header field names"
+" (`tree`, `parent`, `object`, `type`, and `tag`) can be used to specify the "
"value in the header field."
msgstr ""
@@ -34314,19 +34180,19 @@ msgid ""
"The complete message in a commit and tag object is `contents`. Its first "
"line is `contents:subject`, where subject is the concatenation of all lines "
"of the commit message up to the first blank line. The next line is "
-"'contents:body', where body is all of the lines after the first blank line. "
-"The optional GPG signature is `contents:signature`. The first `N` lines of "
-"the message is obtained using `contents:lines=N`. Additionally, the "
-"trailers as interpreted by linkgit:git-interpret-trailers[1] are obtained as "
-"'contents:trailers'."
+"'contents:body', where body is all of the lines after the first blank line."
+" The optional GPG signature is `contents:signature`. The first `N` lines "
+"of the message is obtained using `contents:lines=N`. Additionally, the "
+"trailers as interpreted by linkgit:git-interpret-trailers[1] are obtained as"
+" 'contents:trailers'."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:215
msgid ""
"For sorting purposes, fields with numeric values sort in numeric order "
-"(`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`). "
-"All other fields are used to sort in their byte-value order."
+"(`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`)."
+" All other fields are used to sort in their byte-value order."
msgstr ""
#. type: Plain text
@@ -34347,9 +34213,9 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:226
msgid ""
-"As a special case for the date-type fields, you may specify a format for the "
-"date by adding `:` followed by date format name (see the values the `--date` "
-"option to linkgit:git-rev-list[1] takes)."
+"As a special case for the date-type fields, you may specify a format for the"
+" date by adding `:` followed by date format name (see the values the "
+"`--date` option to linkgit:git-rev-list[1] takes)."
msgstr ""
#. type: Plain text
@@ -34371,8 +34237,8 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:241
msgid ""
-"An example directly producing formatted text. Show the most recent 3 tagged "
-"commits:"
+"An example directly producing formatted text. Show the most recent 3 tagged"
+" commits:"
msgstr ""
#. type: delimited block -
@@ -34423,8 +34289,8 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:272
msgid ""
-"A bit more elaborate report on tags, demonstrating that the format may be an "
-"entire script:"
+"A bit more elaborate report on tags, demonstrating that the format may be an"
+" entire script:"
msgstr ""
#. type: delimited block -
@@ -34512,7 +34378,9 @@ msgstr ""
#. type: delimited block -
#: en/git-for-each-ref.txt:328
#, no-wrap
-msgid "git for-each-ref --format=\"%(if)%(HEAD)%(then)* %(else) %(end)%(refname:short)\" refs/heads/\n"
+msgid ""
+"git for-each-ref --format=\"%(if)%(HEAD)%(then)* %(else) "
+"%(end)%(refname:short)\" refs/heads/\n"
msgstr ""
#. type: Plain text
@@ -34525,15 +34393,16 @@ msgstr ""
#. type: delimited block -
#: en/git-for-each-ref.txt:336
#, no-wrap
-msgid "git for-each-ref --format=\"%(refname)%(if)%(authorname)%(then) Authored by: %(authorname)%(end)\"\n"
+msgid ""
+"git for-each-ref --format=\"%(refname)%(if)%(authorname)%(then) Authored by:"
+" %(authorname)%(end)\"\n"
msgstr ""
#. type: Title =
#: en/git-format-patch.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-format-patch(1)"
-msgstr "git-commit(1)"
+msgstr "git-format-patch(1)"
#. type: Plain text
#: en/git-format-patch.txt:7
@@ -34586,8 +34455,8 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:46
msgid ""
-"Generic <revision range> expression (see \"SPECIFYING REVISIONS\" section in "
-"linkgit:gitrevisions[7]) means the commits in the specified range."
+"Generic <revision range> expression (see \"SPECIFYING REVISIONS\" section in"
+" linkgit:gitrevisions[7]) means the commits in the specified range."
msgstr ""
#. type: Plain text
@@ -34596,8 +34465,8 @@ msgid ""
"The first rule takes precedence in the case of a single <commit>. To apply "
"the second rule, i.e., format everything since the beginning of history up "
"until <commit>, use the '\\--root' option: `git format-patch --root "
-"<commit>`. If you want to format only <commit> itself, you can do this with "
-"`git format-patch -1 <commit>`."
+"<commit>`. If you want to format only <commit> itself, you can do this with"
+" `git format-patch -1 <commit>`."
msgstr ""
#. type: Plain text
@@ -34614,12 +34483,12 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:66
msgid ""
-"If `-o` is specified, output files are created in <dir>. Otherwise they are "
-"created in the current working directory. The default path can be set with "
+"If `-o` is specified, output files are created in <dir>. Otherwise they are"
+" created in the current working directory. The default path can be set with "
"the `format.outputDirectory` configuration option. The `-o` option takes "
"precedence over `format.outputDirectory`. To store patches in the current "
-"working directory even when `format.outputDirectory` points elsewhere, use `-"
-"o .`."
+"working directory even when `format.outputDirectory` points elsewhere, use "
+"`-o .`."
msgstr ""
#. type: Plain text
@@ -34642,8 +34511,8 @@ msgstr ""
#: en/git-format-patch.txt:79
msgid ""
"If given `--thread`, `git-format-patch` will generate `In-Reply-To` and "
-"`References` headers to make the second and subsequent patch mails appear as "
-"replies to the first mail; this also generates a `Message-Id` header to "
+"`References` headers to make the second and subsequent patch mails appear as"
+" replies to the first mail; this also generates a `Message-Id` header to "
"reference."
msgstr ""
@@ -34679,10 +34548,9 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:94 en/git-shortlog.txt:30
-#, fuzzy, no-wrap
-#| msgid "Configuration"
+#, no-wrap
msgid "--numbered"
-msgstr "Configuration"
+msgstr "--numbered"
#. type: Plain text
#: en/git-format-patch.txt:96
@@ -34691,10 +34559,9 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:98
-#, fuzzy, no-wrap
-#| msgid "Configuration"
+#, no-wrap
msgid "--no-numbered"
-msgstr "Configuration"
+msgstr "--no-numbered"
#. type: Plain text
#: en/git-format-patch.txt:100
@@ -34714,23 +34581,22 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:104
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--numbered-files"
-msgstr "git-commit(1)"
+msgstr "--numbered-files"
#. type: Plain text
#: en/git-format-patch.txt:107
msgid ""
-"Output file names will be a simple number sequence without the default first "
-"line of the commit appended."
+"Output file names will be a simple number sequence without the default first"
+" line of the commit appended."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:109
#, no-wrap
msgid "--keep-subject"
-msgstr ""
+msgstr "--keep-subject"
#. type: Plain text
#: en/git-format-patch.txt:112
@@ -34750,13 +34616,13 @@ msgstr ""
#: en/git-format-patch.txt:119 en/git-pack-objects.txt:57
#, no-wrap
msgid "--stdout"
-msgstr ""
+msgstr "--stdout"
#. type: Plain text
#: en/git-format-patch.txt:122
msgid ""
-"Print all commits to the standard output in mbox format, instead of creating "
-"a file for each one."
+"Print all commits to the standard output in mbox format, instead of creating"
+" a file for each one."
msgstr ""
#. type: Labeled list
@@ -34777,7 +34643,7 @@ msgstr ""
#: en/git-format-patch.txt:128
#, no-wrap
msgid "--no-attach"
-msgstr ""
+msgstr "--no-attach"
#. type: Plain text
#: en/git-format-patch.txt:131
@@ -34809,7 +34675,7 @@ msgstr ""
#: en/git-format-patch.txt:138
#, no-wrap
msgid "--no-thread"
-msgstr ""
+msgstr "--no-thread"
#. type: Plain text
#: en/git-format-patch.txt:143
@@ -34823,8 +34689,8 @@ msgstr ""
#: en/git-format-patch.txt:149
msgid ""
"The optional <style> argument can be either `shallow` or `deep`. 'shallow' "
-"threading makes every mail a reply to the head of the series, where the head "
-"is chosen from the cover letter, the `--in-reply-to`, and the first patch "
+"threading makes every mail a reply to the head of the series, where the head"
+" is chosen from the cover letter, the `--in-reply-to`, and the first patch "
"mail, in this order. 'deep' threading makes every mail a reply to the "
"previous one."
msgstr ""
@@ -34840,8 +34706,8 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:157
msgid ""
-"Beware that the default for 'git send-email' is to thread emails itself. If "
-"you want `git format-patch` to take care of threading, you will want to "
+"Beware that the default for 'git send-email' is to thread emails itself. If"
+" you want `git format-patch` to take care of threading, you will want to "
"ensure that threading is disabled for `git send-email`."
msgstr ""
@@ -34863,14 +34729,15 @@ msgstr ""
#: en/git-format-patch.txt:163
#, no-wrap
msgid "--ignore-if-in-upstream"
-msgstr ""
+msgstr "--ignore-if-in-upstream"
#. type: Plain text
#: en/git-format-patch.txt:169
msgid ""
-"Do not include a patch that matches a commit in <until>..<since>. This will "
-"examine all patches reachable from <since> but not from <until> and compare "
-"them with the patches being generated, and any patch that matches is ignored."
+"Do not include a patch that matches a commit in <until>..<since>. This will"
+" examine all patches reachable from <since> but not from <until> and compare"
+" them with the patches being generated, and any patch that matches is "
+"ignored."
msgstr ""
#. type: Labeled list
@@ -34891,14 +34758,14 @@ msgstr ""
#: en/git-format-patch.txt:176
#, no-wrap
msgid "--rfc"
-msgstr ""
+msgstr "--rfc"
#. type: Plain text
#: en/git-format-patch.txt:180
msgid ""
-"Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments"
-"\"; use this when sending an experimental patch for discussion rather than "
-"application."
+"Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For "
+"Comments\"; use this when sending an experimental patch for discussion "
+"rather than application."
msgstr ""
#. type: Labeled list
@@ -34917,10 +34784,10 @@ msgstr ""
#: en/git-format-patch.txt:189
msgid ""
"Mark the series as the <n>-th iteration of the topic. The output filenames "
-"have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, "
-"but configurable via the `--subject-prefix` option) has ` v<n>` appended to "
-"it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file "
-"that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
+"have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default,"
+" but configurable via the `--subject-prefix` option) has ` v<n>` appended to"
+" it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file"
+" that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
@@ -34955,7 +34822,7 @@ msgstr ""
#: en/git-format-patch.txt:202
#, no-wrap
msgid "--from"
-msgstr ""
+msgstr "--from"
#. type: Labeled list
#: en/git-format-patch.txt:203
@@ -35002,7 +34869,7 @@ msgstr ""
#: en/git-format-patch.txt:225
#, no-wrap
msgid "--[no-]cover-letter"
-msgstr ""
+msgstr "--[no-]cover-letter"
#. type: Plain text
#: en/git-format-patch.txt:229
@@ -35029,8 +34896,8 @@ msgstr ""
#: en/git-format-patch.txt:241
msgid ""
"The expected use case of this is to write supporting explanation for the "
-"commit that does not belong to the commit log message proper, and include it "
-"with the patch submission. While one can simply write these explanations "
+"commit that does not belong to the commit log message proper, and include it"
+" with the patch submission. While one can simply write these explanations "
"after `format-patch` has run but before sending, keeping them as Git notes "
"allows them to be maintained between versions of the patch series (but see "
"the discussion of the `notes.rewrite` configuration options in linkgit:git-"
@@ -35092,7 +34959,7 @@ msgstr ""
#: en/git-format-patch.txt:264
#, no-wrap
msgid "--no-binary"
-msgstr ""
+msgstr "--no-binary"
#. type: Plain text
#: en/git-format-patch.txt:269
@@ -35104,10 +34971,9 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:270
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--zero-commit"
-msgstr "git-commit(1)"
+msgstr "--zero-commit"
#. type: Plain text
#: en/git-format-patch.txt:273
@@ -35134,8 +35000,8 @@ msgstr ""
#: en/git-format-patch.txt:285
msgid ""
"Treat the revision argument as a <revision range>, even if it is just a "
-"single commit (that would normally be treated as a <since>). Note that root "
-"commits included in the specified range are always formatted as creation "
+"single commit (that would normally be treated as a <since>). Note that root"
+" commits included in the specified range are always formatted as creation "
"patches, independently of this flag."
msgstr ""
@@ -35255,11 +35121,11 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:363
msgid ""
-"When sending a patch this way, most often you are sending your own patch, so "
-"in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit "
-"`From:` and `Date:` lines from the patch file. The patch title is likely to "
-"be different from the subject of the discussion the patch is in response to, "
-"so it is likely that you would want to keep the Subject: line, like the "
+"When sending a patch this way, most often you are sending your own patch, so"
+" in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit"
+" `From:` and `Date:` lines from the patch file. The patch title is likely "
+"to be different from the subject of the discussion the patch is in response "
+"to, so it is likely that you would want to keep the Subject: line, like the "
"example above."
msgstr ""
@@ -35329,8 +35195,8 @@ msgstr ""
#: en/git-format-patch.txt:396
msgid ""
"The patch itself does not apply cleanly. That is _bad_ but does not have "
-"much to do with your MUA. You might want to rebase the patch with linkgit:"
-"git-rebase[1] before regenerating it in this case."
+"much to do with your MUA. You might want to rebase the patch with "
+"linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
@@ -35376,8 +35242,8 @@ msgstr ""
msgid ""
"GMail does not have any way to turn off line wrapping in the web interface, "
"so it will mangle any emails that you send. You can however use \"git send-"
-"email\" and send your patches through the GMail SMTP server, or use any IMAP "
-"email client to connect to the google IMAP server and forward the emails "
+"email\" and send your patches through the GMail SMTP server, or use any IMAP"
+" email client to connect to the google IMAP server and forward the emails "
"through that."
msgstr ""
@@ -35391,8 +35257,8 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:428
msgid ""
-"For hints on submission using the IMAP interface, see the EXAMPLE section of "
-"linkgit:git-imap-send[1]."
+"For hints on submission using the IMAP interface, see the EXAMPLE section of"
+" linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
@@ -35405,7 +35271,8 @@ msgstr ""
#: en/git-format-patch.txt:434
msgid ""
"By default, Thunderbird will both wrap emails as well as flag them as being "
-"'format=flowed', both of which will make the resulting email unusable by Git."
+"'format=flowed', both of which will make the resulting email unusable by "
+"Git."
msgstr ""
#. type: Plain text
@@ -35426,12 +35293,12 @@ msgstr "Configuration"
#. type: Plain text
#: en/git-format-patch.txt:448
msgid ""
-"Install the Toggle Word Wrap add-on that is available from https://addons."
-"mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry "
-"\"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick "
-"off. Now you can compose the message as you otherwise do (cut + paste, 'git "
-"format-patch' | 'git imap-send', etc), but you have to insert line breaks "
-"manually in any text that you type."
+"Install the Toggle Word Wrap add-on that is available from "
+"https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a "
+"menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you "
+"can tick off. Now you can compose the message as you otherwise do (cut + "
+"paste, 'git format-patch' | 'git imap-send', etc), but you have to insert "
+"line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
@@ -35499,9 +35366,9 @@ msgstr "Configuration"
#. type: Plain text
#: en/git-format-patch.txt:483
msgid ""
-"The following Thunderbird extensions are needed: AboutConfig from http://"
-"aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles."
-"php?lng=en&pg=8"
+"The following Thunderbird extensions are needed: AboutConfig from "
+"http://aboutconfig.mozdev.org/ and External Editor from "
+"http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
@@ -35513,15 +35380,16 @@ msgstr ""
#: en/git-format-patch.txt:490
msgid ""
"Before opening a compose window, use Edit->Account Settings to uncheck the "
-"\"Compose messages in HTML format\" setting in the \"Composition & Addressing"
-"\" panel of the account to be used to send the patch."
+"\"Compose messages in HTML format\" setting in the \"Composition & "
+"Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:494
msgid ""
-"In the main Thunderbird window, 'before' you open the compose window for the "
-"patch, use Tools->about:config to set the following to the indicated values:"
+"In the main Thunderbird window, 'before' you open the compose window for the"
+" patch, use Tools->about:config to set the following to the indicated "
+"values:"
msgstr ""
#. type: delimited block -
@@ -35604,8 +35472,8 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:533
msgid ""
-"Back in the compose window: add whatever other text you wish to the message, "
-"complete the addressing and subject fields, and press send."
+"Back in the compose window: add whatever other text you wish to the message,"
+" complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
@@ -35653,10 +35521,10 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:564
msgid ""
-"With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--"
-"cover-letter` of using `Z..C` instead of `-3 C` to specify the range), the "
-"base tree information block is shown at the end of the first message the "
-"command outputs (either the first patch, or the cover letter), like this:"
+"With `git format-patch --base=P -3 C` (or variants thereof, e.g. with "
+"`--cover-letter` of using `Z..C` instead of `-3 C` to specify the range), "
+"the base tree information block is shown at the end of the first message the"
+" command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
@@ -35686,8 +35554,8 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:583
msgid ""
-"You can also use `git format-patch --base=P -3 C` to generate patches for A, "
-"B and C, and the identifiers for P, X, Y, Z are appended at the end of the "
+"You can also use `git format-patch --base=P -3 C` to generate patches for A,"
+" B and C, and the identifiers for P, X, Y, Z are appended at the end of the "
"first message."
msgstr ""
@@ -35697,8 +35565,8 @@ msgid ""
"If set `--base=auto` in cmdline, it will track base commit automatically, "
"the base commit will be the merge base of tip commit of the remote-tracking "
"branch and revision-range specified in cmdline. For a local branch, you "
-"need to track a remote branch by `git branch --set-upstream-to` before using "
-"this option."
+"need to track a remote branch by `git branch --set-upstream-to` before using"
+" this option."
msgstr ""
#. type: Plain text
@@ -35735,7 +35603,8 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:611
msgid ""
-"Extract all commits that lead to 'origin' since the inception of the project:"
+"Extract all commits that lead to 'origin' since the inception of the "
+"project:"
msgstr ""
#. type: delimited block -
@@ -35761,15 +35630,15 @@ msgid ""
"Additionally, it detects and handles renames and complete rewrites "
"intelligently to produce a renaming patch. A renaming patch reduces the "
"amount of text output, and generally makes it easier to review. Note that "
-"non-Git \"patch\" programs won't understand renaming patches, so use it only "
-"when you know the recipient uses Git to apply your patch."
+"non-Git \"patch\" programs won't understand renaming patches, so use it only"
+" when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:630
msgid ""
-"Extract three topmost commits from the current branch and format them as e-"
-"mailable patches:"
+"Extract three topmost commits from the current branch and format them as "
+"e-mailable patches:"
msgstr ""
#. type: delimited block -
@@ -35795,8 +35664,8 @@ msgstr "git-fsck-objects(1)"
#: en/git-fsck-objects.txt:7
#, fuzzy
#| msgid ""
-#| "git-fsck-objects - Verifies the connectivity and validity of the objects "
-#| "in the database"
+#| "git-fsck-objects - Verifies the connectivity and validity of the objects in "
+#| "the database"
msgid ""
"git-fsck-objects - Verifies the connectivity and validity of the objects in "
"the database"
@@ -35879,7 +35748,7 @@ msgstr ""
#: en/git-fsck.txt:30
#, no-wrap
msgid "--unreachable"
-msgstr ""
+msgstr "--unreachable"
#. type: Plain text
#: en/git-fsck.txt:33
@@ -35892,13 +35761,13 @@ msgstr ""
#: en/git-fsck.txt:34
#, no-wrap
msgid "--[no-]dangling"
-msgstr ""
+msgstr "--[no-]dangling"
#. type: Plain text
#: en/git-fsck.txt:37
msgid ""
-"Print objects that exist but that are never 'directly' used (default). `--"
-"no-dangling` can be used to omit this information from the output."
+"Print objects that exist but that are never 'directly' used (default). "
+"`--no-dangling` can be used to omit this information from the output."
msgstr ""
#. type: Plain text
@@ -35915,7 +35784,7 @@ msgstr ""
#: en/git-fsck.txt:44
#, no-wrap
msgid "--cache"
-msgstr ""
+msgstr "--cache"
#. type: Plain text
#: en/git-fsck.txt:47
@@ -35934,7 +35803,7 @@ msgstr ""
#: en/git-fsck.txt:48
#, no-wrap
msgid "--no-reflogs"
-msgstr ""
+msgstr "--no-reflogs"
#. type: Plain text
#: en/git-fsck.txt:53
@@ -35948,24 +35817,24 @@ msgstr ""
#: en/git-fsck.txt:54
#, no-wrap
msgid "--full"
-msgstr ""
+msgstr "--full"
#. type: Plain text
#: en/git-fsck.txt:63
msgid ""
"Check not just objects in GIT_OBJECT_DIRECTORY ($GIT_DIR/objects), but also "
"the ones found in alternate object pools listed in "
-"GIT_ALTERNATE_OBJECT_DIRECTORIES or $GIT_DIR/objects/info/alternates, and in "
-"packed Git archives found in $GIT_DIR/objects/pack and corresponding pack "
-"subdirectories in alternate object pools. This is now default; you can turn "
-"it off with --no-full."
+"GIT_ALTERNATE_OBJECT_DIRECTORIES or $GIT_DIR/objects/info/alternates, and in"
+" packed Git archives found in $GIT_DIR/objects/pack and corresponding pack "
+"subdirectories in alternate object pools. This is now default; you can turn"
+" it off with --no-full."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:64
#, no-wrap
msgid "--connectivity-only"
-msgstr ""
+msgstr "--connectivity-only"
#. type: Plain text
#: en/git-fsck.txt:68
@@ -35977,17 +35846,16 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:69 en/git-index-pack.txt:74 en/git-unpack-objects.txt:44
-#, fuzzy, no-wrap
-#| msgid "strip"
+#, no-wrap
msgid "--strict"
-msgstr "strip"
+msgstr "--strict"
#. type: Plain text
#: en/git-fsck.txt:76
msgid ""
"Enable more strict checking, namely to catch a file mode recorded with g+w "
-"bit set, which was created by older versions of Git. Existing repositories, "
-"including the Linux kernel, Git itself, and sparse repository have old "
+"bit set, which was created by older versions of Git. Existing repositories,"
+" including the Linux kernel, Git itself, and sparse repository have old "
"objects that triggers this check, but it is recommended to check new "
"projects with this flag."
msgstr ""
@@ -36001,22 +35869,21 @@ msgstr ""
#: en/git-fsck.txt:80
#, no-wrap
msgid "--lost-found"
-msgstr ""
+msgstr "--lost-found"
#. type: Plain text
#: en/git-fsck.txt:85
msgid ""
-"Write dangling objects into .git/lost-found/commit/ or .git/lost-found/"
-"other/, depending on type. If the object is a blob, the contents are "
+"Write dangling objects into .git/lost-found/commit/ or .git/lost-"
+"found/other/, depending on type. If the object is a blob, the contents are "
"written into the file, rather than its object name."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:86
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--name-objects"
-msgstr "git-commit(1)"
+msgstr "--name-objects"
#. type: Plain text
#: en/git-fsck.txt:91
@@ -36030,27 +35897,28 @@ msgstr ""
#: en/git-fsck.txt:98
msgid ""
"Progress status is reported on the standard error stream by default when it "
-"is attached to a terminal, unless --no-progress or --verbose is specified. --"
-"progress forces progress status even if the standard error stream is not "
+"is attached to a terminal, unless --no-progress or --verbose is specified. "
+"--progress forces progress status even if the standard error stream is not "
"directed to a terminal."
msgstr ""
#. type: Plain text
#: en/git-fsck.txt:108
msgid ""
-"git-fsck tests SHA-1 and general object sanity, and it does full tracking of "
-"the resulting reachability and everything else. It prints out any corruption "
-"it finds (missing or bad objects), and if you use the `--unreachable` flag "
-"it will also print out objects that exist but that aren't reachable from any "
-"of the specified head nodes (or the default set, as mentioned above)."
+"git-fsck tests SHA-1 and general object sanity, and it does full tracking of"
+" the resulting reachability and everything else. It prints out any "
+"corruption it finds (missing or bad objects), and if you use the "
+"`--unreachable` flag it will also print out objects that exist but that "
+"aren't reachable from any of the specified head nodes (or the default set, "
+"as mentioned above)."
msgstr ""
#. type: Plain text
#: en/git-fsck.txt:112
msgid ""
-"Any corrupt objects you will have to find in backups or other archives (i."
-"e., you can just remove them and do an 'rsync' with some other site in the "
-"hopes that somebody else has the object you have corrupted)."
+"Any corrupt objects you will have to find in backups or other archives "
+"(i.e., you can just remove them and do an 'rsync' with some other site in "
+"the hopes that somebody else has the object you have corrupted)."
msgstr ""
#. type: Title -
@@ -36062,7 +35930,8 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:116
#, no-wrap
-msgid "expect dangling commits - potential heads - due to lack of head information"
+msgid ""
+"expect dangling commits - potential heads - due to lack of head information"
msgstr ""
#. type: Plain text
@@ -36094,8 +35963,8 @@ msgstr ""
msgid ""
"The <type> object <object>, isn't actually referred to directly or "
"indirectly in any of the trees or commits seen. This can mean that there's "
-"another root node that you're not specifying or that the tree is corrupt. If "
-"you haven't missed a root node then you might as well delete unreachable "
+"another root node that you're not specifying or that the tree is corrupt. If"
+" you haven't missed a root node then you might as well delete unreachable "
"nodes since they can't be used."
msgstr ""
@@ -36108,7 +35977,8 @@ msgstr ""
#. type: Plain text
#: en/git-fsck.txt:135
msgid ""
-"The <type> object <object>, is referred to but isn't present in the database."
+"The <type> object <object>, is referred to but isn't present in the "
+"database."
msgstr ""
#. type: Labeled list
@@ -36160,7 +36030,6 @@ msgstr ""
msgid "GIT_INDEX_FILE"
msgstr ""
-#
#. type: Plain text
#: en/git-fsck.txt:153
#, fuzzy
@@ -36181,10 +36050,9 @@ msgstr ""
#. type: Title =
#: en/git-gc.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-gc(1)"
-msgstr "git-add(1)"
+msgstr "git-gc(1)"
#. type: Plain text
#: en/git-gc.txt:7
@@ -36194,7 +36062,9 @@ msgstr ""
#. type: Plain text
#: en/git-gc.txt:13
#, no-wrap
-msgid "'git gc' [--aggressive] [--auto] [--quiet] [--prune=<date> | --no-prune] [--force]\n"
+msgid ""
+"'git gc' [--aggressive] [--auto] [--quiet] [--prune=<date> | --no-prune] "
+"[--force]\n"
msgstr ""
#. type: Plain text
@@ -36232,7 +36102,7 @@ msgstr ""
#: en/git-gc.txt:36 en/git-read-tree.txt:71
#, no-wrap
msgid "--aggressive"
-msgstr ""
+msgstr "--aggressive"
#. type: Plain text
#: en/git-gc.txt:43
@@ -36248,24 +36118,24 @@ msgstr ""
#: en/git-gc.txt:44
#, no-wrap
msgid "--auto"
-msgstr ""
+msgstr "--auto"
#. type: Plain text
#: en/git-gc.txt:49
msgid ""
"With this option, 'git gc' checks whether any housekeeping is required; if "
-"not, it exits without performing any work. Some git commands run `git gc --"
-"auto` after performing operations that could create many loose objects."
+"not, it exits without performing any work. Some git commands run `git gc "
+"--auto` after performing operations that could create many loose objects."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:56
msgid ""
"Housekeeping is required if there are too many loose objects or too many "
-"packs in the repository. If the number of loose objects exceeds the value of "
-"the `gc.auto` configuration variable, then all loose objects are combined "
-"into a single pack using `git repack -d -l`. Setting the value of `gc.auto` "
-"to 0 disables automatic packing of loose objects."
+"packs in the repository. If the number of loose objects exceeds the value of"
+" the `gc.auto` configuration variable, then all loose objects are combined "
+"into a single pack using `git repack -d -l`. Setting the value of `gc.auto`"
+" to 0 disables automatic packing of loose objects."
msgstr ""
#. type: Plain text
@@ -36273,8 +36143,8 @@ msgstr ""
msgid ""
"If the number of packs exceeds the value of `gc.autoPackLimit`, then "
"existing packs (except those marked with a `.keep` file) are consolidated "
-"into a single pack by using the `-A` option of 'git repack'. Setting `gc."
-"autoPackLimit` to 0 disables automatic consolidation of packs."
+"into a single pack by using the `-A` option of 'git repack'. Setting "
+"`gc.autoPackLimit` to 0 disables automatic consolidation of packs."
msgstr ""
#. type: Labeled list
@@ -36289,15 +36159,15 @@ msgid ""
"Prune loose objects older than date (default is 2 weeks ago, overridable by "
"the config variable `gc.pruneExpire`). --prune=all prunes loose objects "
"regardless of their age and increases the risk of corruption if another "
-"process is writing to the repository concurrently; see \"NOTES\" below. --"
-"prune is on by default."
+"process is writing to the repository concurrently; see \"NOTES\" below. "
+"--prune is on by default."
msgstr ""
#. type: Labeled list
#: en/git-gc.txt:71 en/git-pack-refs.txt:57
#, no-wrap
msgid "--no-prune"
-msgstr ""
+msgstr "--no-prune"
#. type: Plain text
#: en/git-gc.txt:73
@@ -36322,17 +36192,17 @@ msgstr ""
#. type: Plain text
#: en/git-gc.txt:80
msgid ""
-"Force `git gc` to run even if there may be another `git gc` instance running "
-"on this repository."
+"Force `git gc` to run even if there may be another `git gc` instance running"
+" on this repository."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:89
msgid ""
-"The optional configuration variable `gc.reflogExpire` can be set to indicate "
-"how long historical entries within each branch's reflog should remain "
-"available in this repository. The setting is expressed as a length of time, "
-"for example '90 days' or '3 months'. It defaults to '90 days'."
+"The optional configuration variable `gc.reflogExpire` can be set to indicate"
+" how long historical entries within each branch's reflog should remain "
+"available in this repository. The setting is expressed as a length of time,"
+" for example '90 days' or '3 months'. It defaults to '90 days'."
msgstr ""
#. type: Plain text
@@ -36343,8 +36213,8 @@ msgid ""
"current branch should remain available in this repository. These types of "
"entries are generally created as a result of using `git commit --amend` or "
"`git rebase` and are the commits prior to the amend or rebase occurring. "
-"Since these changes are not part of the current project most users will want "
-"to expire them sooner. This option defaults to '30 days'."
+"Since these changes are not part of the current project most users will want"
+" to expire them sooner. This option defaults to '30 days'."
msgstr ""
#. type: Plain text
@@ -36368,15 +36238,15 @@ msgstr ""
#: en/git-gc.txt:112
msgid ""
"The optional configuration variable `gc.rerereResolved` indicates how long "
-"records of conflicted merge you resolved earlier are kept. This defaults to "
-"60 days."
+"records of conflicted merge you resolved earlier are kept. This defaults to"
+" 60 days."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:116
msgid ""
-"The optional configuration variable `gc.rerereUnresolved` indicates how long "
-"records of conflicted merge you have not resolved are kept. This defaults "
+"The optional configuration variable `gc.rerereUnresolved` indicates how long"
+" records of conflicted merge you have not resolved are kept. This defaults "
"to 15 days."
msgstr ""
@@ -36384,8 +36254,8 @@ msgstr ""
#: en/git-gc.txt:121
msgid ""
"The optional configuration variable `gc.packRefs` determines if 'git gc' "
-"runs 'git pack-refs'. This can be set to \"notbare\" to enable it within all "
-"non-bare repos or it can be set to a boolean value. This defaults to true."
+"runs 'git pack-refs'. This can be set to \"notbare\" to enable it within all"
+" non-bare repos or it can be set to a boolean value. This defaults to true."
msgstr ""
#. type: Plain text
@@ -36393,8 +36263,8 @@ msgstr ""
msgid ""
"The optional configuration variable `gc.aggressiveWindow` controls how much "
"time is spent optimizing the delta compression of the objects in the "
-"repository when the --aggressive option is specified. The larger the value, "
-"the more time is spent optimizing the delta compression. See the "
+"repository when the --aggressive option is specified. The larger the value,"
+" the more time is spent optimizing the delta compression. See the "
"documentation for the --window' option in linkgit:git-repack[1] for more "
"details. This defaults to 250."
msgstr ""
@@ -36402,8 +36272,8 @@ msgstr ""
#. type: Plain text
#: en/git-gc.txt:131
msgid ""
-"Similarly, the optional configuration variable `gc.aggressiveDepth` controls "
-"--depth option in linkgit:git-repack[1]. This defaults to 50."
+"Similarly, the optional configuration variable `gc.aggressiveDepth` controls"
+" --depth option in linkgit:git-repack[1]. This defaults to 50."
msgstr ""
#. type: Plain text
@@ -36419,23 +36289,23 @@ msgstr ""
msgid ""
"'git gc' tries very hard not to delete objects that are referenced anywhere "
"in your repository. In particular, it will keep not only objects referenced "
-"by your current set of branches and tags, but also objects referenced by the "
-"index, remote-tracking branches, refs saved by 'git filter-branch' in refs/"
-"original/, or reflogs (which may reference commits in branches that were "
-"later amended or rewound). If you are expecting some objects to be deleted "
-"and they aren't, check all of those locations and decide whether it makes "
-"sense in your case to remove those references."
+"by your current set of branches and tags, but also objects referenced by the"
+" index, remote-tracking branches, refs saved by 'git filter-branch' in "
+"refs/original/, or reflogs (which may reference commits in branches that "
+"were later amended or rewound). If you are expecting some objects to be "
+"deleted and they aren't, check all of those locations and decide whether it "
+"makes sense in your case to remove those references."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:157
msgid ""
"On the other hand, when 'git gc' runs concurrently with another process, "
-"there is a risk of it deleting an object that the other process is using but "
-"hasn't created a reference to. This may just cause the other process to fail "
-"or may corrupt the repository if the other process later adds a reference to "
-"the deleted object. Git has two features that significantly mitigate this "
-"problem:"
+"there is a risk of it deleting an object that the other process is using but"
+" hasn't created a reference to. This may just cause the other process to "
+"fail or may corrupt the repository if the other process later adds a "
+"reference to the deleted object. Git has two features that significantly "
+"mitigate this problem:"
msgstr ""
#. type: Plain text
@@ -36456,8 +36326,8 @@ msgstr ""
#: en/git-gc.txt:169
msgid ""
"However, these features fall short of a complete solution, so users who run "
-"commands concurrently have to live with some risk of corruption (which seems "
-"to be low in practice) unless they turn off automatic garbage collection "
+"commands concurrently have to live with some risk of corruption (which seems"
+" to be low in practice) unless they turn off automatic garbage collection "
"with 'git config gc.auto 0'."
msgstr ""
@@ -36465,17 +36335,16 @@ msgstr ""
#: en/git-gc.txt:175
#, fuzzy
#| msgid ""
-#| "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, "
-#| "and `post-commit` hooks. See linkgit:githooks[5] for more information."
+#| "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, and "
+#| "`post-commit` hooks. See linkgit:githooks[5] for more information."
msgid ""
-"The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:"
-"githooks[5] for more information."
+"The 'git gc --auto' command will run the 'pre-auto-gc' hook. See "
+"linkgit:githooks[5] for more information."
msgstr ""
"Cette commande peut lancer les crochets `commit-msg`, `prepare-commit-msg`, "
-"`pre-commit` et `post-commit`. Voir linkgit:githooks[5] pour de plus amples "
-"informations."
+"`pre-commit` et `post-commit`. Voir linkgit:githooks[5] pour de plus amples"
+" informations."
-#
#. type: Plain text
#: en/git-gc.txt:183
#, fuzzy
@@ -36483,18 +36352,17 @@ msgstr ""
#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
#| "merge[1], linkgit:git-commit-tree[1]"
msgid ""
-"linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-"
-"rerere[1]"
+"linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] "
+"linkgit:git-rerere[1]"
msgstr ""
"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
"merge[1], linkgit:git-commit-tree[1]"
#. type: Title =
#: en/git-get-tar-commit-id.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-get-tar-commit-id(1)"
-msgstr "git-commit(1)"
+msgstr "git-get-tar-commit-id(1)"
#. type: Plain text
#: en/git-get-tar-commit-id.txt:7
@@ -36522,17 +36390,16 @@ msgstr ""
#: en/git-get-tar-commit-id.txt:27
msgid ""
"If no commit ID is found, 'git get-tar-commit-id' quietly exists with a "
-"return code of 1. This can happen if the archive had not been created using "
-"'git archive' or if the first parameter of 'git archive' had been a tree ID "
-"instead of a commit ID or tag."
+"return code of 1. This can happen if the archive had not been created using"
+" 'git archive' or if the first parameter of 'git archive' had been a tree ID"
+" instead of a commit ID or tag."
msgstr ""
#. type: Title =
#: en/git-grep.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-grep(1)"
-msgstr "git-add(1)"
+msgstr "git-grep(1)"
#. type: Plain text
#: en/git-grep.txt:7
@@ -36570,15 +36437,15 @@ msgstr ""
msgid ""
"Look for specified patterns in the tracked files in the work tree, blobs "
"registered in the index file, or blobs in given tree objects. Patterns are "
-"lists of one or more search expressions separated by newline characters. An "
-"empty string as search expression matches all lines."
+"lists of one or more search expressions separated by newline characters. An"
+" empty string as search expression matches all lines."
msgstr ""
#. type: Plain text
#: en/git-grep.txt:61
msgid ""
-"Number of grep worker threads to use. If unset (or set to 0), 8 threads are "
-"used by default (for now)."
+"Number of grep worker threads to use. If unset (or set to 0), 8 threads are"
+" used by default (for now)."
msgstr ""
#. type: Labeled list
@@ -36596,8 +36463,8 @@ msgstr ""
#: en/git-grep.txt:75
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid ""
"Instead of searching tracked files in the working tree, search blobs "
"registered in the index file."
@@ -36612,17 +36479,16 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:79
-#, fuzzy, no-wrap
-#| msgid "add untracked"
+#, no-wrap
msgid "--untracked"
-msgstr "add untracked"
+msgstr "--untracked"
#. type: Plain text
#: en/git-grep.txt:82
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid ""
"In addition to searching in the tracked files in the working tree, search "
"also in untracked files."
@@ -36634,7 +36500,7 @@ msgstr ""
#: en/git-grep.txt:83
#, no-wrap
msgid "--no-exclude-standard"
-msgstr ""
+msgstr "--no-exclude-standard"
#. type: Plain text
#: en/git-grep.txt:86
@@ -36647,7 +36513,7 @@ msgstr ""
#: en/git-grep.txt:87 en/git-ls-files.txt:97
#, no-wrap
msgid "--exclude-standard"
-msgstr ""
+msgstr "--exclude-standard"
#. type: Plain text
#: en/git-grep.txt:91
@@ -36675,9 +36541,9 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:104
msgid ""
-"For internal use only. In order to produce uniform output with the --"
-"recurse-submodules option, this option can be used to provide the basename "
-"of a parent's <tree> object to a submodule so the submodule can prefix its "
+"For internal use only. In order to produce uniform output with the "
+"--recurse-submodules option, this option can be used to provide the basename"
+" of a parent's <tree> object to a submodule so the submodule can prefix its "
"output with the parent's name rather than the SHA1 of the submodule."
msgstr ""
@@ -36721,8 +36587,8 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:130
msgid ""
-"For each <pathspec> given on command line, descend at most <depth> levels of "
-"directories. A negative value means no limit. This option is ignored if "
+"For each <pathspec> given on command line, descend at most <depth> levels of"
+" directories. A negative value means no limit. This option is ignored if "
"<pathspec> contains active wildcards. In other words if \"a*\" matches a "
"directory named \"a*\", \"*\" is matched literally so --max-depth is still "
"effective."
@@ -36732,7 +36598,7 @@ msgstr ""
#: en/git-grep.txt:132
#, no-wrap
msgid "--word-regexp"
-msgstr ""
+msgstr "--word-regexp"
#. type: Plain text
#: en/git-grep.txt:136
@@ -36746,7 +36612,7 @@ msgstr ""
#: en/git-grep.txt:138
#, no-wrap
msgid "--invert-match"
-msgstr ""
+msgstr "--invert-match"
#. type: Plain text
#: en/git-grep.txt:140
@@ -36765,7 +36631,7 @@ msgstr ""
#: en/git-grep.txt:149 en/git-ls-files.txt:136 en/git-ls-tree.txt:68
#, no-wrap
msgid "--full-name"
-msgstr ""
+msgstr "--full-name"
#. type: Plain text
#: en/git-grep.txt:154 en/git-ls-files.txt:141
@@ -36785,7 +36651,7 @@ msgstr ""
#: en/git-grep.txt:156 en/rev-list-options.txt:85
#, no-wrap
msgid "--extended-regexp"
-msgstr ""
+msgstr "--extended-regexp"
#. type: Labeled list
#: en/git-grep.txt:157
@@ -36797,7 +36663,7 @@ msgstr ""
#: en/git-grep.txt:158 en/rev-list-options.txt:80
#, no-wrap
msgid "--basic-regexp"
-msgstr ""
+msgstr "--basic-regexp"
#. type: Plain text
#: en/git-grep.txt:161
@@ -36810,7 +36676,7 @@ msgstr ""
#: en/git-grep.txt:163 en/rev-list-options.txt:94
#, no-wrap
msgid "--perl-regexp"
-msgstr ""
+msgstr "--perl-regexp"
#. type: Plain text
#: en/git-grep.txt:166
@@ -36828,7 +36694,7 @@ msgstr ""
#: en/git-grep.txt:168 en/rev-list-options.txt:90
#, no-wrap
msgid "--fixed-strings"
-msgstr ""
+msgstr "--fixed-strings"
#. type: Plain text
#: en/git-grep.txt:171
@@ -36839,7 +36705,7 @@ msgstr ""
#: en/git-grep.txt:173
#, no-wrap
msgid "--line-number"
-msgstr ""
+msgstr "--line-number"
#. type: Plain text
#: en/git-grep.txt:175
@@ -36850,7 +36716,7 @@ msgstr ""
#: en/git-grep.txt:177
#, no-wrap
msgid "--files-with-matches"
-msgstr ""
+msgstr "--files-with-matches"
#. type: Labeled list
#: en/git-grep.txt:179
@@ -36862,7 +36728,7 @@ msgstr ""
#: en/git-grep.txt:180
#, no-wrap
msgid "--files-without-match"
-msgstr ""
+msgstr "--files-without-match"
#. type: Plain text
#: en/git-grep.txt:185
@@ -36904,7 +36770,7 @@ msgstr ""
#: en/git-grep.txt:202 en/rev-list-options.txt:848
#, no-wrap
msgid "--count"
-msgstr ""
+msgstr "--count"
#. type: Plain text
#: en/git-grep.txt:205
@@ -36930,7 +36796,7 @@ msgstr ""
#: en/git-grep.txt:215
#, no-wrap
msgid "--break"
-msgstr ""
+msgstr "--break"
#. type: Plain text
#: en/git-grep.txt:217
@@ -36941,7 +36807,7 @@ msgstr ""
#: en/git-grep.txt:218
#, no-wrap
msgid "--heading"
-msgstr ""
+msgstr "--heading"
#. type: Plain text
#: en/git-grep.txt:221
@@ -36954,15 +36820,15 @@ msgstr ""
#: en/git-grep.txt:223
#, no-wrap
msgid "--show-function"
-msgstr ""
+msgstr "--show-function"
#. type: Plain text
#: en/git-grep.txt:229
msgid ""
-"Show the preceding line that contains the function name of the match, unless "
-"the matching line is a function name itself. The name is determined in the "
-"same way as 'git diff' works out patch hunk headers (see 'Defining a custom "
-"hunk-header' in linkgit:gitattributes[5])."
+"Show the preceding line that contains the function name of the match, unless"
+" the matching line is a function name itself. The name is determined in the"
+" same way as 'git diff' works out patch hunk headers (see 'Defining a custom"
+" hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
@@ -37045,8 +36911,8 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:256
msgid ""
-"Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' "
-"for more information."
+"Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION'"
+" for more information."
msgstr ""
#. type: Labeled list
@@ -37064,27 +36930,27 @@ msgstr ""
#: en/git-grep.txt:265
msgid ""
"The next parameter is the pattern. This option has to be used for patterns "
-"starting with `-` and should be used in scripts passing user input to grep. "
-"Multiple patterns are combined by 'or'."
+"starting with `-` and should be used in scripts passing user input to grep."
+" Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:266
#, no-wrap
msgid "--and"
-msgstr ""
+msgstr "--and"
#. type: Labeled list
#: en/git-grep.txt:267
#, no-wrap
msgid "--or"
-msgstr ""
+msgstr "--or"
#. type: Labeled list
#: en/git-grep.txt:268 en/git-rev-parse.txt:129 en/rev-list-options.txt:131
#, no-wrap
msgid "--not"
-msgstr ""
+msgstr "--not"
#. type: Labeled list
#: en/git-grep.txt:269
@@ -37095,16 +36961,16 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:274
msgid ""
-"Specify how multiple patterns are combined using Boolean expressions. `--"
-"or` is the default operator. `--and` has higher precedence than `--or`. `-"
-"e` has to be used for all patterns."
+"Specify how multiple patterns are combined using Boolean expressions. "
+"`--or` is the default operator. `--and` has higher precedence than `--or`."
+" `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:275 en/rev-list-options.txt:67
#, no-wrap
msgid "--all-match"
-msgstr ""
+msgstr "--all-match"
#. type: Plain text
#: en/git-grep.txt:279
@@ -37130,8 +36996,8 @@ msgstr ""
#: en/git-grep.txt:288
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid ""
"Instead of searching tracked files in the working tree, search blobs in the "
"given trees."
@@ -37159,13 +37025,12 @@ msgstr ""
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
-#
#. type: Plain text
#: en/git-grep.txt:303
#, fuzzy
#| msgid ""
-#| "Adds content from all `*.txt` files under `Documentation` directory and "
-#| "its subdirectories:"
+#| "Adds content from all `*.txt` files under `Documentation` directory and its "
+#| "subdirectories:"
msgid ""
"Looks for `time_t` in all tracked .c and .h files in the working directory "
"and its subdirectories."
@@ -37200,10 +37065,9 @@ msgstr ""
#. type: Title =
#: en/git-gui.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-gui(1)"
-msgstr "git-add(1)"
+msgstr "git-gui(1)"
#. type: Plain text
#: en/git-gui.txt:7
@@ -37243,9 +37107,9 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32
-#: en/git-shell.txt:25 en/git-submodule.txt:60 en/git-svn.txt:29
-#: en/git-worktree.txt:47
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42
+#: en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:60
+#: en/git-svn.txt:29 en/git-worktree.txt:47
#, no-wrap
msgid "COMMANDS"
msgstr ""
@@ -37287,7 +37151,8 @@ msgstr ""
msgid ""
"Start 'git gui' and arrange to make exactly one commit before exiting and "
"returning to the shell. The interface is limited to only commit actions, "
-"slightly reducing the application's startup time and simplifying the menubar."
+"slightly reducing the application's startup time and simplifying the "
+"menubar."
msgstr ""
#. type: Labeled list
@@ -37432,8 +37297,8 @@ msgstr ""
#: en/git-gui.txt:114
msgid ""
"'git gui' is actually maintained as an independent project, but stable "
-"versions are distributed as part of the Git suite for the convenience of end "
-"users."
+"versions are distributed as part of the Git suite for the convenience of end"
+" users."
msgstr ""
#. type: Plain text
@@ -37462,12 +37327,13 @@ msgstr ""
#: en/git-hash-object.txt:2
#, no-wrap
msgid "git-hash-object(1)"
-msgstr ""
+msgstr "git-hash-object(1)"
#. type: Plain text
#: en/git-hash-object.txt:7
msgid ""
-"git-hash-object - Compute object ID and optionally creates a blob from a file"
+"git-hash-object - Compute object ID and optionally creates a blob from a "
+"file"
msgstr ""
#. type: Plain text
@@ -37500,7 +37366,6 @@ msgstr ""
msgid "Specify the type (default: \"blob\")."
msgstr ""
-#
#. type: Plain text
#: en/git-hash-object.txt:33
#, fuzzy
@@ -37517,7 +37382,7 @@ msgstr ""
#: en/git-hash-object.txt:37
#, no-wrap
msgid "--stdin-paths"
-msgstr ""
+msgstr "--stdin-paths"
#. type: Plain text
#: en/git-hash-object.txt:40
@@ -37530,8 +37395,8 @@ msgstr ""
#: en/git-hash-object.txt:50
msgid ""
"Hash object as it were located at the given path. The location of file does "
-"not directly influence on the hash value, but path is used to determine what "
-"Git filters should be applied to the object before it can be placed to the "
+"not directly influence on the hash value, but path is used to determine what"
+" Git filters should be applied to the object before it can be placed to the "
"object database, and, as result of applying filters, the actual blob put "
"into the object database may differ from the given file. This option is "
"mainly useful for hashing temporary files located outside of the working "
@@ -37542,38 +37407,37 @@ msgstr ""
#: en/git-hash-object.txt:51
#, no-wrap
msgid "--no-filters"
-msgstr ""
+msgstr "--no-filters"
#. type: Plain text
#: en/git-hash-object.txt:56
msgid ""
"Hash the contents as is, ignoring any input filter that would have been "
-"chosen by the attributes mechanism, including the end-of-line conversion. If "
-"the file is read from standard input then this is always implied, unless the "
-"`--path` option is given."
+"chosen by the attributes mechanism, including the end-of-line conversion. If"
+" the file is read from standard input then this is always implied, unless "
+"the `--path` option is given."
msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:57
#, no-wrap
msgid "--literally"
-msgstr ""
+msgstr "--literally"
#. type: Plain text
#: en/git-hash-object.txt:62
msgid ""
"Allow `--stdin` to hash any garbage into a loose object which might not "
-"otherwise pass standard object parsing or git-fsck checks. Useful for stress-"
-"testing Git itself or reproducing characteristics of corrupt or bogus "
-"objects encountered in the wild."
+"otherwise pass standard object parsing or git-fsck checks. Useful for "
+"stress-testing Git itself or reproducing characteristics of corrupt or bogus"
+" objects encountered in the wild."
msgstr ""
#. type: Title =
#: en/git-help.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-help(1)"
-msgstr "git-add(1)"
+msgstr "git-help(1)"
#. type: Plain text
#: en/git-help.txt:7
@@ -37592,8 +37456,8 @@ msgstr ""
#: en/git-help.txt:20
msgid ""
"With no options and no COMMAND or GUIDE given, the synopsis of the 'git' "
-"command and a list of the most commonly used Git commands are printed on the "
-"standard output."
+"command and a list of the most commonly used Git commands are printed on the"
+" standard output."
msgstr ""
#. type: Plain text
@@ -37606,8 +37470,8 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:26
msgid ""
-"If the option `--guide` or `-g` is given, a list of the useful Git guides is "
-"also printed on the standard output."
+"If the option `--guide` or `-g` is given, a list of the useful Git guides is"
+" also printed on the standard output."
msgstr ""
#. type: Plain text
@@ -37621,8 +37485,8 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:34
msgid ""
-"Note that `git --help ...` is identical to `git help ...` because the former "
-"is internally converted into the latter."
+"Note that `git --help ...` is identical to `git help ...` because the former"
+" is internally converted into the latter."
msgstr ""
#. type: Plain text
@@ -37646,33 +37510,33 @@ msgstr ""
#: en/git-help.txt:47
#, no-wrap
msgid "--guides"
-msgstr ""
+msgstr "--guides"
#. type: Plain text
#: en/git-help.txt:50
msgid ""
-"Prints a list of useful guides on the standard output. This option overrides "
-"any given command or guide name."
+"Prints a list of useful guides on the standard output. This option overrides"
+" any given command or guide name."
msgstr ""
#. type: Labeled list
#: en/git-help.txt:52
#, no-wrap
msgid "--info"
-msgstr ""
+msgstr "--info"
#. type: Plain text
#: en/git-help.txt:55
msgid ""
-"Display manual page for the command in the 'info' format. The 'info' program "
-"will be used for that purpose."
+"Display manual page for the command in the 'info' format. The 'info' program"
+" will be used for that purpose."
msgstr ""
#. type: Labeled list
#: en/git-help.txt:57
#, no-wrap
msgid "--man"
-msgstr ""
+msgstr "--man"
#. type: Plain text
#: en/git-help.txt:61
@@ -37693,7 +37557,7 @@ msgstr ""
#: en/git-help.txt:67
#, no-wrap
msgid "--web"
-msgstr ""
+msgstr "--web"
#. type: Plain text
#: en/git-help.txt:70
@@ -37705,11 +37569,11 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:76
msgid ""
-"The web browser can be specified using the configuration variable `help."
-"browser`, or `web.browser` if the former is not set. If none of these config "
-"variables is set, the 'git web{litdd}browse' helper script (called by 'git "
-"help') will pick a suitable default. See linkgit:git-web{litdd}browse[1] for "
-"more information about this."
+"The web browser can be specified using the configuration variable "
+"`help.browser`, or `web.browser` if the former is not set. If none of these "
+"config variables is set, the 'git web{litdd}browse' helper script (called by"
+" 'git help') will pick a suitable default. See linkgit:git-"
+"web{litdd}browse[1] for more information about this."
msgstr ""
#. type: Title -
@@ -37788,8 +37652,8 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:114
msgid ""
-"Values for other tools can be used if there is a corresponding `man.<tool>."
-"cmd` configuration entry (see below)."
+"Values for other tools can be used if there is a corresponding "
+"`man.<tool>.cmd` configuration entry (see below)."
msgstr ""
#. type: Plain text
@@ -37825,8 +37689,8 @@ msgstr ""
#: en/git-help.txt:133
msgid ""
"If everything fails, or if no viewer is configured, the viewer specified in "
-"the `GIT_MAN_VIEWER` environment variable will be tried. If that fails too, "
-"the 'man' program will be tried anyway."
+"the `GIT_MAN_VIEWER` environment variable will be tried. If that fails too,"
+" the 'man' program will be tried anyway."
msgstr ""
#. type: Plain text
@@ -37857,8 +37721,8 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:159
msgid ""
-"When 'konqueror' is specified in the `man.viewer` configuration variable, we "
-"launch 'kfmclient' to try to open the man page on an already opened "
+"When 'konqueror' is specified in the `man.viewer` configuration variable, we"
+" launch 'kfmclient' to try to open the man page on an already opened "
"konqueror in a new tab if possible."
msgstr ""
@@ -37902,8 +37766,8 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:180
msgid ""
-"Note that all these configuration variables should probably be set using the "
-"`--global` flag, for example like this:"
+"Note that all these configuration variables should probably be set using the"
+" `--global` flag, for example like this:"
msgstr ""
#. type: delimited block -
@@ -37923,10 +37787,9 @@ msgstr ""
#. type: Title =
#: en/git-http-backend.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-http-backend(1)"
-msgstr "git-add(1)"
+msgstr "git-http-backend(1)"
#. type: Plain text
#: en/git-http-backend.txt:7
@@ -37944,8 +37807,8 @@ msgstr ""
msgid ""
"A simple CGI program to serve the contents of a Git repository to Git "
"clients accessing the repository over http:// and https:// protocols. The "
-"program supports clients fetching using both the smart HTTP protocol and the "
-"backwards-compatible dumb HTTP protocol, as well as clients pushing using "
+"program supports clients fetching using both the smart HTTP protocol and the"
+" backwards-compatible dumb HTTP protocol, as well as clients pushing using "
"the smart HTTP protocol."
msgstr ""
@@ -37962,8 +37825,8 @@ msgstr ""
#: en/git-http-backend.txt:31
msgid ""
"By default, only the `upload-pack` service is enabled, which serves 'git "
-"fetch-pack' and 'git ls-remote' clients, which are invoked from 'git fetch', "
-"'git pull', and 'git clone'. If the client is authenticated, the `receive-"
+"fetch-pack' and 'git ls-remote' clients, which are invoked from 'git fetch',"
+" 'git pull', and 'git clone'. If the client is authenticated, the `receive-"
"pack` service is enabled, which serves 'git send-pack' clients, which is "
"invoked from 'git push'."
msgstr ""
@@ -37985,10 +37848,10 @@ msgstr ""
#: en/git-http-backend.txt:44
msgid ""
"This serves Git clients older than version 1.6.6 that are unable to use the "
-"upload pack service. When enabled, clients are able to read any file within "
-"the repository, including objects that are no longer reachable from a branch "
-"but are still present. It is enabled by default, but a repository can "
-"disable it by setting this configuration item to `false`."
+"upload pack service. When enabled, clients are able to read any file within"
+" the repository, including objects that are no longer reachable from a "
+"branch but are still present. It is enabled by default, but a repository "
+"can disable it by setting this configuration item to `false`."
msgstr ""
#. type: Labeled list
@@ -38030,8 +37893,8 @@ msgstr ""
#: en/git-http-backend.txt:65
msgid ""
"To determine the location of the repository on disk, 'git http-backend' "
-"concatenates the environment variables PATH_INFO, which is set automatically "
-"by the web server, and GIT_PROJECT_ROOT, which must be set manually in the "
+"concatenates the environment variables PATH_INFO, which is set automatically"
+" by the web server, and GIT_PROJECT_ROOT, which must be set manually in the "
"web server configuration. If GIT_PROJECT_ROOT is not set, 'git http-"
"backend' reads PATH_TRANSLATED, which is also set automatically by the web "
"server."
@@ -38040,8 +37903,8 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:70
msgid ""
-"All of the following examples map `http://$hostname/git/foo/bar.git` to `/"
-"var/www/git/foo/bar.git`."
+"All of the following examples map `http://$hostname/git/foo/bar.git` to "
+"`/var/www/git/foo/bar.git`."
msgstr ""
#. type: Labeled list
@@ -38053,8 +37916,8 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:75
msgid ""
-"Ensure mod_cgi, mod_alias, and mod_env are enabled, set GIT_PROJECT_ROOT (or "
-"DocumentRoot) appropriately, and create a ScriptAlias to the CGI:"
+"Ensure mod_cgi, mod_alias, and mod_env are enabled, set GIT_PROJECT_ROOT (or"
+" DocumentRoot) appropriately, and create a ScriptAlias to the CGI:"
msgstr ""
#. type: delimited block -
@@ -38128,13 +37991,13 @@ msgstr ""
#: en/git-http-backend.txt:125
msgid ""
"In this mode, the server will not request authentication until the client "
-"actually starts the object negotiation phase of the push, rather than during "
-"the initial contact. For this reason, you must also enable the `http."
-"receivepack` config option in any repositories that should accept a push. "
-"The default behavior, if `http.receivepack` is not set, is to reject any "
-"pushes by unauthenticated users; the initial request will therefore report "
-"`403 Forbidden` to the client, without even giving an opportunity for "
-"authentication."
+"actually starts the object negotiation phase of the push, rather than during"
+" the initial contact. For this reason, you must also enable the "
+"`http.receivepack` config option in any repositories that should accept a "
+"push. The default behavior, if `http.receivepack` is not set, is to reject "
+"any pushes by unauthenticated users; the initial request will therefore "
+"report `403 Forbidden` to the client, without even giving an opportunity for"
+" authentication."
msgstr ""
#. type: Plain text
@@ -38207,8 +38070,8 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:168
msgid ""
-"Similar to the above, but Apache can be used to return static files that are "
-"stored on disk.\tOn many systems this may be more efficient as Apache can "
+"Similar to the above, but Apache can be used to return static files that are"
+" stored on disk.\tOn many systems this may be more efficient as Apache can "
"ask the kernel to copy the file contents from the file system directly to "
"the network:"
msgstr ""
@@ -38374,13 +38237,13 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:266
msgid ""
-"The `GIT_HTTP_MAX_REQUEST_BUFFER` environment variable (or the `http."
-"maxRequestBuffer` config variable) may be set to change the largest ref "
-"negotiation request that git will handle during a fetch; any fetch requiring "
-"a larger buffer will not succeed. This value should not normally need to be "
-"changed, but may be helpful if you are fetching from a repository with an "
-"extremely large number of refs. The value can be specified with a unit (e."
-"g., `100M` for 100 megabytes). The default is 10 megabytes."
+"The `GIT_HTTP_MAX_REQUEST_BUFFER` environment variable (or the "
+"`http.maxRequestBuffer` config variable) may be set to change the largest "
+"ref negotiation request that git will handle during a fetch; any fetch "
+"requiring a larger buffer will not succeed. This value should not normally "
+"need to be changed, but may be helpful if you are fetching from a repository"
+" with an extremely large number of refs. The value can be specified with a "
+"unit (e.g., `100M` for 100 megabytes). The default is 10 megabytes."
msgstr ""
#. type: Plain text
@@ -38403,7 +38266,7 @@ msgstr ""
#: en/git-http-fetch.txt:2
#, no-wrap
msgid "git-http-fetch(1)"
-msgstr ""
+msgstr "git-http-fetch(1)"
#. type: Plain text
#: en/git-http-fetch.txt:7
@@ -38415,7 +38278,9 @@ msgstr "git-commit - Enregistrer les modifications dans le d챕p척t"
#. type: Plain text
#: en/git-http-fetch.txt:13
#, no-wrap
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid ""
+"'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] "
+"[--stdin] <commit> <url>\n"
msgstr ""
#. type: Plain text
@@ -38473,8 +38338,8 @@ msgstr ""
#. type: Plain text
#: en/git-http-fetch.txt:39
msgid ""
-"Writes the commit-id into the filename under $GIT_DIR/refs/<filename> on the "
-"local end after the transfer is complete."
+"Writes the commit-id into the filename under $GIT_DIR/refs/<filename> on the"
+" local end after the transfer is complete."
msgstr ""
#. type: Plain text
@@ -38494,7 +38359,7 @@ msgstr ""
#: en/git-http-fetch.txt:46
#, no-wrap
msgid "--recover"
-msgstr ""
+msgstr "--recover"
#. type: Plain text
#: en/git-http-fetch.txt:49
@@ -38507,7 +38372,7 @@ msgstr ""
#: en/git-http-push.txt:2
#, no-wrap
msgid "git-http-push(1)"
-msgstr ""
+msgstr "git-http-push(1)"
#. type: Plain text
#: en/git-http-push.txt:7
@@ -38519,7 +38384,9 @@ msgstr "git-commit - Enregistrer les modifications dans le d챕p척t"
#. type: Plain text
#: en/git-http-push.txt:13
#, no-wrap
-msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>...]\n"
+msgid ""
+"'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> "
+"[<ref>...]\n"
msgstr ""
#. type: Plain text
@@ -38541,8 +38408,8 @@ msgstr ""
#: en/git-http-push.txt:29
msgid ""
"Do not assume that the remote repository is complete in its current state, "
-"and verify all objects in the entire local ref's history exist in the remote "
-"repository."
+"and verify all objects in the entire local ref's history exist in the remote"
+" repository."
msgstr ""
#. type: Plain text
@@ -38569,8 +38436,8 @@ msgstr ""
#: en/git-http-push.txt:49
msgid ""
"Remove <ref> from remote repository. The specified branch cannot be the "
-"remote HEAD. If -d is specified the following other conditions must also be "
-"met:"
+"remote HEAD. If -d is specified the following other conditions must also be"
+" met:"
msgstr ""
#. type: Plain text
@@ -38610,8 +38477,8 @@ msgstr ""
msgid ""
"A '<ref>' specification can be either a single pattern, or a pair of such "
"patterns separated by a colon \":\" (this means that a ref name cannot have "
-"a colon in it). A single pattern '<name>' is just a shorthand for '<name>:"
-"<name>'."
+"a colon in it). A single pattern '<name>' is just a shorthand for "
+"'<name>:<name>'."
msgstr ""
#. type: Plain text
@@ -38654,8 +38521,8 @@ msgid ""
"Without `--force`, the <src> ref is stored at the remote only if <dst> does "
"not exist, or <dst> is a proper subset (i.e. an ancestor) of <src>. This "
"check, known as \"fast-forward check\", is performed in order to avoid "
-"accidentally overwriting the remote ref and lose other peoples' commits from "
-"there."
+"accidentally overwriting the remote ref and lose other peoples' commits from"
+" there."
msgstr ""
#. type: Plain text
@@ -38672,10 +38539,9 @@ msgstr ""
#. type: Title =
#: en/git-imap-send.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-imap-send(1)"
-msgstr "git-add(1)"
+msgstr "git-imap-send(1)"
#. type: Plain text
#: en/git-imap-send.txt:7
@@ -38694,8 +38560,8 @@ msgstr ""
msgid ""
"This command uploads a mailbox generated with 'git format-patch' into an "
"IMAP drafts folder. This allows patches to be sent as other email is when "
-"using mail clients that cannot read mailbox files directly. The command also "
-"works with any general mailbox in which emails have the fields \"From\", "
+"using mail clients that cannot read mailbox files directly. The command also"
+" works with any general mailbox in which emails have the fields \"From\", "
"\"Date\", and \"Subject\" in that order."
msgstr ""
@@ -38718,7 +38584,7 @@ msgstr ""
#: en/git-imap-send.txt:40
#, no-wrap
msgid "--curl"
-msgstr ""
+msgstr "--curl"
#. type: Plain text
#: en/git-imap-send.txt:44
@@ -38731,7 +38597,7 @@ msgstr ""
#: en/git-imap-send.txt:45
#, no-wrap
msgid "--no-curl"
-msgstr ""
+msgstr "--no-curl"
#. type: Plain text
#: en/git-imap-send.txt:49
@@ -38743,8 +38609,8 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:56
msgid ""
-"To use the tool, imap.folder and either imap.tunnel or imap.host must be set "
-"to appropriate values."
+"To use the tool, imap.folder and either imap.tunnel or imap.host must be set"
+" to appropriate values."
msgstr ""
#. type: Labeled list
@@ -38756,8 +38622,9 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:64
msgid ""
-"The folder to drop the mails into, which is typically the Drafts folder. For "
-"example: \"INBOX.Drafts\", \"INBOX/Drafts\" or \"[Gmail]/Drafts\". Required."
+"The folder to drop the mails into, which is typically the Drafts folder. For"
+" example: \"INBOX.Drafts\", \"INBOX/Drafts\" or \"[Gmail]/Drafts\". "
+"Required."
msgstr ""
#. type: Labeled list
@@ -38860,11 +38727,11 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:104
msgid ""
-"Specify authenticate method for authentication with IMAP server. If Git was "
-"built with the NO_CURL option, or if your curl version is older than 7.34.0, "
-"or if you're running git-imap-send with the `--no-curl` option, the only "
-"supported method is 'CRAM-MD5'. If this is not set then 'git imap-send' uses "
-"the basic IMAP plaintext LOGIN command."
+"Specify authenticate method for authentication with IMAP server. If Git was"
+" built with the NO_CURL option, or if your curl version is older than "
+"7.34.0, or if you're running git-imap-send with the `--no-curl` option, the "
+"only supported method is 'CRAM-MD5'. If this is not set then 'git imap-send'"
+" uses the basic IMAP plaintext LOGIN command."
msgstr ""
#. type: Plain text
@@ -38918,8 +38785,8 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:143
msgid ""
-"To submit patches using GMail's IMAP interface, first, edit your ~/."
-"gitconfig to specify your account settings:"
+"To submit patches using GMail's IMAP interface, first, edit your "
+"~/.gitconfig to specify your account settings:"
msgstr ""
#. type: delimited block -
@@ -38949,7 +38816,9 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:159
#, no-wrap
-msgid " $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
+msgid ""
+" $ git format-patch --cover-letter -M --stdout origin/master | git imap-"
+"send\n"
msgstr ""
#. type: Plain text
@@ -38971,9 +38840,9 @@ msgstr ""
msgid ""
"It is still your responsibility to make sure that the email message sent by "
"your email program meets the standards of your project. Many projects do "
-"not like patches to be attached. Some mail agents will transform patches (e."
-"g. wrap lines, send them as format=flowed) in ways that make them fail. You "
-"will get angry flames ridiculing you if you don't check this."
+"not like patches to be attached. Some mail agents will transform patches "
+"(e.g. wrap lines, send them as format=flowed) in ways that make them fail. "
+"You will get angry flames ridiculing you if you don't check this."
msgstr ""
#. type: Plain text
@@ -38994,7 +38863,7 @@ msgstr ""
#: en/git-index-pack.txt:2
#, no-wrap
msgid "git-index-pack(1)"
-msgstr ""
+msgstr "git-index-pack(1)"
#. type: Plain text
#: en/git-index-pack.txt:7
@@ -39032,8 +38901,8 @@ msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:37
msgid ""
-"Write the generated pack index into the specified file. Without this option "
-"the name of pack index file is constructed from the name of packed archive "
+"Write the generated pack index into the specified file. Without this option"
+" the name of pack index file is constructed from the name of packed archive "
"file by replacing .pack with .idx (and the program fails if the name of "
"packed archive does not end with .pack)."
msgstr ""
@@ -39042,8 +38911,8 @@ msgstr ""
#: en/git-index-pack.txt:47
msgid ""
"When this flag is provided, the pack is read from stdin instead and a copy "
-"is then written to <pack-file>. If <pack-file> is not specified, the pack is "
-"written to objects/pack/ directory of the current Git repository with a "
+"is then written to <pack-file>. If <pack-file> is not specified, the pack is"
+" written to objects/pack/ directory of the current Git repository with a "
"default name determined from the pack content. If <pack-file> is not "
"specified consider using --keep to prevent a race condition between this "
"process and 'git repack'."
@@ -39053,7 +38922,7 @@ msgstr ""
#: en/git-index-pack.txt:48
#, no-wrap
msgid "--fix-thin"
-msgstr ""
+msgstr "--fix-thin"
#. type: Plain text
#: en/git-index-pack.txt:53
@@ -39068,9 +38937,9 @@ msgstr ""
#: en/git-index-pack.txt:61
msgid ""
"Before moving the index into its final destination create an empty .keep "
-"file for the associated pack file. This option is usually necessary with --"
-"stdin to prevent a simultaneous 'git repack' process from deleting the newly "
-"constructed pack and index before refs can be updated to use objects "
+"file for the associated pack file. This option is usually necessary with "
+"--stdin to prevent a simultaneous 'git repack' process from deleting the "
+"newly constructed pack and index before refs can be updated to use objects "
"contained in the pack."
msgstr ""
@@ -39085,8 +38954,8 @@ msgstr ""
msgid ""
"Like --keep create a .keep file before moving the index into its final "
"destination, but rather than creating an empty file place '<msg>' followed "
-"by an LF into the .keep file. The '<msg>' message can later be searched for "
-"within all .keep files to locate any which have outlived their usefulness."
+"by an LF into the .keep file. The '<msg>' message can later be searched for"
+" within all .keep files to locate any which have outlived their usefulness."
msgstr ""
#. type: Labeled list
@@ -39169,10 +39038,9 @@ msgstr ""
#. type: Title =
#: en/git-init-db.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-init-db(1)"
-msgstr "git-add(1)"
+msgstr "git-init-db(1)"
#. type: Plain text
#: en/git-init-db.txt:7
@@ -39184,7 +39052,9 @@ msgstr "git-commit - Enregistrer les modifications dans le d챕p척t"
#. type: Plain text
#: en/git-init-db.txt:13
#, no-wrap
-msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] [--separate-git-dir <git dir>] [--shared[=<permissions>]]\n"
+msgid ""
+"'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] "
+"[--separate-git-dir <git dir>] [--shared[=<permissions>]]\n"
msgstr ""
#. type: Plain text
@@ -39202,10 +39072,9 @@ msgstr ""
#. type: Title =
#: en/git-init.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-init(1)"
-msgstr "git-commit(1)"
+msgstr "git-init(1)"
#. type: Plain text
#: en/git-init.txt:7
@@ -39229,8 +39098,8 @@ msgstr ""
msgid ""
"This command creates an empty Git repository - basically a `.git` directory "
"with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template "
-"files. An initial `HEAD` file that references the HEAD of the master branch "
-"is also created."
+"files. An initial `HEAD` file that references the HEAD of the master branch"
+" is also created."
msgstr ""
#. type: Plain text
@@ -39243,8 +39112,8 @@ msgstr ""
#. type: Plain text
#: en/git-init.txt:32
msgid ""
-"If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` "
-"environment variable then the sha1 directories are created underneath - "
+"If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY`"
+" environment variable then the sha1 directories are created underneath - "
"otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
@@ -39302,10 +39171,10 @@ msgstr ""
#. type: Plain text
#: en/git-init.txt:75
msgid ""
-"Specify that the Git repository is to be shared amongst several users. This "
-"allows users belonging to the same group to push into that repository. When "
-"specified, the config variable \"core.sharedRepository\" is set so that "
-"files and directories under `$GIT_DIR` are created with the requested "
+"Specify that the Git repository is to be shared amongst several users. This"
+" allows users belonging to the same group to push into that repository. "
+"When specified, the config variable \"core.sharedRepository\" is set so that"
+" files and directories under `$GIT_DIR` are created with the requested "
"permissions. When not specified, Git will use permissions reported by "
"umask(2)."
msgstr ""
@@ -39399,8 +39268,8 @@ msgstr ""
#. type: Plain text
#: en/git-init.txt:121
msgid ""
-"Files and directories in the template directory whose name do not start with "
-"a dot will be copied to the `$GIT_DIR` after it is created."
+"Files and directories in the template directory whose name do not start with"
+" a dot will be copied to the `$GIT_DIR` after it is created."
msgstr ""
#. type: Plain text
@@ -39468,7 +39337,6 @@ msgstr ""
msgid "Create a /path/to/my/codebase/.git directory."
msgstr ""
-#
#. type: Plain text
#: en/git-init.txt:154
#, fuzzy
@@ -39483,10 +39351,9 @@ msgstr ""
#. type: Title =
#: en/git-instaweb.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-instaweb(1)"
-msgstr "git-commit(1)"
+msgstr "git-instaweb(1)"
#. type: Plain text
#: en/git-instaweb.txt:7
@@ -39518,7 +39385,7 @@ msgstr ""
#: en/git-instaweb.txt:28
#, no-wrap
msgid "--httpd"
-msgstr ""
+msgstr "--httpd"
#. type: Plain text
#: en/git-instaweb.txt:34
@@ -39533,20 +39400,20 @@ msgstr ""
#: en/git-instaweb.txt:36
#, no-wrap
msgid "--module-path"
-msgstr ""
+msgstr "--module-path"
#. type: Plain text
#: en/git-instaweb.txt:39
msgid ""
-"The module path (only needed if httpd is Apache). (Default: /usr/lib/"
-"apache2/modules)"
+"The module path (only needed if httpd is Apache). (Default: "
+"/usr/lib/apache2/modules)"
msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:41
#, no-wrap
msgid "--port"
-msgstr ""
+msgstr "--port"
#. type: Plain text
#: en/git-instaweb.txt:43
@@ -39557,14 +39424,14 @@ msgstr ""
#: en/git-instaweb.txt:45
#, no-wrap
msgid "--browser"
-msgstr ""
+msgstr "--browser"
#. type: Plain text
#: en/git-instaweb.txt:51
msgid ""
"The web browser that should be used to view the gitweb page. This will be "
-"passed to the 'git web{litdd}browse' helper script along with the URL of the "
-"gitweb instance. See linkgit:git-web{litdd}browse[1] for more information "
+"passed to the 'git web{litdd}browse' helper script along with the URL of the"
+" gitweb instance. See linkgit:git-web{litdd}browse[1] for more information "
"about this. If the script fails, the URL will be printed to stdout."
msgstr ""
@@ -39578,7 +39445,7 @@ msgstr ""
#: en/git-instaweb.txt:53
#, no-wrap
msgid "--start"
-msgstr ""
+msgstr "--start"
#. type: Plain text
#: en/git-instaweb.txt:56
@@ -39597,7 +39464,7 @@ msgstr ""
#: en/git-instaweb.txt:58
#, no-wrap
msgid "--stop"
-msgstr ""
+msgstr "--stop"
#. type: Plain text
#: en/git-instaweb.txt:62
@@ -39617,7 +39484,7 @@ msgstr ""
#: en/git-instaweb.txt:64
#, no-wrap
msgid "--restart"
-msgstr ""
+msgstr "--restart"
#. type: Plain text
#: en/git-instaweb.txt:67
@@ -39655,21 +39522,23 @@ msgstr ""
#: en/git-interpret-trailers.txt:2
#, no-wrap
msgid "git-interpret-trailers(1)"
-msgstr ""
+msgstr "git-interpret-trailers(1)"
-#
#. type: Plain text
#: en/git-interpret-trailers.txt:7
#, fuzzy
#| msgid "git-add - Add file contents to the index"
msgid ""
-"git-interpret-trailers - help add structured information into commit messages"
+"git-interpret-trailers - help add structured information into commit "
+"messages"
msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index"
#. type: Plain text
#: en/git-interpret-trailers.txt:12
#, no-wrap
-msgid "'git interpret-trailers' [--in-place] [--trim-empty] [(--trailer <token>[(=|:)<value>])...] [<file>...]\n"
+msgid ""
+"'git interpret-trailers' [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]\n"
msgstr ""
#. type: Plain text
@@ -39683,8 +39552,8 @@ msgstr ""
#: en/git-interpret-trailers.txt:24
msgid ""
"This command reads some patches or commit messages from either the <file> "
-"arguments or the standard input if no <file> is specified. Then this command "
-"applies the arguments passed using the `--trailer` option, if any, to the "
+"arguments or the standard input if no <file> is specified. Then this command"
+" applies the arguments passed using the `--trailer` option, if any, to the "
"commit message part of each input file. The result is emitted on the "
"standard output."
msgstr ""
@@ -39701,8 +39570,8 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:36
msgid ""
-"By default, a '<token>=<value>' or '<token>:<value>' argument given using `--"
-"trailer` will be appended after the existing trailers only if the last "
+"By default, a '<token>=<value>' or '<token>:<value>' argument given using "
+"`--trailer` will be appended after the existing trailers only if the last "
"trailer has a different (<token>, <value>) pair (or if there is no existing "
"trailer). The <token> and <value> parts will be trimmed to remove starting "
"and trailing whitespace, and the resulting trimmed <token> and <value> will "
@@ -39726,8 +39595,8 @@ msgstr ""
#: en/git-interpret-trailers.txt:49
msgid ""
"By default the new trailer will appear at the end of all the existing "
-"trailers. If there is no existing trailer, the new trailer will appear after "
-"the commit message part of the output, and, if there is no line with only "
+"trailers. If there is no existing trailer, the new trailer will appear after"
+" the commit message part of the output, and, if there is no line with only "
"spaces at the end of the commit message part, one blank line will be added "
"before the new trailer."
msgstr ""
@@ -39756,8 +39625,8 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:67
msgid ""
-"Note that 'trailers' do not follow and are not intended to follow many rules "
-"for RFC 822 headers. For example they do not follow the encoding rules and "
+"Note that 'trailers' do not follow and are not intended to follow many rules"
+" for RFC 822 headers. For example they do not follow the encoding rules and "
"probably many other rules."
msgstr ""
@@ -39765,7 +39634,7 @@ msgstr ""
#: en/git-interpret-trailers.txt:70
#, no-wrap
msgid "--in-place"
-msgstr ""
+msgstr "--in-place"
#. type: Plain text
#: en/git-interpret-trailers.txt:72
@@ -39776,7 +39645,7 @@ msgstr ""
#: en/git-interpret-trailers.txt:73
#, no-wrap
msgid "--trim-empty"
-msgstr ""
+msgstr "--trim-empty"
#. type: Plain text
#: en/git-interpret-trailers.txt:77
@@ -39795,8 +39664,8 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:82
msgid ""
-"Specify a (<token>, <value>) pair that should be applied as a trailer to the "
-"input messages. See the description of this command."
+"Specify a (<token>, <value>) pair that should be applied as a trailer to the"
+" input messages. See the description of this command."
msgstr ""
#. type: Labeled list
@@ -39827,9 +39696,9 @@ msgid ""
"For example, if the value for this option is \"%=$\", then only lines using "
"the format '<token><sep><value>' with <sep> containing '%', '=' or '$' and "
"then spaces will be considered trailers. And '%' will be the default "
-"separator used, so by default trailers will appear like: '<token>% "
-"<value>' (one percent sign and one space will appear between the token and "
-"the value)."
+"separator used, so by default trailers will appear like: '<token>% <value>' "
+"(one percent sign and one space will appear between the token and the "
+"value)."
msgstr ""
#. type: Labeled list
@@ -39851,15 +39720,15 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:110
msgid ""
-"If it is `end`, then each new trailer will appear at the end of the existing "
-"trailers."
+"If it is `end`, then each new trailer will appear at the end of the existing"
+" trailers."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:113
msgid ""
-"If it is `start`, then each new trailer will appear at the start, instead of "
-"the end, of the existing trailers."
+"If it is `start`, then each new trailer will appear at the start, instead of"
+" the end, of the existing trailers."
msgstr ""
#. type: Plain text
@@ -39914,8 +39783,8 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:137
msgid ""
-"With `add`, a new trailer will be added, even if some trailers with the same "
-"(<token>, <value>) pair are already in the message."
+"With `add`, a new trailer will be added, even if some trailers with the same"
+" (<token>, <value>) pair are already in the message."
msgstr ""
#. type: Plain text
@@ -39929,8 +39798,8 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:145
msgid ""
-"With `doNothing`, nothing will be done; that is no new trailer will be added "
-"if there is already one with the same <token> in the message."
+"With `doNothing`, nothing will be done; that is no new trailer will be added"
+" if there is already one with the same <token> in the message."
msgstr ""
#. type: Labeled list
@@ -39974,8 +39843,8 @@ msgstr ""
msgid ""
"This `key` will be used instead of <token> in the trailer. At the end of "
"this key, a separator can appear and then some space characters. By default "
-"the only valid separator is ':', but this can be changed using the `trailer."
-"separators` config variable."
+"the only valid separator is ':', but this can be changed using the "
+"`trailer.separators` config variable."
msgstr ""
#. type: Plain text
@@ -39995,8 +39864,8 @@ msgstr ""
#: en/git-interpret-trailers.txt:172
msgid ""
"This option takes the same values as the 'trailer.where' configuration "
-"variable and it overrides what is specified by that option for trailers with "
-"the specified <token>."
+"variable and it overrides what is specified by that option for trailers with"
+" the specified <token>."
msgstr ""
#. type: Labeled list
@@ -40009,8 +39878,8 @@ msgstr ""
#: en/git-interpret-trailers.txt:177
msgid ""
"This option takes the same values as the 'trailer.ifexist' configuration "
-"variable and it overrides what is specified by that option for trailers with "
-"the specified <token>."
+"variable and it overrides what is specified by that option for trailers with"
+" the specified <token>."
msgstr ""
#. type: Labeled list
@@ -40023,8 +39892,8 @@ msgstr ""
#: en/git-interpret-trailers.txt:182
msgid ""
"This option takes the same values as the 'trailer.ifmissing' configuration "
-"variable and it overrides what is specified by that option for trailers with "
-"the specified <token>."
+"variable and it overrides what is specified by that option for trailers with"
+" the specified <token>."
msgstr ""
#. type: Labeled list
@@ -40052,8 +39921,8 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:197
msgid ""
-"If the command contains the `$ARG` string, this string will be replaced with "
-"the <value> part of an existing trailer with the same <token>, if any, "
+"If the command contains the `$ARG` string, this string will be replaced with"
+" the <value> part of an existing trailer with the same <token>, if any, "
"before the command is launched."
msgstr ""
@@ -40156,8 +40025,8 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:256
msgid ""
-"Configure a 'sign' trailer with a command to automatically add a 'Signed-off-"
-"by: ' with the author information only if there is no 'Signed-off-by: ' "
+"Configure a 'sign' trailer with a command to automatically add a 'Signed-"
+"off-by: ' with the author information only if there is no 'Signed-off-by: ' "
"already, and show how it works:"
msgstr ""
@@ -40275,7 +40144,6 @@ msgid ""
"$ chmod +x .git/hooks/commit-msg\n"
msgstr ""
-#
#. type: Plain text
#: en/git-interpret-trailers.txt:336
#, fuzzy
@@ -40290,10 +40158,9 @@ msgstr ""
#. type: Title =
#: en/git-log.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-log(1)"
-msgstr "git-add(1)"
+msgstr "git-log(1)"
#. type: Plain text
#: en/git-log.txt:7
@@ -40323,7 +40190,7 @@ msgstr ""
#: en/git-log.txt:27
#, no-wrap
msgid "--follow"
-msgstr ""
+msgstr "--follow"
#. type: Plain text
#: en/git-log.txt:30
@@ -40336,7 +40203,7 @@ msgstr ""
#: en/git-log.txt:31
#, no-wrap
msgid "--no-decorate"
-msgstr ""
+msgstr "--no-decorate"
#. type: Labeled list
#: en/git-log.txt:32
@@ -40348,10 +40215,10 @@ msgstr ""
#: en/git-log.txt:40
msgid ""
"Print out the ref names of any commits that are shown. If 'short' is "
-"specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/"
-"remotes/' will not be printed. If 'full' is specified, the full ref name "
-"(including prefix) will be printed. If 'auto' is specified, then if the "
-"output is going to a terminal, the ref names are shown as if 'short' were "
+"specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and "
+"'refs/remotes/' will not be printed. If 'full' is specified, the full ref "
+"name (including prefix) will be printed. If 'auto' is specified, then if the"
+" output is going to a terminal, the ref names are shown as if 'short' were "
"given, otherwise no ref names are shown. The default option is 'short'."
msgstr ""
@@ -40359,7 +40226,7 @@ msgstr ""
#: en/git-log.txt:41
#, no-wrap
msgid "--source"
-msgstr ""
+msgstr "--source"
#. type: Plain text
#: en/git-log.txt:44
@@ -40370,10 +40237,9 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:45
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--use-mailmap"
-msgstr "git-commit(1)"
+msgstr "--use-mailmap"
#. type: Plain text
#: en/git-log.txt:49
@@ -40386,7 +40252,7 @@ msgstr ""
#: en/git-log.txt:50
#, no-wrap
msgid "--full-diff"
-msgstr ""
+msgstr "--full-diff"
#. type: Plain text
#: en/git-log.txt:56
@@ -40409,14 +40275,14 @@ msgstr ""
#: en/git-log.txt:60
#, no-wrap
msgid "--log-size"
-msgstr ""
+msgstr "--log-size"
#. type: Plain text
#: en/git-log.txt:65
msgid ""
"Include a line ``log size <number>'' in the output for each commit, where "
-"<number> is the length of that commit's message in bytes. Intended to speed "
-"up tools that read log messages from `git log` output by allowing them to "
+"<number> is the length of that commit's message in bytes. Intended to speed"
+" up tools that read log messages from `git log` output by allowing them to "
"allocate space in advance."
msgstr ""
@@ -40451,11 +40317,11 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:85
msgid ""
-"Show only commits in the specified revision range. When no <revision range> "
-"is specified, it defaults to `HEAD` (i.e. the whole history leading to the "
+"Show only commits in the specified revision range. When no <revision range>"
+" is specified, it defaults to `HEAD` (i.e. the whole history leading to the "
"current commit). `origin..HEAD` specifies all the commits reachable from "
-"the current commit (i.e. `HEAD`), but not from `origin`. For a complete list "
-"of ways to spell <revision range>, see the 'Specifying Ranges' section of "
+"the current commit (i.e. `HEAD`), but not from `origin`. For a complete list"
+" of ways to spell <revision range>, see the 'Specifying Ranges' section of "
"linkgit:gitrevisions[7]."
msgstr ""
@@ -40533,8 +40399,8 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:129
msgid ""
-"Show the commits that are in the \"test\" branch but not yet in the \"release"
-"\" branch, along with the list of paths each commit modifies."
+"Show the commits that are in the \"test\" branch but not yet in the "
+"\"release\" branch, along with the list of paths each commit modifies."
msgstr ""
#. type: Labeled list
@@ -40546,8 +40412,8 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:135
msgid ""
-"Shows the commits that changed `builtin/rev-list.c`, including those commits "
-"that occurred before the file was given its present name."
+"Shows the commits that changed `builtin/rev-list.c`, including those commits"
+" that occurred before the file was given its present name."
msgstr ""
#. type: Labeled list
@@ -40559,8 +40425,8 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:141
msgid ""
-"Shows all commits that are in any of local branches but not in any of remote-"
-"tracking branches for 'origin' (what you have that origin doesn't)."
+"Shows all commits that are in any of local branches but not in any of "
+"remote-tracking branches for 'origin' (what you have that origin doesn't)."
msgstr ""
#. type: Labeled list
@@ -40600,7 +40466,8 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:159
-msgid "Shows how the function `main()` in the file `main.c` evolved over time."
+msgid ""
+"Shows how the function `main()` in the file `main.c` evolved over time."
msgstr ""
#. type: Labeled list
@@ -40639,15 +40506,15 @@ msgstr ""
#: en/git-log.txt:188
msgid ""
"Default format for human-readable dates. (Compare the `--date` option.) "
-"Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 "
-"2010 -0500`."
+"Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34"
+" 2010 -0500`."
msgstr ""
#. type: Plain text
#: en/git-log.txt:200
msgid ""
-"If `false`, `git log` and related commands will not treat the initial commit "
-"as a big creation event. Any root commits in `git log -p` output would be "
+"If `false`, `git log` and related commands will not treat the initial commit"
+" as a big creation event. Any root commits in `git log -p` output would be "
"shown without a diff attached. The default is `true`."
msgstr ""
@@ -40687,31 +40554,31 @@ msgstr ""
#: en/git-log.txt:217
msgid ""
"May be an unabbreviated ref name or a glob and may be specified multiple "
-"times. A warning will be issued for refs that do not exist, but a glob that "
-"does not match any refs is silently ignored."
+"times. A warning will be issued for refs that do not exist, but a glob that"
+" does not match any refs is silently ignored."
msgstr ""
#. type: Plain text
#: en/git-log.txt:221
msgid ""
"This setting can be disabled by the `--no-notes` option, overridden by the "
-"`GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--"
-"notes=<ref>` option."
+"`GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the "
+"`--notes=<ref>` option."
msgstr ""
#. type: Title =
#: en/git-ls-files.txt:2
#, no-wrap
msgid "git-ls-files(1)"
-msgstr ""
+msgstr "git-ls-files(1)"
-#
#. type: Plain text
#: en/git-ls-files.txt:7
#, fuzzy
#| msgid "git-add - Add file contents to the index"
msgid ""
-"git-ls-files - Show information about files in the index and the working tree"
+"git-ls-files - Show information about files in the index and the working "
+"tree"
msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index"
#. type: Plain text
@@ -40753,7 +40620,7 @@ msgstr ""
#: en/git-ls-files.txt:40
#, no-wrap
msgid "--deleted"
-msgstr ""
+msgstr "--deleted"
#. type: Plain text
#: en/git-ls-files.txt:42
@@ -40762,10 +40629,9 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:44
-#, fuzzy, no-wrap
-#| msgid "modified content"
+#, no-wrap
msgid "--modified"
-msgstr "contenu modifi챕"
+msgstr "--modified"
#. type: Plain text
#: en/git-ls-files.txt:46
@@ -40776,7 +40642,7 @@ msgstr ""
#: en/git-ls-files.txt:48
#, no-wrap
msgid "--others"
-msgstr ""
+msgstr "--others"
#. type: Plain text
#: en/git-ls-files.txt:50
@@ -40787,7 +40653,7 @@ msgstr ""
#: en/git-ls-files.txt:52 en/git-status.txt:97
#, no-wrap
msgid "--ignored"
-msgstr ""
+msgstr "--ignored"
#. type: Plain text
#: en/git-ls-files.txt:57
@@ -40799,10 +40665,9 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:59
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "--stage"
-msgstr "git-add(1)"
+msgstr "--stage"
#. type: Plain text
#: en/git-ls-files.txt:61
@@ -40814,7 +40679,7 @@ msgstr ""
#: en/git-ls-files.txt:62
#, no-wrap
msgid "--directory"
-msgstr ""
+msgstr "--directory"
#. type: Plain text
#: en/git-ls-files.txt:65
@@ -40827,7 +40692,7 @@ msgstr ""
#: en/git-ls-files.txt:66
#, no-wrap
msgid "--no-empty-directory"
-msgstr ""
+msgstr "--no-empty-directory"
#. type: Plain text
#: en/git-ls-files.txt:68
@@ -40836,10 +40701,9 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:70 en/git-update-index.txt:65
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--unmerged"
-msgstr "git-commit(1)"
+msgstr "--unmerged"
#. type: Plain text
#: en/git-ls-files.txt:72
@@ -40850,7 +40714,7 @@ msgstr ""
#: en/git-ls-files.txt:74
#, no-wrap
msgid "--killed"
-msgstr ""
+msgstr "--killed"
#. type: Plain text
#: en/git-ls-files.txt:78
@@ -40862,8 +40726,8 @@ msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:82
msgid ""
-"\\0 line termination on output and do not quote filenames. See OUTPUT below "
-"for more information."
+"\\0 line termination on output and do not quote filenames. See OUTPUT below"
+" for more information."
msgstr ""
#. type: Labeled list
@@ -40920,7 +40784,7 @@ msgstr ""
#: en/git-ls-files.txt:101
#, no-wrap
msgid "--error-unmatch"
-msgstr ""
+msgstr "--error-unmatch"
#. type: Plain text
#: en/git-ls-files.txt:104
@@ -41061,15 +40925,15 @@ msgstr ""
#: en/git-ls-files.txt:150 en/git-ls-tree.txt:67
msgid ""
"Instead of showing the full 40-byte hexadecimal object lines, show only a "
-"partial prefix. Non default number of digits can be specified with --"
-"abbrev=<n>."
+"partial prefix. Non default number of digits can be specified with "
+"--abbrev=<n>."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:156
msgid ""
-"After each line that describes a file, add more data about its cache entry. "
-"This is intended to show as much information as possible for manual "
+"After each line that describes a file, add more data about its cache entry."
+" This is intended to show as much information as possible for manual "
"inspection; the exact format may change at any time."
msgstr ""
@@ -41077,15 +40941,15 @@ msgstr ""
#: en/git-ls-files.txt:157
#, no-wrap
msgid "--eol"
-msgstr ""
+msgstr "--eol"
#. type: Plain text
#: en/git-ls-files.txt:162
msgid ""
"Show <eolinfo> and <eolattr> of files. <eolinfo> is the file content "
"identification used by Git when the \"text\" attribute is \"auto\" (or not "
-"set and core.autocrlf is not false). <eolinfo> is either \"-text\", \"none"
-"\", \"lf\", \"crlf\", \"mixed\" or \"\"."
+"set and core.autocrlf is not false). <eolinfo> is either \"-text\", "
+"\"none\", \"lf\", \"crlf\", \"mixed\" or \"\"."
msgstr ""
#. type: Plain text
@@ -41108,8 +40972,8 @@ msgstr ""
#: en/git-ls-files.txt:173
msgid ""
"Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tree "
-"(\"w/<eolinfo>\") are shown for regular files, followed by the (\"attr/"
-"<eolattr>\")."
+"(\"w/<eolinfo>\") are shown for regular files, followed by the "
+"(\"attr/<eolattr>\")."
msgstr ""
#. type: Labeled list
@@ -41163,8 +41027,8 @@ msgstr ""
#: en/git-ls-files.txt:199
msgid ""
"For an unmerged path, instead of recording a single mode/SHA-1 pair, the "
-"index records up to three such pairs; one from tree O in stage 1, A in stage "
-"2, and B in stage 3. This information can be used by the user (or the "
+"index records up to three such pairs; one from tree O in stage 1, A in stage"
+" 2, and B in stage 3. This information can be used by the user (or the "
"porcelain) to see what should eventually be recorded at the path. (see "
"linkgit:git-read-tree[1] for more information on state)"
msgstr ""
@@ -41179,9 +41043,9 @@ msgstr ""
#: en/git-ls-files.txt:213
msgid ""
"'git ls-files' can use a list of \"exclude patterns\" when traversing the "
-"directory tree and finding files to show when the flags --others or --"
-"ignored are specified. linkgit:gitignore[5] specifies the format of exclude "
-"patterns."
+"directory tree and finding files to show when the flags --others or "
+"--ignored are specified. linkgit:gitignore[5] specifies the format of "
+"exclude patterns."
msgstr ""
#. type: Plain text
@@ -41200,15 +41064,15 @@ msgstr ""
#: en/git-ls-files.txt:223
msgid ""
"The command-line flag --exclude-from=<file> specifies a file containing a "
-"list of patterns. Patterns are ordered in the same order they appear in the "
-"file."
+"list of patterns. Patterns are ordered in the same order they appear in the"
+" file."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:229
msgid ""
-"The command-line flag --exclude-per-directory=<name> specifies a name of the "
-"file in each directory 'git ls-files' examines, normally `.gitignore`. "
+"The command-line flag --exclude-per-directory=<name> specifies a name of the"
+" file in each directory 'git ls-files' examines, normally `.gitignore`. "
"Files in deeper directories take precedence. Patterns are ordered in the "
"same order they appear in the files."
msgstr ""
@@ -41216,13 +41080,12 @@ msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:235
msgid ""
-"A pattern specified on the command line with --exclude or read from the file "
-"specified with --exclude-from is relative to the top of the directory tree. "
-"A pattern read from a file specified by --exclude-per-directory is relative "
-"to the directory that the pattern file appears in."
+"A pattern specified on the command line with --exclude or read from the file"
+" specified with --exclude-from is relative to the top of the directory tree."
+" A pattern read from a file specified by --exclude-per-directory is "
+"relative to the directory that the pattern file appears in."
msgstr ""
-#
#. type: Plain text
#: en/git-ls-files.txt:239
#, fuzzy
@@ -41236,10 +41099,9 @@ msgstr ""
#. type: Title =
#: en/git-ls-remote.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-ls-remote(1)"
-msgstr "git-commit(1)"
+msgstr "git-ls-remote(1)"
#. type: Plain text
#: en/git-ls-remote.txt:7
@@ -41266,7 +41128,7 @@ msgstr ""
#: en/git-ls-remote.txt:25 en/git-show-ref.txt:41
#, no-wrap
msgid "--heads"
-msgstr ""
+msgstr "--heads"
#. type: Plain text
#: en/git-ls-remote.txt:32
@@ -41280,7 +41142,7 @@ msgstr ""
#: en/git-ls-remote.txt:33
#, no-wrap
msgid "--refs"
-msgstr ""
+msgstr "--refs"
#. type: Plain text
#: en/git-ls-remote.txt:35
@@ -41320,21 +41182,21 @@ msgstr ""
#: en/git-ls-remote.txt:52
#, no-wrap
msgid "--get-url"
-msgstr ""
+msgstr "--get-url"
#. type: Plain text
#: en/git-ls-remote.txt:56
msgid ""
-"Expand the URL of the given remote repository taking into account any \"url."
-"<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit "
-"without talking to the remote."
+"Expand the URL of the given remote repository taking into account any "
+"\"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit"
+" without talking to the remote."
msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:57
#, no-wrap
msgid "--symref"
-msgstr ""
+msgstr "--symref"
#. type: Plain text
#: en/git-ls-remote.txt:62
@@ -41355,9 +41217,9 @@ msgstr ""
#. type: Plain text
#: en/git-ls-remote.txt:73
msgid ""
-"When unspecified, all references, after filtering done with --heads and --"
-"tags, are shown. When <refs>... are specified, only references matching the "
-"given patterns are displayed."
+"When unspecified, all references, after filtering done with --heads and "
+"--tags, are shown. When <refs>... are specified, only references matching "
+"the given patterns are displayed."
msgstr ""
#. type: Plain text
@@ -41385,7 +41247,7 @@ msgstr ""
#: en/git-ls-tree.txt:2
#, no-wrap
msgid "git-ls-tree(1)"
-msgstr ""
+msgstr "git-ls-tree(1)"
#. type: Plain text
#: en/git-ls-tree.txt:7
@@ -41422,12 +41284,12 @@ msgstr ""
msgid ""
"the behaviour is similar to that of \"/bin/ls\" in that the '<path>' is "
"taken as relative to the current working directory. E.g. when you are in a "
-"directory 'sub' that has a directory 'dir', you can run 'git ls-tree -r HEAD "
-"dir' to list the contents of the tree (that is 'sub/dir' in `HEAD`). You "
-"don't want to give a tree that is not at the root level (e.g. `git ls-tree -"
-"r HEAD:sub dir`) in this case, as that would result in asking for 'sub/sub/"
-"dir' in the `HEAD` commit. However, the current working directory can be "
-"ignored by passing --full-tree option."
+"directory 'sub' that has a directory 'dir', you can run 'git ls-tree -r HEAD"
+" dir' to list the contents of the tree (that is 'sub/dir' in `HEAD`). You "
+"don't want to give a tree that is not at the root level (e.g. `git ls-tree "
+"-r HEAD:sub dir`) in this case, as that would result in asking for "
+"'sub/sub/dir' in the `HEAD` commit. However, the current working directory "
+"can be ignored by passing --full-tree option."
msgstr ""
#. type: Plain text
@@ -41448,8 +41310,8 @@ msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:50
msgid ""
-"Show tree entries even when going to recurse them. Has no effect if `-r` was "
-"not passed. `-d` implies `-t`."
+"Show tree entries even when going to recurse them. Has no effect if `-r` was"
+" not passed. `-d` implies `-t`."
msgstr ""
#. type: Plain text
@@ -41472,8 +41334,8 @@ msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:71
msgid ""
-"Instead of showing the path names relative to the current working directory, "
-"show the full path names."
+"Instead of showing the path names relative to the current working directory,"
+" show the full path names."
msgstr ""
#. type: Plain text
@@ -41494,8 +41356,8 @@ msgstr "patch"
#: en/git-ls-tree.txt:80
msgid ""
"When paths are given, show them (note that this isn't really raw pathnames, "
-"but rather a list of patterns to match). Otherwise implicitly uses the root "
-"level of the tree as the sole path argument."
+"but rather a list of patterns to match). Otherwise implicitly uses the root"
+" level of the tree as the sole path argument."
msgstr ""
#. type: Title -
@@ -41538,10 +41400,9 @@ msgstr ""
#. type: Title =
#: en/git-mailinfo.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-mailinfo(1)"
-msgstr "git-commit(1)"
+msgstr "git-mailinfo(1)"
#. type: Plain text
#: en/git-mailinfo.txt:7
@@ -41552,16 +41413,18 @@ msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:13
#, no-wrap
-msgid "'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n] [--[no-]scissors] <msg> <patch>\n"
+msgid ""
+"'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n] [--[no-]scissors] "
+"<msg> <patch>\n"
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:23
msgid ""
-"Reads a single e-mail message from the standard input, and writes the commit "
-"log message in <msg> file, and the patches in <patch> file. The author "
-"name, e-mail and e-mail subject are written out to the standard output to be "
-"used by 'git am' to create a commit. It is usually not necessary to use "
+"Reads a single e-mail message from the standard input, and writes the commit"
+" log message in <msg> file, and the patches in <patch> file. The author "
+"name, e-mail and e-mail subject are written out to the standard output to be"
+" used by 'git am' to create a commit. It is usually not necessary to use "
"this command directly. See linkgit:git-am[1] instead."
msgstr ""
@@ -41570,8 +41433,8 @@ msgstr ""
msgid ""
"Usually the program removes email cruft from the Subject: header line to "
"extract the title line for the commit log message. This option prevents "
-"this munging, and is most useful when used to read back 'git format-patch -"
-"k' output."
+"this munging, and is most useful when used to read back 'git format-patch "
+"-k' output."
msgstr ""
#. type: Plain text
@@ -41602,7 +41465,8 @@ msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:46
msgid ""
-"Finally, runs of whitespace are normalized to a single ASCII space character."
+"Finally, runs of whitespace are normalized to a single ASCII space "
+"character."
msgstr ""
#. type: Plain text
@@ -41616,9 +41480,9 @@ msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:58
msgid ""
-"The commit log message, author name and author email are taken from the e-"
-"mail, and after minimally decoding MIME transfer encoding, re-coded in the "
-"charset specified by i18n.commitencoding (defaulting to UTF-8) by "
+"The commit log message, author name and author email are taken from the "
+"e-mail, and after minimally decoding MIME transfer encoding, re-coded in the"
+" charset specified by i18n.commitencoding (defaulting to UTF-8) by "
"transliterating them. This used to be optional but now it is the default."
msgstr ""
@@ -41644,8 +41508,8 @@ msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:73
msgid ""
-"Copy the Message-ID header at the end of the commit message. This is useful "
-"in order to associate commits with mailing list discussions."
+"Copy the Message-ID header at the end of the commit message. This is useful"
+" in order to associate commits with mailing list discussions."
msgstr ""
#. type: Plain text
@@ -41654,16 +41518,16 @@ msgid ""
"Remove everything in body before a scissors line. A line that mainly "
"consists of scissors (either \">8\" or \"8<\") and perforation (dash \"-\") "
"marks is called a scissors line, and is used to request the reader to cut "
-"the message at that line. If such a line appears in the body of the message "
-"before the patch, everything before it (including the scissors line itself) "
-"is ignored when this option is used."
+"the message at that line. If such a line appears in the body of the message"
+" before the patch, everything before it (including the scissors line itself)"
+" is ignored when this option is used."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:87
msgid ""
-"This is useful if you want to begin your message in a discussion thread with "
-"comments and suggestions on the message you are responding to, and to "
+"This is useful if you want to begin your message in a discussion thread with"
+" comments and suggestions on the message you are responding to, and to "
"conclude it with a patch submission, separating the discussion and the "
"beginning of the proposed commit log message with a scissors line."
msgstr ""
@@ -41671,8 +41535,8 @@ msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:89
msgid ""
-"This can be enabled by default with the configuration option mailinfo."
-"scissors."
+"This can be enabled by default with the configuration option "
+"mailinfo.scissors."
msgstr ""
#. type: Plain text
@@ -41708,10 +41572,9 @@ msgstr ""
#. type: Title =
#: en/git-mailsplit.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-mailsplit(1)"
-msgstr "git-commit(1)"
+msgstr "git-mailsplit(1)"
#. type: Plain text
#: en/git-mailsplit.txt:7
@@ -41771,8 +41634,8 @@ msgstr ""
#. type: Plain text
#: en/git-mailsplit.txt:31
msgid ""
-"Root of the Maildir to split. This directory should contain the cur, tmp and "
-"new subdirectories."
+"Root of the Maildir to split. This directory should contain the cur, tmp and"
+" new subdirectories."
msgstr ""
#. type: Labeled list
@@ -41823,7 +41686,7 @@ msgstr ""
#: en/git-mailsplit.txt:48
#, no-wrap
msgid "--keep-cr"
-msgstr ""
+msgstr "--keep-cr"
#. type: Plain text
#: en/git-mailsplit.txt:50
@@ -41834,19 +41697,18 @@ msgstr ""
#: en/git-mailsplit.txt:51
#, no-wrap
msgid "--mboxrd"
-msgstr ""
+msgstr "--mboxrd"
#. type: Plain text
#: en/git-mailsplit.txt:54
-msgid ""
-"Input is of the \"mboxrd\" format and \"^>+From \" line escaping is reversed."
+msgid "Input is of the \"mboxrd\" format and \"^>+From \" line escaping is reversed."
msgstr ""
#. type: Title =
#: en/git-merge-base.txt:2
#, no-wrap
msgid "git-merge-base(1)"
-msgstr ""
+msgstr "git-merge-base(1)"
#. type: Plain text
#: en/git-merge-base.txt:7
@@ -41867,12 +41729,12 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:27
msgid ""
-"'git merge-base' finds best common ancestor(s) between two commits to use in "
-"a three-way merge. One common ancestor is 'better' than another common "
-"ancestor if the latter is an ancestor of the former. A common ancestor that "
-"does not have any better common ancestor is a 'best common ancestor', i.e. a "
-"'merge base'. Note that there can be more than one merge base for a pair of "
-"commits."
+"'git merge-base' finds best common ancestor(s) between two commits to use in"
+" a three-way merge. One common ancestor is 'better' than another common "
+"ancestor if the latter is an ancestor of the former. A common ancestor that"
+" does not have any better common ancestor is a 'best common ancestor', i.e. "
+"a 'merge base'. Note that there can be more than one merge base for a pair "
+"of commits."
msgstr ""
#. type: Title -
@@ -41892,10 +41754,10 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:38
msgid ""
-"More generally, among the two commits to compute the merge base from, one is "
-"specified by the first commit argument on the command line; the other commit "
-"is a (possibly hypothetical) commit that is a merge across all the remaining "
-"commits on the command line."
+"More generally, among the two commits to compute the merge base from, one is"
+" specified by the first commit argument on the command line; the other "
+"commit is a (possibly hypothetical) commit that is a merge across all the "
+"remaining commits on the command line."
msgstr ""
#. type: Plain text
@@ -41911,7 +41773,7 @@ msgstr ""
#: en/git-merge-base.txt:43
#, no-wrap
msgid "--octopus"
-msgstr ""
+msgstr "--octopus"
#. type: Plain text
#: en/git-merge-base.txt:47
@@ -41925,22 +41787,22 @@ msgstr ""
#: en/git-merge-base.txt:48 en/git-show-branch.txt:90
#, no-wrap
msgid "--independent"
-msgstr ""
+msgstr "--independent"
#. type: Plain text
#: en/git-merge-base.txt:54
msgid ""
"Instead of printing merge bases, print a minimal subset of the supplied "
"commits with the same ancestors. In other words, among the commits given, "
-"list those which cannot be reached from any other. This mimics the behavior "
-"of 'git show-branch --independent'."
+"list those which cannot be reached from any other. This mimics the behavior"
+" of 'git show-branch --independent'."
msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:55
#, no-wrap
msgid "--is-ancestor"
-msgstr ""
+msgstr "--is-ancestor"
#. type: Plain text
#: en/git-merge-base.txt:59
@@ -41954,16 +41816,17 @@ msgstr ""
#: en/git-merge-base.txt:60 en/git-rebase.txt:346
#, no-wrap
msgid "--fork-point"
-msgstr ""
+msgstr "--fork-point"
#. type: Plain text
#: en/git-merge-base.txt:68
msgid ""
"Find the point at which a branch (or any history that leads to <commit>) "
"forked from another branch (or any reference) <ref>. This does not just "
-"look for the common ancestor of the two commits, but also takes into account "
-"the reflog of <ref> to see if the history leading to <commit> forked from an "
-"earlier incarnation of the branch <ref> (see discussion on this mode below)."
+"look for the common ancestor of the two commits, but also takes into account"
+" the reflog of <ref> to see if the history leading to <commit> forked from "
+"an earlier incarnation of the branch <ref> (see discussion on this mode "
+"below)."
msgstr ""
#. type: Plain text
@@ -42019,8 +41882,8 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:101
msgid ""
-"the result of `git merge-base A B C` is '1'. This is because the equivalent "
-"topology with a merge commit 'M' between 'B' and 'C' is:"
+"the result of `git merge-base A B C` is '1'. This is because the equivalent"
+" topology with a merge commit 'M' between 'B' and 'C' is:"
msgstr ""
#. type: Plain text
@@ -42070,16 +41933,16 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:128
msgid ""
-"both '1' and '2' are merge-bases of A and B. Neither one is better than the "
-"other (both are 'best' merge bases). When the `--all` option is not given, "
-"it is unspecified which best one is output."
+"both '1' and '2' are merge-bases of A and B. Neither one is better than the"
+" other (both are 'best' merge bases). When the `--all` option is not given,"
+" it is unspecified which best one is output."
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:133
msgid ""
-"A common idiom to check \"fast-forward-ness\" between two commits A and B is "
-"(or at least used to be) to compute the merge base between A and B, and "
+"A common idiom to check \"fast-forward-ness\" between two commits A and B is"
+" (or at least used to be) to compute the merge base between A and B, and "
"check if it is the same as A, in which case, A is an ancestor of B. You "
"will see this idiom used often in older scripts."
msgstr ""
@@ -42146,10 +42009,10 @@ msgstr ""
#: en/git-merge-base.txt:170
msgid ""
"where `origin/master` used to point at commits B3, B2, B1 and now it points "
-"at B, and your `topic` branch was started on top of it back when `origin/"
-"master` was at B3. This mode uses the reflog of `origin/master` to find B3 "
-"as the fork point, so that the `topic` can be rebased on top of the updated "
-"`origin/master` by:"
+"at B, and your `topic` branch was started on top of it back when "
+"`origin/master` was at B3. This mode uses the reflog of `origin/master` to "
+"find B3 as the fork point, so that the `topic` can be rebased on top of the "
+"updated `origin/master` by:"
msgstr ""
#. type: Plain text
@@ -42167,7 +42030,6 @@ msgstr "$ git commit\n"
msgid "See also"
msgstr ""
-#
#. type: Plain text
#: en/git-merge-base.txt:180
#, fuzzy
@@ -42182,10 +42044,9 @@ msgstr ""
#. type: Title =
#: en/git-merge-file.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-merge-file(1)"
-msgstr "git-commit(1)"
+msgstr "git-merge-file(1)"
#. type: Plain text
#: en/git-merge-file.txt:7
@@ -42237,9 +42098,10 @@ msgstr ""
msgid ""
"If there are conflicts, the user should edit the result and delete one of "
"the alternatives. When `--ours`, `--theirs`, or `--union` option is in "
-"effect, however, these conflicts are resolved favouring lines from `<current-"
-"file>`, lines from `<other-file>`, or lines from both respectively. The "
-"length of the conflict markers can be given with the `--marker-size` option."
+"effect, however, these conflicts are resolved favouring lines from "
+"`<current-file>`, lines from `<other-file>`, or lines from both "
+"respectively. The length of the conflict markers can be given with the "
+"`--marker-size` option."
msgstr ""
#. type: Plain text
@@ -42254,8 +42116,8 @@ msgstr ""
#: en/git-merge-file.txt:50
msgid ""
"'git merge-file' is designed to be a minimal clone of RCS 'merge'; that is, "
-"it implements all of RCS 'merge''s functionality which is needed by linkgit:"
-"git[1]."
+"it implements all of RCS 'merge''s functionality which is needed by "
+"linkgit:git[1]."
msgstr ""
#. type: Labeled list
@@ -42286,10 +42148,9 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:70
-#, fuzzy, no-wrap
-#| msgid "diff"
+#, no-wrap
msgid "--diff3"
-msgstr "diff"
+msgstr "--diff3"
#. type: Plain text
#: en/git-merge-file.txt:72
@@ -42300,7 +42161,7 @@ msgstr ""
#: en/git-merge-file.txt:75
#, no-wrap
msgid "--union"
-msgstr ""
+msgstr "--union"
#. type: Plain text
#: en/git-merge-file.txt:78
@@ -42318,8 +42179,8 @@ msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:87
msgid ""
-"combines the changes of README.my and README.upstream since README, tries to "
-"merge them and writes the result into README.my."
+"combines the changes of README.my and README.upstream since README, tries to"
+" merge them and writes the result into README.my."
msgstr ""
#. type: Labeled list
@@ -42331,15 +42192,15 @@ msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:92
msgid ""
-"merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels `a` and "
-"`c` instead of `tmp/a123` and `tmp/c345`."
+"merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels `a` and"
+" `c` instead of `tmp/a123` and `tmp/c345`."
msgstr ""
#. type: Title =
#: en/git-merge-index.txt:2
#, no-wrap
msgid "git-merge-index(1)"
-msgstr ""
+msgstr "git-merge-index(1)"
#. type: Plain text
#: en/git-merge-index.txt:7
@@ -42443,8 +42304,8 @@ msgstr ""
#: en/git-merge-index.txt:76
msgid ""
"where the latter example shows how 'git merge-index' will stop trying to "
-"merge once anything has returned an error (i.e., `cat` returned an error for "
-"the AA file, because it didn't exist in the original, and thus 'git merge-"
+"merge once anything has returned an error (i.e., `cat` returned an error for"
+" the AA file, because it didn't exist in the original, and thus 'git merge-"
"index' didn't even try to merge the MM thing)."
msgstr ""
@@ -42452,7 +42313,7 @@ msgstr ""
#: en/git-merge-one-file.txt:2
#, no-wrap
msgid "git-merge-one-file(1)"
-msgstr ""
+msgstr "git-merge-one-file(1)"
#. type: Plain text
#: en/git-merge-one-file.txt:7
@@ -42469,8 +42330,8 @@ msgstr ""
#. type: Plain text
#: en/git-merge-one-file.txt:18
msgid ""
-"This is the standard helper program to use with 'git merge-index' to resolve "
-"a merge after the trivial merge done with 'git read-tree -m'."
+"This is the standard helper program to use with 'git merge-index' to resolve"
+" a merge after the trivial merge done with 'git read-tree -m'."
msgstr ""
#. type: Title =
@@ -42494,15 +42355,15 @@ msgstr ""
#: en/git-mergetool--lib.txt:19 en/git-sh-i18n.txt:19 en/git-sh-setup.txt:19
msgid ""
"This is not a command the end user would want to run. Ever. This "
-"documentation is meant for people who are studying the Porcelain-ish scripts "
-"and/or are writing new ones."
+"documentation is meant for people who are studying the Porcelain-ish scripts"
+" and/or are writing new ones."
msgstr ""
#. type: Plain text
#: en/git-mergetool--lib.txt:23
msgid ""
-"The 'git-mergetool{litdd}lib' scriptlet is designed to be sourced (using `."
-"`) by other shell scripts to set up functions for working with Git merge "
+"The 'git-mergetool{litdd}lib' scriptlet is designed to be sourced (using "
+"`.`) by other shell scripts to set up functions for working with Git merge "
"tools."
msgstr ""
@@ -42570,10 +42431,9 @@ msgstr ""
#. type: Title =
#: en/git-mergetool.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-mergetool(1)"
-msgstr "git-commit(1)"
+msgstr "git-mergetool(1)"
#. type: Plain text
#: en/git-mergetool.txt:7
@@ -42599,9 +42459,9 @@ msgstr ""
#: en/git-mergetool.txt:24
msgid ""
"If one or more <file> parameters are given, the merge tool program will be "
-"run to resolve differences on each file (skipping those without conflicts). "
-"Specifying a directory will include all unresolved files in that path. If "
-"no <file> names are specified, 'git mergetool' will run the merge tool "
+"run to resolve differences on each file (skipping those without conflicts)."
+" Specifying a directory will include all unresolved files in that path. If"
+" no <file> names are specified, 'git mergetool' will run the merge tool "
"program on every file with merge conflicts."
msgstr ""
@@ -42616,9 +42476,9 @@ msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:38
msgid ""
-"If a merge resolution program is not specified, 'git mergetool' will use the "
-"configuration variable `merge.tool`. If the configuration variable `merge."
-"tool` is not set, 'git mergetool' will pick a suitable default."
+"If a merge resolution program is not specified, 'git mergetool' will use the"
+" configuration variable `merge.tool`. If the configuration variable "
+"`merge.tool` is not set, 'git mergetool' will pick a suitable default."
msgstr ""
#. type: Plain text
@@ -42633,8 +42493,8 @@ msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:49
msgid ""
-"Instead of running one of the known merge tool programs, 'git mergetool' can "
-"be customized to run an alternative program by specifying the command line "
+"Instead of running one of the known merge tool programs, 'git mergetool' can"
+" be customized to run an alternative program by specifying the command line "
"to invoke in a configuration variable `mergetool.<tool>.cmd`."
msgstr ""
@@ -42644,21 +42504,22 @@ msgid ""
"When 'git mergetool' is invoked with this tool (either through the `-t` or "
"`--tool` option or the `merge.tool` configuration variable) the configured "
"command line will be invoked with `$BASE` set to the name of a temporary "
-"file containing the common base for the merge, if available; `$LOCAL` set to "
-"the name of a temporary file containing the contents of the file on the "
-"current branch; `$REMOTE` set to the name of a temporary file containing the "
-"contents of the file to be merged, and `$MERGED` set to the name of the file "
-"to which the merge tool should write the result of the merge resolution."
+"file containing the common base for the merge, if available; `$LOCAL` set to"
+" the name of a temporary file containing the contents of the file on the "
+"current branch; `$REMOTE` set to the name of a temporary file containing the"
+" contents of the file to be merged, and `$MERGED` set to the name of the "
+"file to which the merge tool should write the result of the merge "
+"resolution."
msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:66
msgid ""
"If the custom merge tool correctly indicates the success of a merge "
-"resolution with its exit code, then the configuration variable `mergetool."
-"<tool>.trustExitCode` can be set to `true`. Otherwise, 'git mergetool' will "
-"prompt the user to indicate the success of the resolution after the custom "
-"tool has exited."
+"resolution with its exit code, then the configuration variable "
+"`mergetool.<tool>.trustExitCode` can be set to `true`. Otherwise, 'git "
+"mergetool' will prompt the user to indicate the success of the resolution "
+"after the custom tool has exited."
msgstr ""
#. type: Plain text
@@ -42684,10 +42545,10 @@ msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:88
msgid ""
-"Process files in the order specified in the <orderfile>, which has one shell "
-"glob pattern per line. This overrides the `diff.orderFile` configuration "
-"variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/"
-"dev/null`."
+"Process files in the order specified in the <orderfile>, which has one shell"
+" glob pattern per line. This overrides the `diff.orderFile` configuration "
+"variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use "
+"`-O/dev/null`."
msgstr ""
#. type: Title -
@@ -42699,8 +42560,8 @@ msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:94
msgid ""
-"`git mergetool` creates `*.orig` backup files while resolving merges. These "
-"are safe to remove once a file has been merged and its `git mergetool` "
+"`git mergetool` creates `*.orig` backup files while resolving merges. These"
+" are safe to remove once a file has been merged and its `git mergetool` "
"session has completed."
msgstr ""
@@ -42708,16 +42569,15 @@ msgstr ""
#: en/git-mergetool.txt:98
msgid ""
"Setting the `mergetool.keepBackup` configuration variable to `false` causes "
-"`git mergetool` to automatically remove the backup as files are successfully "
-"merged."
+"`git mergetool` to automatically remove the backup as files are successfully"
+" merged."
msgstr ""
#. type: Title =
#: en/git-merge-tree.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-merge-tree(1)"
-msgstr "git-commit(1)"
+msgstr "git-merge-tree(1)"
#. type: Plain text
#: en/git-merge-tree.txt:7
@@ -42750,10 +42610,9 @@ msgstr ""
#. type: Title =
#: en/git-merge.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-merge(1)"
-msgstr "git-commit(1)"
+msgstr "git-merge(1)"
#. type: Plain text
#: en/git-merge.txt:7
@@ -42778,8 +42637,8 @@ msgstr ""
msgid ""
"Incorporates changes from the named commits (since the time their histories "
"diverged from the current branch) into the current branch. This command is "
-"used by 'git pull' to incorporate changes from another repository and can be "
-"used by hand to merge changes from one branch into another."
+"used by 'git pull' to incorporate changes from another repository and can be"
+" used by hand to merge changes from one branch into another."
msgstr ""
#. type: Plain text
@@ -42831,8 +42690,8 @@ msgid ""
"has resulted in conflicts. 'git merge --abort' will abort the merge process "
"and try to reconstruct the pre-merge state. However, if there were "
"uncommitted changes when the merge started (and especially if those changes "
-"were further modified after the merge was started), 'git merge --abort' will "
-"in some cases be unable to reconstruct the original (pre-merge) changes. "
+"were further modified after the merge was started), 'git merge --abort' will"
+" in some cases be unable to reconstruct the original (pre-merge) changes. "
"Therefore:"
msgstr ""
@@ -42898,7 +42757,7 @@ msgstr ""
#: en/git-merge.txt:89
#, no-wrap
msgid "--[no-]rerere-autoupdate"
-msgstr ""
+msgstr "--[no-]rerere-autoupdate"
#. type: Plain text
#: en/git-merge.txt:92
@@ -42973,8 +42832,8 @@ msgstr ""
msgid ""
"Before applying outside changes, you should get your own work in good shape "
"and committed locally, so it will not be clobbered if there are conflicts. "
-"See also linkgit:git-stash[1]. 'git pull' and 'git merge' will stop without "
-"doing anything when local uncommitted changes overlap with files that 'git "
+"See also linkgit:git-stash[1]. 'git pull' and 'git merge' will stop without"
+" doing anything when local uncommitted changes overlap with files that 'git "
"pull'/'git merge' may need to update."
msgstr ""
@@ -42982,8 +42841,8 @@ msgstr ""
#: en/git-merge.txt:139
msgid ""
"To avoid recording unrelated changes in the merge commit, 'git pull' and "
-"'git merge' will also abort if there are any changes registered in the index "
-"relative to the `HEAD` commit. (One exception is when the changed index "
+"'git merge' will also abort if there are any changes registered in the index"
+" relative to the `HEAD` commit. (One exception is when the changed index "
"entries are in the state that would result from the merge already.)"
msgstr ""
@@ -43035,8 +42894,8 @@ msgstr ""
msgid ""
"A merged version reconciling the changes from all branches to be merged is "
"committed, and your `HEAD`, index, and working tree are updated to it. It "
-"is possible to have modifications in the working tree as long as they do not "
-"overlap; the update will preserve them."
+"is possible to have modifications in the working tree as long as they do not"
+" overlap; the update will preserve them."
msgstr ""
#. type: Plain text
@@ -43068,8 +42927,8 @@ msgid ""
"For conflicting paths, the index file records up to three versions: stage 1 "
"stores the version from the common ancestor, stage 2 from `HEAD`, and stage "
"3 from `MERGE_HEAD` (you can inspect the stages with `git ls-files -u`). "
-"The working tree files contain the result of the \"merge\" program; i.e. 3-"
-"way merge results with familiar conflict markers `<<<` `===` `>>>`."
+"The working tree files contain the result of the \"merge\" program; i.e. "
+"3-way merge results with familiar conflict markers `<<<` `===` `>>>`."
msgstr ""
#. type: Plain text
@@ -43098,8 +42957,8 @@ msgstr ""
msgid ""
"When merging an annotated (and possibly signed) tag, Git always creates a "
"merge commit even if a fast-forward merge is possible, and the commit "
-"message template is prepared with the tag message. Additionally, if the tag "
-"is signed, the signature check is reported as a comment in the message "
+"message template is prepared with the tag message. Additionally, if the tag"
+" is signed, the signature check is reported as a comment in the message "
"template. See also linkgit:git-tag[1]."
msgstr ""
@@ -43107,8 +42966,8 @@ msgstr ""
#: en/git-merge.txt:202
msgid ""
"When you want to just integrate with the work leading to the commit that "
-"happens to be tagged, e.g. synchronizing with an upstream release point, you "
-"may not want to make an unnecessary merge commit."
+"happens to be tagged, e.g. synchronizing with an upstream release point, you"
+" may not want to make an unnecessary merge commit."
msgstr ""
#. type: Plain text
@@ -43142,15 +43001,15 @@ msgid ""
"overlapping ones (that is, you changed an area of the file while the other "
"side left that area intact, or vice versa) are incorporated in the final "
"result verbatim. When both sides made changes to the same area, however, "
-"Git cannot randomly pick one side over the other, and asks you to resolve it "
-"by leaving what both sides did to that area."
+"Git cannot randomly pick one side over the other, and asks you to resolve it"
+" by leaving what both sides did to that area."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:227
msgid ""
-"By default, Git uses the same style as the one used by the \"merge\" program "
-"from the RCS suite to present such a conflicted hunk, like this:"
+"By default, Git uses the same style as the one used by the \"merge\" program"
+" from the RCS suite to present such a conflicted hunk, like this:"
msgstr ""
#. type: delimited block -
@@ -43171,8 +43030,8 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:243
msgid ""
-"The area where a pair of conflicting changes happened is marked with markers "
-"`<<<<<<<`, `=======`, and `>>>>>>>`. The part before the `=======` is "
+"The area where a pair of conflicting changes happened is marked with markers"
+" `<<<<<<<`, `=======`, and `>>>>>>>`. The part before the `=======` is "
"typically your side, and the part afterwards is typically their side."
msgstr ""
@@ -43180,18 +43039,18 @@ msgstr ""
#: en/git-merge.txt:249
msgid ""
"The default format does not show what the original said in the conflicting "
-"area. You cannot tell how many lines are deleted and replaced with Barbie's "
-"remark on your side. The only thing you can tell is that your side wants to "
-"say it is hard and you'd prefer to go shopping, while the other side wants "
-"to claim it is easy."
+"area. You cannot tell how many lines are deleted and replaced with Barbie's"
+" remark on your side. The only thing you can tell is that your side wants "
+"to say it is hard and you'd prefer to go shopping, while the other side "
+"wants to claim it is easy."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:253
msgid ""
"An alternative style can be used by setting the \"merge.conflictStyle\" "
-"configuration variable to \"diff3\". In \"diff3\" style, the above conflict "
-"may look like this:"
+"configuration variable to \"diff3\". In \"diff3\" style, the above conflict"
+" may look like this:"
msgstr ""
#. type: delimited block -
@@ -43237,16 +43096,16 @@ msgstr ""
#: en/git-merge.txt:285
msgid ""
"Decide not to merge. The only clean-ups you need are to reset the index "
-"file to the `HEAD` commit to reverse 2. and to clean up working tree changes "
-"made by 2. and 3.; `git merge --abort` can be used for this."
+"file to the `HEAD` commit to reverse 2. and to clean up working tree changes"
+" made by 2. and 3.; `git merge --abort` can be used for this."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:289
msgid ""
"Resolve the conflicts. Git will mark the conflicts in the working tree. "
-"Edit the files into shape and 'git add' them to the index. Use 'git commit' "
-"to seal the deal."
+"Edit the files into shape and 'git add' them to the index. Use 'git commit'"
+" to seal the deal."
msgstr ""
#. type: Plain text
@@ -43257,8 +43116,8 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:294
msgid ""
-"Use a mergetool. `git mergetool` to launch a graphical mergetool which will "
-"work you through the merge."
+"Use a mergetool. `git mergetool` to launch a graphical mergetool which will"
+" work you through the merge."
msgstr ""
#. type: Plain text
@@ -43299,7 +43158,8 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:321
msgid ""
-"Merge branch `obsolete` into the current branch, using `ours` merge strategy:"
+"Merge branch `obsolete` into the current branch, using `ours` merge "
+"strategy:"
msgstr ""
#. type: delimited block -
@@ -43345,7 +43205,6 @@ msgid ""
"containing whitespace characters are currently not supported."
msgstr ""
-#
#. type: Plain text
#: en/git-merge.txt:360
#, fuzzy
@@ -43353,19 +43212,18 @@ msgstr ""
#| "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-"
#| "mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
msgid ""
-"linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], "
-"linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:"
-"git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
+"linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5],"
+" linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], "
+"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
msgstr ""
"linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-"
"mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
#. type: Title =
#: en/git-mktag.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-mktag(1)"
-msgstr "git-add(1)"
+msgstr "git-mktag(1)"
#. type: Plain text
#: en/git-mktag.txt:7
@@ -43399,8 +43257,8 @@ msgstr ""
#. type: Plain text
#: en/git-mktag.txt:25
msgid ""
-"A tag signature file, to be fed to this command's standard input, has a very "
-"simple fixed format: four lines of"
+"A tag signature file, to be fed to this command's standard input, has a very"
+" simple fixed format: four lines of"
msgstr ""
#. type: Plain text
@@ -43418,18 +43276,16 @@ msgstr ""
msgid ""
"followed by some 'optional' free-form message (some tags created by older "
"Git may not have `tagger` line). The message, when exists, is separated by "
-"a blank line from the header. The message part may contain a signature that "
-"Git itself doesn't care about, but that can be verified with gpg."
+"a blank line from the header. The message part may contain a signature that"
+" Git itself doesn't care about, but that can be verified with gpg."
msgstr ""
#. type: Title =
#: en/git-mktree.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-mktree(1)"
-msgstr "git-commit(1)"
+msgstr "git-mktree(1)"
-#
#. type: Plain text
#: en/git-mktree.txt:7
#, fuzzy
@@ -43446,10 +43302,10 @@ msgstr ""
#. type: Plain text
#: en/git-mktree.txt:20
msgid ""
-"Reads standard input in non-recursive `ls-tree` output format, and creates a "
-"tree object. The order of the tree entries is normalised by mktree so pre-"
-"sorting the input is not required. The object name of the tree object built "
-"is written to the standard output."
+"Reads standard input in non-recursive `ls-tree` output format, and creates a"
+" tree object. The order of the tree entries is normalised by mktree so pre-"
+"sorting the input is not required. The object name of the tree object built"
+" is written to the standard output."
msgstr ""
#. type: Plain text
@@ -43461,15 +43317,15 @@ msgstr ""
#: en/git-mktree.txt:26
#, no-wrap
msgid "--missing"
-msgstr ""
+msgstr "--missing"
#. type: Plain text
#: en/git-mktree.txt:31
msgid ""
"Allow missing objects. The default behaviour (without this option) is to "
"verify that each tree entry's sha1 identifies an existing object. This "
-"option has no effect on the treatment of gitlink entries (aka \"submodules"
-"\") which are always allowed to be missing."
+"option has no effect on the treatment of gitlink entries (aka "
+"\"submodules\") which are always allowed to be missing."
msgstr ""
#. type: Plain text
@@ -43482,10 +43338,9 @@ msgstr ""
#. type: Title =
#: en/git-mv.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-mv(1)"
-msgstr "git-add(1)"
+msgstr "git-mv(1)"
#. type: Plain text
#: en/git-mv.txt:7
@@ -43535,9 +43390,9 @@ msgstr ""
#. type: Plain text
#: en/git-mv.txt:39
msgid ""
-"Skip move or rename actions which would lead to an error condition. An error "
-"happens when a source is neither existing nor controlled by Git, or when it "
-"would overwrite an existing file unless `-f` is given."
+"Skip move or rename actions which would lead to an error condition. An error"
+" happens when a source is neither existing nor controlled by Git, or when it"
+" would overwrite an existing file unless `-f` is given."
msgstr ""
#. type: Plain text
@@ -43568,10 +43423,10 @@ msgstr ""
#: en/git-mv.txt:54
msgid ""
"Moving a submodule using a gitfile (which means they were cloned with a Git "
-"version 1.7.8 or newer) will update the gitfile and core.worktree setting to "
-"make the submodule work in the new location. It also will attempt to update "
-"the submodule.<name>.path setting in the linkgit:gitmodules[5] file and "
-"stage that file (unless -n is used)."
+"version 1.7.8 or newer) will update the gitfile and core.worktree setting to"
+" make the submodule work in the new location. It also will attempt to "
+"update the submodule.<name>.path setting in the linkgit:gitmodules[5] file "
+"and stage that file (unless -n is used)."
msgstr ""
#. type: Plain text
@@ -43580,19 +43435,18 @@ msgid ""
"Each time a superproject update moves a populated submodule (e.g. when "
"switching between commits before and after the move) a stale submodule "
"checkout will remain in the old location and an empty directory will appear "
-"in the new location. To populate the submodule again in the new location the "
-"user will have to run \"git submodule update\" afterwards. Removing the old "
-"directory is only safe when it uses a gitfile, as otherwise the history of "
+"in the new location. To populate the submodule again in the new location the"
+" user will have to run \"git submodule update\" afterwards. Removing the old"
+" directory is only safe when it uses a gitfile, as otherwise the history of "
"the submodule will be deleted too. Both steps will be obsolete when "
"recursive submodule update has been implemented."
msgstr ""
#. type: Title =
#: en/git-name-rev.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-name-rev(1)"
-msgstr "git-add(1)"
+msgstr "git-name-rev(1)"
#. type: Plain text
#: en/git-name-rev.txt:7
@@ -43610,8 +43464,8 @@ msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:19
msgid ""
-"Finds symbolic names suitable for human digestion for revisions given in any "
-"format parsable by 'git rev-parse'."
+"Finds symbolic names suitable for human digestion for revisions given in any"
+" format parsable by 'git rev-parse'."
msgstr ""
#. type: Plain text
@@ -43630,19 +43484,20 @@ msgstr ""
msgid ""
"Only use refs whose names match a given shell pattern. The pattern can be "
"one of branch name, tag name or fully qualified ref name. If given multiple "
-"times, use refs whose names match any of the given shell patterns. Use `--no-"
-"refs` to clear any previous ref patterns given."
+"times, use refs whose names match any of the given shell patterns. Use "
+"`--no-refs` to clear any previous ref patterns given."
msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:41
msgid ""
-"Do not use any ref whose name matches a given shell pattern. The pattern can "
-"be one of branch name, tag name or fully qualified ref name. If given "
+"Do not use any ref whose name matches a given shell pattern. The pattern can"
+" be one of branch name, tag name or fully qualified ref name. If given "
"multiple times, a ref will be excluded when it matches any of the given "
-"patterns. When used together with --refs, a ref will be used as a match only "
-"when it matches at least one --refs pattern and does not match any --exclude "
-"patterns. Use `--no-exclude` to clear the list of exclude patterns."
+"patterns. When used together with --refs, a ref will be used as a match only"
+" when it matches at least one --refs pattern and does not match any "
+"--exclude patterns. Use `--no-exclude` to clear the list of exclude "
+"patterns."
msgstr ""
#. type: Plain text
@@ -43662,15 +43517,15 @@ msgstr ""
#: en/git-name-rev.txt:56
msgid ""
"Instead of printing both the SHA-1 and the name, print only the name. If "
-"given with --tags the usual tag prefix of \"tags/\" is also omitted from the "
-"name, matching the output of `git-describe` more closely."
+"given with --tags the usual tag prefix of \"tags/\" is also omitted from the"
+" name, matching the output of `git-describe` more closely."
msgstr ""
#. type: Labeled list
#: en/git-name-rev.txt:57
#, no-wrap
msgid "--no-undefined"
-msgstr ""
+msgstr "--no-undefined"
#. type: Plain text
#: en/git-name-rev.txt:60
@@ -43723,10 +43578,9 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-notes(1)"
-msgstr "git-commit(1)"
+msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
@@ -43763,8 +43617,8 @@ msgstr ""
msgid ""
"By default, notes are saved to and read from `refs/notes/commits`, but this "
"default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT "
-"sections below. If this ref does not exist, it will be quietly created when "
-"it is first needed to store a note."
+"sections below. If this ref does not exist, it will be quietly created when"
+" it is first needed to store a note."
msgstr ""
#. type: Plain text
@@ -43780,8 +43634,8 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
msgid ""
-"Notes can also be added to patches prepared with `git format-patch` by using "
-"the `--notes` option. Such notes are added as a patch commentary after a "
+"Notes can also be added to patches prepared with `git format-patch` by using"
+" the `--notes` option. Such notes are added as a patch commentary after a "
"three dash separator line."
msgstr ""
@@ -43814,8 +43668,8 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:61
msgid ""
-"List the notes object for a given object. If no object is given, show a list "
-"of all note objects and the objects they annotate (in the format \"<note "
+"List the notes object for a given object. If no object is given, show a list"
+" of all note objects and the objects they annotate (in the format \"<note "
"object> <annotated object>\"). This is the default subcommand if no "
"subcommand is given."
msgstr ""
@@ -43829,9 +43683,9 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
msgid ""
-"Add notes for a given object (defaults to HEAD). Abort if the object already "
-"has notes (use `-f` to overwrite existing notes). However, if you're using "
-"`add` interactively (using an editor to supply the notes contents), then - "
+"Add notes for a given object (defaults to HEAD). Abort if the object already"
+" has notes (use `-f` to overwrite existing notes). However, if you're using"
+" `add` interactively (using an editor to supply the notes contents), then - "
"instead of aborting - the existing notes will be opened in the editor (like "
"the `edit` subcommand)."
msgstr ""
@@ -43880,8 +43734,8 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:90
msgid ""
-"Append to the notes of an existing object (defaults to HEAD). Creates a new "
-"notes object if needed."
+"Append to the notes of an existing object (defaults to HEAD). Creates a new"
+" notes object if needed."
msgstr ""
#. type: Labeled list
@@ -43924,10 +43778,10 @@ msgstr ""
#: en/git-notes.txt:111
msgid ""
"If conflicts arise and a strategy for automatically resolving conflicting "
-"notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual"
-"\" resolver is used. This resolver checks out the conflicting notes in a "
-"special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to "
-"manually resolve the conflicts there. When done, the user can either "
+"notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the "
+"\"manual\" resolver is used. This resolver checks out the conflicting notes "
+"in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user "
+"to manually resolve the conflicts there. When done, the user can either "
"finalize the merge with 'git notes merge --commit', or abort the merge with "
"'git notes merge --abort'."
msgstr ""
@@ -43987,8 +43841,8 @@ msgstr ""
#| "\tIf multiple `-m` options are given, their values are\n"
#| "\tconcatenated as separate paragraphs.\n"
msgid ""
-"Use the given note message (instead of prompting). If multiple `-m` options "
-"are given, their values are concatenated as separate paragraphs. Lines "
+"Use the given note message (instead of prompting). If multiple `-m` options"
+" are given, their values are concatenated as separate paragraphs. Lines "
"starting with `#` and empty lines other than a single line between "
"paragraphs will be stripped out."
msgstr ""
@@ -44007,9 +43861,9 @@ msgstr ""
#| "\tTake the commit message from the given file. Use '-' to\n"
#| "\tread the message from the standard input.\n"
msgid ""
-"Take the note message from the given file. Use '-' to read the note message "
-"from the standard input. Lines starting with `#` and empty lines other than "
-"a single line between paragraphs will be stripped out."
+"Take the note message from the given file. Use '-' to read the note message"
+" from the standard input. Lines starting with `#` and empty lines other "
+"than a single line between paragraphs will be stripped out."
msgstr ""
"-F <fichier>::\n"
"--file=<fichier>::\n"
@@ -44031,8 +43885,8 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
msgid ""
-"Take the given blob object (for\texample, another note) as the note message. "
-"(Use `git notes copy <object>` instead to copy notes between objects.)"
+"Take the given blob object (for\texample, another note) as the note message."
+" (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
@@ -44056,8 +43910,8 @@ msgstr ""
#| "\tLike '-C', but with `-c` the editor is invoked, so that\n"
#| "\tthe user can further edit the commit message.\n"
msgid ""
-"Like '-C', but with `-c` the editor is invoked, so that the user can further "
-"edit the note message."
+"Like '-C', but with `-c` the editor is invoked, so that the user can further"
+" edit the note message."
msgstr ""
"-c <commit>::\n"
"--reedit-message=<commit>::\n"
@@ -44081,8 +43935,8 @@ msgstr ""
#: en/git-notes.txt:168
msgid ""
"Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the "
-"\"core.notesRef\" configuration. The ref specifies the full refname when it "
-"begins with `refs/notes/`; when it begins with `notes/`, `refs/` and "
+"\"core.notesRef\" configuration. The ref specifies the full refname when it"
+" begins with `refs/notes/`; when it begins with `notes/`, `refs/` and "
"otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
@@ -44118,28 +43972,28 @@ msgstr ""
#: en/git-notes.txt:191
msgid ""
"When merging notes, resolve notes conflicts using the given strategy. The "
-"following strategies are recognized: \"manual\" (default), \"ours\", \"theirs"
-"\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes."
-"mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" "
-"section below for more information on each notes merge strategy."
+"following strategies are recognized: \"manual\" (default), \"ours\", "
+"\"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the "
+"\"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE "
+"STRATEGIES\" section below for more information on each notes merge "
+"strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--commit"
-msgstr "git-commit(1)"
+msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
msgid ""
"Finalize an in-progress 'git notes merge'. Use this option when you have "
-"resolved the conflicts that 'git notes merge' stored in .git/"
-"NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git "
-"notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in ."
-"git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF "
-"symref is updated to the resulting commit."
+"resolved the conflicts that 'git notes merge' stored in "
+".git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by "
+"'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes "
+"in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the "
+".git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
@@ -44164,21 +44018,21 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
msgid ""
-"Commit notes are blobs containing extra information about an object (usually "
-"information to supplement a commit's message). These blobs are taken from "
+"Commit notes are blobs containing extra information about an object (usually"
+" information to supplement a commit's message). These blobs are taken from "
"notes refs. A notes ref is usually a branch which contains \"files\" whose "
"paths are the object names for the objects they describe, with some "
"directory separators included for performance reasons footnote:[Permitted "
-"pathnames have the form 'ab'`/`'cd'`/`'ef'`/`'...'`/`'abcdef...': a sequence "
-"of directory names of two hexadecimal digits each followed by a filename "
+"pathnames have the form 'ab'`/`'cd'`/`'ef'`/`'...'`/`'abcdef...': a sequence"
+" of directory names of two hexadecimal digits each followed by a filename "
"with the rest of the object ID.]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:236
msgid ""
-"Every notes change creates a new commit at the specified notes ref. You can "
-"therefore inspect the history of the notes by invoking, e.g., `git log -p "
+"Every notes change creates a new commit at the specified notes ref. You can"
+" therefore inspect the history of the notes by invoking, e.g., `git log -p "
"notes/commits`. Currently the commit message only records which operation "
"triggered the update, and the commit authorship is determined according to "
"the usual rules (see linkgit:git-commit[1]). These details may change in "
@@ -44202,11 +44056,12 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
msgid ""
-"The default notes merge strategy is \"manual\", which checks out conflicting "
-"notes in a special work tree for resolving notes conflicts (`.git/"
-"NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in "
-"that work tree. When done, the user can either finalize the merge with 'git "
-"notes merge --commit', or abort the merge with 'git notes merge --abort'."
+"The default notes merge strategy is \"manual\", which checks out conflicting"
+" notes in a special work tree for resolving notes conflicts "
+"(`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the "
+"conflicts in that work tree. When done, the user can either finalize the "
+"merge with 'git notes merge --commit', or abort the merge with 'git notes "
+"merge --abort'."
msgstr ""
#. type: Plain text
@@ -44241,9 +44096,9 @@ msgstr ""
#: en/git-notes.txt:275
msgid ""
"\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating "
-"the local and remote versions, this strategy also sorts the resulting lines, "
-"and removes duplicate lines from the result. This is equivalent to applying "
-"the \"cat | sort | uniq\" shell pipeline to the local and remote versions. "
+"the local and remote versions, this strategy also sorts the resulting lines,"
+" and removes duplicate lines from the result. This is equivalent to applying"
+" the \"cat | sort | uniq\" shell pipeline to the local and remote versions. "
"This strategy is useful if the notes follow a line-based format where one "
"wants to avoid duplicated lines in the merge result. Note that if either "
"the local or remote version contain duplicate lines prior to the merge, "
@@ -44253,8 +44108,8 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
msgid ""
-"You can use notes to add annotations with information that was not available "
-"at the time a commit was written."
+"You can use notes to add annotations with information that was not available"
+" at the time a commit was written."
msgstr ""
#. type: delimited block -
@@ -44315,8 +44170,8 @@ msgstr ""
msgid ""
"Which merge strategy to choose by default when resolving notes conflicts. "
"Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. "
-"Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more "
-"information on each strategy."
+"Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more"
+" information on each strategy."
msgstr ""
#. type: Plain text
@@ -44327,10 +44182,10 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
msgid ""
-"Which merge strategy to choose when doing a notes merge into refs/notes/"
-"<name>. This overrides the more general \"notes.mergeStrategy\". See the "
-"\"NOTES MERGE STRATEGIES\" section above for more information on each "
-"available strategy."
+"Which merge strategy to choose when doing a notes merge into "
+"refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\"."
+" See the \"NOTES MERGE STRATEGIES\" section above for more information on "
+"each available strategy."
msgstr ""
#. type: Plain text
@@ -44362,9 +44217,9 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
msgid ""
-"When copying notes during a rewrite, what to do if the target commit already "
-"has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or "
-"`ignore`. Defaults to `concatenate`."
+"When copying notes during a rewrite, what to do if the target commit already"
+" has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or"
+" `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
@@ -44412,8 +44267,8 @@ msgstr ""
#: en/git-notes.txt:385
msgid ""
"Colon-delimited list of refs or globs indicating which refs, in addition to "
-"the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when "
-"showing commit messages. This overrides the `notes.displayRef` setting."
+"the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when"
+" showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
@@ -44432,9 +44287,9 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:394
msgid ""
-"When copying notes during a rewrite, what to do if the target commit already "
-"has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or "
-"`ignore`. This overrides the `core.rewriteMode` setting."
+"When copying notes during a rewrite, what to do if the target commit already"
+" has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or"
+" `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
@@ -44459,10 +44314,9 @@ msgstr ""
#. type: Title =
#: en/git-p4.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-p4(1)"
-msgstr "git-add(1)"
+msgstr "git-p4(1)"
#. type: Plain text
#: en/git-p4.txt:7
@@ -44483,7 +44337,8 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:22
-msgid "This command provides a way to interact with p4 repositories using Git."
+msgid ""
+"This command provides a way to interact with p4 repositories using Git."
msgstr ""
#. type: Plain text
@@ -44492,8 +44347,8 @@ msgid ""
"Create a new Git repository from an existing p4 repository using 'git p4 "
"clone', giving it one or more p4 depot paths. Incorporate new commits from "
"p4 changes with 'git p4 sync'. The 'sync' command is also used to include "
-"new branches from other p4 depot paths. Submit Git changes back to p4 using "
-"'git p4 submit'. The command 'git p4 rebase' does a sync plus rebases the "
+"new branches from other p4 depot paths. Submit Git changes back to p4 using"
+" 'git p4 submit'. The command 'git p4 rebase' does a sync plus rebases the "
"current branch onto the updated p4 remote branch."
msgstr ""
@@ -44525,8 +44380,8 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:50
msgid ""
-"Update the Git repository with recent changes from p4, rebasing your work on "
-"top:"
+"Update the Git repository with recent changes from p4, rebasing your work on"
+" top:"
msgstr ""
#. type: delimited block -
@@ -44604,8 +44459,8 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:92
msgid ""
-"As development continues in the p4 repository, those changes can be included "
-"in the Git repository using:"
+"As development continues in the p4 repository, those changes can be included"
+" in the Git repository using:"
msgstr ""
#. type: delimited block -
@@ -44690,16 +44545,16 @@ msgstr ""
msgid ""
"Submitting changes from a Git repository back to the p4 repository requires "
"a separate p4 client workspace. This should be specified using the "
-"`P4CLIENT` environment variable or the Git configuration variable 'git-p4."
-"client'. The p4 client must exist, but the client root will be created and "
-"populated if it does not already exist."
+"`P4CLIENT` environment variable or the Git configuration variable "
+"'git-p4.client'. The p4 client must exist, but the client root will be "
+"created and populated if it does not already exist."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:143
msgid ""
-"To submit all changes that are in the current Git branch but not in the 'p4/"
-"master' branch, use:"
+"To submit all changes that are in the current Git branch but not in the "
+"'p4/master' branch, use:"
msgstr ""
#. type: Plain text
@@ -44723,9 +44578,9 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:159
msgid ""
-"The p4 changes will be created as the user invoking 'git p4 submit'. The `--"
-"preserve-user` option will cause ownership to be modified according to the "
-"author of the Git commit. This option requires admin privileges in p4, "
+"The p4 changes will be created as the user invoking 'git p4 submit'. The "
+"`--preserve-user` option will cause ownership to be modified according to "
+"the author of the Git commit. This option requires admin privileges in p4, "
"which can be granted using 'p4 protect'."
msgstr ""
@@ -44788,8 +44643,8 @@ msgstr ""
#: en/git-p4.txt:188
msgid ""
"By default a <ref> not starting with refs/ is treated as the name of a "
-"remote-tracking branch (under refs/remotes/). This behavior can be modified "
-"using the --import-local option."
+"remote-tracking branch (under refs/remotes/). This behavior can be modified"
+" using the --import-local option."
msgstr ""
#. type: Plain text
@@ -44816,7 +44671,7 @@ msgstr ""
#: en/git-p4.txt:199
#, no-wrap
msgid "--detect-branches"
-msgstr ""
+msgstr "--detect-branches"
#. type: Plain text
#: en/git-p4.txt:202
@@ -44843,7 +44698,7 @@ msgstr ""
#: en/git-p4.txt:208
#, no-wrap
msgid "--silent"
-msgstr ""
+msgstr "--silent"
#. type: Plain text
#: en/git-p4.txt:210
@@ -44860,13 +44715,13 @@ msgstr ""
#: en/git-p4.txt:211
#, no-wrap
msgid "--detect-labels"
-msgstr ""
+msgstr "--detect-labels"
#. type: Plain text
#: en/git-p4.txt:215
msgid ""
-"Query p4 for labels associated with the depot paths, and add them as tags in "
-"Git. Limited usefulness as only imports labels associated with new "
+"Query p4 for labels associated with the depot paths, and add them as tags in"
+" Git. Limited usefulness as only imports labels associated with new "
"changelists. Deprecated."
msgstr ""
@@ -44874,7 +44729,7 @@ msgstr ""
#: en/git-p4.txt:216 en/git-p4.txt:331
#, no-wrap
msgid "--import-labels"
-msgstr ""
+msgstr "--import-labels"
#. type: Plain text
#: en/git-p4.txt:218
@@ -44885,13 +44740,13 @@ msgstr ""
#: en/git-p4.txt:219
#, no-wrap
msgid "--import-local"
-msgstr ""
+msgstr "--import-local"
#. type: Plain text
#: en/git-p4.txt:226
msgid ""
-"By default, p4 branches are stored in 'refs/remotes/p4/', where they will be "
-"treated as remote-tracking branches by linkgit:git-branch[1] and other "
+"By default, p4 branches are stored in 'refs/remotes/p4/', where they will be"
+" treated as remote-tracking branches by linkgit:git-branch[1] and other "
"commands. This option instead puts p4 branches in 'refs/heads/p4/'. Note "
"that future sync operations must specify `--import-local` as well so that "
"they can find the p4 branches in refs/heads."
@@ -44906,10 +44761,10 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:233
msgid ""
-"Import at most 'n' changes, rather than the entire range of changes included "
-"in the given revision specifier. A typical usage would be use '@all' as the "
-"revision specifier, but then to use '--max-changes 1000' to import only the "
-"last 1000 revisions rather than the entire revision history."
+"Import at most 'n' changes, rather than the entire range of changes included"
+" in the given revision specifier. A typical usage would be use '@all' as the"
+" revision specifier, but then to use '--max-changes 1000' to import only the"
+" last 1000 revisions rather than the entire revision history."
msgstr ""
#. type: Labeled list
@@ -44924,8 +44779,8 @@ msgid ""
"The internal block size to use when converting a revision specifier such as "
"'@all' into a list of specific change numbers. Instead of using a single "
"call to 'p4 changes' to find the full list of changes for the conversion, "
-"there are a sequence of calls to 'p4 changes -m', each of which requests one "
-"block of changes of the given size. The default block size is 500, which "
+"there are a sequence of calls to 'p4 changes -m', each of which requests one"
+" block of changes of the given size. The default block size is 500, which "
"should usually be suitable."
msgstr ""
@@ -44933,7 +44788,7 @@ msgstr ""
#: en/git-p4.txt:243
#, no-wrap
msgid "--keep-path"
-msgstr ""
+msgstr "--keep-path"
#. type: Plain text
#: en/git-p4.txt:250
@@ -44949,7 +44804,7 @@ msgstr ""
#: en/git-p4.txt:251
#, no-wrap
msgid "--use-client-spec"
-msgstr ""
+msgstr "--use-client-spec"
#. type: Plain text
#: en/git-p4.txt:254
@@ -45031,8 +44886,8 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:285
msgid ""
-"Detect renames. See linkgit:git-diff[1]. Renames will be represented in p4 "
-"using explicit 'move' operations. There is no corresponding option to "
+"Detect renames. See linkgit:git-diff[1]. Renames will be represented in p4"
+" using explicit 'move' operations. There is no corresponding option to "
"detect copies, but there are variables for both moves and copies."
msgstr ""
@@ -45040,20 +44895,20 @@ msgstr ""
#: en/git-p4.txt:286
#, no-wrap
msgid "--preserve-user"
-msgstr ""
+msgstr "--preserve-user"
#. type: Plain text
#: en/git-p4.txt:289
msgid ""
-"Re-author p4 changes before submitting to p4. This option requires p4 admin "
-"privileges."
+"Re-author p4 changes before submitting to p4. This option requires p4 admin"
+" privileges."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:290
#, no-wrap
msgid "--export-labels"
-msgstr ""
+msgstr "--export-labels"
#. type: Plain text
#: en/git-p4.txt:293
@@ -45073,23 +44928,23 @@ msgstr ""
#: en/git-p4.txt:299
#, no-wrap
msgid "--prepare-p4-only"
-msgstr ""
+msgstr "--prepare-p4-only"
#. type: Plain text
#: en/git-p4.txt:305
msgid ""
-"Apply a commit to the p4 workspace, opening, adding and deleting files in p4 "
-"as for a normal submit operation. Do not issue the final \"p4 submit\", but "
-"instead print a message about how to submit manually or revert. This option "
-"always stops after the first (oldest) commit. Git tags are not exported to "
-"p4."
+"Apply a commit to the p4 workspace, opening, adding and deleting files in p4"
+" as for a normal submit operation. Do not issue the final \"p4 submit\", "
+"but instead print a message about how to submit manually or revert. This "
+"option always stops after the first (oldest) commit. Git tags are not "
+"exported to p4."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:306
#, no-wrap
msgid "--shelve"
-msgstr ""
+msgstr "--shelve"
#. type: Plain text
#: en/git-p4.txt:310
@@ -45166,9 +45021,9 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:339
msgid ""
-"The p4 depot path argument to 'git p4 sync' and 'git p4 clone' can be one or "
-"more space-separated p4 depot paths, with an optional p4 revision specifier "
-"on the end:"
+"The p4 depot path argument to 'git p4 sync' and 'git p4 clone' can be one or"
+" more space-separated p4 depot paths, with an optional p4 revision specifier"
+" on the end:"
msgstr ""
#. type: Labeled list
@@ -45179,7 +45034,8 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:342
-msgid "Import one commit with all files in the '#head' change under that tree."
+msgid ""
+"Import one commit with all files in the '#head' change under that tree."
msgstr ""
#. type: Labeled list
@@ -45215,11 +45071,11 @@ msgstr ""
msgid ""
"Import all changes from both named depot paths into a single repository. "
"Only files below these directories are included. There is not a "
-"subdirectory in Git for each \"proj1\" and \"proj2\". You must use the `--"
-"destination` option when specifying more than one depot path. The revision "
-"specifier must be specified identically on each depot path. If there are "
-"files in the depot paths with the same name, the path with the most recently "
-"updated version of the file is the one that appears in Git."
+"subdirectory in Git for each \"proj1\" and \"proj2\". You must use the "
+"`--destination` option when specifying more than one depot path. The "
+"revision specifier must be specified identically on each depot path. If "
+"there are files in the depot paths with the same name, the path with the "
+"most recently updated version of the file is the one that appears in Git."
msgstr ""
#. type: Plain text
@@ -45238,8 +45094,8 @@ msgstr ""
msgid ""
"The p4 client specification is maintained with the 'p4 client' command and "
"contains among other fields, a View that specifies how the depot is mapped "
-"into the client repository. The 'clone' and 'sync' commands can consult the "
-"client spec when given the `--use-client-spec` option or when the "
+"into the client repository. The 'clone' and 'sync' commands can consult the"
+" client spec when given the `--use-client-spec` option or when the "
"useClientSpec variable is true. After 'git p4 clone', the useClientSpec "
"variable is automatically set in the repository configuration file. This "
"allows future 'git p4 submit' commands to work properly; the submit command "
@@ -45250,10 +45106,10 @@ msgstr ""
#: en/git-p4.txt:380
msgid ""
"The full syntax for a p4 view is documented in 'p4 help views'. 'git p4' "
-"knows only a subset of the view syntax. It understands multi-line mappings, "
-"overlays with '+', exclusions with '-' and double-quotes around whitespace. "
-"Of the possible wildcards, 'git p4' only handles '...', and only when it is "
-"at the end of the path. 'git p4' will complain if it encounters an "
+"knows only a subset of the view syntax. It understands multi-line mappings,"
+" overlays with '+', exclusions with '-' and double-quotes around whitespace."
+" Of the possible wildcards, 'git p4' only handles '...', and only when it "
+"is at the end of the path. 'git p4' will complain if it encounters an "
"unhandled wildcard."
msgstr ""
@@ -45262,8 +45118,8 @@ msgstr ""
msgid ""
"Bugs in the implementation of overlap mappings exist. If multiple depot "
"paths map through overlays to the same location in the repository, 'git p4' "
-"can choose the wrong one. This is hard to solve without dedicating a client "
-"spec just for 'git p4'."
+"can choose the wrong one. This is hard to solve without dedicating a client"
+" spec just for 'git p4'."
msgstr ""
#. type: Plain text
@@ -45284,11 +45140,11 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:400
msgid ""
-"P4 does not have the same concept of a branch as Git. Instead, p4 organizes "
-"its content as a directory tree, where by convention different logical "
-"branches are in different locations in the tree. The 'p4 branch' command is "
-"used to maintain mappings between different areas in the tree, and indicate "
-"related content. 'git p4' can use these mappings to determine branch "
+"P4 does not have the same concept of a branch as Git. Instead, p4 organizes"
+" its content as a directory tree, where by convention different logical "
+"branches are in different locations in the tree. The 'p4 branch' command is"
+" used to maintain mappings between different areas in the tree, and indicate"
+" related content. 'git p4' can use these mappings to determine branch "
"relationships."
msgstr ""
@@ -45297,8 +45153,8 @@ msgstr ""
msgid ""
"If you have a repository where all the branches of interest exist as "
"subdirectories of a single depot path, you can use `--detect-branches` when "
-"cloning or syncing to have 'git p4' automatically find subdirectories in p4, "
-"and to generate these as branches in Git."
+"cloning or syncing to have 'git p4' automatically find subdirectories in p4,"
+" and to generate these as branches in Git."
msgstr ""
#. type: Plain text
@@ -45346,14 +45202,14 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:433
msgid ""
-"However, it is not necessary to create branches in p4 to be able to use them "
-"like branches. Because it is difficult to infer branch relationships "
+"However, it is not necessary to create branches in p4 to be able to use them"
+" like branches. Because it is difficult to infer branch relationships "
"automatically, a Git configuration setting 'git-p4.branchList' can be used "
-"to explicitly identify branch relationships. It is a list of \"source:"
-"destination\" pairs, like a simple p4 branch specification, where the "
-"\"source\" and \"destination\" are the path elements in the p4 repository. "
-"The example above relied on the presence of the p4 branch. Without p4 "
-"branches, the same result will occur with:"
+"to explicitly identify branch relationships. It is a list of "
+"\"source:destination\" pairs, like a simple p4 branch specification, where "
+"the \"source\" and \"destination\" are the path elements in the p4 "
+"repository. The example above relied on the presence of the p4 branch. "
+"Without p4 branches, the same result will occur with:"
msgstr ""
#. type: delimited block -
@@ -45376,16 +45232,16 @@ msgstr ""
#: en/git-p4.txt:447
msgid ""
"The fast-import mechanism used by 'git p4' creates one pack file for each "
-"invocation of 'git p4 sync'. Normally, Git garbage compression (linkgit:git-"
-"gc[1]) automatically compresses these to fewer pack files, but explicit "
-"invocation of 'git repack -adf' may improve performance."
+"invocation of 'git p4 sync'. Normally, Git garbage compression "
+"(linkgit:git-gc[1]) automatically compresses these to fewer pack files, but "
+"explicit invocation of 'git repack -adf' may improve performance."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:453
msgid ""
-"The following config settings can be used to modify 'git p4' behavior. They "
-"all are in the 'git-p4' section."
+"The following config settings can be used to modify 'git p4' behavior. They"
+" all are in the 'git-p4' section."
msgstr ""
#. type: Title ~
@@ -45510,8 +45366,8 @@ msgstr ""
#: en/git-p4.txt:499
msgid ""
"One phase in branch detection involves looking at p4 branches to find new "
-"ones to import. By default, all branches are inspected. This option limits "
-"the search to just those owned by the single user named in the variable."
+"ones to import. By default, all branches are inspected. This option limits"
+" the search to just those owned by the single user named in the variable."
msgstr ""
#. type: Labeled list
@@ -45582,10 +45438,10 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:527
msgid ""
-"Specify that the p4 client spec should be used to identify p4 depot paths of "
-"interest. This is equivalent to specifying the option `--use-client-spec`. "
-"See the \"CLIENT SPEC\" section above. This variable is a boolean, not the "
-"name of a p4 client."
+"Specify that the p4 client spec should be used to identify p4 depot paths of"
+" interest. This is equivalent to specifying the option `--use-client-spec`."
+" See the \"CLIENT SPEC\" section above. This variable is a boolean, not "
+"the name of a p4 client."
msgstr ""
#. type: Labeled list
@@ -45598,8 +45454,8 @@ msgstr ""
#: en/git-p4.txt:534
msgid ""
"Perforce keeps the encoding of a path as given by the originating OS. Git "
-"expects paths encoded as UTF-8. Use this config to tell git-p4 what encoding "
-"Perforce had used for the paths. This encoding is used to transcode the "
+"expects paths encoded as UTF-8. Use this config to tell git-p4 what encoding"
+" Perforce had used for the paths. This encoding is used to transcode the "
"paths to UTF-8. As an example, Perforce on Windows often uses \"cp1252\" to "
"encode path names."
msgstr ""
@@ -45614,10 +45470,10 @@ msgstr ""
#: en/git-p4.txt:541
msgid ""
"Specify the system that is used for large (binary) files. Please note that "
-"large file systems do not support the 'git p4 submit' command. Only Git LFS "
-"is implemented right now (see https://git-lfs.github.com/ for more "
-"information). Download and install the Git LFS command line extension to use "
-"this option and configure it like this:"
+"large file systems do not support the 'git p4 submit' command. Only Git LFS"
+" is implemented right now (see https://git-lfs.github.com/ for more "
+"information). Download and install the Git LFS command line extension to use"
+" this option and configure it like this:"
msgstr ""
#. type: delimited block -
@@ -45827,8 +45683,8 @@ msgstr ""
msgid ""
"By default, any branch can be used as the source for a 'git p4 submit' "
"operation. This configuration variable, if set, permits only the named "
-"branches to be used as submit sources. Branch names must be the short names "
-"(no \"refs/heads/\"), and should be separated by commas (\",\"), with no "
+"branches to be used as submit sources. Branch names must be the short names"
+" (no \"refs/heads/\"), and should be separated by commas (\",\"), with no "
"spaces."
msgstr ""
@@ -45893,8 +45749,8 @@ msgstr "git-commit(1)"
#. type: Plain text
#: en/git-p4.txt:640
msgid ""
-"Specify submit behavior when a conflict with p4 is found, as per --"
-"conflict. The default behavior is 'ask'."
+"Specify submit behavior when a conflict with p4 is found, as per --conflict."
+" The default behavior is 'ask'."
msgstr ""
#. type: Title -
@@ -45911,8 +45767,8 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:646
msgid ""
-"Cloning or syncing does not require a p4 client; file contents are collected "
-"using 'p4 print'."
+"Cloning or syncing does not require a p4 client; file contents are collected"
+" using 'p4 print'."
msgstr ""
#. type: Plain text
@@ -45933,10 +45789,9 @@ msgstr ""
#. type: Title =
#: en/git-pack-objects.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-pack-objects(1)"
-msgstr "git-commit(1)"
+msgstr "git-pack-objects(1)"
#. type: Plain text
#: en/git-pack-objects.txt:7
@@ -45981,9 +45836,9 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:39
msgid ""
-"A pack index file (.idx) is generated for fast, random access to the objects "
-"in the pack. Placing both the index file (.idx) and the packed archive (."
-"pack) in the pack/ subdirectory of $GIT_OBJECT_DIRECTORY (or any of the "
+"A pack index file (.idx) is generated for fast, random access to the objects"
+" in the pack. Placing both the index file (.idx) and the packed archive "
+"(.pack) in the pack/ subdirectory of $GIT_OBJECT_DIRECTORY (or any of the "
"directories on $GIT_ALTERNATE_OBJECT_DIRECTORIES) enables Git to read from "
"the pack archive."
msgstr ""
@@ -46008,8 +45863,8 @@ msgstr ""
msgid ""
"Write into a pair of files (.pack and .idx), using <base-name> to determine "
"the name of the created file. When this option is used, the two files are "
-"written in <base-name>-<SHA-1>.{pack,idx} files. <SHA-1> is a hash based on "
-"the pack content and is written to the standard output of the command."
+"written in <base-name>-<SHA-1>.{pack,idx} files. <SHA-1> is a hash based on"
+" the pack content and is written to the standard output of the command."
msgstr ""
#. type: Plain text
@@ -46023,24 +45878,23 @@ msgstr ""
#: en/git-pack-objects.txt:61
#, no-wrap
msgid "--revs"
-msgstr ""
+msgstr "--revs"
#. type: Plain text
#: en/git-pack-objects.txt:69
msgid ""
"Read the revision arguments from the standard input, instead of individual "
-"object names. The revision arguments are processed the same way as 'git rev-"
-"list' with the `--objects` flag uses its `commit` arguments to build the "
-"list of objects it outputs. The objects on the resulting list are packed. "
-"Besides revisions, `--not` or `--shallow <SHA-1>` lines are also accepted."
+"object names. The revision arguments are processed the same way as 'git "
+"rev-list' with the `--objects` flag uses its `commit` arguments to build the"
+" list of objects it outputs. The objects on the resulting list are packed."
+" Besides revisions, `--not` or `--shallow <SHA-1>` lines are also accepted."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:70 en/rev-list-options.txt:693
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "--unpacked"
-msgstr "git-add(1)"
+msgstr "--unpacked"
#. type: Plain text
#: en/git-pack-objects.txt:74
@@ -46061,8 +45915,8 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:85
msgid ""
-"Include unasked-for annotated tags if the object they reference was included "
-"in the resulting packfile. This can be useful to send new tags to native "
+"Include unasked-for annotated tags if the object they reference was included"
+" in the resulting packfile. This can be useful to send new tags to native "
"Git clients."
msgstr ""
@@ -46077,11 +45931,11 @@ msgstr ""
msgid ""
"These two options affect how the objects contained in the pack are stored "
"using delta compression. The objects are first internally sorted by type, "
-"size and optionally names and compared against the other objects within --"
-"window to see if using delta compression saves space. --depth limits the "
+"size and optionally names and compared against the other objects within "
+"--window to see if using delta compression saves space. --depth limits the "
"maximum delta depth; making it too deep affects the performance on the "
-"unpacker side, because delta data needs to be applied that many times to get "
-"to the necessary object. The default value for --window is 10 and --depth "
+"unpacker side, because delta data needs to be applied that many times to get"
+" to the necessary object. The default value for --window is 10 and --depth "
"is 50."
msgstr ""
@@ -46098,8 +45952,8 @@ msgid ""
"size will dynamically scale down so as to not take up more than '<n>' bytes "
"in memory. This is useful in repositories with a mix of large and small "
"objects to not run out of memory with a large window, but still be able to "
-"take advantage of the large window for the smaller objects. The size can be "
-"suffixed with \"k\", \"m\", or \"g\". `--window-memory=0` makes memory "
+"take advantage of the large window for the smaller objects. The size can be"
+" suffixed with \"k\", \"m\", or \"g\". `--window-memory=0` makes memory "
"usage unlimited. The default is taken from the `pack.windowMemory` "
"configuration variable."
msgstr ""
@@ -46118,7 +45972,7 @@ msgstr ""
#: en/git-pack-objects.txt:118
#, no-wrap
msgid "--honor-pack-keep"
-msgstr ""
+msgstr "--honor-pack-keep"
#. type: Plain text
#: en/git-pack-objects.txt:122
@@ -46145,7 +45999,7 @@ msgstr ""
#: en/git-pack-objects.txt:132
#, no-wrap
msgid "--non-empty"
-msgstr ""
+msgstr "--non-empty"
#. type: Plain text
#: en/git-pack-objects.txt:135
@@ -46156,15 +46010,15 @@ msgstr ""
#: en/git-pack-objects.txt:142
#, no-wrap
msgid "--all-progress"
-msgstr ""
+msgstr "--all-progress"
#. type: Plain text
#: en/git-pack-objects.txt:152
msgid ""
"When --stdout is specified then progress report is displayed during the "
"object count and compression phases but inhibited during the write-out "
-"phase. The reason is that in some cases the output stream is directly linked "
-"to another command which may wish to display progress status of its own as "
+"phase. The reason is that in some cases the output stream is directly linked"
+" to another command which may wish to display progress status of its own as "
"it processes incoming pack data. This flag is like --progress except that "
"it forces progress report for the write-out phase as well even if --stdout "
"is used."
@@ -46174,28 +46028,28 @@ msgstr ""
#: en/git-pack-objects.txt:153
#, no-wrap
msgid "--all-progress-implied"
-msgstr ""
+msgstr "--all-progress-implied"
#. type: Plain text
#: en/git-pack-objects.txt:157
msgid ""
-"This is used to imply --all-progress whenever progress display is "
-"activated. Unlike --all-progress this flag doesn't actually force any "
-"progress display by itself."
+"This is used to imply --all-progress whenever progress display is activated."
+" Unlike --all-progress this flag doesn't actually force any progress "
+"display by itself."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:161
msgid ""
-"This flag makes the command not to report its progress on the standard error "
-"stream."
+"This flag makes the command not to report its progress on the standard error"
+" stream."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:162
#, no-wrap
msgid "--no-reuse-delta"
-msgstr ""
+msgstr "--no-reuse-delta"
#. type: Plain text
#: en/git-pack-objects.txt:168
@@ -46210,7 +46064,7 @@ msgstr ""
#: en/git-pack-objects.txt:169
#, no-wrap
msgid "--no-reuse-object"
-msgstr ""
+msgstr "--no-reuse-object"
#. type: Plain text
#: en/git-pack-objects.txt:175
@@ -46230,18 +46084,18 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:183
msgid ""
-"Specifies compression level for newly-compressed data in the generated "
-"pack. If not specified, pack compression level is determined first by pack."
-"compression, then by core.compression, and defaults to -1, the zlib default, "
-"if neither is set. Add --no-reuse-object if you want to force a uniform "
-"compression level on all data no matter the source."
+"Specifies compression level for newly-compressed data in the generated pack."
+" If not specified, pack compression level is determined first by "
+"pack.compression, then by core.compression, and defaults to -1, the zlib "
+"default, if neither is set. Add --no-reuse-object if you want to force a "
+"uniform compression level on all data no matter the source."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:188
msgid ""
-"Create a \"thin\" pack by omitting the common objects between a sender and a "
-"receiver in order to reduce network transfer. This option only makes sense "
+"Create a \"thin\" pack by omitting the common objects between a sender and a"
+" receiver in order to reduce network transfer. This option only makes sense "
"in conjunction with --stdout."
msgstr ""
@@ -46258,31 +46112,32 @@ msgstr ""
#: en/git-pack-objects.txt:194
#, no-wrap
msgid "--shallow"
-msgstr ""
+msgstr "--shallow"
#. type: Plain text
#: en/git-pack-objects.txt:198
msgid ""
-"Optimize a pack that will be provided to a client with a shallow "
-"repository. This option, combined with --thin, can result in a smaller pack "
-"at the cost of speed."
+"Optimize a pack that will be provided to a client with a shallow repository."
+" This option, combined with --thin, can result in a smaller pack at the "
+"cost of speed."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:199
#, no-wrap
msgid "--delta-base-offset"
-msgstr ""
+msgstr "--delta-base-offset"
#. type: Plain text
#: en/git-pack-objects.txt:209
msgid ""
"A packed archive can express the base object of a delta as either a 20-byte "
-"object name or as an offset in the stream, but ancient versions of Git don't "
-"understand the latter. By default, 'git pack-objects' only uses the former "
-"format for better compatibility. This option allows the command to use the "
-"latter format for compactness. Depending on the average delta chain length, "
-"this option typically shrinks the resulting packfile by 3-5 per-cent."
+"object name or as an offset in the stream, but ancient versions of Git don't"
+" understand the latter. By default, 'git pack-objects' only uses the former"
+" format for better compatibility. This option allows the command to use the"
+" latter format for compactness. Depending on the average delta chain "
+"length, this option typically shrinks the resulting packfile by 3-5 per-"
+"cent."
msgstr ""
#. type: Plain text
@@ -46310,7 +46165,7 @@ msgstr ""
#: en/git-pack-objects.txt:230
#, no-wrap
msgid "--keep-true-parents"
-msgstr ""
+msgstr "--keep-true-parents"
#. type: Plain text
#: en/git-pack-objects.txt:233
@@ -46318,7 +46173,6 @@ msgid ""
"With this option, parents that are hidden by grafts are packed nevertheless."
msgstr ""
-#
#. type: Plain text
#: en/git-pack-objects.txt:239
#, fuzzy
@@ -46333,10 +46187,9 @@ msgstr ""
#. type: Title =
#: en/git-pack-redundant.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-pack-redundant(1)"
-msgstr "git-add(1)"
+msgstr "git-pack-redundant(1)"
#. type: Plain text
#: en/git-pack-redundant.txt:7
@@ -46346,7 +46199,9 @@ msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:13
#, no-wrap
-msgid "'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename ... >\n"
+msgid ""
+"'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename "
+"... >\n"
msgstr ""
#. type: Plain text
@@ -46369,8 +46224,8 @@ msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:27
msgid ""
-"git fsck --full --unreachable | cut -d ' ' -f3 | \\ git pack-redundant --all "
-"| xargs rm"
+"git fsck --full --unreachable | cut -d ' ' -f3 | \\ git pack-redundant --all"
+" | xargs rm"
msgstr ""
#. type: Plain text
@@ -46382,7 +46237,7 @@ msgstr ""
#: en/git-pack-redundant.txt:35
#, no-wrap
msgid "--alt-odb"
-msgstr ""
+msgstr "--alt-odb"
#. type: Plain text
#: en/git-pack-redundant.txt:38
@@ -46396,7 +46251,6 @@ msgstr ""
msgid "Outputs some statistics to stderr. Has a small performance penalty."
msgstr ""
-#
#. type: Plain text
#: en/git-pack-redundant.txt:47
#, fuzzy
@@ -46404,17 +46258,17 @@ msgstr ""
#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
#| "merge[1], linkgit:git-commit-tree[1]"
msgid ""
-"linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
+"linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-"
+"packed[1]"
msgstr ""
"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
"merge[1], linkgit:git-commit-tree[1]"
#. type: Title =
#: en/git-pack-refs.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-pack-refs(1)"
-msgstr "git-add(1)"
+msgstr "git-pack-refs(1)"
#. type: Plain text
#: en/git-pack-refs.txt:7
@@ -46430,8 +46284,8 @@ msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:24
msgid ""
-"Traditionally, tips of branches and tags (collectively known as 'refs') were "
-"stored one file per ref in a (sub)directory under `$GIT_DIR/refs` "
+"Traditionally, tips of branches and tags (collectively known as 'refs') were"
+" stored one file per ref in a (sub)directory under `$GIT_DIR/refs` "
"directory. While many branch tips tend to be updated often, most tags and "
"some branch tips are never updated. When a repository has hundreds or "
"thousands of tags, this one-file-per-ref format both wastes storage and "
@@ -46441,25 +46295,25 @@ msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:31
msgid ""
-"This command is used to solve the storage and performance problem by storing "
-"the refs in a single file, `$GIT_DIR/packed-refs`. When a ref is missing "
-"from the traditional `$GIT_DIR/refs` directory hierarchy, it is looked up in "
-"this file and used if found."
+"This command is used to solve the storage and performance problem by storing"
+" the refs in a single file, `$GIT_DIR/packed-refs`. When a ref is missing "
+"from the traditional `$GIT_DIR/refs` directory hierarchy, it is looked up in"
+" this file and used if found."
msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:34
msgid ""
-"Subsequent updates to branches always create new files under `$GIT_DIR/refs` "
-"directory hierarchy."
+"Subsequent updates to branches always create new files under `$GIT_DIR/refs`"
+" directory hierarchy."
msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:43
msgid ""
"A recommended practice to deal with a repository with too many refs is to "
-"pack its refs with `--all` once, and occasionally run `git pack-refs`. Tags "
-"are by definition stationary and are not expected to change. Branch heads "
+"pack its refs with `--all` once, and occasionally run `git pack-refs`. Tags"
+" are by definition stationary and are not expected to change. Branch heads "
"will be packed with the initial `pack-refs --all`, but only the currently "
"active branch heads will become unpacked, and the next `pack-refs` (without "
"`--all`) will leave them unpacked."
@@ -46478,8 +46332,8 @@ msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:61
msgid ""
-"The command usually removes loose refs under `$GIT_DIR/refs` hierarchy after "
-"packing them. This option tells it not to."
+"The command usually removes loose refs under `$GIT_DIR/refs` hierarchy after"
+" packing them. This option tells it not to."
msgstr ""
#. type: Plain text
@@ -46494,7 +46348,7 @@ msgstr ""
#: en/git-parse-remote.txt:2
#, no-wrap
msgid "git-parse-remote(1)"
-msgstr ""
+msgstr "git-parse-remote(1)"
#. type: Plain text
#: en/git-parse-remote.txt:7
@@ -46512,17 +46366,16 @@ msgstr ""
#. type: Plain text
#: en/git-parse-remote.txt:20
msgid ""
-"This script is included in various scripts to supply routines to parse files "
-"under $GIT_DIR/remotes/ and $GIT_DIR/branches/ and configuration variables "
+"This script is included in various scripts to supply routines to parse files"
+" under $GIT_DIR/remotes/ and $GIT_DIR/branches/ and configuration variables "
"that are related to fetching, pulling and pushing."
msgstr ""
#. type: Title =
#: en/git-patch-id.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-patch-id(1)"
-msgstr "git-add(1)"
+msgstr "git-patch-id(1)"
#. type: Plain text
#: en/git-patch-id.txt:7
@@ -46569,7 +46422,7 @@ msgstr ""
#: en/git-patch-id.txt:33
#, no-wrap
msgid "--stable"
-msgstr ""
+msgstr "--stable"
#. type: Plain text
#: en/git-patch-id.txt:35
@@ -46582,15 +46435,15 @@ msgid ""
"Reordering file diffs that make up a patch does not affect the ID. In "
"particular, two patches produced by comparing the same two trees with two "
"different settings for \"-O<orderfile>\" result in the same patch ID "
-"signature, thereby allowing the computed result to be used as a key to index "
-"some meta-information about the change between the two trees;"
+"signature, thereby allowing the computed result to be used as a key to index"
+" some meta-information about the change between the two trees;"
msgstr ""
#. type: Plain text
#: en/git-patch-id.txt:47
msgid ""
-"Result is different from the value produced by git 1.9 and older or produced "
-"when an \"unstable\" hash (see --unstable below) is configured - even when "
+"Result is different from the value produced by git 1.9 and older or produced"
+" when an \"unstable\" hash (see --unstable below) is configured - even when "
"used on a diff output taken without any use of \"-O<orderfile>\", thereby "
"making existing databases storing such \"unstable\" or historical patch-ids "
"unusable."
@@ -46606,7 +46459,7 @@ msgstr ""
#: en/git-patch-id.txt:50
#, no-wrap
msgid "--unstable"
-msgstr ""
+msgstr "--unstable"
#. type: Plain text
#: en/git-patch-id.txt:56
@@ -46630,10 +46483,9 @@ msgstr ""
#. type: Title =
#: en/git-prune-packed.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-prune-packed(1)"
-msgstr "git-add(1)"
+msgstr "git-prune-packed(1)"
#. type: Plain text
#: en/git-prune-packed.txt:7
@@ -46650,7 +46502,8 @@ msgstr ""
#: en/git-prune-packed.txt:19
msgid ""
"This program searches the `$GIT_OBJECT_DIRECTORY` for all objects that "
-"currently exist in a pack file as well as the independent object directories."
+"currently exist in a pack file as well as the independent object "
+"directories."
msgstr ""
#. type: Plain text
@@ -46694,7 +46547,6 @@ msgstr ""
msgid "Squelch the progress indicator."
msgstr ""
-#
#. type: Plain text
#: en/git-prune-packed.txt:44
#, fuzzy
@@ -46708,12 +46560,10 @@ msgstr ""
#. type: Title =
#: en/git-prune.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-prune(1)"
-msgstr "git-add(1)"
+msgstr "git-prune(1)"
-#
#. type: Plain text
#: en/git-prune.txt:7
#, fuzzy
@@ -46738,9 +46588,9 @@ msgstr ""
#: en/git-prune.txt:29
msgid ""
"This runs 'git fsck --unreachable' using all the refs available in `refs/`, "
-"optionally with additional set of objects specified on the command line, and "
-"prunes all unpacked objects unreachable from any of these head objects from "
-"the object database. In addition, it prunes the unpacked objects that are "
+"optionally with additional set of objects specified on the command line, and"
+" prunes all unpacked objects unreachable from any of these head objects from"
+" the object database. In addition, it prunes the unpacked objects that are "
"also found in packs by running 'git prune-packed'. It also removes entries "
"from .git/shallow that are not reachable by any ref."
msgstr ""
@@ -46832,7 +46682,6 @@ msgid ""
"fsck''s --unreachable option."
msgstr ""
-#
#. type: Plain text
#: en/git-prune.txt:83
#, fuzzy
@@ -46846,15 +46695,15 @@ msgstr ""
#. type: Title =
#: en/git-pull.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-pull(1)"
-msgstr "git-add(1)"
+msgstr "git-pull(1)"
#. type: Plain text
#: en/git-pull.txt:7
msgid ""
-"git-pull - Fetch from and integrate with another repository or a local branch"
+"git-pull - Fetch from and integrate with another repository or a local "
+"branch"
msgstr ""
#. type: Plain text
@@ -46882,11 +46731,12 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:33
msgid ""
-"<repository> should be the name of a remote repository as passed to linkgit:"
-"git-fetch[1]. <refspec> can name an arbitrary remote ref (for example, the "
-"name of a tag) or even a collection of refs with corresponding remote-"
-"tracking branches (e.g., refs/heads/{asterisk}:refs/remotes/origin/"
-"{asterisk}), but usually it is the name of a branch in the remote repository."
+"<repository> should be the name of a remote repository as passed to "
+"linkgit:git-fetch[1]. <refspec> can name an arbitrary remote ref (for "
+"example, the name of a tag) or even a collection of refs with corresponding "
+"remote-tracking branches (e.g., "
+"refs/heads/{asterisk}:refs/remotes/origin/{asterisk}), but usually it is the"
+" name of a branch in the remote repository."
msgstr ""
#. type: Plain text
@@ -46912,10 +46762,10 @@ msgstr ""
#: en/git-pull.txt:54
msgid ""
"Then \"`git pull`\" will fetch and replay the changes from the remote "
-"`master` branch since it diverged from the local `master` (i.e., `E`) until "
-"its current commit (`C`) on top of `master` and record the result in a new "
-"commit along with the names of the two parent commits and a log message from "
-"the user describing the changes."
+"`master` branch since it diverged from the local `master` (i.e., `E`) until"
+" its current commit (`C`) on top of `master` and record the result in a new "
+"commit along with the names of the two parent commits and a log message from"
+" the user describing the changes."
msgstr ""
#. type: delimited block -
@@ -46937,10 +46787,10 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:68
msgid ""
-"In Git 1.7.0 or later, to cancel a conflicting merge, use `git reset --"
-"merge`. *Warning*: In older versions of Git, running 'git pull' with "
-"uncommitted changes is discouraged: while possible, it leaves you in a state "
-"that may be hard to back out of in the case of a conflict."
+"In Git 1.7.0 or later, to cancel a conflicting merge, use `git reset "
+"--merge`. *Warning*: In older versions of Git, running 'git pull' with "
+"uncommitted changes is discouraged: while possible, it leaves you in a state"
+" that may be hard to back out of in the case of a conflict."
msgstr ""
#. type: Plain text
@@ -46997,8 +46847,8 @@ msgstr ""
#: en/git-pull.txt:110
msgid ""
"When true, rebase the current branch on top of the upstream branch after "
-"fetching. If there is a remote-tracking branch corresponding to the upstream "
-"branch and the upstream branch was rebased since last fetched, the rebase "
+"fetching. If there is a remote-tracking branch corresponding to the upstream"
+" branch and the upstream branch was rebased since last fetched, the rebase "
"uses that information to avoid rebasing non-local changes."
msgstr ""
@@ -47039,7 +46889,7 @@ msgstr ""
#: en/git-pull.txt:128 en/git-svn.txt:245
#, no-wrap
msgid "--no-rebase"
-msgstr ""
+msgstr "--no-rebase"
#. type: Plain text
#: en/git-pull.txt:130
@@ -47050,13 +46900,13 @@ msgstr ""
#: en/git-pull.txt:131 en/git-rebase.txt:442
#, no-wrap
msgid "--autostash"
-msgstr ""
+msgstr "--autostash"
#. type: Labeled list
#: en/git-pull.txt:132 en/git-rebase.txt:443
#, no-wrap
msgid "--no-autostash"
-msgstr ""
+msgstr "--no-autostash"
#. type: Plain text
#: en/git-pull.txt:137
@@ -47098,20 +46948,20 @@ msgstr ""
msgid ""
"In order to determine what URL to use to fetch from, the value of the "
"configuration `remote.<origin>.url` is consulted and if there is not any "
-"such variable, the value on `URL: ` line in `$GIT_DIR/remotes/<origin>` file "
-"is used."
+"such variable, the value on `URL: ` line in `$GIT_DIR/remotes/<origin>` file"
+" is used."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:173
msgid ""
-"In order to determine what remote branches to fetch (and optionally store in "
-"the remote-tracking branches) when the command is run without any refspec "
-"parameters on the command line, values of the configuration variable `remote."
-"<origin>.fetch` are consulted, and if there aren't any, `$GIT_DIR/remotes/"
-"<origin>` file is consulted and its `Pull: ` lines are used. In addition to "
-"the refspec formats described in the OPTIONS section, you can have a "
-"globbing refspec that looks like this:"
+"In order to determine what remote branches to fetch (and optionally store in"
+" the remote-tracking branches) when the command is run without any refspec "
+"parameters on the command line, values of the configuration variable "
+"`remote.<origin>.fetch` are consulted, and if there aren't any, "
+"`$GIT_DIR/remotes/<origin>` file is consulted and its `Pull: ` lines are "
+"used. In addition to the refspec formats described in the OPTIONS section, "
+"you can have a globbing refspec that looks like this:"
msgstr ""
#. type: delimited block -
@@ -47124,9 +46974,10 @@ msgstr ""
#: en/git-pull.txt:183
msgid ""
"A globbing refspec must have a non-empty RHS (i.e. must store what were "
-"fetched in remote-tracking branches), and its LHS and RHS must end with `/"
-"*`. The above specifies that all remote branches are tracked using remote-"
-"tracking branches in `refs/remotes/origin/` hierarchy under the same name."
+"fetched in remote-tracking branches), and its LHS and RHS must end with "
+"`/*`. The above specifies that all remote branches are tracked using "
+"remote-tracking branches in `refs/remotes/origin/` hierarchy under the same "
+"name."
msgstr ""
#. type: Plain text
@@ -47171,8 +47022,8 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:211
msgid ""
-"Update the remote-tracking branches for the repository you cloned from, then "
-"merge one of them into your current branch:"
+"Update the remote-tracking branches for the repository you cloned from, then"
+" merge one of them into your current branch:"
msgstr ""
#. type: delimited block -
@@ -47224,7 +47075,6 @@ msgid ""
"start over, you can recover with 'git reset'."
msgstr ""
-#
#. type: Plain text
#: en/git-pull.txt:254
#, fuzzy
@@ -47238,10 +47088,9 @@ msgstr ""
#. type: Title =
#: en/git-push.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-push(1)"
-msgstr "git-add(1)"
+msgstr "git-push(1)"
#. type: Plain text
#: en/git-push.txt:7
@@ -47278,8 +47127,8 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:33
msgid ""
-"When the command line does not specify where to push with the `<repository>` "
-"argument, `branch.*.remote` configuration for the current branch is "
+"When the command line does not specify where to push with the `<repository>`"
+" argument, `branch.*.remote` configuration for the current branch is "
"consulted to determine where to push. If the configuration is missing, it "
"defaults to 'origin'."
msgstr ""
@@ -47329,14 +47178,15 @@ msgstr ""
msgid ""
"Specify what destination ref to update with what source object. The format "
"of a <refspec> parameter is an optional plus `+`, followed by the source "
-"object <src>, followed by a colon `:`, followed by the destination ref <dst>."
+"object <src>, followed by a colon `:`, followed by the destination ref "
+"<dst>."
msgstr ""
#. type: Plain text
#: en/git-push.txt:65
msgid ""
-"The <src> is often the name of the branch you would want to push, but it can "
-"be any arbitrary \"SHA-1 expression\", such as `master~4` or `HEAD` (see "
+"The <src> is often the name of the branch you would want to push, but it can"
+" be any arbitrary \"SHA-1 expression\", such as `master~4` or `HEAD` (see "
"linkgit:gitrevisions[7])."
msgstr ""
@@ -47360,8 +47210,8 @@ msgid ""
"remote side. By default this is only allowed if <dst> is not a tag "
"(annotated or lightweight), and then only if it can fast-forward <dst>. By "
"having the optional leading `+`, you can tell Git to update the <dst> ref "
-"even if it is not allowed by default (e.g., it is not a fast-forward.) This "
-"does *not* attempt to merge <src> into <dst>. See EXAMPLES below for "
+"even if it is not allowed by default (e.g., it is not a fast-forward.) This"
+" does *not* attempt to merge <src> into <dst>. See EXAMPLES below for "
"details."
msgstr ""
@@ -47380,17 +47230,17 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:93
msgid ""
-"The special refspec `:` (or `+:` to allow non-fast-forward updates) directs "
-"Git to push \"matching\" branches: for every branch that exists on the local "
-"side, the remote side is updated if a branch of the same name already exists "
-"on the remote side."
+"The special refspec `:` (or `+:` to allow non-fast-forward updates) directs"
+" Git to push \"matching\" branches: for every branch that exists on the "
+"local side, the remote side is updated if a branch of the same name already "
+"exists on the remote side."
msgstr ""
#. type: Plain text
#: en/git-push.txt:97
msgid ""
-"Push all branches (i.e. refs under `refs/heads/`); cannot be used with other "
-"<refspec>."
+"Push all branches (i.e. refs under `refs/heads/`); cannot be used with other"
+" <refspec>."
msgstr ""
#. type: Plain text
@@ -47398,8 +47248,8 @@ msgstr ""
msgid ""
"Remove remote branches that don't have a local counterpart. For example a "
"remote branch `tmp` will be removed if a local branch with the same name "
-"doesn't exist any more. This also respects refspecs, e.g. `git push --prune "
-"remote refs/heads/*:refs/tmp/*` would make sure that remote `refs/tmp/foo` "
+"doesn't exist any more. This also respects refspecs, e.g. `git push --prune"
+" remote refs/heads/*:refs/tmp/*` would make sure that remote `refs/tmp/foo` "
"will be removed if `refs/heads/foo` doesn't exist."
msgstr ""
@@ -47411,8 +47261,8 @@ msgid ""
"`refs/tags/`) be mirrored to the remote repository. Newly created local "
"refs will be pushed to the remote end, locally updated refs will be force "
"updated on the remote end, and deleted refs will be removed from the remote "
-"end. This is the default if the configuration option `remote.<remote>."
-"mirror` is set."
+"end. This is the default if the configuration option "
+"`remote.<remote>.mirror` is set."
msgstr ""
#. type: Plain text
@@ -47441,7 +47291,7 @@ msgstr ""
#: en/git-push.txt:135
#, no-wrap
msgid "--follow-tags"
-msgstr ""
+msgstr "--follow-tags"
#. type: Plain text
#: en/git-push.txt:142
@@ -47457,7 +47307,7 @@ msgstr ""
#: en/git-push.txt:143 en/git-send-pack.txt:73
#, no-wrap
msgid "--[no-]signed"
-msgstr ""
+msgstr "--[no-]signed"
#. type: Labeled list
#: en/git-push.txt:144 en/git-send-pack.txt:74
@@ -47471,8 +47321,8 @@ msgid ""
"GPG-sign the push request to update refs on the receiving side, to allow it "
"to be checked by the hooks and/or be logged. If `false` or `--no-signed`, "
"no signing will be attempted. If `true` or `--signed`, the push will fail "
-"if the server does not support signed pushes. If set to `if-asked`, sign if "
-"and only if the server supports signed pushes. The push will also fail if "
+"if the server does not support signed pushes. If set to `if-asked`, sign if"
+" and only if the server supports signed pushes. The push will also fail if "
"the actual call to `gpg --sign` fails. See linkgit:git-receive-pack[1] for "
"the details on the receiving end."
msgstr ""
@@ -47481,7 +47331,7 @@ msgstr ""
#: en/git-push.txt:154
#, no-wrap
msgid "--[no-]atomic"
-msgstr ""
+msgstr "--[no-]atomic"
#. type: Plain text
#: en/git-push.txt:158
@@ -47493,10 +47343,9 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:160
-#, fuzzy, no-wrap
-#| msgid "status"
+#, no-wrap
msgid "--push-option"
-msgstr "status"
+msgstr "--push-option"
#. type: Plain text
#: en/git-push.txt:164
@@ -47532,7 +47381,7 @@ msgstr ""
#: en/git-push.txt:172
#, no-wrap
msgid "--[no-]force-with-lease"
-msgstr ""
+msgstr "--[no-]force-with-lease"
#. type: Labeled list
#: en/git-push.txt:173
@@ -47549,8 +47398,8 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:177
msgid ""
-"Usually, \"git push\" refuses to update a remote ref that is not an ancestor "
-"of the local ref used to overwrite it."
+"Usually, \"git push\" refuses to update a remote ref that is not an ancestor"
+" of the local ref used to overwrite it."
msgstr ""
#. type: Plain text
@@ -47565,10 +47414,10 @@ msgstr ""
msgid ""
"Imagine that you have to rebase what you have already published. You will "
"have to bypass the \"must fast-forward\" rule in order to replace the "
-"history you originally published with the rebased history. If somebody else "
-"built on top of your original history while you are rebasing, the tip of the "
-"branch at the remote may advance with her commit, and blindly pushing with "
-"`--force` will lose her work."
+"history you originally published with the rebased history. If somebody else"
+" built on top of your original history while you are rebasing, the tip of "
+"the branch at the remote may advance with her commit, and blindly pushing "
+"with `--force` will lose her work."
msgstr ""
#. type: Plain text
@@ -47585,9 +47434,9 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:199
msgid ""
-"`--force-with-lease` alone, without specifying the details, will protect all "
-"remote refs that are going to be updated by requiring their current value to "
-"be the same as the remote-tracking branch we have for them."
+"`--force-with-lease` alone, without specifying the details, will protect all"
+" remote refs that are going to be updated by requiring their current value "
+"to be the same as the remote-tracking branch we have for them."
msgstr ""
#. type: Plain text
@@ -47604,8 +47453,8 @@ msgstr ""
msgid ""
"`--force-with-lease=<refname>:<expect>` will protect the named ref (alone), "
"if it is going to be updated, by requiring its current value to be the same "
-"as the specified value `<expect>` (which is allowed to be different from the "
-"remote-tracking branch we have for the refname, or we do not even have to "
+"as the specified value `<expect>` (which is allowed to be different from the"
+" remote-tracking branch we have for the refname, or we do not even have to "
"have such a remote-tracking branch when this form is used). If `<expect>` "
"is the empty string, then the named ref must not already exist."
msgstr ""
@@ -47622,8 +47471,8 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:220
msgid ""
-"\"--no-force-with-lease\" will cancel all the previous --force-with-lease on "
-"the command line."
+"\"--no-force-with-lease\" will cancel all the previous --force-with-lease on"
+" the command line."
msgstr ""
#. type: Plain text
@@ -47638,8 +47487,8 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:231
msgid ""
-"This flag disables these checks, and can cause the remote repository to lose "
-"commits; use it with care."
+"This flag disables these checks, and can cause the remote repository to lose"
+" commits; use it with care."
msgstr ""
#. type: Plain text
@@ -47649,8 +47498,8 @@ msgid ""
"with `push.default` set to `matching` or with multiple push destinations "
"configured with `remote.*.push` may overwrite refs other than the current "
"branch (including local refs that are strictly behind their remote "
-"counterpart). To force a push to only one branch, use a `+` in front of the "
-"refspec to push (e.g `git push origin +master` to force a push to the "
+"counterpart). To force a push to only one branch, use a `+` in front of the"
+" refspec to push (e.g `git push origin +master` to force a push to the "
"`master` branch). See the `<refspec>...` section above for details."
msgstr ""
@@ -47680,7 +47529,7 @@ msgstr ""
#: en/git-push.txt:252
#, no-wrap
msgid "--[no-]thin"
-msgstr ""
+msgstr "--[no-]thin"
#. type: Plain text
#: en/git-push.txt:257
@@ -47709,29 +47558,29 @@ msgid ""
"May be used to make sure all submodule commits used by the revisions to be "
"pushed are available on a remote-tracking branch. If 'check' is used Git "
"will verify that all submodule commits that changed in the revisions to be "
-"pushed are available on at least one remote of the submodule. If any commits "
-"are missing the push will be aborted and exit with non-zero status. If 'on-"
+"pushed are available on at least one remote of the submodule. If any commits"
+" are missing the push will be aborted and exit with non-zero status. If 'on-"
"demand' is used all submodules that changed in the revisions to be pushed "
-"will be pushed. If on-demand was not able to push all necessary revisions it "
-"will also be aborted and exit with non-zero status. If 'only' is used all "
+"will be pushed. If on-demand was not able to push all necessary revisions it"
+" will also be aborted and exit with non-zero status. If 'only' is used all "
"submodules will be recursively pushed while the superproject is left "
"unpushed. A value of 'no' or using `--no-recurse-submodules` can be used to "
-"override the push.recurseSubmodules configuration variable when no submodule "
-"recursion is required."
+"override the push.recurseSubmodules configuration variable when no submodule"
+" recursion is required."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:290
#, no-wrap
msgid "--[no-]verify"
-msgstr ""
+msgstr "--[no-]verify"
#. type: Plain text
#: en/git-push.txt:294
msgid ""
-"Toggle the pre-push hook (see linkgit:githooks[5]). The default is --"
-"verify, giving the hook a chance to prevent the push. With --no-verify, the "
-"hook is bypassed completely."
+"Toggle the pre-push hook (see linkgit:githooks[5]). The default is "
+"--verify, giving the hook a chance to prevent the push. With --no-verify, "
+"the hook is bypassed completely."
msgstr ""
#. type: Plain text
@@ -47840,8 +47689,8 @@ msgid ""
"side, or because the remote repository has one of the following safety "
"options in effect: `receive.denyCurrentBranch` (for pushes to the checked "
"out branch), `receive.denyNonFastForwards` (for forced non-fast-forward "
-"updates), `receive.denyDeletes` or `receive.denyDeleteCurrent`. See linkgit:"
-"git-config[1]."
+"updates), `receive.denyDeletes` or `receive.denyDeleteCurrent`. See "
+"linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
@@ -47876,7 +47725,8 @@ msgstr ""
#: en/git-push.txt:378
msgid ""
"A human-readable explanation. In the case of successfully pushed refs, no "
-"explanation is needed. For a failed ref, the reason for failure is described."
+"explanation is needed. For a failed ref, the reason for failure is "
+"described."
msgstr ""
#. type: Title -
@@ -48011,15 +47861,15 @@ msgstr ""
#: en/git-push.txt:464
msgid ""
"There is another common situation where you may encounter non-fast-forward "
-"rejection when you try to push, and it is possible even when you are pushing "
-"into a repository nobody else pushes into. After you push commit A yourself "
-"(in the first picture in this section), replace it with \"git commit --amend"
-"\" to produce commit B, and you try to push it out, because forgot that you "
-"have pushed A out already. In such a case, and only if you are certain that "
-"nobody in the meantime fetched your earlier commit A (and started building "
-"on top of it), you can run \"git push --force\" to overwrite it. In other "
-"words, \"git push --force\" is a method reserved for a case where you do "
-"mean to lose history."
+"rejection when you try to push, and it is possible even when you are pushing"
+" into a repository nobody else pushes into. After you push commit A yourself"
+" (in the first picture in this section), replace it with \"git commit "
+"--amend\" to produce commit B, and you try to push it out, because forgot "
+"that you have pushed A out already. In such a case, and only if you are "
+"certain that nobody in the meantime fetched your earlier commit A (and "
+"started building on top of it), you can run \"git push --force\" to "
+"overwrite it. In other words, \"git push --force\" is a method reserved for "
+"a case where you do mean to lose history."
msgstr ""
#. type: Labeled list
@@ -48047,8 +47897,8 @@ msgstr "$ git commit\n"
#: en/git-push.txt:479
msgid ""
"Without additional configuration, pushes the current branch to the "
-"configured upstream (`remote.origin.merge` configuration variable) if it has "
-"the same name as the current branch, and errors out without pushing "
+"configured upstream (`remote.origin.merge` configuration variable) if it has"
+" the same name as the current branch, and errors out without pushing "
"otherwise."
msgstr ""
@@ -48056,16 +47906,16 @@ msgstr ""
#: en/git-push.txt:483
msgid ""
"The default behavior of this command when no <refspec> is given can be "
-"configured by setting the `push` option of the remote, or the `push.default` "
-"configuration variable."
+"configured by setting the `push` option of the remote, or the `push.default`"
+" configuration variable."
msgstr ""
#. type: Plain text
#: en/git-push.txt:488
msgid ""
"For example, to default to pushing only the current branch to `origin` use "
-"`git config remote.origin.push HEAD`. Any valid <refspec> (like the ones in "
-"the examples below) can be configured as the default for `git push origin`."
+"`git config remote.origin.push HEAD`. Any valid <refspec> (like the ones in"
+" the examples below) can be configured as the default for `git push origin`."
msgstr ""
#. type: Labeled list
@@ -48078,8 +47928,9 @@ msgstr "$ git commit\n"
#. type: Plain text
#: en/git-push.txt:493
msgid ""
-"Push \"matching\" branches to `origin`. See <refspec> in the <<OPTIONS,"
-"OPTIONS>> section above for a description of \"matching\" branches."
+"Push \"matching\" branches to `origin`. See <refspec> in the "
+"<<OPTIONS,OPTIONS>> section above for a description of \"matching\" "
+"branches."
msgstr ""
#. type: Labeled list
@@ -48093,9 +47944,9 @@ msgstr "$ git commit\n"
#: en/git-push.txt:500
msgid ""
"Find a ref that matches `master` in the source repository (most likely, it "
-"would find `refs/heads/master`), and update the same ref (e.g. `refs/heads/"
-"master`) in `origin` repository with it. If `master` did not exist "
-"remotely, it would be created."
+"would find `refs/heads/master`), and update the same ref (e.g. "
+"`refs/heads/master`) in `origin` repository with it. If `master` did not "
+"exist remotely, it would be created."
msgstr ""
#. type: Labeled list
@@ -48120,18 +47971,18 @@ msgstr ""
#: en/git-push.txt:510
msgid ""
"Use the source ref that matches `master` (e.g. `refs/heads/master`) to "
-"update the ref that matches `satellite/master` (most probably `refs/remotes/"
-"satellite/master`) in the `mothership` repository; do the same for `dev` and "
-"`satellite/dev`."
+"update the ref that matches `satellite/master` (most probably "
+"`refs/remotes/satellite/master`) in the `mothership` repository; do the same"
+" for `dev` and `satellite/dev`."
msgstr ""
#. type: Plain text
#: en/git-push.txt:517
msgid ""
-"This is to emulate `git fetch` run on the `mothership` using `git push` that "
-"is run in the opposite direction in order to integrate the work done on "
-"`satellite`, and is often necessary when you can only make connection in one "
-"way (i.e. satellite can ssh into mothership but mothership cannot initiate "
+"This is to emulate `git fetch` run on the `mothership` using `git push` that"
+" is run in the opposite direction in order to integrate the work done on "
+"`satellite`, and is often necessary when you can only make connection in one"
+" way (i.e. satellite can ssh into mothership but mothership cannot initiate "
"connection to satellite because the latter is behind a firewall or does not "
"run sshd)."
msgstr ""
@@ -48139,9 +47990,10 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:522
msgid ""
-"After running this `git push` on the `satellite` machine, you would ssh into "
-"the `mothership` and run `git merge` there to complete the emulation of `git "
-"pull` that were run on `mothership` to pull changes made on `satellite`."
+"After running this `git push` on the `satellite` machine, you would ssh into"
+" the `mothership` and run `git merge` there to complete the emulation of "
+"`git pull` that were run on `mothership` to pull changes made on "
+"`satellite`."
msgstr ""
#. type: Labeled list
@@ -48168,8 +48020,8 @@ msgstr ""
#: en/git-push.txt:534
msgid ""
"Create the branch `experimental` in the `origin` repository by copying the "
-"current `master` branch. This form is only needed to create a new branch or "
-"tag in the remote repository when the local name and the remote name are "
+"current `master` branch. This form is only needed to create a new branch or"
+" tag in the remote repository when the local name and the remote name are "
"different; otherwise, the ref name on its own will work."
msgstr ""
@@ -48227,16 +48079,16 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:562
msgid ""
-"Commits A and B would no longer belong to a branch with a symbolic name, and "
-"so would be unreachable. As such, these commits would be removed by a `git "
-"gc` command on the origin repository."
+"Commits A and B would no longer belong to a branch with a symbolic name, and"
+" so would be unreachable. As such, these commits would be removed by a `git"
+" gc` command on the origin repository."
msgstr ""
#. type: Title =
#: en/git-quiltimport.txt:2
#, no-wrap
msgid "git-quiltimport(1)"
-msgstr ""
+msgstr "git-quiltimport(1)"
#. type: Plain text
#: en/git-quiltimport.txt:7
@@ -48263,8 +48115,8 @@ msgstr ""
#: en/git-quiltimport.txt:27
msgid ""
"For each patch the code attempts to extract the author from the patch "
-"description. If that fails it falls back to the author specified with --"
-"author. If the --author flag was not given the patch description is "
+"description. If that fails it falls back to the author specified with "
+"--author. If the --author flag was not given the patch description is "
"displayed and the user is asked to interactively enter the author of the "
"patch."
msgstr ""
@@ -48279,8 +48131,8 @@ msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:40
msgid ""
-"Walk through the patches in the series and warn if we cannot find all of the "
-"necessary information to commit a patch. At the time of this writing only "
+"Walk through the patches in the series and warn if we cannot find all of the"
+" necessary information to commit a patch. At the time of this writing only "
"missing author information is warned about."
msgstr ""
@@ -48311,8 +48163,8 @@ msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:51
msgid ""
-"The default for the patch directory is patches or the value of the `"
-"$QUILT_PATCHES` environment variable."
+"The default for the patch directory is patches or the value of the "
+"`$QUILT_PATCHES` environment variable."
msgstr ""
#. type: Labeled list
@@ -48329,18 +48181,16 @@ msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:58
msgid ""
-"The default for the series file is <patches>/series or the value of the `"
-"$QUILT_SERIES` environment variable."
+"The default for the series file is <patches>/series or the value of the "
+"`$QUILT_SERIES` environment variable."
msgstr ""
#. type: Title =
#: en/git-read-tree.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-read-tree(1)"
-msgstr "git-add(1)"
+msgstr "git-read-tree(1)"
-#
#. type: Plain text
#: en/git-read-tree.txt:7
#, fuzzy
@@ -48362,15 +48212,15 @@ msgstr ""
#: en/git-read-tree.txt:23
msgid ""
"Reads the tree information given by <tree-ish> into the index, but does not "
-"actually *update* any of the files it \"caches\". (see: linkgit:git-checkout-"
-"index[1])"
+"actually *update* any of the files it \"caches\". (see: linkgit:git-"
+"checkout-index[1])"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:28
msgid ""
-"Optionally, it can merge a tree into the index, perform a fast-forward (i.e. "
-"2-way) merge, or a 3-way merge, with the `-m` flag. When used with `-m`, "
+"Optionally, it can merge a tree into the index, perform a fast-forward (i.e."
+" 2-way) merge, or a 3-way merge, with the `-m` flag. When used with `-m`, "
"the `-u` flag causes it to also update the files in the work tree with the "
"result of the merge."
msgstr ""
@@ -48392,10 +48242,9 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:40
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--reset"
-msgstr "git-commit(1)"
+msgstr "--reset"
#. type: Plain text
#: en/git-read-tree.txt:43
@@ -48436,7 +48285,7 @@ msgstr ""
#: en/git-read-tree.txt:65
#, no-wrap
msgid "--trivial"
-msgstr ""
+msgstr "--trivial"
#. type: Plain text
#: en/git-read-tree.txt:70
@@ -48458,8 +48307,8 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:80
msgid ""
-"when one side removes a path and the other side leaves the path unmodified. "
-"The resolution is to remove that path."
+"when one side removes a path and the other side leaves the path unmodified."
+" The resolution is to remove that path."
msgstr ""
#. type: Plain text
@@ -48476,8 +48325,8 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:90
msgid ""
-"Keep the current index contents, and read the contents of the named tree-ish "
-"under the directory at `<prefix>`. The command will refuse to overwrite "
+"Keep the current index contents, and read the contents of the named tree-ish"
+" under the directory at `<prefix>`. The command will refuse to overwrite "
"entries that already existed in the original index file. Note that the "
"`<prefix>/` value must end with a slash."
msgstr ""
@@ -48494,13 +48343,13 @@ msgid ""
"When running the command with `-u` and `-m` options, the merge result may "
"need to overwrite paths that are not tracked in the current branch. The "
"command usually refuses to proceed with the merge to avoid losing such a "
-"path. However this safety valve sometimes gets in the way. For example, it "
-"often happens that the other branch added a file that used to be a generated "
-"file in your branch, and the safety valve triggers when you try to switch to "
-"that branch after you ran `make` but before running `make clean` to remove "
-"the generated file. This option tells the command to read per-directory "
-"exclude file (usually '.gitignore') and allows such an untracked but "
-"explicitly ignored file to be overwritten."
+"path. However this safety valve sometimes gets in the way. For example, it"
+" often happens that the other branch added a file that used to be a "
+"generated file in your branch, and the safety valve triggers when you try to"
+" switch to that branch after you ran `make` but before running `make clean` "
+"to remove the generated file. This option tells the command to read per-"
+"directory exclude file (usually '.gitignore') and allows such an untracked "
+"but explicitly ignored file to be overwritten."
msgstr ""
#. type: Labeled list
@@ -48512,20 +48361,20 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:117
msgid ""
-"Instead of writing the results out to `$GIT_INDEX_FILE`, write the resulting "
-"index in the named file. While the command is operating, the original index "
-"file is locked with the same mechanism as usual. The file must allow to be "
-"rename(2)ed into from a temporary file that is created next to the usual "
-"index file; typically this means it needs to be on the same filesystem as "
-"the index file itself, and you need write permission to the directories the "
-"index file and index output file are located in."
+"Instead of writing the results out to `$GIT_INDEX_FILE`, write the resulting"
+" index in the named file. While the command is operating, the original "
+"index file is locked with the same mechanism as usual. The file must allow "
+"to be rename(2)ed into from a temporary file that is created next to the "
+"usual index file; typically this means it needs to be on the same filesystem"
+" as the index file itself, and you need write permission to the directories "
+"the index file and index output file are located in."
msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:118
#, no-wrap
msgid "--no-sparse-checkout"
-msgstr ""
+msgstr "--no-sparse-checkout"
#. type: Plain text
#: en/git-read-tree.txt:121
@@ -48536,7 +48385,7 @@ msgstr ""
#: en/git-read-tree.txt:122
#, no-wrap
msgid "--empty"
-msgstr ""
+msgstr "--empty"
#. type: Plain text
#: en/git-read-tree.txt:125
@@ -48563,9 +48412,9 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:136
msgid ""
-"If `-m` is specified, 'git read-tree' can perform 3 kinds of merge, a single "
-"tree merge if only 1 tree is given, a fast-forward merge with 2 trees, or a "
-"3-way merge if 3 trees are provided."
+"If `-m` is specified, 'git read-tree' can perform 3 kinds of merge, a single"
+" tree merge if only 1 tree is given, a fast-forward merge with 2 trees, or a"
+" 3-way merge if 3 trees are provided."
msgstr ""
#. type: Title ~
@@ -48577,8 +48426,8 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:145
msgid ""
-"If only 1 tree is specified, 'git read-tree' operates as if the user did not "
-"specify `-m`, except that if the original index has an entry for a given "
+"If only 1 tree is specified, 'git read-tree' operates as if the user did not"
+" specify `-m`, except that if the original index has an entry for a given "
"pathname, and the contents of the path match with the tree being read, the "
"stat info from the index is used. (In other words, the index's stat()s take "
"precedence over the merged tree's)."
@@ -48588,8 +48437,8 @@ msgstr ""
#: en/git-read-tree.txt:149
msgid ""
"That means that if you do a `git read-tree -m <newtree>` followed by a `git "
-"checkout-index -f -u -a`, the 'git checkout-index' only checks out the stuff "
-"that really changed."
+"checkout-index -f -u -a`, the 'git checkout-index' only checks out the stuff"
+" that really changed."
msgstr ""
#. type: Plain text
@@ -48608,8 +48457,8 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:161
msgid ""
-"Typically, this is invoked as `git read-tree -m $H $M`, where $H is the head "
-"commit of the current repository, and $M is the head of a foreign tree, "
+"Typically, this is invoked as `git read-tree -m $H $M`, where $H is the head"
+" commit of the current repository, and $M is the head of a foreign tree, "
"which is simply ahead of $H (i.e. we are in a fast-forward situation)."
msgstr ""
@@ -48639,10 +48488,10 @@ msgstr ""
#: en/git-read-tree.txt:175
msgid ""
"In this case, the `git read-tree -m $H $M` command makes sure that no local "
-"change is lost as the result of this \"merge\". Here are the \"carry forward"
-"\" rules, where \"I\" denotes the index, \"clean\" means that index and work "
-"tree coincide, and \"exists\"/\"nothing\" refer to the presence of a path in "
-"the specified commit:"
+"change is lost as the result of this \"merge\". Here are the \"carry "
+"forward\" rules, where \"I\" denotes the index, \"clean\" means that index "
+"and work tree coincide, and \"exists\"/\"nothing\" refer to the presence of "
+"a path in the specified commit:"
msgstr ""
#. type: Plain text
@@ -48718,20 +48567,20 @@ msgstr ""
#: en/git-read-tree.txt:219
msgid ""
"In all \"keep index\" cases, the index entry stays as in the original index "
-"file. If the entry is not up to date, 'git read-tree' keeps the copy in the "
-"work tree intact when operating under the -u flag."
+"file. If the entry is not up to date, 'git read-tree' keeps the copy in the"
+" work tree intact when operating under the -u flag."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:230
msgid ""
-"When this form of 'git read-tree' returns successfully, you can see which of "
-"the \"local changes\" that you made were carried forward by running `git "
+"When this form of 'git read-tree' returns successfully, you can see which of"
+" the \"local changes\" that you made were carried forward by running `git "
"diff-index --cached $M`. Note that this does not necessarily match what "
"`git diff-index --cached $H` would have produced before such a two tree "
"merge. This is because of cases 18 and 19 --- if you already had the "
-"changes in $M (e.g. maybe you picked it up via e-mail in a patch form), `git "
-"diff-index --cached $H` would have told you about the change before this "
+"changes in $M (e.g. maybe you picked it up via e-mail in a patch form), `git"
+" diff-index --cached $H` would have told you about the change before this "
"merge, but it would not show in `git diff-index --cached $M` output after "
"the two-tree merge."
msgstr ""
@@ -48740,10 +48589,10 @@ msgstr ""
#: en/git-read-tree.txt:237
msgid ""
"Case 3 is slightly tricky and needs explanation. The result from this rule "
-"logically should be to remove the path if the user staged the removal of the "
-"path and then switching to a new branch. That however will prevent the "
-"initial checkout from happening, so the rule is modified to use M (new tree) "
-"only when the content of the index is empty. Otherwise the removal of the "
+"logically should be to remove the path if the user staged the removal of the"
+" path and then switching to a new branch. That however will prevent the "
+"initial checkout from happening, so the rule is modified to use M (new tree)"
+" only when the content of the index is empty. Otherwise the removal of the "
"path is kept as long as $H and $M are the same."
msgstr ""
@@ -48807,8 +48656,8 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:271
msgid ""
-"stage 1 and stage 2 are the same and stage 3 is different; take stage 3 (our "
-"branch in stage 2 did not do anything since the ancestor in stage 1 while "
+"stage 1 and stage 2 are the same and stage 3 is different; take stage 3 (our"
+" branch in stage 2 did not do anything since the ancestor in stage 1 while "
"their branch in stage 3 worked on it)"
msgstr ""
@@ -48830,10 +48679,10 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:284
msgid ""
-"OK, this all sounds like a collection of totally nonsensical rules, but it's "
-"actually exactly what you want in order to do a fast merge. The different "
-"stages represent the \"result tree\" (stage 0, aka \"merged\"), the original "
-"tree (stage 1, aka \"orig\"), and the two trees you are trying to merge "
+"OK, this all sounds like a collection of totally nonsensical rules, but it's"
+" actually exactly what you want in order to do a fast merge. The different "
+"stages represent the \"result tree\" (stage 0, aka \"merged\"), the original"
+" tree (stage 1, aka \"orig\"), and the two trees you are trying to merge "
"(stage 2 and 3 respectively)."
msgstr ""
@@ -48865,8 +48714,8 @@ msgstr ""
#: en/git-read-tree.txt:302
msgid ""
"the index file saves and restores with all this information, so you can "
-"merge things incrementally, but as long as it has entries in stages 1/2/3 (i."
-"e., \"unmerged entries\") you can't write the result. So now the merge "
+"merge things incrementally, but as long as it has entries in stages 1/2/3 "
+"(i.e., \"unmerged entries\") you can't write the result. So now the merge "
"algorithm ends up being really simple:"
msgstr ""
@@ -48880,8 +48729,8 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:309
msgid ""
-"if you find a \"stage1\", but no matching \"stage2\" or \"stage3\", you know "
-"it's been removed from both trees (it only existed in the original tree), "
+"if you find a \"stage1\", but no matching \"stage2\" or \"stage3\", you know"
+" it's been removed from both trees (it only existed in the original tree), "
"and you remove that entry."
msgstr ""
@@ -48948,8 +48797,8 @@ msgstr ""
#: en/git-read-tree.txt:351
msgid ""
"Your work tree is still based on your HEAD ($JC), but you have some edits "
-"since. Three-way merge makes sure that you have not added or modified index "
-"entries since $JC, and if you haven't, then does the right thing. So with "
+"since. Three-way merge makes sure that you have not added or modified index"
+" entries since $JC, and if you haven't, then does the right thing. So with "
"the following sequence:"
msgstr ""
@@ -48984,12 +48833,12 @@ msgstr ""
msgid ""
"In other words, there is no need to worry about what exists only in the "
"working tree. When you have local changes in a part of the project that is "
-"not involved in the merge, your changes do not interfere with the merge, and "
-"are kept intact. When they *do* interfere, the merge does not even start "
-"('git read-tree' complains loudly and fails without modifying anything). In "
-"such a case, you can simply continue doing what you were in the middle of "
-"doing, and when your working tree is ready (i.e. you have finished your work-"
-"in-progress), attempt the merge again."
+"not involved in the merge, your changes do not interfere with the merge, and"
+" are kept intact. When they *do* interfere, the merge does not even start "
+"('git read-tree' complains loudly and fails without modifying anything). In"
+" such a case, you can simply continue doing what you were in the middle of "
+"doing, and when your working tree is ready (i.e. you have finished your "
+"work-in-progress), attempt the merge again."
msgstr ""
#. type: Title -
@@ -49011,12 +48860,12 @@ msgstr ""
msgid ""
"'git read-tree' and other merge-based commands ('git merge', 'git "
"checkout'...) can help maintaining the skip-worktree bitmap and working "
-"directory update. `$GIT_DIR/info/sparse-checkout` is used to define the skip-"
-"worktree reference bitmap. When 'git read-tree' needs to update the working "
-"directory, it resets the skip-worktree bit in the index based on this file, "
-"which uses the same syntax as .gitignore files. If an entry matches a "
-"pattern in this file, skip-worktree will not be set on that entry. "
-"Otherwise, skip-worktree will be set."
+"directory update. `$GIT_DIR/info/sparse-checkout` is used to define the "
+"skip-worktree reference bitmap. When 'git read-tree' needs to update the "
+"working directory, it resets the skip-worktree bit in the index based on "
+"this file, which uses the same syntax as .gitignore files. If an entry "
+"matches a pattern in this file, skip-worktree will not be set on that entry."
+" Otherwise, skip-worktree will be set."
msgstr ""
#. type: Plain text
@@ -49031,8 +48880,8 @@ msgstr ""
#: en/git-read-tree.txt:401
msgid ""
"While `$GIT_DIR/info/sparse-checkout` is usually used to specify what files "
-"are in, you can also specify what files are _not_ in, using negate patterns. "
-"For example, to remove the file `unwanted`:"
+"are in, you can also specify what files are _not_ in, using negate patterns."
+" For example, to remove the file `unwanted`:"
msgstr ""
#. type: delimited block -
@@ -49046,10 +48895,10 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:413
msgid ""
-"Another tricky thing is fully repopulating the working directory when you no "
-"longer want sparse checkout. You cannot just disable \"sparse checkout\" "
-"because skip-worktree bits are still in the index and your working directory "
-"is still sparsely populated. You should re-populate the working directory "
+"Another tricky thing is fully repopulating the working directory when you no"
+" longer want sparse checkout. You cannot just disable \"sparse checkout\" "
+"because skip-worktree bits are still in the index and your working directory"
+" is still sparsely populated. You should re-populate the working directory "
"with the `$GIT_DIR/info/sparse-checkout` file content as follows:"
msgstr ""
@@ -49063,11 +48912,10 @@ msgstr ""
#: en/git-read-tree.txt:422
msgid ""
"Then you can disable sparse checkout. Sparse checkout support in 'git read-"
-"tree' and similar commands is disabled by default. You need to turn `core."
-"sparseCheckout` on in order to have sparse checkout support."
+"tree' and similar commands is disabled by default. You need to turn "
+"`core.sparseCheckout` on in order to have sparse checkout support."
msgstr ""
-#
#. type: Plain text
#: en/git-read-tree.txt:428
#, fuzzy
@@ -49082,10 +48930,9 @@ msgstr ""
#. type: Title =
#: en/git-rebase.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-rebase(1)"
-msgstr "git-add(1)"
+msgstr "git-rebase(1)"
#. type: Plain text
#: en/git-rebase.txt:7
@@ -49114,11 +48961,11 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:28
msgid ""
-"If <upstream> is not specified, the upstream configured in branch.<name>."
-"remote and branch.<name>.merge options will be used (see linkgit:git-"
-"config[1] for details) and the `--fork-point` option is assumed. If you are "
-"currently not on any branch or if the current branch does not have a "
-"configured upstream, the rebase will abort."
+"If <upstream> is not specified, the upstream configured in "
+"branch.<name>.remote and branch.<name>.merge options will be used (see "
+"linkgit:git-config[1] for details) and the `--fork-point` option is assumed."
+" If you are currently not on any branch or if the current branch does not "
+"have a configured upstream, the rebase will abort."
msgstr ""
#. type: Plain text
@@ -49127,16 +48974,16 @@ msgid ""
"All changes made by commits in the current branch but that are not in "
"<upstream> are saved to a temporary area. This is the same set of commits "
"that would be shown by `git log <upstream>..HEAD`; or by `git log "
-"'fork_point'..HEAD`, if `--fork-point` is active (see the description on `--"
-"fork-point` below); or by `git log HEAD`, if the `--root` option is "
+"'fork_point'..HEAD`, if `--fork-point` is active (see the description on "
+"`--fork-point` below); or by `git log HEAD`, if the `--root` option is "
"specified."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:40
msgid ""
-"The current branch is reset to <upstream>, or <newbase> if the --onto option "
-"was supplied. This has the exact same effect as `git reset --hard "
+"The current branch is reset to <upstream>, or <newbase> if the --onto option"
+" was supplied. This has the exact same effect as `git reset --hard "
"<upstream>` (or <newbase>). ORIG_HEAD is set to point at the tip of the "
"branch before the reset."
msgstr ""
@@ -49145,10 +48992,10 @@ msgstr ""
#: en/git-rebase.txt:46
msgid ""
"The commits that were previously saved into the temporary area are then "
-"reapplied to the current branch, one by one, in order. Note that any commits "
-"in HEAD which introduce the same textual changes as a commit in HEAD.."
-"<upstream> are omitted (i.e., a patch already accepted upstream with a "
-"different commit message or timestamp will be skipped)."
+"reapplied to the current branch, one by one, in order. Note that any commits"
+" in HEAD which introduce the same textual changes as a commit in "
+"HEAD..<upstream> are omitted (i.e., a patch already accepted upstream with a"
+" different commit message or timestamp will be skipped)."
msgstr ""
#. type: Plain text
@@ -49164,8 +49011,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:55
-msgid ""
-"Assume the following history exists and the current branch is \"topic\":"
+msgid "Assume the following history exists and the current branch is \"topic\":"
msgstr ""
#. type: delimited block -
@@ -49250,16 +49096,16 @@ msgstr ""
#: en/git-rebase.txt:103
msgid ""
"Here is how you would transplant a topic branch based on one branch to "
-"another, to pretend that you forked the topic branch from the latter branch, "
-"using `rebase --onto`."
+"another, to pretend that you forked the topic branch from the latter branch,"
+" using `rebase --onto`."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:107
msgid ""
"First let's assume your 'topic' is based on branch 'next'. For example, a "
-"feature developed in 'topic' depends on some functionality which is found in "
-"'next'."
+"feature developed in 'topic' depends on some functionality which is found in"
+" 'next'."
msgstr ""
#. type: delimited block -
@@ -49442,8 +49288,8 @@ msgstr ""
#: en/git-rebase.txt:221
msgid ""
"If set to \"warn\", print warnings about removed commits in interactive "
-"mode. If set to \"error\", print the warnings and stop the rebase. If set to "
-"\"ignore\", no checking is done. \"ignore\" by default."
+"mode. If set to \"error\", print the warnings and stop the rebase. If set to"
+" \"ignore\", no checking is done. \"ignore\" by default."
msgstr ""
#. type: Plain text
@@ -49469,8 +49315,8 @@ msgstr ""
#: en/git-rebase.txt:236
msgid ""
"As a special case, you may use \"A\\...B\" as a shortcut for the merge base "
-"of A and B if there is exactly one merge base. You can leave out at most one "
-"of A and B, in which case it defaults to HEAD."
+"of A and B if there is exactly one merge base. You can leave out at most one"
+" of A and B, in which case it defaults to HEAD."
msgstr ""
#. type: Plain text
@@ -49499,7 +49345,7 @@ msgstr ""
#: en/git-rebase.txt:255 en/sequencer.txt:6
#, no-wrap
msgid "--quit"
-msgstr ""
+msgstr "--quit"
#. type: Plain text
#: en/git-rebase.txt:259
@@ -49512,7 +49358,7 @@ msgstr ""
#: en/git-rebase.txt:260
#, no-wrap
msgid "--keep-empty"
-msgstr ""
+msgstr "--keep-empty"
#. type: Plain text
#: en/git-rebase.txt:263
@@ -49529,7 +49375,7 @@ msgstr ""
#: en/git-rebase.txt:267
#, no-wrap
msgid "--edit-todo"
-msgstr ""
+msgstr "--edit-todo"
#. type: Plain text
#: en/git-rebase.txt:269
@@ -49585,8 +49431,8 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:299
msgid ""
-"Pass the <strategy-option> through to the merge strategy. This implies `--"
-"merge` and, if no strategy has been specified, `-s recursive`. Note the "
+"Pass the <strategy-option> through to the merge strategy. This implies "
+"`--merge` and, if no strategy has been specified, `-s recursive`. Note the "
"reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
@@ -49611,8 +49457,8 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:317
msgid ""
-"Show a diffstat of what changed upstream since the last rebase. The diffstat "
-"is also controlled by the configuration option rebase.stat."
+"Show a diffstat of what changed upstream since the last rebase. The diffstat"
+" is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
@@ -49641,20 +49487,20 @@ msgstr ""
#: en/git-tag.txt:80
#, no-wrap
msgid "--verify"
-msgstr ""
+msgstr "--verify"
#. type: Plain text
#: en/git-rebase.txt:328
msgid ""
-"Allows the pre-rebase hook to run, which is the default. This option can be "
-"used to override --no-verify. See also linkgit:githooks[5]."
+"Allows the pre-rebase hook to run, which is the default. This option can be"
+" used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:336
#, no-wrap
msgid "--force-rebase"
-msgstr ""
+msgstr "--force-rebase"
#. type: Plain text
#: en/git-rebase.txt:339
@@ -49669,15 +49515,15 @@ msgid ""
"You may find this (or --no-ff with an interactive rebase) helpful after "
"reverting a topic branch merge, as this option recreates the topic branch "
"with fresh commits so it can be remerged successfully without needing to "
-"\"revert the reversion\" (see the link:howto/revert-a-faulty-merge."
-"html[revert-a-faulty-merge How-To] for details)."
+"\"revert the reversion\" (see the link:howto/revert-a-faulty-"
+"merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:347
#, no-wrap
msgid "--no-fork-point"
-msgstr ""
+msgstr "--no-fork-point"
#. type: Plain text
#: en/git-rebase.txt:351
@@ -49689,11 +49535,11 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:357
msgid ""
-"When --fork-point is active, 'fork_point' will be used instead of <upstream> "
-"to calculate the set of commits to rebase, where 'fork_point' is the result "
-"of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:"
-"git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> "
-"will be used as a fallback."
+"When --fork-point is active, 'fork_point' will be used instead of <upstream>"
+" to calculate the set of commits to rebase, where 'fork_point' is the result"
+" of `git merge-base --fork-point <upstream> <branch>` command (see "
+"linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the "
+"<upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
@@ -49713,16 +49559,17 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:372
msgid ""
-"These flags are passed to 'git am' to easily change the dates of the rebased "
-"commits (see linkgit:git-am[1]). Incompatible with the --interactive option."
+"These flags are passed to 'git am' to easily change the dates of the rebased"
+" commits (see linkgit:git-am[1]). Incompatible with the --interactive "
+"option."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:378
msgid ""
-"Make a list of the commits which are about to be rebased. Let the user edit "
-"that list before rebasing. This mode can also be used to split commits (see "
-"SPLITTING COMMITS below)."
+"Make a list of the commits which are about to be rebased. Let the user edit"
+" that list before rebasing. This mode can also be used to split commits "
+"(see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
@@ -49737,7 +49584,7 @@ msgstr ""
#: en/git-rebase.txt:384 en/git-svn.txt:642
#, no-wrap
msgid "--preserve-merges"
-msgstr ""
+msgstr "--preserve-merges"
#. type: Plain text
#: en/git-rebase.txt:388
@@ -49816,9 +49663,9 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:424
msgid ""
-"Rebase all commits reachable from <branch>, instead of limiting them with an "
-"<upstream>. This allows you to rebase the root commit(s) on a branch. When "
-"used with --onto, it will skip changes already contained in <newbase> "
+"Rebase all commits reachable from <branch>, instead of limiting them with an"
+" <upstream>. This allows you to rebase the root commit(s) on a branch. "
+"When used with --onto, it will skip changes already contained in <newbase> "
"(instead of <upstream>) whereas without --onto it will operate on every "
"change. When used together with both --onto and --preserve-merges, 'all' "
"root commits will be rewritten to have <newbase> as parent instead."
@@ -49828,19 +49675,19 @@ msgstr ""
#: en/git-rebase.txt:425
#, no-wrap
msgid "--autosquash"
-msgstr ""
+msgstr "--autosquash"
#. type: Labeled list
#: en/git-rebase.txt:426
#, no-wrap
msgid "--no-autosquash"
-msgstr ""
+msgstr "--no-autosquash"
#. type: Plain text
#: en/git-rebase.txt:435
msgid ""
-"When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), "
-"and there is a commit whose title begins with the same ..., automatically "
+"When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"),"
+" and there is a commit whose title begins with the same ..., automatically "
"modify the todo list of rebase -i so that the commit marked for squashing "
"comes right after the commit to be modified, and change the action of the "
"moved commit from `pick` to `squash` (or `fixup`). Ignores subsequent "
@@ -49866,22 +49713,22 @@ msgstr ""
msgid ""
"Automatically create a temporary stash before the operation begins, and "
"apply it after the operation ends. This means that you can run rebase on a "
-"dirty worktree. However, use with care: the final stash application after a "
-"successful rebase might result in non-trivial conflicts."
+"dirty worktree. However, use with care: the final stash application after a"
+" successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:450 en/merge-options.txt:35
#, no-wrap
msgid "--no-ff"
-msgstr ""
+msgstr "--no-ff"
#. type: Plain text
#: en/git-rebase.txt:454
msgid ""
"With --interactive, cherry-pick all rebased commits instead of fast-"
-"forwarding over the unchanged ones. This ensures that the entire history of "
-"the rebased branch is composed of new commits."
+"forwarding over the unchanged ones. This ensures that the entire history of"
+" the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
@@ -49894,8 +49741,9 @@ msgstr ""
msgid ""
"You may find this helpful after reverting a topic branch merge, as this "
"option recreates the topic branch with fresh commits so it can be remerged "
-"successfully without needing to \"revert the reversion\" (see the link:howto/"
-"revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
+"successfully without needing to \"revert the reversion\" (see the "
+"link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for "
+"details)."
msgstr ""
#. type: Title -
@@ -49908,24 +49756,24 @@ msgstr ""
#: en/git-rebase.txt:470
#, fuzzy
#| msgid ""
-#| "You should understand the implications of rewriting history if you amend "
-#| "a commit that has already been published. (See the \"RECOVERING FROM "
-#| "UPSTREAM REBASE\" section in linkgit:git-rebase[1].)"
+#| "You should understand the implications of rewriting history if you amend a "
+#| "commit that has already been published. (See the \"RECOVERING FROM UPSTREAM"
+#| " REBASE\" section in linkgit:git-rebase[1].)"
msgid ""
-"You should understand the implications of using 'git rebase' on a repository "
-"that you share. See also RECOVERING FROM UPSTREAM REBASE below."
+"You should understand the implications of using 'git rebase' on a repository"
+" that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
-"Vous devriez comprendre les implications d'une r챕챕criture de l'historique si "
-"vous modifiez un commit qui a d챕j횪 챕t챕 publi챕 (Voir la section 짬혻RATTRAPPER "
-"UN REBASAGE AMONT혻쨩 dans linkgit:git-rebase[1])."
+"Vous devriez comprendre les implications d'une r챕챕criture de l'historique si"
+" vous modifiez un commit qui a d챕j횪 챕t챕 publi챕 (Voir la section 짬혻RATTRAPPER"
+" UN REBASAGE AMONT혻쨩 dans linkgit:git-rebase[1])."
#. type: Plain text
#: en/git-rebase.txt:475
msgid ""
"When the git-rebase command is run, it will first execute a \"pre-rebase\" "
"hook if one exists. You can use this hook to do sanity checks and reject "
-"the rebase if it isn't appropriate. Please see the template pre-rebase hook "
-"script for an example."
+"the rebase if it isn't appropriate. Please see the template pre-rebase hook"
+" script for an example."
msgstr ""
#. type: Plain text
@@ -50019,11 +49867,11 @@ msgstr "git-commit(1)"
#. type: Plain text
#: en/git-rebase.txt:510
msgid ""
-"Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect "
-"commit it fixes, because that commit is buried deeply in a patch series. "
-"That is exactly what interactive rebase is for: use it after plenty of \"a"
-"\"s and \"b\"s, by rearranging and editing commits, and squashing multiple "
-"commits into one."
+"Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect"
+" commit it fixes, because that commit is buried deeply in a patch series. "
+"That is exactly what interactive rebase is for: use it after plenty of "
+"\"a\"s and \"b\"s, by rearranging and editing commits, and squashing "
+"multiple commits into one."
msgstr ""
#. type: Plain text
@@ -50042,8 +49890,8 @@ msgstr ""
msgid ""
"An editor will be fired up with all the commits in your current branch "
"(ignoring merge commits), which come after the given commit. You can "
-"reorder the commits in this list to your heart's content, and you can remove "
-"them. The list looks more or less like this:"
+"reorder the commits in this list to your heart's content, and you can remove"
+" them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
@@ -50058,8 +49906,8 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:529
msgid ""
-"The oneline descriptions are purely for your pleasure; 'git rebase' will not "
-"look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this "
+"The oneline descriptions are purely for your pleasure; 'git rebase' will not"
+" look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this "
"example), so do not delete or edit the names."
msgstr ""
@@ -50081,27 +49929,27 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:540
msgid ""
-"To drop a commit, replace the command \"pick\" with \"drop\", or just delete "
-"the matching line."
+"To drop a commit, replace the command \"pick\" with \"drop\", or just delete"
+" the matching line."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:548
msgid ""
-"If you want to fold two or more commits into one, replace the command \"pick"
-"\" for the second and subsequent commits with \"squash\" or \"fixup\". If "
-"the commits had different authors, the folded commit will be attributed to "
-"the author of the first commit. The suggested commit message for the folded "
-"commit is the concatenation of the commit messages of the first commit and "
-"of those with the \"squash\" command, but omits the commit messages of "
-"commits with the \"fixup\" command."
+"If you want to fold two or more commits into one, replace the command "
+"\"pick\" for the second and subsequent commits with \"squash\" or \"fixup\"."
+" If the commits had different authors, the folded commit will be attributed"
+" to the author of the first commit. The suggested commit message for the "
+"folded commit is the concatenation of the commit messages of the first "
+"commit and of those with the \"squash\" command, but omits the commit "
+"messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:552
msgid ""
-"'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when "
-"a command fails due to merge errors. When you are done editing and/or "
+"'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when"
+" a command fails due to merge errors. When you are done editing and/or "
"resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
@@ -50156,10 +50004,10 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:585
msgid ""
-"Reordering and editing commits usually creates untested intermediate steps. "
-"You may want to check that your history editing did not break anything by "
-"running a test, or at least recompiling at intermediate points in history by "
-"using the \"exec\" command (shortcut \"x\"). You may do so by creating a "
+"Reordering and editing commits usually creates untested intermediate steps."
+" You may want to check that your history editing did not break anything by "
+"running a test, or at least recompiling at intermediate points in history by"
+" using the \"exec\" command (shortcut \"x\"). You may do so by creating a "
"todo list like this one:"
msgstr ""
@@ -50179,17 +50027,17 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:599
msgid ""
-"The interactive rebase will stop when a command fails (i.e. exits with non-0 "
-"status) to give you an opportunity to fix the problem. You can continue with "
-"`git rebase --continue`."
+"The interactive rebase will stop when a command fails (i.e. exits with non-0"
+" status) to give you an opportunity to fix the problem. You can continue "
+"with `git rebase --continue`."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:604
msgid ""
-"The \"exec\" command launches the command in a shell (the one specified in `"
-"$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell "
-"features (like \"cd\", \">\", \";\" ...). The command is run from the root "
+"The \"exec\" command launches the command in a shell (the one specified in "
+"`$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell"
+" features (like \"cd\", \">\", \";\" ...). The command is run from the root "
"of the working tree."
msgstr ""
@@ -50230,17 +50078,17 @@ msgstr ""
#: en/git-rebase.txt:630
msgid ""
"In interactive mode, you can mark commits with the action \"edit\". "
-"However, this does not necessarily mean that 'git rebase' expects the result "
-"of this edit to be exactly one commit. Indeed, you can undo the commit, or "
-"you can add other commits. This can be used to split a commit into two:"
+"However, this does not necessarily mean that 'git rebase' expects the result"
+" of this edit to be exactly one commit. Indeed, you can undo the commit, or"
+" you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:634
msgid ""
"Start an interactive rebase with `git rebase -i <commit>^`, where <commit> "
-"is the commit you want to split. In fact, any commit range will do, as long "
-"as it contains that commit."
+"is the commit you want to split. In fact, any commit range will do, as long"
+" as it contains that commit."
msgstr ""
#. type: Plain text
@@ -50251,23 +50099,24 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:640
msgid ""
-"When it comes to editing that commit, execute `git reset HEAD^`. The effect "
-"is that the HEAD is rewound by one, and the index follows suit. However, "
+"When it comes to editing that commit, execute `git reset HEAD^`. The effect"
+" is that the HEAD is rewound by one, and the index follows suit. However, "
"the working tree stays the same."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:644
msgid ""
-"Now add the changes to the index that you want to have in the first commit. "
-"You can use `git add` (possibly interactively) or 'git gui' (or both) to do "
-"that."
+"Now add the changes to the index that you want to have in the first commit."
+" You can use `git add` (possibly interactively) or 'git gui' (or both) to "
+"do that."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:647
msgid ""
-"Commit the now-current index with whatever commit message is appropriate now."
+"Commit the now-current index with whatever commit message is appropriate "
+"now."
msgstr ""
#. type: Plain text
@@ -50395,8 +50244,8 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:720
msgid ""
-"This happens if the 'subsystem' rebase had conflicts, or used `--"
-"interactive` to omit, edit, squash, or fixup commits; or if the upstream "
+"This happens if the 'subsystem' rebase had conflicts, or used "
+"`--interactive` to omit, edit, squash, or fixup commits; or if the upstream "
"used one of `commit --amend`, `reset`, or `filter-branch`."
msgstr ""
@@ -50471,8 +50320,8 @@ msgstr ""
#: en/git-rebase.txt:760
msgid ""
"The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended "
-"and your 'topic' began\", that is, what the old merge-base between them "
-"was. You will have to find a way to name the last commit of the old "
+"and your 'topic' began\", that is, what the old merge-base between them was."
+" You will have to find a way to name the last commit of the old "
"'subsystem', for example:"
msgstr ""
@@ -50487,8 +50336,8 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:767
msgid ""
-"Relative to the tip of 'topic': knowing that your 'topic' has three commits, "
-"the old tip of 'subsystem' must be `topic~3`."
+"Relative to the tip of 'topic': knowing that your 'topic' has three commits,"
+" the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
@@ -50516,9 +50365,9 @@ msgstr ""
#: en/git-rebase.txt:784
msgid ""
"The todo list presented by `--preserve-merges --interactive` does not "
-"represent the topology of the revision graph. Editing commits and rewording "
-"their commit messages should work fine, but attempts to reorder commits tend "
-"to produce counterintuitive results."
+"represent the topology of the revision graph. Editing commits and rewording"
+" their commit messages should work fine, but attempts to reorder commits "
+"tend to produce counterintuitive results."
msgstr ""
#. type: Plain text
@@ -50556,7 +50405,7 @@ msgstr ""
#: en/git-receive-pack.txt:2
#, no-wrap
msgid "git-receive-pack(1)"
-msgstr ""
+msgstr "git-receive-pack(1)"
#. type: Plain text
#: en/git-receive-pack.txt:7
@@ -50590,10 +50439,10 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:28
msgid ""
-"The command allows for creation and fast-forwarding of sha1 refs (heads/"
-"tags) on the remote end (strictly speaking, it is the local end 'git-receive-"
-"pack' runs, but to the user who is sitting at the send-pack end, it is "
-"updating the remote. Confused?)"
+"The command allows for creation and fast-forwarding of sha1 refs "
+"(heads/tags) on the remote end (strictly speaking, it is the local end 'git-"
+"receive-pack' runs, but to the user who is sitting at the send-pack end, it "
+"is updating the remote. Confused?)"
msgstr ""
#. type: Plain text
@@ -50659,9 +50508,9 @@ msgstr ""
msgid ""
"When accepting a signed push (see linkgit:git-push[1]), the signed push "
"certificate is stored in a blob and an environment variable `GIT_PUSH_CERT` "
-"can be consulted for its object name. See the description of `post-receive` "
-"hook for an example. In addition, the certificate is verified using GPG and "
-"the result is exported with the following environment variables:"
+"can be consulted for its object name. See the description of `post-receive`"
+" hook for an example. In addition, the certificate is verified using GPG "
+"and the result is exported with the following environment variables:"
msgstr ""
#. type: Labeled list
@@ -50673,8 +50522,8 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:69
msgid ""
-"The name and the e-mail address of the owner of the key that signed the push "
-"certificate."
+"The name and the e-mail address of the owner of the key that signed the push"
+" certificate."
msgstr ""
#. type: Labeled list
@@ -50727,7 +50576,7 @@ msgstr ""
#: en/git-receive-pack.txt:86
#, no-wrap
msgid "`UNSOLICITED`"
-msgstr ""
+msgstr "`UNSOLICITED`"
#. type: Plain text
#: en/git-receive-pack.txt:89
@@ -50738,7 +50587,7 @@ msgstr ""
#: en/git-receive-pack.txt:89
#, no-wrap
msgid "`MISSING`"
-msgstr ""
+msgstr "`MISSING`"
#. type: Plain text
#: en/git-receive-pack.txt:91
@@ -50749,7 +50598,7 @@ msgstr ""
#: en/git-receive-pack.txt:91
#, no-wrap
msgid "`BAD`"
-msgstr ""
+msgstr "`BAD`"
#. type: Plain text
#: en/git-receive-pack.txt:93
@@ -50760,7 +50609,7 @@ msgstr ""
#: en/git-receive-pack.txt:93
#, no-wrap
msgid "`OK`"
-msgstr ""
+msgstr "`OK`"
#. type: Plain text
#: en/git-receive-pack.txt:95
@@ -50771,7 +50620,7 @@ msgstr ""
#: en/git-receive-pack.txt:95
#, no-wrap
msgid "`SLOP`"
-msgstr ""
+msgstr "`SLOP`"
#. type: Plain text
#: en/git-receive-pack.txt:99
@@ -50793,8 +50642,8 @@ msgid ""
"\"git push --signed\" sent a nonce different from what we asked it to send "
"now, but in a different session whose starting time is different by this "
"many seconds from the current session. Only meaningful when "
-"`GIT_PUSH_CERT_NONCE_STATUS` says `SLOP`. Also read about `receive."
-"certNonceSlop` variable in linkgit:git-config[1]."
+"`GIT_PUSH_CERT_NONCE_STATUS` says `SLOP`. Also read about "
+"`receive.certNonceSlop` variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
@@ -50807,10 +50656,10 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:116
msgid ""
-"If the pre-receive hook exits with a non-zero exit status no updates will be "
-"performed, and the update, post-receive and post-update hooks will not be "
-"invoked either. This can be useful to quickly bail out if the update is not "
-"to be supported."
+"If the pre-receive hook exits with a non-zero exit status no updates will be"
+" performed, and the update, post-receive and post-update hooks will not be "
+"invoked either. This can be useful to quickly bail out if the update is not"
+" to be supported."
msgstr ""
#. type: Title -
@@ -50836,8 +50685,8 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:130
msgid ""
-"The refname parameter is relative to $GIT_DIR; e.g. for the master head this "
-"is \"refs/heads/master\". The two sha1 arguments are the object names for "
+"The refname parameter is relative to $GIT_DIR; e.g. for the master head this"
+" is \"refs/heads/master\". The two sha1 arguments are the object names for "
"the refname before and after the update. Note that the hook is called "
"before the refname is updated, so either sha1-old is 0\\{40} (meaning there "
"is no such ref yet), or it should match what is recorded in refname."
@@ -50855,8 +50704,8 @@ msgstr ""
msgid ""
"Successful execution (a zero exit status) of this hook does not ensure the "
"ref will actually be updated, it is only a prerequisite. As such it is not "
-"a good idea to send notices (e.g. email) from this hook. Consider using the "
-"post-receive hook instead."
+"a good idea to send notices (e.g. email) from this hook. Consider using the"
+" post-receive hook instead."
msgstr ""
#. type: Title -
@@ -50888,8 +50737,8 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:159
msgid ""
-"The `GIT_PUSH_CERT*` environment variables can be inspected, just as in `pre-"
-"receive` hook, after accepting a signed push."
+"The `GIT_PUSH_CERT*` environment variables can be inspected, just as in "
+"`pre-receive` hook, after accepting a signed push."
msgstr ""
#. type: Plain text
@@ -50942,9 +50791,9 @@ msgstr ""
msgid ""
"Note that it is possible for refname to not have sha1-new when this hook "
"runs. This can easily occur if another user modifies the ref after it was "
-"updated by 'git-receive-pack', but before the hook was able to evaluate it. "
-"It is recommended that hooks rely on sha1-new rather than the current value "
-"of refname."
+"updated by 'git-receive-pack', but before the hook was able to evaluate it."
+" It is recommended that hooks rely on sha1-new rather than the current "
+"value of refname."
msgstr ""
#. type: Title -
@@ -50957,10 +50806,10 @@ msgstr "update"
#. type: Plain text
#: en/git-receive-pack.txt:205
msgid ""
-"After all other processing, if at least one ref was updated, and if $GIT_DIR/"
-"hooks/post-update file exists and is executable, then post-update will be "
-"called with the list of refs that have been updated. This can be used to "
-"implement any repository wide cleanup tasks."
+"After all other processing, if at least one ref was updated, and if "
+"$GIT_DIR/hooks/post-update file exists and is executable, then post-update "
+"will be called with the list of refs that have been updated. This can be "
+"used to implement any repository wide cleanup tasks."
msgstr ""
#. type: Plain text
@@ -50992,10 +50841,9 @@ msgstr ""
#. type: Title =
#: en/git-reflog.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-reflog(1)"
-msgstr "git-commit(1)"
+msgstr "git-reflog(1)"
#. type: Plain text
#: en/git-reflog.txt:7
@@ -51027,9 +50875,10 @@ msgid ""
"Reference logs, or \"reflogs\", record when the tips of branches and other "
"references were updated in the local repository. Reflogs are useful in "
"various Git commands, to specify the old value of a reference. For example, "
-"`HEAD@{2}` means \"where HEAD used to be two moves ago\", `master@{one.week."
-"ago}` means \"where master used to point to one week ago in this local "
-"repository\", and so on. See linkgit:gitrevisions[7] for more details."
+"`HEAD@{2}` means \"where HEAD used to be two moves ago\", "
+"`master@{one.week.ago}` means \"where master used to point to one week ago "
+"in this local repository\", and so on. See linkgit:gitrevisions[7] for more "
+"details."
msgstr ""
#. type: Plain text
@@ -51041,8 +50890,8 @@ msgstr ""
#: en/git-reflog.txt:44
msgid ""
"The \"show\" subcommand (which is also the default, in the absence of any "
-"subcommands) shows the log of the reference provided in the command-line (or "
-"`HEAD`, by default). The reflog covers all recent actions, and in addition "
+"subcommands) shows the log of the reference provided in the command-line (or"
+" `HEAD`, by default). The reflog covers all recent actions, and in addition "
"the `HEAD` reflog records branch switching. `git reflog show` is an alias "
"for `git log -g --abbrev-commit --pretty=oneline`; see linkgit:git-log[1] "
"for more information."
@@ -51061,8 +50910,8 @@ msgstr ""
#: en/git-reflog.txt:55
msgid ""
"The \"delete\" subcommand deletes single entries from the reflog. Its "
-"argument must be an _exact_ entry (e.g. \"`git reflog delete master@{2}`\"). "
-"This subcommand is also typically not used directly by end users."
+"argument must be an _exact_ entry (e.g. \"`git reflog delete master@{2}`\")."
+" This subcommand is also typically not used directly by end users."
msgstr ""
#. type: Plain text
@@ -51104,8 +50953,8 @@ msgstr ""
#: en/git-reflog.txt:82
msgid ""
"Prune entries older than the specified time. If this option is not "
-"specified, the expiration time is taken from the configuration setting `gc."
-"reflogExpire`, which in turn defaults to 90 days. `--expire=all` prunes "
+"specified, the expiration time is taken from the configuration setting "
+"`gc.reflogExpire`, which in turn defaults to 90 days. `--expire=all` prunes "
"entries regardless of their age; `--expire=never` turns off pruning of "
"reachable entries (but see `--expire-unreachable`)."
msgstr ""
@@ -51129,24 +50978,23 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:93
-#, fuzzy, no-wrap
-#| msgid "update"
+#, no-wrap
msgid "--updateref"
-msgstr "update"
+msgstr "--updateref"
#. type: Plain text
#: en/git-reflog.txt:97
msgid ""
-"Update the reference to the value of the top reflog entry (i.e. <ref>@"
-"\\{0\\}) if the previous top entry was pruned. (This option is ignored for "
-"symbolic references.)"
+"Update the reference to the value of the top reflog entry (i.e. "
+"<ref>@\\{0\\}) if the previous top entry was pruned. (This option is "
+"ignored for symbolic references.)"
msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:98
#, no-wrap
msgid "--rewrite"
-msgstr ""
+msgstr "--rewrite"
#. type: Plain text
#: en/git-reflog.txt:102
@@ -51159,7 +51007,7 @@ msgstr ""
#: en/git-reflog.txt:103
#, no-wrap
msgid "--stale-fix"
-msgstr ""
+msgstr "--stale-fix"
#. type: Plain text
#: en/git-reflog.txt:108
@@ -51208,17 +51056,16 @@ msgstr ""
#. type: Plain text
#: en/git-reflog.txt:129
msgid ""
-"`git reflog delete` accepts options `--updateref`, `--rewrite`, `-n`, `--dry-"
-"run`, and `--verbose`, with the same meanings as when they are used with "
-"`expire`."
+"`git reflog delete` accepts options `--updateref`, `--rewrite`, `-n`, "
+"`--dry-run`, and `--verbose`, with the same meanings as when they are used "
+"with `expire`."
msgstr ""
#. type: Title =
#: en/git-remote-ext.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-remote-ext(1)"
-msgstr "git-commit(1)"
+msgstr "git-remote-ext(1)"
#. type: Plain text
#: en/git-remote-ext.txt:7
@@ -51234,8 +51081,8 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:17
msgid ""
-"This remote helper uses the specified '<command>' to connect to a remote Git "
-"server."
+"This remote helper uses the specified '<command>' to connect to a remote Git"
+" server."
msgstr ""
#. type: Plain text
@@ -51373,7 +51220,8 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:70
msgid ""
-"Set to long name (git-upload-pack, etc...) of service helper needs to invoke."
+"Set to long name (git-upload-pack, etc...) of service helper needs to "
+"invoke."
msgstr ""
#. type: Labeled list
@@ -51455,8 +51303,8 @@ msgstr ""
msgid ""
"Represents a repository with path /repo accessed using the helper program "
"\"git-server-alias foo\". The hostname for the remote server passed in the "
-"protocol stream will be \"foo\" (this allows multiple virtual Git servers to "
-"share a link-level address)."
+"protocol stream will be \"foo\" (this allows multiple virtual Git servers to"
+" share a link-level address)."
msgstr ""
#. type: Labeled list
@@ -51469,9 +51317,9 @@ msgstr ""
#: en/git-remote-ext.txt:112
msgid ""
"Represents a repository with path '/repo with spaces' accessed using the "
-"helper program \"git-server-alias foo\". The hostname for the remote server "
-"passed in the protocol stream will be \"foo\" (this allows multiple virtual "
-"Git servers to share a link-level address)."
+"helper program \"git-server-alias foo\". The hostname for the remote server"
+" passed in the protocol stream will be \"foo\" (this allows multiple virtual"
+" Git servers to share a link-level address)."
msgstr ""
#. type: Labeled list
@@ -51483,9 +51331,9 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:118
msgid ""
-"Represents a repository accessed using the helper program \"git-ssl foo."
-"example /bar\". The type of request can be determined by the helper using "
-"environment variables (see above)."
+"Represents a repository accessed using the helper program \"git-ssl "
+"foo.example /bar\". The type of request can be determined by the helper "
+"using environment variables (see above)."
msgstr ""
#. type: Plain text
@@ -51496,10 +51344,9 @@ msgstr ""
#. type: Title =
#: en/git-remote-fd.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-remote-fd(1)"
-msgstr "git-commit(1)"
+msgstr "git-remote-fd(1)"
#. type: Plain text
#: en/git-remote-fd.txt:7
@@ -51525,8 +51372,8 @@ msgid ""
"If only <infd> is given, it is assumed to be a bidirectional socket "
"connected to remote Git server (git-upload-pack, git-receive-pack or git-"
"upload-archive). If both <infd> and <outfd> are given, they are assumed to "
-"be pipes connected to a remote Git server (<infd> being the inbound pipe and "
-"<outfd> being the outbound pipe."
+"be pipes connected to a remote Git server (<infd> being the inbound pipe and"
+" <outfd> being the outbound pipe."
msgstr ""
#. type: Plain text
@@ -51540,7 +51387,8 @@ msgstr ""
#: en/git-remote-fd.txt:30
msgid ""
"<anything> can be any string. It is ignored. It is meant for providing "
-"information to user in the URL in case that URL is displayed in some context."
+"information to user in the URL in case that URL is displayed in some "
+"context."
msgstr ""
#. type: Title -
@@ -51577,8 +51425,8 @@ msgstr ""
#. type: Plain text
#: en/git-remote-fd.txt:49
msgid ""
-"Push master, using file descriptor #7 to read data from git-receive-pack and "
-"file descriptor #8 to write data to same service."
+"Push master, using file descriptor #7 to read data from git-receive-pack and"
+" file descriptor #8 to write data to same service."
msgstr ""
#. type: Labeled list
@@ -51591,7 +51439,7 @@ msgstr ""
#: en/git-remote-testgit.txt:2
#, no-wrap
msgid "git-remote-testgit(1)"
-msgstr ""
+msgstr "git-remote-testgit(1)"
#. type: Plain text
#: en/git-remote-testgit.txt:7
@@ -51621,10 +51469,9 @@ msgstr ""
#. type: Title =
#: en/git-remote.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-remote(1)"
-msgstr "git-commit(1)"
+msgstr "git-remote(1)"
#. type: Plain text
#: en/git-remote.txt:7
@@ -51660,8 +51507,8 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:39
msgid ""
-"Be a little more verbose and show remote url after name. NOTE: This must be "
-"placed between `remote` and `subcommand`."
+"Be a little more verbose and show remote url after name. NOTE: This must be"
+" placed between `remote` and `subcommand`."
msgstr ""
#. type: Plain text
@@ -51681,8 +51528,8 @@ msgstr ""
#: en/git-remote.txt:52
msgid ""
"Adds a remote named <name> for the repository at <url>. The command `git "
-"fetch <name>` can then be used to create and update remote-tracking branches "
-"<name>/<branch>."
+"fetch <name>` can then be used to create and update remote-tracking branches"
+" <name>/<branch>."
msgstr ""
#. type: Plain text
@@ -51718,8 +51565,8 @@ msgstr ""
msgid ""
"With `-t <branch>` option, instead of the default glob refspec for the "
"remote to track all branches under the `refs/remotes/<name>/` namespace, a "
-"refspec to track only `<branch>` is created. You can give more than one `-t "
-"<branch>` to track multiple branches without grabbing all branches."
+"refspec to track only `<branch>` is created. You can give more than one `-t"
+" <branch>` to track multiple branches without grabbing all branches."
msgstr ""
#. type: Plain text
@@ -51733,8 +51580,8 @@ msgstr ""
#: en/git-remote.txt:79
msgid ""
"When a fetch mirror is created with `--mirror=fetch`, the refs will not be "
-"stored in the 'refs/remotes/' namespace, but rather everything in 'refs/' on "
-"the remote will be directly mirrored into 'refs/' in the local repository. "
+"stored in the 'refs/remotes/' namespace, but rather everything in 'refs/' on"
+" the remote will be directly mirrored into 'refs/' in the local repository. "
"This option only makes sense in bare repositories, because a fetch would "
"overwrite any local commits."
msgstr ""
@@ -51762,8 +51609,8 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:91
msgid ""
-"In case <old> and <new> are the same, and <old> is a file under `$GIT_DIR/"
-"remotes` or `$GIT_DIR/branches`, the remote is converted to the "
+"In case <old> and <new> are the same, and <old> is a file under "
+"`$GIT_DIR/remotes` or `$GIT_DIR/branches`, the remote is converted to the "
"configuration file format."
msgstr ""
@@ -51799,8 +51646,8 @@ msgid ""
"`refs/remotes/<name>/HEAD`) for the named remote. Having a default branch "
"for a remote is not required, but allows the name of the remote to be "
"specified in lieu of a specific branch. For example, if the default branch "
-"for `origin` is set to `master`, then `origin` may be specified wherever you "
-"would normally specify `origin/master`."
+"for `origin` is set to `master`, then `origin` may be specified wherever you"
+" would normally specify `origin/master`."
msgstr ""
#. type: Plain text
@@ -51814,11 +51661,11 @@ msgstr ""
#: en/git-remote.txt:116
msgid ""
"With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then "
-"the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., "
-"if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`"
-"\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/"
-"origin/next`. This will only work if `refs/remotes/origin/next` already "
-"exists; if not it must be fetched first."
+"the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g.,"
+" if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin "
+"-a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to "
+"`refs/remotes/origin/next`. This will only work if "
+"`refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
@@ -51931,7 +51778,6 @@ msgstr ""
msgid "'show'"
msgstr ""
-#
#. type: Plain text
#: en/git-remote.txt:169
#, fuzzy
@@ -51942,8 +51788,8 @@ msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index"
#. type: Plain text
#: en/git-remote.txt:172
msgid ""
-"With `-n` option, the remote heads are not queried first with `git ls-remote "
-"<name>`; cached information is used instead."
+"With `-n` option, the remote heads are not queried first with `git ls-remote"
+" <name>`; cached information is used instead."
msgstr ""
#. type: Labeled list
@@ -51978,11 +51824,11 @@ msgstr "update"
#: en/git-remote.txt:191
msgid ""
"Fetch updates for a named set of remotes in the repository as defined by "
-"remotes.<group>. If a named group is not specified on the command line, the "
-"configuration parameter remotes.default will be used; if remotes.default is "
-"not defined, all remotes which do not have the configuration parameter "
-"remote.<name>.skipDefaultUpdate set to true will be updated. (See linkgit:"
-"git-config[1])."
+"remotes.<group>. If a named group is not specified on the command line, the"
+" configuration parameter remotes.default will be used; if remotes.default is"
+" not defined, all remotes which do not have the configuration parameter "
+"remote.<name>.skipDefaultUpdate set to true will be updated. (See "
+"linkgit:git-config[1])."
msgstr ""
#. type: Plain text
@@ -52053,7 +51899,6 @@ msgid ""
"$ git merge origin\n"
msgstr ""
-#
#. type: Plain text
#: en/git-remote.txt:249
#, fuzzy
@@ -52067,10 +51912,9 @@ msgstr ""
#. type: Title =
#: en/git-repack.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-repack(1)"
-msgstr "git-add(1)"
+msgstr "git-repack(1)"
#. type: Plain text
#: en/git-repack.txt:7
@@ -52082,7 +51926,9 @@ msgstr "git-commit - Enregistrer les modifications dans le d챕p척t"
#. type: Plain text
#: en/git-repack.txt:13
#, no-wrap
-msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [--window=<n>] [--depth=<n>]\n"
+msgid ""
+"'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [--window=<n>] "
+"[--depth=<n>]\n"
msgstr ""
#. type: Plain text
@@ -52098,8 +51944,8 @@ msgstr ""
msgid ""
"Instead of incrementally packing the unpacked objects, pack everything "
"referenced into a single pack. Especially useful when packing a repository "
-"that is used for private development. Use with `-d`. This will clean up the "
-"objects that `git prune` leaves behind, but `git fsck --full --dangling` "
+"that is used for private development. Use with `-d`. This will clean up the"
+" objects that `git prune` leaves behind, but `git fsck --full --dangling` "
"shows as dangling."
msgstr ""
@@ -52116,8 +51962,8 @@ msgstr ""
msgid ""
"Same as `-a`, unless `-d` is used. Then any unreachable objects in a "
"previous pack become loose, unpacked objects, instead of being left in the "
-"old pack. Unreachable objects are never intentionally added to a pack, even "
-"when repacking. This option prevents unreachable objects from being "
+"old pack. Unreachable objects are never intentionally added to a pack, even"
+" when repacking. This option prevents unreachable objects from being "
"immediately deleted by way of being left in the old pack and then removed. "
"Instead, the loose unreachable objects will be pruned according to normal "
"expiry rules with the next 'git gc' invocation. See linkgit:git-gc[1]."
@@ -52131,7 +51977,6 @@ msgid ""
"remove redundant loose object files."
msgstr ""
-#
#. type: Plain text
#: en/git-repack.txt:64
#, fuzzy
@@ -52159,7 +52004,6 @@ msgid ""
"pack-objects[1]."
msgstr ""
-#
#. type: Plain text
#: en/git-repack.txt:76
#, fuzzy
@@ -52186,11 +52030,11 @@ msgstr ""
msgid ""
"These two options affect how the objects contained in the pack are stored "
"using delta compression. The objects are first internally sorted by type, "
-"size and optionally names and compared against the other objects within `--"
-"window` to see if using delta compression saves space. `--depth` limits the "
-"maximum delta depth; making it too deep affects the performance on the "
-"unpacker side, because delta data needs to be applied that many times to get "
-"to the necessary object. The default value for --window is 10 and --depth "
+"size and optionally names and compared against the other objects within "
+"`--window` to see if using delta compression saves space. `--depth` limits "
+"the maximum delta depth; making it too deep affects the performance on the "
+"unpacker side, because delta data needs to be applied that many times to get"
+" to the necessary object. The default value for --window is 10 and --depth "
"is 50."
msgstr ""
@@ -52201,34 +52045,34 @@ msgid ""
"size will dynamically scale down so as to not take up more than '<n>' bytes "
"in memory. This is useful in repositories with a mix of large and small "
"objects to not run out of memory with a large window, but still be able to "
-"take advantage of the large window for the smaller objects. The size can be "
-"suffixed with \"k\", \"m\", or \"g\". `--window-memory=0` makes memory "
+"take advantage of the large window for the smaller objects. The size can be"
+" suffixed with \"k\", \"m\", or \"g\". `--window-memory=0` makes memory "
"usage unlimited. The default is taken from the `pack.windowMemory` "
-"configuration variable. Note that the actual memory usage will be the limit "
-"multiplied by the number of threads used by linkgit:git-pack-objects[1]."
+"configuration variable. Note that the actual memory usage will be the limit"
+" multiplied by the number of threads used by linkgit:git-pack-objects[1]."
msgstr ""
#. type: Labeled list
#: en/git-repack.txt:117
#, no-wrap
msgid "--write-bitmap-index"
-msgstr ""
+msgstr "--write-bitmap-index"
#. type: Plain text
#: en/git-repack.txt:123
msgid ""
"Write a reachability bitmap index as part of the repack. This only makes "
"sense when used with `-a` or `-A`, as the bitmaps must be able to refer to "
-"all reachable objects. This option overrides the setting of `repack."
-"writeBitmaps`. This option has no effect if multiple packfiles are created."
+"all reachable objects. This option overrides the setting of "
+"`repack.writeBitmaps`. This option has no effect if multiple packfiles are "
+"created."
msgstr ""
#. type: Labeled list
#: en/git-repack.txt:124
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--pack-kept-objects"
-msgstr "git-commit(1)"
+msgstr "--pack-kept-objects"
#. type: Plain text
#: en/git-repack.txt:132
@@ -52259,7 +52103,7 @@ msgstr ""
#: en/git-repack.txt:140
#, no-wrap
msgid "--keep-unreachable"
-msgstr ""
+msgstr "--keep-unreachable"
#. type: Plain text
#: en/git-repack.txt:145
@@ -52290,10 +52134,9 @@ msgstr ""
#. type: Title =
#: en/git-replace.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-replace(1)"
-msgstr "git-add(1)"
+msgstr "git-replace(1)"
#. type: Plain text
#: en/git-replace.txt:7
@@ -52414,20 +52257,20 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:76
msgid ""
-"Edit an object's content interactively. The existing content for <object> is "
-"pretty-printed into a temporary file, an editor is launched on the file, and "
-"the result is parsed to create a new object of the same type as <object>. A "
-"replacement ref is then created to replace <object> with the newly created "
-"object. See linkgit:git-var[1] for details about how the editor will be "
-"chosen."
+"Edit an object's content interactively. The existing content for <object> is"
+" pretty-printed into a temporary file, an editor is launched on the file, "
+"and the result is parsed to create a new object of the same type as "
+"<object>. A replacement ref is then created to replace <object> with the "
+"newly created object. See linkgit:git-var[1] for details about how the "
+"editor will be chosen."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:84
msgid ""
"When editing, provide the raw object contents rather than pretty-printed "
-"ones. Currently this only affects trees, which will be shown in their binary "
-"form. This is harder to work with, but can help when repairing a tree that "
+"ones. Currently this only affects trees, which will be shown in their binary"
+" form. This is harder to work with, but can help when repairing a tree that "
"is so corrupted it cannot be pretty-printed. Note that you may need to "
"configure your editor to cleanly read and write binary data."
msgstr ""
@@ -52442,8 +52285,8 @@ msgstr ""
#: en/git-replace.txt:93
msgid ""
"Create a graft commit. A new commit is created with the same content as "
-"<commit> except that its parents will be [<parent>...] instead of <commit>'s "
-"parents. A replacement ref is then created to replace <commit> with the "
+"<commit> except that its parents will be [<parent>...] instead of <commit>'s"
+" parents. A replacement ref is then created to replace <commit> with the "
"newly created commit. See contrib/convert-grafts-to-replace-refs.sh for an "
"example script based on this option that can convert grafts to replace refs."
msgstr ""
@@ -52464,8 +52307,8 @@ msgstr ""
#: en/git-replace.txt:100
msgid ""
"List replace refs for objects that match the given pattern (or all if no "
-"pattern is given). Typing \"git replace\" without arguments, also lists all "
-"replace refs."
+"pattern is given). Typing \"git replace\" without arguments, also lists all"
+" replace refs."
msgstr ""
#. type: Labeled list
@@ -52565,7 +52408,6 @@ msgid ""
"objects."
msgstr ""
-#
#. type: Plain text
#: en/git-replace.txt:153
#, fuzzy
@@ -52584,7 +52426,7 @@ msgstr ""
#: en/git-request-pull.txt:2
#, no-wrap
msgid "git-request-pull(1)"
-msgstr ""
+msgstr "git-request-pull(1)"
#. type: Plain text
#: en/git-request-pull.txt:7
@@ -52660,16 +52502,17 @@ msgstr ""
#: en/git-request-pull.txt:47
msgid ""
"When the repository named by `<url>` has the commit at a tip of a ref that "
-"is different from the ref you have locally, you can use the `<local>:"
-"<remote>` syntax, to have its local name, a colon `:`, and its remote name."
+"is different from the ref you have locally, you can use the "
+"`<local>:<remote>` syntax, to have its local name, a colon `:`, and its "
+"remote name."
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:56
msgid ""
"Imagine that you built your work on your `master` branch on top of the "
-"`v1.0` release, and want it to be integrated to the project. First you push "
-"that change to your public repository for others to see:"
+"`v1.0` release, and want it to be integrated to the project. First you push"
+" that change to your public repository for others to see:"
msgstr ""
#. type: Plain text
@@ -52723,10 +52566,9 @@ msgstr ""
#. type: Title =
#: en/git-rerere.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-rerere(1)"
-msgstr "git-add(1)"
+msgstr "git-rerere(1)"
#. type: Plain text
#: en/git-rerere.txt:7
@@ -52736,7 +52578,9 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:12
#, no-wrap
-msgid "'git rerere' ['clear'|'forget' <pathspec>|'diff'|'remaining'|'status'|'gc']\n"
+msgid ""
+"'git rerere' ['clear'|'forget' "
+"<pathspec>|'diff'|'remaining'|'status'|'gc']\n"
msgstr ""
#. type: Plain text
@@ -52760,8 +52604,8 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:29
msgid ""
-"You need to set the configuration variable rerere.enabled in order to enable "
-"this command."
+"You need to set the configuration variable rerere.enabled in order to enable"
+" this command."
msgstr ""
#. type: Plain text
@@ -52810,8 +52654,9 @@ msgstr "diff"
#: en/git-rerere.txt:55
msgid ""
"Display diffs for the current state of the resolution. It is useful for "
-"tracking what has changed while the user is resolving conflicts. Additional "
-"arguments are passed directly to the system 'diff' command installed in PATH."
+"tracking what has changed while the user is resolving conflicts. Additional"
+" arguments are passed directly to the system 'diff' command installed in "
+"PATH."
msgstr ""
#. type: Labeled list
@@ -52851,8 +52696,8 @@ msgstr ""
msgid ""
"Prune records of conflicted merges that occurred a long time ago. By "
"default, unresolved conflicts older than 15 days and resolved conflicts "
-"older than 60 days are pruned. These defaults are controlled via the `gc."
-"rerereUnresolved` and `gc.rerereResolved` configuration variables "
+"older than 60 days are pruned. These defaults are controlled via the "
+"`gc.rerereUnresolved` and `gc.rerereResolved` configuration variables "
"respectively."
msgstr ""
@@ -52861,8 +52706,8 @@ msgstr ""
msgid ""
"When your topic branch modifies an overlapping area that your master branch "
"(or upstream) touched since your topic branch forked from it, you may want "
-"to test it with the latest master, even before your topic branch is ready to "
-"be pushed upstream:"
+"to test it with the latest master, even before your topic branch is ready to"
+" be pushed upstream:"
msgstr ""
#. type: delimited block -
@@ -52902,9 +52747,9 @@ msgstr ""
#: en/git-rerere.txt:106
msgid ""
"The commits marked with `*` touch the same area in the same file; you need "
-"to resolve the conflicts when creating the commit marked with `+`. Then you "
-"can test the result to make sure your work-in-progress still works with what "
-"is in the latest master."
+"to resolve the conflicts when creating the commit marked with `+`. Then you"
+" can test the result to make sure your work-in-progress still works with "
+"what is in the latest master."
msgstr ""
#. type: Plain text
@@ -52944,8 +52789,8 @@ msgid ""
"When your topic branch is long-lived, however, your topic branch would end "
"up having many such \"Merge from master\" commits on it, which would "
"unnecessarily clutter the development history. Readers of the Linux kernel "
-"mailing list may remember that Linus complained about such too frequent test "
-"merges when a subsystem maintainer asked to pull from a branch full of "
+"mailing list may remember that Linus complained about such too frequent test"
+" merges when a subsystem maintainer asked to pull from a branch full of "
"\"useless merges\"."
msgstr ""
@@ -52995,17 +52840,17 @@ msgid ""
"Running the 'git rerere' command immediately after a conflicted automerge "
"records the conflicted working tree files, with the usual conflict markers "
"`<<<<<<<`, `=======`, and `>>>>>>>` in them. Later, after you are done "
-"resolving the conflicts, running 'git rerere' again will record the resolved "
-"state of these files. Suppose you did this when you created the test merge "
-"of master into the topic branch."
+"resolving the conflicts, running 'git rerere' again will record the resolved"
+" state of these files. Suppose you did this when you created the test merge"
+" of master into the topic branch."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:177
msgid ""
"Next time, after seeing the same conflicted automerge, running 'git rerere' "
-"will perform a three-way merge between the earlier conflicted automerge, the "
-"earlier manual resolution, and the current conflicted automerge. If this "
+"will perform a three-way merge between the earlier conflicted automerge, the"
+" earlier manual resolution, and the current conflicted automerge. If this "
"three-way merge resolves cleanly, the result is written out to your working "
"tree file, so you do not have to manually resolve it. Note that 'git "
"rerere' leaves the index file alone, so you still need to do the final "
@@ -53029,16 +52874,16 @@ msgstr ""
msgid ""
"In our example, when you do the test merge, the manual resolution is "
"recorded, and it will be reused when you do the actual merge later with the "
-"updated master and topic branch, as long as the recorded resolution is still "
-"applicable."
+"updated master and topic branch, as long as the recorded resolution is still"
+" applicable."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:194
msgid ""
-"The information 'git rerere' records is also used when running 'git "
-"rebase'. After blowing away the test merge and continuing development on "
-"the topic branch:"
+"The information 'git rerere' records is also used when running 'git rebase'."
+" After blowing away the test merge and continuing development on the topic "
+"branch:"
msgstr ""
#. type: delimited block -
@@ -53068,19 +52913,18 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:213
msgid ""
-"you could run `git rebase master topic`, to bring yourself up-to-date before "
-"your topic is ready to be sent upstream. This would result in falling back "
-"to a three-way merge, and it would conflict the same way as the test merge "
+"you could run `git rebase master topic`, to bring yourself up-to-date before"
+" your topic is ready to be sent upstream. This would result in falling back"
+" to a three-way merge, and it would conflict the same way as the test merge "
"you resolved earlier. 'git rerere' will be run by 'git rebase' to help you "
"resolve this conflict."
msgstr ""
#. type: Title =
#: en/git-reset.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-reset(1)"
-msgstr "git-commit(1)"
+msgstr "git-reset(1)"
#. type: Plain text
#: en/git-reset.txt:7
@@ -53099,10 +52943,10 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:21
msgid ""
-"In the first and second form, copy entries from <tree-ish> to the index. In "
-"the third form, set the current branch head (HEAD) to <commit>, optionally "
-"modifying index and working tree to match. The <tree-ish>/<commit> defaults "
-"to HEAD in all forms."
+"In the first and second form, copy entries from <tree-ish> to the index. In"
+" the third form, set the current branch head (HEAD) to <commit>, optionally "
+"modifying index and working tree to match. The <tree-ish>/<commit> defaults"
+" to HEAD in all forms."
msgstr ""
#. type: Labeled list
@@ -53129,9 +52973,9 @@ msgstr ""
msgid ""
"After running `git reset <paths>` to update the index entry, you can use "
"linkgit:git-checkout[1] to check the contents out of the index to the "
-"working tree. Alternatively, using linkgit:git-checkout[1] and specifying a "
-"commit, you can copy the contents of a path out of a commit to the index and "
-"to the working tree in one go."
+"working tree. Alternatively, using linkgit:git-checkout[1] and specifying a"
+" commit, you can copy the contents of a path out of a commit to the index "
+"and to the working tree in one go."
msgstr ""
#. type: Labeled list
@@ -53152,11 +52996,11 @@ msgstr ""
#: en/git-reset.txt:45
#, fuzzy
#| msgid ""
-#| "by using the --interactive or --patch switches with the 'commit' command "
-#| "to decide one by one which files or hunks should be part of the commit in "
-#| "addition to contents in the index, before finalizing the operation. See "
-#| "the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to "
-#| "operate these modes."
+#| "by using the --interactive or --patch switches with the 'commit' command to "
+#| "decide one by one which files or hunks should be part of the commit in "
+#| "addition to contents in the index, before finalizing the operation. See the "
+#| "``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate "
+#| "these modes."
msgid ""
"This means that `git reset -p` is the opposite of `git add -p`, i.e. you "
"can use it to selectively reset hunks. See the ``Interactive Mode'' section "
@@ -53188,7 +53032,7 @@ msgstr ""
#: en/git-reset.txt:53
#, no-wrap
msgid "--soft"
-msgstr ""
+msgstr "--soft"
#. type: Plain text
#: en/git-reset.txt:58
@@ -53202,7 +53046,7 @@ msgstr ""
#: en/git-reset.txt:59
#, no-wrap
msgid "--mixed"
-msgstr ""
+msgstr "--mixed"
#. type: Plain text
#: en/git-reset.txt:63
@@ -53215,15 +53059,15 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:66
msgid ""
-"If `-N` is specified, removed paths are marked as intent-to-add (see linkgit:"
-"git-add[1])."
+"If `-N` is specified, removed paths are marked as intent-to-add (see "
+"linkgit:git-add[1])."
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:67
#, no-wrap
msgid "--hard"
-msgstr ""
+msgstr "--hard"
#. type: Plain text
#: en/git-reset.txt:70
@@ -53238,8 +53082,8 @@ msgid ""
"Resets the index and updates the files in the working tree that are "
"different between <commit> and HEAD, but keeps those which are different "
"between the index and working tree (i.e. which have changes which have not "
-"been added). If a file that is different between <commit> and the index has "
-"unstaged changes, reset is aborted."
+"been added). If a file that is different between <commit> and the index has"
+" unstaged changes, reset is aborted."
msgstr ""
#. type: Plain text
@@ -53344,8 +53188,8 @@ msgstr ""
#: en/git-reset.txt:140
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid "Make corrections to working tree files."
msgstr ""
"en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et "
@@ -53354,8 +53198,8 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:143
msgid ""
-"\"reset\" copies the old head to .git/ORIG_HEAD; redo the commit by starting "
-"with its log message. If you do not need to edit the message further, you "
+"\"reset\" copies the old head to .git/ORIG_HEAD; redo the commit by starting"
+" with its log message. If you do not need to edit the message further, you "
"can give -C option instead."
msgstr ""
@@ -53416,8 +53260,8 @@ msgstr ""
msgid ""
"The last three commits (HEAD, HEAD^, and HEAD~2) were bad and you do not "
"want to ever see them again. Do *not* do this if you have already given "
-"these commits to somebody else. (See the \"RECOVERING FROM UPSTREAM REBASE"
-"\" section in linkgit:git-rebase[1] for the implications of doing so.)"
+"these commits to somebody else. (See the \"RECOVERING FROM UPSTREAM "
+"REBASE\" section in linkgit:git-rebase[1] for the implications of doing so.)"
msgstr ""
#. type: Labeled list
@@ -53444,8 +53288,8 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:191
msgid ""
-"Try to update from the upstream resulted in a lot of conflicts; you were not "
-"ready to spend a lot of time merging right now, so you decide to do that "
+"Try to update from the upstream resulted in a lot of conflicts; you were not"
+" ready to spend a lot of time merging right now, so you decide to do that "
"later."
msgstr ""
@@ -53548,8 +53392,8 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:246
msgid ""
-"This removes the 'WIP' commit from the commit history, and sets your working "
-"tree to the state just before you made that snapshot."
+"This removes the 'WIP' commit from the commit history, and sets your working"
+" tree to the state just before you made that snapshot."
msgstr ""
#. type: Plain text
@@ -53567,7 +53411,6 @@ msgstr ""
msgid "See also linkgit:git-stash[1]."
msgstr "git-commit(1)"
-#
#. type: Labeled list
#: en/git-reset.txt:252
#, fuzzy, no-wrap
@@ -53596,8 +53439,8 @@ msgstr ""
#: en/git-reset.txt:266
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid ""
"This removes the file from the index while keeping it in the working "
"directory."
@@ -53610,7 +53453,6 @@ msgstr ""
msgid "This commits all other changes in the index."
msgstr ""
-#
#. type: Plain text
#: en/git-reset.txt:268
#, fuzzy
@@ -53656,8 +53498,8 @@ msgstr ""
#: en/git-reset.txt:292
msgid ""
"In the ideal world, you could have realized that the earlier commit did not "
-"belong to the new topic when you created and switched to branch2 (i.e. \"git "
-"checkout -b branch2 start\"), but nobody is perfect."
+"belong to the new topic when you created and switched to branch2 (i.e. \"git"
+" checkout -b branch2 start\"), but nobody is perfect."
msgstr ""
#. type: Plain text
@@ -53703,18 +53545,18 @@ msgstr ""
#: en/git-reset.txt:319
msgid ""
"First, reset the history back one commit so that we remove the original "
-"commit, but leave the working tree with all the changes. The -N ensures that "
-"any new files added with HEAD are still marked so that git add -p will find "
-"them."
+"commit, but leave the working tree with all the changes. The -N ensures that"
+" any new files added with HEAD are still marked so that git add -p will find"
+" them."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:323
msgid ""
"Next, we interactively select diff hunks to add using the git add -p "
-"facility. This will ask you about each diff hunk in sequence and you can use "
-"simple commands such as \"yes, include this\", \"No don't include this\" or "
-"even the very powerful \"edit\" facility."
+"facility. This will ask you about each diff hunk in sequence and you can use"
+" simple commands such as \"yes, include this\", \"No don't include this\" or"
+" even the very powerful \"edit\" facility."
msgstr ""
#. type: Plain text
@@ -53729,10 +53571,10 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:333
msgid ""
-"Next, commit the changes stored in the index. The -c option specifies to pre-"
-"populate the commit message from the original message that you started with "
-"in the first commit. This is helpful to avoid retyping it. The HEAD@{1} is a "
-"special notation for the commit that HEAD used to be at prior to the "
+"Next, commit the changes stored in the index. The -c option specifies to "
+"pre-populate the commit message from the original message that you started "
+"with in the first commit. This is helpful to avoid retyping it. The HEAD@{1}"
+" is a special notation for the commit that HEAD used to be at prior to the "
"original reset commit (1 change ago). See linkgit:git-reflog[1] for more "
"details. You may also use any other valid commit reference."
msgstr ""
@@ -53790,8 +53632,8 @@ msgid ""
"example, the first line of the first table means that if a file is in state "
"A in the working tree, in state B in the index, in state C in HEAD and in "
"state D in the target, then \"git reset --soft target\" will leave the file "
-"in the working tree in state A and in the index in state B. It resets (i.e. "
-"moves) the HEAD (i.e. the tip of the current branch, if you are on one) to "
+"in the working tree in state A and in the index in state B. It resets (i.e."
+" moves) the HEAD (i.e. the tip of the current branch, if you are on one) to "
"\"target\" (which has the file in state D)."
msgstr ""
@@ -53882,8 +53724,8 @@ msgid ""
"starts, and that it writes the result out to the working tree. So if we see "
"some difference between the index and the target and also between the index "
"and the working tree, then it means that we are not resetting out from a "
-"state that a mergy operation left after failing with a conflict. That is why "
-"we disallow --merge option in this case."
+"state that a mergy operation left after failing with a conflict. That is why"
+" we disallow --merge option in this case."
msgstr ""
#. type: Plain text
@@ -53900,7 +53742,8 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:433
-msgid "The following tables show what happens when there are unmerged entries:"
+msgid ""
+"The following tables show what happens when there are unmerged entries:"
msgstr ""
#. type: Plain text
@@ -53936,10 +53779,9 @@ msgstr ""
#. type: Title =
#: en/git-revert.txt:2
-#, fuzzy, no-wrap
-#| msgid "revert"
+#, no-wrap
msgid "git-revert(1)"
-msgstr "revert"
+msgstr "git-revert(1)"
#. type: Plain text
#: en/git-revert.txt:7
@@ -53990,8 +53832,8 @@ msgstr ""
#. type: Plain text
#: en/git-revert.txt:48
msgid ""
-"With this option, 'git revert' will let you edit the commit message prior to "
-"committing the revert. This is the default if you run the command from a "
+"With this option, 'git revert' will let you edit the commit message prior to"
+" committing the revert. This is the default if you run the command from a "
"terminal."
msgstr ""
@@ -54030,8 +53872,8 @@ msgstr ""
#: en/git-revert.txt:79
msgid ""
"Usually the command automatically creates some commits with commit log "
-"messages stating which commits were reverted. This flag applies the changes "
-"necessary to revert the named commits to your working tree and the index, "
+"messages stating which commits were reverted. This flag applies the changes"
+" necessary to revert the named commits to your working tree and the index, "
"but does not make the commits. In addition, when this option is used, your "
"index does not have to match the HEAD commit. The revert is done against "
"the beginning state of your index."
@@ -54040,8 +53882,8 @@ msgstr ""
#. type: Plain text
#: en/git-revert.txt:82
msgid ""
-"This is useful when reverting more than one commits' effect to your index in "
-"a row."
+"This is useful when reverting more than one commits' effect to your index in"
+" a row."
msgstr ""
#. type: Labeled list
@@ -54074,10 +53916,9 @@ msgstr ""
#. type: Title =
#: en/git-rev-list.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-rev-list(1)"
-msgstr "git-commit(1)"
+msgstr "git-rev-list(1)"
#. type: Plain text
#: en/git-rev-list.txt:7
@@ -54152,10 +53993,10 @@ msgstr ""
#. type: Plain text
#: en/git-rev-list.txt:77
msgid ""
-"You can think of this as a set operation. Commits given on the command line "
-"form a set of commits that are reachable from any of them, and then commits "
-"reachable from any of the ones given with '{caret}' in front are subtracted "
-"from that set. The remaining commits are what comes out in the command's "
+"You can think of this as a set operation. Commits given on the command line"
+" form a set of commits that are reachable from any of them, and then commits"
+" reachable from any of the ones given with '{caret}' in front are subtracted"
+" from that set. The remaining commits are what comes out in the command's "
"output. Various other options and paths parameters can be used to further "
"limit the result."
msgstr ""
@@ -54184,8 +54025,8 @@ msgstr ""
#: en/git-rev-list.txt:90
msgid ""
"A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand "
-"for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following "
-"may be used interchangeably:"
+"for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following"
+" may be used interchangeably:"
msgstr ""
#. type: delimited block -
@@ -54215,18 +54056,17 @@ msgstr ""
#. type: Plain text
#: en/git-rev-list.txt:110
msgid ""
-"'rev-list' is a very essential Git command, since it provides the ability to "
-"build and traverse commit ancestry graphs. For this reason, it has a lot of "
-"different options that enables it to be used by commands as different as "
+"'rev-list' is a very essential Git command, since it provides the ability to"
+" build and traverse commit ancestry graphs. For this reason, it has a lot of"
+" different options that enables it to be used by commands as different as "
"'git bisect' and 'git repack'."
msgstr ""
#. type: Title =
#: en/git-rev-parse.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-rev-parse(1)"
-msgstr "git-add(1)"
+msgstr "git-rev-parse(1)"
#. type: Plain text
#: en/git-rev-parse.txt:7
@@ -54264,7 +54104,7 @@ msgstr ""
#: en/git-rev-parse.txt:33
#, no-wrap
msgid "--parseopt"
-msgstr ""
+msgstr "--parseopt"
#. type: Plain text
#: en/git-rev-parse.txt:35
@@ -54276,7 +54116,7 @@ msgstr ""
#: en/git-rev-parse.txt:36
#, no-wrap
msgid "--sq-quote"
-msgstr ""
+msgstr "--sq-quote"
#. type: Plain text
#: en/git-rev-parse.txt:40
@@ -54296,7 +54136,7 @@ msgstr ""
#: en/git-rev-parse.txt:44
#, no-wrap
msgid "--keep-dashdash"
-msgstr ""
+msgstr "--keep-dashdash"
#. type: Plain text
#: en/git-rev-parse.txt:47
@@ -54307,24 +54147,23 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:48
-#, fuzzy, no-wrap
-#| msgid "status"
+#, no-wrap
msgid "--stop-at-non-option"
-msgstr "status"
+msgstr "--stop-at-non-option"
#. type: Plain text
#: en/git-rev-parse.txt:52
msgid ""
"Only meaningful in `--parseopt` mode. Lets the option parser stop at the "
-"first non-option argument. This can be used to parse sub-commands that take "
-"options themselves."
+"first non-option argument. This can be used to parse sub-commands that take"
+" options themselves."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:53
#, no-wrap
msgid "--stuck-long"
-msgstr ""
+msgstr "--stuck-long"
#. type: Plain text
#: en/git-rev-parse.txt:56
@@ -54343,7 +54182,7 @@ msgstr ""
#: en/git-rev-parse.txt:60
#, no-wrap
msgid "--revs-only"
-msgstr ""
+msgstr "--revs-only"
#. type: Plain text
#: en/git-rev-parse.txt:63
@@ -54355,7 +54194,7 @@ msgstr ""
#: en/git-rev-parse.txt:64
#, no-wrap
msgid "--no-revs"
-msgstr ""
+msgstr "--no-revs"
#. type: Plain text
#: en/git-rev-parse.txt:67
@@ -54366,7 +54205,7 @@ msgstr ""
#: en/git-rev-parse.txt:68
#, no-wrap
msgid "--flags"
-msgstr ""
+msgstr "--flags"
#. type: Plain text
#: en/git-rev-parse.txt:70
@@ -54377,7 +54216,7 @@ msgstr ""
#: en/git-rev-parse.txt:71
#, no-wrap
msgid "--no-flags"
-msgstr ""
+msgstr "--no-flags"
#. type: Plain text
#: en/git-rev-parse.txt:73
@@ -54420,8 +54259,8 @@ msgstr ""
#: en/git-rev-parse.txt:90
msgid ""
"This can be used to convert arguments to a command run in a subdirectory so "
-"that they can still be used after moving to the top-level of the "
-"repository. For example:"
+"that they can still be used after moving to the top-level of the repository."
+" For example:"
msgstr ""
#. type: delimited block -
@@ -54446,8 +54285,8 @@ msgstr ""
#: en/git-rev-parse.txt:112
msgid ""
"If you want to make sure that the output actually names an object in your "
-"object database and/or can be used as a specific type of object you require, "
-"you can add the `^{type}` peeling operator to the parameter. For example, "
+"object database and/or can be used as a specific type of object you require,"
+" you can add the `^{type}` peeling operator to the parameter. For example, "
"`git rev-parse \"$VAR^{commit}\"` will make sure `$VAR` names an existing "
"object that is a commit-ish (i.e. a commit, or an annotated tag that points "
"at a commit). To make sure that `$VAR` names an existing object of any "
@@ -54458,24 +54297,24 @@ msgstr ""
#: en/git-rev-parse.txt:119
msgid ""
"Only meaningful in `--verify` mode. Do not output an error message if the "
-"first argument is not a valid object name; instead exit with non-zero status "
-"silently. SHA-1s for valid object names are printed to stdout on success."
+"first argument is not a valid object name; instead exit with non-zero status"
+" silently. SHA-1s for valid object names are printed to stdout on success."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:120
#, no-wrap
msgid "--sq"
-msgstr ""
+msgstr "--sq"
#. type: Plain text
#: en/git-rev-parse.txt:128
msgid ""
"Usually the output is made one line per flag and parameter. This option "
"makes output a single line, properly quoted for consumption by shell. "
-"Useful when you expect your parameter to contain whitespaces and newlines (e."
-"g. when using pickaxe `-S` with 'git diff-{asterisk}'). In contrast to the "
-"`--sq-quote` option, the command input is still interpreted as usual."
+"Useful when you expect your parameter to contain whitespaces and newlines "
+"(e.g. when using pickaxe `-S` with 'git diff-{asterisk}'). In contrast to "
+"the `--sq-quote` option, the command input is still interpreted as usual."
msgstr ""
#. type: Plain text
@@ -54494,8 +54333,8 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:138
msgid ""
-"A non-ambiguous short name of the objects name. The option core."
-"warnAmbiguousRefs is used to select the strict abbreviation mode."
+"A non-ambiguous short name of the objects name. The option "
+"core.warnAmbiguousRefs is used to select the strict abbreviation mode."
msgstr ""
#. type: Labeled list
@@ -54517,7 +54356,7 @@ msgstr ""
#: en/git-rev-parse.txt:145
#, no-wrap
msgid "--symbolic"
-msgstr ""
+msgstr "--symbolic"
#. type: Plain text
#: en/git-rev-parse.txt:149
@@ -54531,7 +54370,7 @@ msgstr ""
#: en/git-rev-parse.txt:150
#, no-wrap
msgid "--symbolic-full-name"
-msgstr ""
+msgstr "--symbolic-full-name"
#. type: Plain text
#: en/git-rev-parse.txt:157
@@ -54582,9 +54421,9 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:174
msgid ""
-"If a `pattern` is given, only refs matching the given shell glob are shown. "
-"If the pattern does not contain a globbing character (`?`, `*`, or `[`), it "
-"is turned into a prefix match by appending `/*`."
+"If a `pattern` is given, only refs matching the given shell glob are shown."
+" If the pattern does not contain a globbing character (`?`, `*`, or `[`), "
+"it is turned into a prefix match by appending `/*`."
msgstr ""
#. type: Labeled list
@@ -54596,8 +54435,8 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:181
msgid ""
-"Show all refs matching the shell glob pattern `pattern`. If the pattern does "
-"not start with `refs/`, this is automatically prepended. If the pattern "
+"Show all refs matching the shell glob pattern `pattern`. If the pattern does"
+" not start with `refs/`, this is automatically prepended. If the pattern "
"does not contain a globbing character (`?`, `*`, or `[`), it is turned into "
"a prefix match by appending `/*`."
msgstr ""
@@ -54611,18 +54450,18 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:189 en/rev-list-options.txt:171
msgid ""
-"Do not include refs matching '<glob-pattern>' that the next `--all`, `--"
-"branches`, `--tags`, `--remotes`, or `--glob` would otherwise consider. "
-"Repetitions of this option accumulate exclusion patterns up to the next `--"
-"all`, `--branches`, `--tags`, `--remotes`, or `--glob` option (other options "
-"or arguments do not clear accumulated patterns)."
+"Do not include refs matching '<glob-pattern>' that the next `--all`, "
+"`--branches`, `--tags`, `--remotes`, or `--glob` would otherwise consider. "
+"Repetitions of this option accumulate exclusion patterns up to the next "
+"`--all`, `--branches`, `--tags`, `--remotes`, or `--glob` option (other "
+"options or arguments do not clear accumulated patterns)."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:195 en/rev-list-options.txt:177
msgid ""
-"The patterns given should not begin with `refs/heads`, `refs/tags`, or `refs/"
-"remotes` when applied to `--branches`, `--tags`, or `--remotes`, "
+"The patterns given should not begin with `refs/heads`, `refs/tags`, or "
+"`refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`, "
"respectively, and they must begin with `refs/` when applied to `--glob` or "
"`--all`. If a trailing '/{asterisk}' is intended, it must be given "
"explicitly."
@@ -54652,7 +54491,7 @@ msgstr ""
#: en/git-rev-parse.txt:205
#, no-wrap
msgid "--local-env-vars"
-msgstr ""
+msgstr "--local-env-vars"
#. type: Plain text
#: en/git-rev-parse.txt:210
@@ -54664,10 +54503,9 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:211
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "--git-dir"
-msgstr "git-add(1)"
+msgstr "--git-dir"
#. type: Plain text
#: en/git-rev-parse.txt:215
@@ -54680,15 +54518,15 @@ msgstr ""
#: en/git-rev-parse.txt:219
msgid ""
"If `$GIT_DIR` is not defined and the current directory is not detected to "
-"lie in a Git repository or work tree print a message to stderr and exit with "
-"nonzero status."
+"lie in a Git repository or work tree print a message to stderr and exit with"
+" nonzero status."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:220
#, no-wrap
msgid "--absolute-git-dir"
-msgstr ""
+msgstr "--absolute-git-dir"
#. type: Plain text
#: en/git-rev-parse.txt:223
@@ -54698,10 +54536,9 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:224
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--git-common-dir"
-msgstr "git-commit(1)"
+msgstr "--git-common-dir"
#. type: Plain text
#: en/git-rev-parse.txt:226
@@ -54712,7 +54549,7 @@ msgstr ""
#: en/git-rev-parse.txt:227
#, no-wrap
msgid "--is-inside-git-dir"
-msgstr ""
+msgstr "--is-inside-git-dir"
#. type: Plain text
#: en/git-rev-parse.txt:230
@@ -54725,20 +54562,20 @@ msgstr ""
#: en/git-rev-parse.txt:231
#, no-wrap
msgid "--is-inside-work-tree"
-msgstr ""
+msgstr "--is-inside-work-tree"
#. type: Plain text
#: en/git-rev-parse.txt:234
msgid ""
-"When the current working directory is inside the work tree of the repository "
-"print \"true\", otherwise \"false\"."
+"When the current working directory is inside the work tree of the repository"
+" print \"true\", otherwise \"false\"."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:235
#, no-wrap
msgid "--is-bare-repository"
-msgstr ""
+msgstr "--is-bare-repository"
#. type: Plain text
#: en/git-rev-parse.txt:237
@@ -54778,7 +54615,7 @@ msgstr ""
#: en/git-rev-parse.txt:251
#, no-wrap
msgid "--show-cdup"
-msgstr ""
+msgstr "--show-cdup"
#. type: Plain text
#: en/git-rev-parse.txt:255
@@ -54792,7 +54629,7 @@ msgstr ""
#: en/git-rev-parse.txt:256
#, no-wrap
msgid "--show-prefix"
-msgstr ""
+msgstr "--show-prefix"
#. type: Plain text
#: en/git-rev-parse.txt:260
@@ -54805,7 +54642,7 @@ msgstr ""
#: en/git-rev-parse.txt:261
#, no-wrap
msgid "--show-toplevel"
-msgstr ""
+msgstr "--show-toplevel"
#. type: Plain text
#: en/git-rev-parse.txt:263
@@ -54827,7 +54664,7 @@ msgstr ""
#: en/git-rev-parse.txt:270
#, no-wrap
msgid "--shared-index-path"
-msgstr ""
+msgstr "--shared-index-path"
#. type: Plain text
#: en/git-rev-parse.txt:273
@@ -54857,8 +54694,8 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:281
msgid ""
-"Parse the date string, and output the corresponding --max-age= parameter for "
-"'git rev-list'."
+"Parse the date string, and output the corresponding --max-age= parameter for"
+" 'git rev-list'."
msgstr ""
#. type: Labeled list
@@ -54877,8 +54714,8 @@ msgstr "Configuration"
#. type: Plain text
#: en/git-rev-parse.txt:286
msgid ""
-"Parse the date string, and output the corresponding --min-age= parameter for "
-"'git rev-list'."
+"Parse the date string, and output the corresponding --min-age= parameter for"
+" 'git rev-list'."
msgstr ""
#. type: Labeled list
@@ -54910,10 +54747,10 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:304
msgid ""
-"It takes on the standard input the specification of the options to parse and "
-"understand, and echoes on the standard output a string suitable for `sh(1)` "
-"`eval` to replace the arguments with normalized ones. In case of error, it "
-"outputs usage on the standard error stream, and exits with code 129."
+"It takes on the standard input the specification of the options to parse and"
+" understand, and echoes on the standard output a string suitable for `sh(1)`"
+" `eval` to replace the arguments with normalized ones. In case of error, it"
+" outputs usage on the standard error stream, and exits with code 129."
msgstr ""
#. type: Plain text
@@ -54985,9 +54822,9 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:339
msgid ""
-"Use `*` to mean that this option should not be listed in the usage generated "
-"for the `-h` argument. It's shown for `--help-all` as documented in linkgit:"
-"gitcli[7]."
+"Use `*` to mean that this option should not be listed in the usage generated"
+" for the `-h` argument. It's shown for `--help-all` as documented in "
+"linkgit:gitcli[7]."
msgstr ""
#. type: Plain text
@@ -55068,7 +54905,9 @@ msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:375
#, no-wrap
-msgid "eval \"$(echo \"$OPTS_SPEC\" | git rev-parse --parseopt -- \"$@\" || echo exit $?)\"\n"
+msgid ""
+"eval \"$(echo \"$OPTS_SPEC\" | git rev-parse --parseopt -- \"$@\" || echo "
+"exit $?)\"\n"
msgstr ""
#. type: Title ~
@@ -55124,8 +54963,8 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:406
msgid ""
-"In `--sq-quote` mode, 'git rev-parse' echoes on the standard output a single "
-"line suitable for `sh(1)` `eval`. This line is made by normalizing the "
+"In `--sq-quote` mode, 'git rev-parse' echoes on the standard output a single"
+" line suitable for `sh(1)` `eval`. This line is made by normalizing the "
"arguments following `--sq-quote`. Nothing other than quoting the arguments "
"is done."
msgstr ""
@@ -55203,17 +55042,16 @@ msgstr ""
#. type: Title =
#: en/git-rm.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-rm(1)"
-msgstr "git-add(1)"
+msgstr "git-rm(1)"
#. type: Plain text
#: en/git-rm.txt:7
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid "git-rm - Remove files from the working tree and from the index"
msgstr ""
"en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et "
@@ -55222,7 +55060,9 @@ msgstr ""
#. type: Plain text
#: en/git-rm.txt:12
#, no-wrap
-msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
+msgid ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] "
+"[--] <file>...\n"
msgstr ""
#. type: Plain text
@@ -55235,19 +55075,19 @@ msgid ""
"to be identical to the tip of the branch, and no updates to their contents "
"can be staged in the index, though that default behavior can be overridden "
"with the `-f` option. When `--cached` is given, the staged content has to "
-"match either the tip of the branch or the file on disk, allowing the file to "
-"be removed from just the index."
+"match either the tip of the branch or the file on disk, allowing the file to"
+" be removed from just the index."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:38
msgid ""
-"Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching "
-"files. If you want Git to expand file glob characters, you may need to "
-"shell-escape them. A leading directory name (e.g. `dir` to remove `dir/"
-"file1` and `dir/file2`) can be given to remove all files in the directory, "
-"and recursively all sub-directories, but this requires the `-r` option to be "
-"explicitly given."
+"Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching"
+" files. If you want Git to expand file glob characters, you may need to "
+"shell-escape them. A leading directory name (e.g. `dir` to remove "
+"`dir/file1` and `dir/file2`) can be given to remove all files in the "
+"directory, and recursively all sub-directories, but this requires the `-r` "
+"option to be explicitly given."
msgstr ""
#. type: Plain text
@@ -55294,7 +55134,7 @@ msgstr ""
#: en/git-rm.txt:63
#, no-wrap
msgid "--ignore-unmatch"
-msgstr ""
+msgstr "--ignore-unmatch"
#. type: Plain text
#: en/git-rm.txt:65
@@ -55313,8 +55153,8 @@ msgstr ""
msgid ""
"The <file> list given to the command can be exact pathnames, file glob "
"patterns, or leading directory names. The command removes only the paths "
-"that are known to Git. Giving the name of a file that you have not told Git "
-"about does not remove that file."
+"that are known to Git. Giving the name of a file that you have not told Git"
+" about does not remove that file."
msgstr ""
#. type: Plain text
@@ -55334,8 +55174,8 @@ msgstr ""
#. type: Plain text
#: en/git-rm.txt:91
msgid ""
-"There is no option for `git rm` to remove from the index only the paths that "
-"have disappeared from the filesystem. However, depending on the use case, "
+"There is no option for `git rm` to remove from the index only the paths that"
+" have disappeared from the filesystem. However, depending on the use case, "
"there are several ways that can be done."
msgstr ""
@@ -55350,8 +55190,8 @@ msgstr "$ git commit\n"
#: en/git-rm.txt:100
msgid ""
"If you intend that your next commit should record all modifications of "
-"tracked files in the working tree and record all removals of files that have "
-"been removed from the working tree with `rm` (as opposed to `git rm`), use "
+"tracked files in the working tree and record all removals of files that have"
+" been removed from the working tree with `rm` (as opposed to `git rm`), use "
"`git commit -a`, as it will automatically notice and record all removals. "
"You can also have a similar effect without committing by using `git add -u`."
msgstr ""
@@ -55437,10 +55277,10 @@ msgid ""
"version 1.7.8 or newer) will be removed from the work tree, as their "
"repository lives inside the .git directory of the superproject. If a "
"submodule (or one of those nested inside it) still uses a .git directory, "
-"`git rm` will fail - no matter if forced or not - to protect the submodule's "
-"history. If it exists the submodule.<name> section in the linkgit:"
-"gitmodules[5] file will also be removed and that file will be staged (unless "
-"--cached or -n are used)."
+"`git rm` will fail - no matter if forced or not - to protect the submodule's"
+" history. If it exists the submodule.<name> section in the "
+"linkgit:gitmodules[5] file will also be removed and that file will be staged"
+" (unless --cached or -n are used)."
msgstr ""
#. type: Plain text
@@ -55467,13 +55307,12 @@ msgstr ""
msgid "`git rm Documentation/\\*.txt`"
msgstr "$ git add Documentation/\\*.txt\n"
-#
#. type: Plain text
#: en/git-rm.txt:163
#, fuzzy
#| msgid ""
-#| "Adds content from all `*.txt` files under `Documentation` directory and "
-#| "its subdirectories:"
+#| "Adds content from all `*.txt` files under `Documentation` directory and its "
+#| "subdirectories:"
msgid ""
"Removes all `*.txt` files from the index that are under the `Documentation` "
"directory and any of its subdirectories."
@@ -55481,14 +55320,13 @@ msgstr ""
"Ajouter le contenu de tous le fichiers `*.txt` sous le r챕pertoire "
"`Documentation` et ses sous r챕pertoires."
-#
#. type: Plain text
#: en/git-rm.txt:167
#, fuzzy
#| msgid ""
#| "Note that the asterisk `*` is quoted from the shell in this example; this "
-#| "lets the command include the files from subdirectories of `Documentation/"
-#| "` directory."
+#| "lets the command include the files from subdirectories of `Documentation/` "
+#| "directory."
msgid ""
"Note that the asterisk `*` is quoted from the shell in this example; this "
"lets Git, and not the shell, expand the pathnames of files and "
@@ -55505,7 +55343,6 @@ msgstr ""
msgid "`git rm -f git-*.sh`"
msgstr "$ git add git-*.sh\n"
-#
#. type: Plain text
#: en/git-rm.txt:172
#, fuzzy
@@ -55525,18 +55362,17 @@ msgstr ""
msgid ""
"Each time a superproject update removes a populated submodule (e.g. when "
"switching between commits before and after the removal) a stale submodule "
-"checkout will remain in the old location. Removing the old directory is only "
-"safe when it uses a gitfile, as otherwise the history of the submodule will "
-"be deleted too. This step will be obsolete when recursive submodule update "
+"checkout will remain in the old location. Removing the old directory is only"
+" safe when it uses a gitfile, as otherwise the history of the submodule will"
+" be deleted too. This step will be obsolete when recursive submodule update "
"has been implemented."
msgstr ""
#. type: Title =
#: en/git-send-email.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-send-email(1)"
-msgstr "git-commit(1)"
+msgstr "git-send-email(1)"
#. type: Plain text
#: en/git-send-email.txt:7
@@ -55607,17 +55443,16 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:48 en/git-tag.txt:60
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--annotate"
-msgstr "git-commit(1)"
+msgstr "--annotate"
#. type: Plain text
#: en/git-send-email.txt:52
msgid ""
"Review and edit each patch you're about to send. Default is the value of "
-"`sendemail.annotate`. See the CONFIGURATION section for `sendemail."
-"multiEdit`."
+"`sendemail.annotate`. See the CONFIGURATION section for "
+"`sendemail.multiEdit`."
msgstr ""
#. type: Labeled list
@@ -55629,8 +55464,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:56
msgid ""
-"Specify a \"Bcc:\" value for each email. Default is the value of `sendemail."
-"bcc`."
+"Specify a \"Bcc:\" value for each email. Default is the value of "
+"`sendemail.bcc`."
msgstr ""
#. type: Plain text
@@ -55655,7 +55490,7 @@ msgstr ""
#: en/git-send-email.txt:65
#, no-wrap
msgid "--compose"
-msgstr ""
+msgstr "--compose"
#. type: Plain text
#: en/git-send-email.txt:68
@@ -55693,9 +55528,9 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:86
msgid ""
-"Specify the sender of the emails. If not specified on the command line, the "
-"value of the `sendemail.from` configuration option is used. If neither the "
-"command-line option nor `sendemail.from` are set, then the user will be "
+"Specify the sender of the emails. If not specified on the command line, the"
+" value of the `sendemail.from` configuration option is used. If neither the"
+" command-line option nor `sendemail.from` are set, then the user will be "
"prompted for the value. The default for the prompt will be the value of "
"GIT_AUTHOR_IDENT, or GIT_COMMITTER_IDENT if that is not set, as returned by "
"\"git var -l\"."
@@ -55740,8 +55575,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:108
msgid ""
-"Only necessary if --compose is also set. If --compose is not set, this will "
-"be prompted for."
+"Only necessary if --compose is also set. If --compose is not set, this will"
+" be prompted for."
msgstr ""
#. type: Labeled list
@@ -55753,8 +55588,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:113
msgid ""
-"Specify the initial subject of the email thread. Only necessary if --"
-"compose is also set. If --compose is not set, this will be prompted for."
+"Specify the initial subject of the email thread. Only necessary if "
+"--compose is also set. If --compose is not set, this will be prompted for."
msgstr ""
#. type: Labeled list
@@ -55768,8 +55603,8 @@ msgstr ""
msgid ""
"Specify the primary recipient of the emails generated. Generally, this will "
"be the upstream maintainer of the project involved. Default is the value of "
-"the `sendemail.to` configuration value; if that is unspecified, and --to-cmd "
-"is not specified, this will be prompted for."
+"the `sendemail.to` configuration value; if that is unspecified, and --to-cmd"
+" is not specified, this will be prompted for."
msgstr ""
#. type: Labeled list
@@ -55802,8 +55637,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:134
msgid ""
-"Specify encoding of compose message. Default is the value of the 'sendemail."
-"composeencoding'; if that is unspecified, UTF-8 is assumed."
+"Specify encoding of compose message. Default is the value of the "
+"'sendemail.composeencoding'; if that is unspecified, UTF-8 is assumed."
msgstr ""
#. type: Labeled list
@@ -55821,27 +55656,27 @@ msgid ""
"but makes the raw patch email file (as saved from a MUA) much harder to "
"inspect manually. base64 is even more fool proof, but also even more "
"opaque. Default is the value of the `sendemail.transferEncoding` "
-"configuration value; if that is unspecified, git will use 8bit and not add a "
-"Content-Transfer-Encoding header."
+"configuration value; if that is unspecified, git will use 8bit and not add a"
+" Content-Transfer-Encoding header."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:145
#, no-wrap
msgid "--xmailer"
-msgstr ""
+msgstr "--xmailer"
#. type: Labeled list
#: en/git-send-email.txt:146
#, no-wrap
msgid "--no-xmailer"
-msgstr ""
+msgstr "--no-xmailer"
#. type: Plain text
#: en/git-send-email.txt:150
msgid ""
-"Add (or prevent adding) the \"X-Mailer:\" header. By default, the header is "
-"added, but it can be turned off by setting the `sendemail.xmailer` "
+"Add (or prevent adding) the \"X-Mailer:\" header. By default, the header is"
+" added, but it can be turned off by setting the `sendemail.xmailer` "
"configuration variable to `false`."
msgstr ""
@@ -55860,12 +55695,13 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:162
msgid ""
-"Specify the envelope sender used to send the emails. This is useful if your "
-"default address is not the address that is subscribed to a list. In order to "
-"use the 'From' address, set the value to \"auto\". If you use the sendmail "
-"binary, you must have suitable privileges for the -f parameter. Default is "
-"the value of the `sendemail.envelopeSender` configuration variable; if that "
-"is unspecified, choosing the envelope sender is left to your MTA."
+"Specify the envelope sender used to send the emails. This is useful if your"
+" default address is not the address that is subscribed to a list. In order "
+"to use the 'From' address, set the value to \"auto\". If you use the "
+"sendmail binary, you must have suitable privileges for the -f parameter. "
+"Default is the value of the `sendemail.envelopeSender` configuration "
+"variable; if that is unspecified, choosing the envelope sender is left to "
+"your MTA."
msgstr ""
#. type: Labeled list
@@ -55920,9 +55756,9 @@ msgstr ""
msgid ""
"If at least one of the specified mechanisms matches the ones advertised by "
"the SMTP server and if it is supported by the utilized SASL library, the "
-"mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--"
-"smtp-auth` is specified, all mechanisms supported by the SASL library can be "
-"used."
+"mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor "
+"`--smtp-auth` is specified, all mechanisms supported by the SASL library can"
+" be used."
msgstr ""
#. type: Labeled list
@@ -55979,8 +55815,8 @@ msgid ""
"Specifies a port different from the default port (SMTP servers typically "
"listen to smtp port 25, but may also listen to submission port 587, or the "
"common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead "
-"of 587) are also accepted. The port can also be set with the `sendemail."
-"smtpServerPort` configuration variable."
+"of 587) are also accepted. The port can also be set with the "
+"`sendemail.smtpServerPort` configuration variable."
msgstr ""
#. type: Labeled list
@@ -55992,15 +55828,15 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:222
msgid ""
-"If set, specifies the outgoing SMTP server option to use. Default value can "
-"be specified by the `sendemail.smtpServerOption` configuration option."
+"If set, specifies the outgoing SMTP server option to use. Default value can"
+" be specified by the `sendemail.smtpServerOption` configuration option."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:226
msgid ""
-"The --smtp-server-option option must be repeated for each option you want to "
-"pass to the server. Likewise, different lines in the configuration files "
+"The --smtp-server-option option must be repeated for each option you want to"
+" pass to the server. Likewise, different lines in the configuration files "
"must be used for each option."
msgstr ""
@@ -56008,7 +55844,7 @@ msgstr ""
#: en/git-send-email.txt:227
#, no-wrap
msgid "--smtp-ssl"
-msgstr ""
+msgstr "--smtp-ssl"
#. type: Plain text
#: en/git-send-email.txt:229
@@ -56019,7 +55855,7 @@ msgstr ""
#: en/git-send-email.txt:230
#, no-wrap
msgid "--smtp-ssl-cert-path"
-msgstr ""
+msgstr "--smtp-ssl-cert-path"
#. type: Plain text
#: en/git-send-email.txt:240
@@ -56029,9 +55865,9 @@ msgid ""
"single file containing one or more PEM format certificates concatenated "
"together: see verify(1) -CAfile and -CApath for more information on these). "
"Set it to an empty string to disable certificate verification. Defaults to "
-"the value of the `sendemail.smtpsslcertpath` configuration variable, if set, "
-"or the backing SSL library's compiled-in default otherwise (which should be "
-"the best choice on most platforms)."
+"the value of the `sendemail.smtpsslcertpath` configuration variable, if set,"
+" or the backing SSL library's compiled-in default otherwise (which should be"
+" the best choice on most platforms)."
msgstr ""
#. type: Labeled list
@@ -56044,8 +55880,8 @@ msgstr ""
#: en/git-send-email.txt:245
msgid ""
"Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a "
-"username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then "
-"authentication is not attempted."
+"username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then"
+" authentication is not attempted."
msgstr ""
#. type: Labeled list
@@ -56077,9 +55913,9 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:259
msgid ""
-"Specify a command to execute once per patch file which should generate patch "
-"file specific \"To:\" entries. Output of this command must be single email "
-"address per line. Default is the value of 'sendemail.tocmd' configuration "
+"Specify a command to execute once per patch file which should generate patch"
+" file specific \"To:\" entries. Output of this command must be single email"
+" address per line. Default is the value of 'sendemail.tocmd' configuration "
"value."
msgstr ""
@@ -56092,9 +55928,9 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:265
msgid ""
-"Specify a command to execute once per patch file which should generate patch "
-"file specific \"Cc:\" entries. Output of this command must be single email "
-"address per line. Default is the value of `sendemail.ccCmd` configuration "
+"Specify a command to execute once per patch file which should generate patch"
+" file specific \"Cc:\" entries. Output of this command must be single email"
+" address per line. Default is the value of `sendemail.ccCmd` configuration "
"value."
msgstr ""
@@ -56102,7 +55938,7 @@ msgstr ""
#: en/git-send-email.txt:266
#, no-wrap
msgid "--[no-]chain-reply-to"
-msgstr ""
+msgstr "--[no-]chain-reply-to"
#. type: Plain text
#: en/git-send-email.txt:273
@@ -56124,30 +55960,29 @@ msgstr "git-commit(1)"
#. type: Labeled list
#: en/git-send-email.txt:280
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--[no-]signed-off-by-cc"
-msgstr "git-commit(1)"
+msgstr "--[no-]signed-off-by-cc"
#. type: Plain text
#: en/git-send-email.txt:284
msgid ""
"If this is set, add emails found in Signed-off-by: or Cc: lines to the cc "
-"list. Default is the value of `sendemail.signedoffbycc` configuration value; "
-"if that is unspecified, default to --signed-off-by-cc."
+"list. Default is the value of `sendemail.signedoffbycc` configuration value;"
+" if that is unspecified, default to --signed-off-by-cc."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:285
#, no-wrap
msgid "--[no-]cc-cover"
-msgstr ""
+msgstr "--[no-]cc-cover"
#. type: Plain text
#: en/git-send-email.txt:290
msgid ""
-"If this is set, emails found in Cc: headers in the first patch of the series "
-"(typically the cover letter) are added to the cc list for each email set. "
+"If this is set, emails found in Cc: headers in the first patch of the series"
+" (typically the cover letter) are added to the cc list for each email set. "
"Default is the value of 'sendemail.cccover' configuration value; if that is "
"unspecified, default to --no-cc-cover."
msgstr ""
@@ -56156,13 +55991,13 @@ msgstr ""
#: en/git-send-email.txt:291
#, no-wrap
msgid "--[no-]to-cover"
-msgstr ""
+msgstr "--[no-]to-cover"
#. type: Plain text
#: en/git-send-email.txt:296
msgid ""
-"If this is set, emails found in To: headers in the first patch of the series "
-"(typically the cover letter) are added to the to list for each email set. "
+"If this is set, emails found in To: headers in the first patch of the series"
+" (typically the cover letter) are added to the to list for each email set. "
"Default is the value of 'sendemail.tocover' configuration value; if that is "
"unspecified, default to --no-to-cover."
msgstr ""
@@ -56199,8 +56034,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:308
msgid ""
-"'bodycc' will avoid including anyone mentioned in Cc lines in the patch body "
-"(commit message) except for self (use 'self' for that)."
+"'bodycc' will avoid including anyone mentioned in Cc lines in the patch body"
+" (commit message) except for self (use 'self' for that)."
msgstr ""
#. type: Plain text
@@ -56241,7 +56076,7 @@ msgstr ""
#: en/git-send-email.txt:319
#, no-wrap
msgid "--[no-]suppress-from"
-msgstr ""
+msgstr "--[no-]suppress-from"
#. type: Plain text
#: en/git-send-email.txt:323
@@ -56255,13 +56090,13 @@ msgstr ""
#: en/git-send-email.txt:324
#, no-wrap
msgid "--[no-]thread"
-msgstr ""
+msgstr "--[no-]thread"
#. type: Plain text
#: en/git-send-email.txt:330
msgid ""
-"If this is set, the In-Reply-To and References headers will be added to each "
-"email sent. Whether each mail refers to the previous email (`deep` "
+"If this is set, the In-Reply-To and References headers will be added to each"
+" email sent. Whether each mail refers to the previous email (`deep` "
"threading per 'git format-patch' wording) or to the first email (`shallow` "
"threading) is governed by \"--[no-]chain-reply-to\"."
msgstr ""
@@ -56270,8 +56105,9 @@ msgstr ""
#: en/git-send-email.txt:335
msgid ""
"If disabled with \"--no-thread\", those headers will not be added (unless "
-"specified with --in-reply-to). Default is the value of the `sendemail."
-"thread` configuration value; if that is unspecified, default to --thread."
+"specified with --in-reply-to). Default is the value of the "
+"`sendemail.thread` configuration value; if that is unspecified, default to "
+"--thread."
msgstr ""
#. type: Plain text
@@ -56320,7 +56156,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:355
msgid ""
-"'compose' will confirm before sending the first message when using --compose."
+"'compose' will confirm before sending the first message when using "
+"--compose."
msgstr ""
#. type: Plain text
@@ -56343,18 +56180,17 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:365
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--[no-]format-patch"
-msgstr "git-commit(1)"
+msgstr "--[no-]format-patch"
#. type: Plain text
#: en/git-send-email.txt:370
msgid ""
"When an argument may be understood either as a reference or as a file name, "
-"choose to understand it as a format-patch argument (`--format-patch`) or as "
-"a file name (`--no-format-patch`). By default, when such a conflict occurs, "
-"git send-email will fail."
+"choose to understand it as a format-patch argument (`--format-patch`) or as"
+" a file name (`--no-format-patch`). By default, when such a conflict occurs,"
+" git send-email will fail."
msgstr ""
#. type: Plain text
@@ -56368,12 +56204,13 @@ msgstr ""
#: en/git-send-email.txt:375
#, no-wrap
msgid "--[no-]validate"
-msgstr ""
+msgstr "--[no-]validate"
#. type: Plain text
#: en/git-send-email.txt:378
msgid ""
-"Perform sanity checks on patches. Currently, validation means the following:"
+"Perform sanity checks on patches. Currently, validation means the "
+"following:"
msgstr ""
#. type: Plain text
@@ -56384,14 +56221,15 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:382
#, no-wrap
-msgid "is due to SMTP limits as described by http://www.ietf.org/rfc/rfc2821.txt.\n"
+msgid ""
+"is due to SMTP limits as described by http://www.ietf.org/rfc/rfc2821.txt.\n"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:386
msgid ""
-"Default is the value of `sendemail.validate`; if this is not set, default to "
-"`--validate`."
+"Default is the value of `sendemail.validate`; if this is not set, default to"
+" `--validate`."
msgstr ""
#. type: Plain text
@@ -56410,7 +56248,7 @@ msgstr "Configuration"
#: en/git-send-email.txt:394
#, no-wrap
msgid "--dump-aliases"
-msgstr ""
+msgstr "--dump-aliases"
#. type: Plain text
#: en/git-send-email.txt:399
@@ -56491,8 +56329,8 @@ msgstr ""
#: en/git-send-email.txt:434
msgid ""
"If true (default), a single editor instance will be spawned to edit files "
-"you have to edit (patches when `--annotate` is used, and the summary when `--"
-"compose` is used). If false, files will be edited one after the other, "
+"you have to edit (patches when `--annotate` is used, and the summary when "
+"`--compose` is used). If false, files will be edited one after the other, "
"spawning a new editor each time."
msgstr ""
@@ -56531,10 +56369,10 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:458
msgid ""
-"If you have multifactor authentication setup on your gmail account, you will "
-"need to generate an app-specific password for use with 'git send-email'. "
-"Visit https://security.google.com/settings/security/apppasswords to setup an "
-"app-specific password. Once setup, you can store it with the credentials "
+"If you have multifactor authentication setup on your gmail account, you will"
+" need to generate an app-specific password for use with 'git send-email'. "
+"Visit https://security.google.com/settings/security/apppasswords to setup an"
+" app-specific password. Once setup, you can store it with the credentials "
"helper:"
msgstr ""
@@ -56573,7 +56411,6 @@ msgid ""
" Net::SMTP::SSL, MIME::Base64 and Authen::SASL\n"
msgstr ""
-#
#. type: Plain text
#: en/git-send-email.txt:479
#, fuzzy
@@ -56587,10 +56424,9 @@ msgstr ""
#. type: Title =
#: en/git-send-pack.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-send-pack(1)"
-msgstr "git-add(1)"
+msgstr "git-send-pack(1)"
#. type: Plain text
#: en/git-send-pack.txt:7
@@ -56612,8 +56448,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:21
msgid ""
-"Usually you would want to use 'git push', which is a higher-level wrapper of "
-"this command, instead. See linkgit:git-push[1]."
+"Usually you would want to use 'git push', which is a higher-level wrapper of"
+" this command, instead. See linkgit:git-push[1]."
msgstr ""
#. type: Plain text
@@ -56631,8 +56467,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:40
msgid ""
-"Instead of explicitly specifying which refs to update, update all heads that "
-"locally exist."
+"Instead of explicitly specifying which refs to update, update all heads that"
+" locally exist."
msgstr ""
#. type: Plain text
@@ -56646,13 +56482,13 @@ msgstr ""
#: en/git-send-pack.txt:68
#, no-wrap
msgid "--atomic"
-msgstr ""
+msgstr "--atomic"
#. type: Plain text
#: en/git-send-pack.txt:72
msgid ""
-"Use an atomic transaction for updating the refs. If any of the refs fails to "
-"update then the entire push will fail without changing any refs."
+"Use an atomic transaction for updating the refs. If any of the refs fails to"
+" update then the entire push will fail without changing any refs."
msgstr ""
#. type: Labeled list
@@ -56675,14 +56511,15 @@ msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:101
-msgid "There are three ways to specify which refs to update on the remote end."
+msgid ""
+"There are three ways to specify which refs to update on the remote end."
msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:105
msgid ""
-"With `--all` flag, all refs that exist locally are transferred to the remote "
-"side. You cannot specify any '<ref>' if you use this flag."
+"With `--all` flag, all refs that exist locally are transferred to the remote"
+" side. You cannot specify any '<ref>' if you use this flag."
msgstr ""
#. type: Plain text
@@ -56696,10 +56533,10 @@ msgstr ""
#: en/git-send-pack.txt:114
msgid ""
"When one or more '<ref>' are specified explicitly (whether on the command "
-"line or via `--stdin`), it can be either a single pattern, or a pair of such "
-"pattern separated by a colon \":\" (this means that a ref name cannot have a "
-"colon in it). A single pattern '<name>' is just a shorthand for '<name>:"
-"<name>'."
+"line or via `--stdin`), it can be either a single pattern, or a pair of such"
+" pattern separated by a colon \":\" (this means that a ref name cannot have "
+"a colon in it). A single pattern '<name>' is just a shorthand for "
+"'<name>:<name>'."
msgstr ""
#. type: Plain text
@@ -56720,10 +56557,9 @@ msgstr ""
#. type: Title =
#: en/git-shell.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-shell(1)"
-msgstr "git-add(1)"
+msgstr "git-shell(1)"
#. type: Plain text
#: en/git-shell.txt:7
@@ -56742,10 +56578,10 @@ msgstr ""
#. type: Plain text
#: en/git-shell.txt:23
msgid ""
-"This is a login shell for SSH accounts to provide restricted Git access. It "
-"permits execution only of server-side Git commands implementing the pull/"
-"push functionality, plus custom commands present in a subdirectory named "
-"`git-shell-commands` in the user's home directory."
+"This is a login shell for SSH accounts to provide restricted Git access. It"
+" permits execution only of server-side Git commands implementing the "
+"pull/push functionality, plus custom commands present in a subdirectory "
+"named `git-shell-commands` in the user's home directory."
msgstr ""
#. type: Plain text
@@ -56824,8 +56660,8 @@ msgstr ""
#. type: Plain text
#: en/git-shell.txt:61
msgid ""
-"Generally this mode is used as an administrative interface to allow users to "
-"list repositories they have access to, create, delete, or rename "
+"Generally this mode is used as an administrative interface to allow users to"
+" list repositories they have access to, create, delete, or rename "
"repositories, or change repository descriptions and permissions."
msgstr ""
@@ -56888,8 +56724,8 @@ msgstr ""
#: en/git-sh-i18n--envsubst.txt:24
msgid ""
"This is not a command the end user would want to run. Ever. This "
-"documentation is meant for people who are studying the plumbing scripts and/"
-"or are writing new ones."
+"documentation is meant for people who are studying the plumbing scripts "
+"and/or are writing new ones."
msgstr ""
#. type: Plain text
@@ -56912,7 +56748,7 @@ msgstr ""
#: en/git-sh-i18n.txt:2
#, no-wrap
msgid "git-sh-i18n(1)"
-msgstr ""
+msgstr "git-sh-i18n(1)"
#. type: Plain text
#: en/git-sh-i18n.txt:7
@@ -56929,10 +56765,10 @@ msgstr ""
#: en/git-sh-i18n.txt:26
msgid ""
"The 'git sh-i18n scriptlet is designed to be sourced (using `.`) by Git's "
-"porcelain programs implemented in shell script. It provides wrappers for the "
-"GNU `gettext` and `eval_gettext` functions accessible through the `gettext."
-"sh` script, and provides pass-through fallbacks on systems without GNU "
-"gettext."
+"porcelain programs implemented in shell script. It provides wrappers for the"
+" GNU `gettext` and `eval_gettext` functions accessible through the "
+"`gettext.sh` script, and provides pass-through fallbacks on systems without "
+"GNU gettext."
msgstr ""
#. type: Labeled list
@@ -56959,17 +56795,16 @@ msgstr ""
#: en/git-sh-i18n.txt:40
msgid ""
"Currently a dummy fall-through function implemented as a wrapper around "
-"`printf(1)` with variables expanded by the linkgit:git-sh-i18n{litdd}"
-"envsubst[1] helper. Will be replaced by a real gettext implementation in a "
-"later version."
+"`printf(1)` with variables expanded by the linkgit:git-"
+"sh-i18n{litdd}envsubst[1] helper. Will be replaced by a real gettext "
+"implementation in a later version."
msgstr ""
#. type: Title =
#: en/git-shortlog.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-shortlog(1)"
-msgstr "git-commit(1)"
+msgstr "git-shortlog(1)"
#. type: Plain text
#: en/git-shortlog.txt:7
@@ -57019,10 +56854,9 @@ msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:39
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--email"
-msgstr "git-commit(1)"
+msgstr "--email"
#. type: Plain text
#: en/git-shortlog.txt:41
@@ -57052,10 +56886,9 @@ msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:51
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--committer"
-msgstr "git-commit(1)"
+msgstr "--committer"
#. type: Plain text
#: en/git-shortlog.txt:53
@@ -57087,12 +56920,12 @@ msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:71
msgid ""
-"Show only commits in the specified revision range. When no <revision range> "
-"is specified, it defaults to `HEAD` (i.e. the whole history leading to the "
+"Show only commits in the specified revision range. When no <revision range>"
+" is specified, it defaults to `HEAD` (i.e. the whole history leading to the "
"current commit). `origin..HEAD` specifies all the commits reachable from "
-"the current commit (i.e. `HEAD`), but not from `origin`. For a complete list "
-"of ways to spell <revision range>, see the \"Specifying Ranges\" section of "
-"linkgit:gitrevisions[7]."
+"the current commit (i.e. `HEAD`), but not from `origin`. For a complete list"
+" of ways to spell <revision range>, see the \"Specifying Ranges\" section of"
+" linkgit:gitrevisions[7]."
msgstr ""
#. type: Plain text
@@ -57121,7 +56954,7 @@ msgstr ""
#: en/git-show-branch.txt:2
#, no-wrap
msgid "git-show-branch(1)"
-msgstr ""
+msgstr "git-show-branch(1)"
#. type: Plain text
#: en/git-show-branch.txt:7
@@ -57155,8 +56988,8 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:29
msgid ""
-"It uses `showbranch.default` multi-valued configuration items if no <rev> or "
-"<glob> is given on the command line."
+"It uses `showbranch.default` multi-valued configuration items if no <rev> or"
+" <glob> is given on the command line."
msgstr ""
#. type: Labeled list
@@ -57200,7 +57033,7 @@ msgstr ""
#: en/git-show-branch.txt:51
#, no-wrap
msgid "--current"
-msgstr ""
+msgstr "--current"
#. type: Plain text
#: en/git-show-branch.txt:55
@@ -57213,21 +57046,21 @@ msgstr ""
#: en/git-show-branch.txt:56 en/rev-list-options.txt:635
#, no-wrap
msgid "--topo-order"
-msgstr ""
+msgstr "--topo-order"
#. type: Plain text
#: en/git-show-branch.txt:61
msgid ""
"By default, the branches and their commits are shown in reverse "
-"chronological order. This option makes them appear in topological order (i."
-"e., descendant commits are shown before their parents)."
+"chronological order. This option makes them appear in topological order "
+"(i.e., descendant commits are shown before their parents)."
msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:62 en/rev-list-options.txt:627
#, no-wrap
msgid "--date-order"
-msgstr ""
+msgstr "--date-order"
#. type: Plain text
#: en/git-show-branch.txt:66
@@ -57242,7 +57075,7 @@ msgstr ""
#: en/rev-list-options.txt:466
#, no-wrap
msgid "--sparse"
-msgstr ""
+msgstr "--sparse"
#. type: Plain text
#: en/git-show-branch.txt:71
@@ -57275,7 +57108,7 @@ msgstr ""
#: en/git-show-branch.txt:83
#, no-wrap
msgid "--merge-base"
-msgstr ""
+msgstr "--merge-base"
#. type: Plain text
#: en/git-show-branch.txt:89
@@ -57297,7 +57130,7 @@ msgstr ""
#: en/git-show-branch.txt:94
#, no-wrap
msgid "--no-name"
-msgstr ""
+msgstr "--no-name"
#. type: Plain text
#: en/git-show-branch.txt:96
@@ -57308,7 +57141,7 @@ msgstr ""
#: en/git-show-branch.txt:97
#, no-wrap
msgid "--sha1-name"
-msgstr ""
+msgstr "--sha1-name"
#. type: Plain text
#: en/git-show-branch.txt:102
@@ -57322,13 +57155,13 @@ msgstr ""
#: en/git-show-branch.txt:103
#, no-wrap
msgid "--topics"
-msgstr ""
+msgstr "--topics"
#. type: Plain text
#: en/git-show-branch.txt:110
msgid ""
-"Shows only commits that are NOT on the first branch given. This helps track "
-"topic branches by hiding any commit that is already in the main line of "
+"Shows only commits that are NOT on the first branch given. This helps track"
+" topic branches by hiding any commit that is already in the main line of "
"development. When given \"git show-branch --topics master topic1 topic2\", "
"this will show the revisions given by \"git rev-list {caret}master topic1 "
"topic2\""
@@ -57383,18 +57216,16 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:146
msgid ""
-"Following these N lines, one-line log for each commit is displayed, indented "
-"N places. If a commit is on the I-th branch, the I-th indentation character "
-"shows a `+` sign; otherwise it shows a space. Merge commits are denoted by "
-"a `-` sign. Each commit shows a short name that can be used as an extended "
-"SHA-1 to name that commit."
+"Following these N lines, one-line log for each commit is displayed, indented"
+" N places. If a commit is on the I-th branch, the I-th indentation "
+"character shows a `+` sign; otherwise it shows a space. Merge commits are "
+"denoted by a `-` sign. Each commit shows a short name that can be used as "
+"an extended SHA-1 to name that commit."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:149
-msgid ""
-"The following example shows three branches, \"master\", \"fixes\" and \"mhf"
-"\":"
+msgid "The following example shows three branches, \"master\", \"fixes\" and \"mhf\":"
msgstr ""
#. type: delimited block -
@@ -57428,11 +57259,11 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:174
msgid ""
-"These three branches all forked from a common commit, [master], whose commit "
-"message is \"Add {apostrophe}git show-branch{apostrophe}\". The \"fixes\" "
+"These three branches all forked from a common commit, [master], whose commit"
+" message is \"Add {apostrophe}git show-branch{apostrophe}\". The \"fixes\" "
"branch adds one commit \"Introduce \"reset type\" flag to \"git reset\"\". "
-"The \"mhf\" branch adds many other commits. The current branch is \"master"
-"\"."
+"The \"mhf\" branch adds many other commits. The current branch is "
+"\"master\"."
msgstr ""
#. type: Plain text
@@ -57456,8 +57287,8 @@ msgstr ""
#: en/git-show-branch.txt:193
msgid ""
"With this, `git show-branch` without extra parameters would show only the "
-"primary branches. In addition, if you happen to be on your topic branch, it "
-"is shown as well."
+"primary branches. In addition, if you happen to be on your topic branch, it"
+" is shown as well."
msgstr ""
#. type: delimited block -
@@ -57476,10 +57307,9 @@ msgstr ""
#. type: Title =
#: en/git-show-index.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-show-index(1)"
-msgstr "git-commit(1)"
+msgstr "git-show-index(1)"
#. type: Plain text
#: en/git-show-index.txt:7
@@ -57495,8 +57325,8 @@ msgstr ""
#. type: Plain text
#: en/git-show-index.txt:20
msgid ""
-"Read the idx file for a Git packfile created with 'git pack-objects' command "
-"from the standard input, and dump its contents."
+"Read the idx file for a Git packfile created with 'git pack-objects' command"
+" from the standard input, and dump its contents."
msgstr ""
#. type: Plain text
@@ -57511,7 +57341,7 @@ msgstr ""
#: en/git-show-ref.txt:2
#, no-wrap
msgid "git-show-ref(1)"
-msgstr ""
+msgstr "git-show-ref(1)"
#. type: Plain text
#: en/git-show-ref.txt:7
@@ -57545,23 +57375,23 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:29
msgid ""
-"The --exclude-existing form is a filter that does the inverse. It reads refs "
-"from stdin, one ref per line, and shows those that don't exist in the local "
-"repository."
+"The --exclude-existing form is a filter that does the inverse. It reads refs"
+" from stdin, one ref per line, and shows those that don't exist in the local"
+" repository."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:32
msgid ""
-"Use of this utility is encouraged in favor of directly accessing files under "
-"the `.git` directory."
+"Use of this utility is encouraged in favor of directly accessing files under"
+" the `.git` directory."
msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:36
#, no-wrap
msgid "--head"
-msgstr ""
+msgstr "--head"
#. type: Plain text
#: en/git-show-ref.txt:39
@@ -57572,21 +57402,21 @@ msgstr ""
#: en/git-show-ref.txt:46
msgid ""
"Limit to \"refs/heads\" and \"refs/tags\", respectively. These options are "
-"not mutually exclusive; when given both, references stored in \"refs/heads\" "
-"and \"refs/tags\" are displayed."
+"not mutually exclusive; when given both, references stored in \"refs/heads\""
+" and \"refs/tags\" are displayed."
msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:48
#, no-wrap
msgid "--dereference"
-msgstr ""
+msgstr "--dereference"
#. type: Plain text
#: en/git-show-ref.txt:52
msgid ""
-"Dereference tags into object IDs as well. They will be shown with \"{caret}"
-"{}\" appended."
+"Dereference tags into object IDs as well. They will be shown with "
+"\"{caret}{}\" appended."
msgstr ""
#. type: Labeled list
@@ -57598,23 +57428,23 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:58
msgid ""
-"Only show the SHA-1 hash, not the reference name. When combined with --"
-"dereference the dereferenced tag will still be shown after the SHA-1."
+"Only show the SHA-1 hash, not the reference name. When combined with "
+"--dereference the dereferenced tag will still be shown after the SHA-1."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:64
msgid ""
"Enable stricter reference checking by requiring an exact ref path. Aside "
-"from returning an error code of 1, it will also print an error message if `--"
-"quiet` was not specified."
+"from returning an error code of 1, it will also print an error message if "
+"`--quiet` was not specified."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:69
msgid ""
-"Abbreviate the object name. When using `--hash`, you do not have to say `--"
-"hash --abbrev`; `--hash=n` would do."
+"Abbreviate the object name. When using `--hash`, you do not have to say "
+"`--hash --abbrev`; `--hash=n` would do."
msgstr ""
#. type: Plain text
@@ -57666,15 +57496,17 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:95
msgid ""
-"Show references matching one or more patterns. Patterns are matched from the "
-"end of the full name, and only complete parts are matched, e.g. 'master' "
-"matches 'refs/heads/master', 'refs/remotes/origin/master', 'refs/tags/jedi/"
-"master' but not 'refs/heads/mymaster' or 'refs/remotes/master/jedi'."
+"Show references matching one or more patterns. Patterns are matched from the"
+" end of the full name, and only complete parts are matched, e.g. 'master' "
+"matches 'refs/heads/master', 'refs/remotes/origin/master', "
+"'refs/tags/jedi/master' but not 'refs/heads/mymaster' or "
+"'refs/remotes/master/jedi'."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:100
-msgid "The output is in the format: '<SHA-1 ID>' '<space>' '<reference name>'."
+msgid ""
+"The output is in the format: '<SHA-1 ID>' '<space>' '<reference name>'."
msgstr ""
#. type: delimited block -
@@ -57713,8 +57545,8 @@ msgstr ""
#: en/git-show-ref.txt:129
msgid ""
"To show all references called \"master\", whether tags or heads or anything "
-"else, and regardless of how deep in the reference naming hierarchy they are, "
-"use:"
+"else, and regardless of how deep in the reference naming hierarchy they are,"
+" use:"
msgstr ""
#. type: delimited block -
@@ -57726,8 +57558,8 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:136
msgid ""
-"This will show \"refs/heads/master\" but also \"refs/remote/other-repo/master"
-"\", if such references exists."
+"This will show \"refs/heads/master\" but also \"refs/remote/other-"
+"repo/master\", if such references exists."
msgstr ""
#. type: Plain text
@@ -57780,15 +57612,15 @@ msgstr ""
#: en/git-show-ref.txt:163
msgid ""
"To show only tags, or only proper branch heads, use \"--tags\" and/or \"--"
-"heads\" respectively (using both means that it shows tags and heads, but not "
-"other random references under the refs/ subdirectory)."
+"heads\" respectively (using both means that it shows tags and heads, but not"
+" other random references under the refs/ subdirectory)."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:166
msgid ""
-"To do automatic tag object dereferencing, use the \"-d\" or \"--dereference"
-"\" flag, so you can do"
+"To do automatic tag object dereferencing, use the \"-d\" or \"--"
+"dereference\" flag, so you can do"
msgstr ""
#. type: delimited block -
@@ -57807,7 +57639,6 @@ msgstr ""
msgid "`.git/refs/*`, `.git/packed-refs`"
msgstr ""
-#
#. type: Plain text
#: en/git-show-ref.txt:183
#, fuzzy
@@ -57823,10 +57654,9 @@ msgstr ""
#. type: Title =
#: en/git-show.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-show(1)"
-msgstr "git-add(1)"
+msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
@@ -57859,7 +57689,8 @@ msgstr ""
#. type: Plain text
#: en/git-show.txt:26
msgid ""
-"For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
+"For trees, it shows the names (equivalent to 'git ls-tree' with --name-"
+"only)."
msgstr ""
#. type: Plain text
@@ -57889,8 +57720,8 @@ msgstr ""
#: en/git-show.txt:41
msgid ""
"The names of objects to show. For a more complete list of ways to spell "
-"object names, see \"SPECIFYING REVISIONS\" section in linkgit:"
-"gitrevisions[7]."
+"object names, see \"SPECIFYING REVISIONS\" section in "
+"linkgit:gitrevisions[7]."
msgstr ""
#. type: Labeled list
@@ -57956,7 +57787,7 @@ msgstr ""
#: en/git-sh-setup.txt:2
#, no-wrap
msgid "git-sh-setup(1)"
-msgstr ""
+msgstr "git-sh-setup(1)"
#. type: Plain text
#: en/git-sh-setup.txt:7
@@ -57989,8 +57820,8 @@ msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:32
msgid ""
-"The scriptlet sets `GIT_DIR` and `GIT_OBJECT_DIRECTORY` shell variables, but "
-"does *not* export them to the environment."
+"The scriptlet sets `GIT_DIR` and `GIT_OBJECT_DIRECTORY` shell variables, but"
+" does *not* export them to the environment."
msgstr ""
#. type: Labeled list
@@ -58025,10 +57856,10 @@ msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:49
msgid ""
-"Set `GIT_REFLOG_ACTION` environment to a given string (typically the name of "
-"the program) unless it is already set. Whenever the script runs a `git` "
-"command that updates refs, a reflog entry is created using the value of this "
-"string to leave the record of what command updated the ref."
+"Set `GIT_REFLOG_ACTION` environment to a given string (typically the name of"
+" the program) unless it is already set. Whenever the script runs a `git` "
+"command that updates refs, a reflog entry is created using the value of this"
+" string to leave the record of what command updated the ref."
msgstr ""
#. type: Labeled list
@@ -58041,8 +57872,8 @@ msgstr ""
#: en/git-sh-setup.txt:54
msgid ""
"runs an editor of user's choice (GIT_EDITOR, core.editor, VISUAL or EDITOR) "
-"on a given file, but error out if no editor is specified and the terminal is "
-"dumb."
+"on a given file, but error out if no editor is specified and the terminal is"
+" dumb."
msgstr ""
#. type: Labeled list
@@ -58138,19 +57969,17 @@ msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:92
msgid ""
-"modifies the first file so only lines in common with the second file remain. "
-"If there is insufficient common material, then the first file is left empty. "
-"The result is suitable as a virtual base input for a 3-way merge."
+"modifies the first file so only lines in common with the second file remain."
+" If there is insufficient common material, then the first file is left "
+"empty. The result is suitable as a virtual base input for a 3-way merge."
msgstr ""
#. type: Title =
#: en/git-stage.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-stage(1)"
-msgstr "git-add(1)"
+msgstr "git-stage(1)"
-#
#. type: Plain text
#: en/git-stage.txt:7
#, fuzzy
@@ -58171,18 +58000,17 @@ msgstr ""
#| "This is a synonym for linkgit:git-fsck[1]. Please refer to the "
#| "documentation of that command."
msgid ""
-"This is a synonym for linkgit:git-add[1]. Please refer to the documentation "
-"of that command."
+"This is a synonym for linkgit:git-add[1]. Please refer to the documentation"
+" of that command."
msgstr ""
"Ceci est un synonyme pour linkgit:git-fsck[1]. Veuillez vous r챕f챕rer 횪 la "
"documentation de cette commande."
#. type: Title =
#: en/git-stash.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-stash(1)"
-msgstr "git-add(1)"
+msgstr "git-stash(1)"
#. type: Plain text
#: en/git-stash.txt:7
@@ -58220,12 +58048,12 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:40
msgid ""
-"The modifications stashed away by this command can be listed with `git stash "
-"list`, inspected with `git stash show`, and restored (potentially on top of "
-"a different commit) with `git stash apply`. Calling `git stash` without any "
-"arguments is equivalent to `git stash save`. A stash is by default listed "
-"as \"WIP on 'branchname' ...\", but you can give a more descriptive message "
-"on the command line when you create one."
+"The modifications stashed away by this command can be listed with `git stash"
+" list`, inspected with `git stash show`, and restored (potentially on top of"
+" a different commit) with `git stash apply`. Calling `git stash` without "
+"any arguments is equivalent to `git stash save`. A stash is by default "
+"listed as \"WIP on 'branchname' ...\", but you can give a more descriptive "
+"message on the command line when you create one."
msgstr ""
#. type: Plain text
@@ -58242,13 +58070,17 @@ msgstr ""
#. type: Labeled list
#: en/git-stash.txt:51
#, no-wrap
-msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
+msgid ""
+"save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all]"
+" [-q|--quiet] [<message>]"
msgstr ""
#. type: Labeled list
#: en/git-stash.txt:52
#, no-wrap
-msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+msgid ""
+"push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all]"
+" [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
@@ -58282,8 +58114,8 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:73
msgid ""
-"If the `--keep-index` option is used, all changes already added to the index "
-"are left intact."
+"If the `--keep-index` option is used, all changes already added to the index"
+" are left intact."
msgstr ""
#. type: Plain text
@@ -58300,9 +58132,9 @@ msgstr ""
msgid ""
"With `--patch`, you can interactively select hunks from the diff between "
"HEAD and the working tree to be stashed. The stash entry is constructed "
-"such that its index state is the same as the index state of your repository, "
-"and its worktree contains only the changes you selected interactively. The "
-"selected changes are then rolled back from your worktree. See the "
+"such that its index state is the same as the index state of your repository,"
+" and its worktree contains only the changes you selected interactively. The"
+" selected changes are then rolled back from your worktree. See the "
"``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate "
"the `--patch` mode."
msgstr ""
@@ -58357,8 +58189,8 @@ msgid ""
"and its original parent. When no `<stash>` is given, shows the latest one. "
"By default, the command shows the diffstat, but it will accept any format "
"known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second "
-"most recent stash in patch form). You can use stash.showStat and/or stash."
-"showPatch config variables to change the default behavior."
+"most recent stash in patch form). You can use stash.showStat and/or "
+"stash.showPatch config variables to change the default behavior."
msgstr ""
#. type: Labeled list
@@ -58370,8 +58202,8 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:122
msgid ""
-"Remove a single stashed state from the stash list and apply it on top of the "
-"current working tree state, i.e., do the inverse operation of `git stash "
+"Remove a single stashed state from the stash list and apply it on top of the"
+" current working tree state, i.e., do the inverse operation of `git stash "
"save`. The working directory must match the index."
msgstr ""
@@ -58379,8 +58211,8 @@ msgstr ""
#: en/git-stash.txt:126
msgid ""
"Applying the state can fail with conflicts; in this case, it is not removed "
-"from the stash list. You need to resolve the conflicts by hand and call `git "
-"stash drop` manually afterwards."
+"from the stash list. You need to resolve the conflicts by hand and call `git"
+" stash drop` manually afterwards."
msgstr ""
#. type: Plain text
@@ -58395,8 +58227,8 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:134
msgid ""
-"When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must "
-"be a reference of the form `stash@{<revision>}`."
+"When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must"
+" be a reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
@@ -58409,8 +58241,8 @@ msgstr ""
#: en/git-stash.txt:140
msgid ""
"Like `pop`, but do not remove the state from the stash list. Unlike `pop`, "
-"`<stash>` may be any commit that looks like a commit created by `stash save` "
-"or `stash create`."
+"`<stash>` may be any commit that looks like a commit created by `stash save`"
+" or `stash create`."
msgstr ""
#. type: Labeled list
@@ -58425,8 +58257,8 @@ msgid ""
"Creates and checks out a new branch named `<branchname>` starting from the "
"commit at which the `<stash>` was originally created, applies the changes "
"recorded in `<stash>` to the new working tree and index. If that succeeds, "
-"and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops "
-"the `<stash>`. When no `<stash>` is given, applies the latest one."
+"and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops"
+" the `<stash>`. When no `<stash>` is given, applies the latest one."
msgstr ""
#. type: Plain text
@@ -58462,8 +58294,8 @@ msgstr ""
#: en/git-stash.txt:167
msgid ""
"Remove a single stashed state from the stash list. When no `<stash>` is "
-"given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must "
-"be a valid stash log reference of the form `stash@{<revision>}`."
+"given, it removes the latest one. i.e. `stash@{0}`, otherwise `<stash>` must"
+" be a valid stash log reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
@@ -58476,9 +58308,9 @@ msgstr ""
#: en/git-stash.txt:174
msgid ""
"Create a stash (which is a regular commit object) and return its object "
-"name, without storing it anywhere in the ref namespace. This is intended to "
-"be useful for scripts. It is probably not the command you want to use; see "
-"\"save\" above."
+"name, without storing it anywhere in the ref namespace. This is intended to"
+" be useful for scripts. It is probably not the command you want to use; see"
+" \"save\" above."
msgstr ""
#. type: Labeled list
@@ -58491,8 +58323,8 @@ msgstr ""
#: en/git-stash.txt:181
msgid ""
"Store a given stash created via 'git stash create' (which is a dangling "
-"merge commit) in the stash ref, updating the stash reflog. This is intended "
-"to be useful for scripts. It is probably not the command you want to use; "
+"merge commit) in the stash ref, updating the stash reflog. This is intended"
+" to be useful for scripts. It is probably not the command you want to use; "
"see \"save\" above."
msgstr ""
@@ -58541,8 +58373,8 @@ msgstr ""
#: en/git-stash.txt:214
msgid ""
"However, there are cases in which your local changes do conflict with the "
-"upstream changes, and `git pull` refuses to overwrite your changes. In such "
-"a case, you can stash your changes away, perform a pull, and then unstash, "
+"upstream changes, and `git pull` refuses to overwrite your changes. In such"
+" a case, you can stash your changes away, perform a pull, and then unstash, "
"like this:"
msgstr ""
@@ -58561,9 +58393,9 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:230
msgid ""
-"When you are in the middle of something, your boss comes in and demands that "
-"you fix something immediately. Traditionally, you would make a commit to a "
-"temporary branch to store your changes away, and return to your original "
+"When you are in the middle of something, your boss comes in and demands that"
+" you fix something immediately. Traditionally, you would make a commit to a"
+" temporary branch to store your changes away, and return to your original "
"branch to make the emergency fix, like this:"
msgstr ""
@@ -58652,7 +58484,6 @@ msgid ""
"xargs git log --merges --no-walk --grep=WIP\n"
msgstr ""
-#
#. type: Plain text
#: en/git-stash.txt:292
#, fuzzy
@@ -58668,10 +58499,9 @@ msgstr ""
#. type: Title =
#: en/git-status.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-status(1)"
-msgstr "git-add(1)"
+msgstr "git-status(1)"
#. type: Plain text
#: en/git-status.txt:7
@@ -58747,17 +58577,17 @@ msgstr ""
msgid ""
"In addition to the names of files that have been changed, also show the "
"textual changes that are staged to be committed (i.e., like the output of "
-"`git diff --cached`). If `-v` is specified twice, then also show the changes "
-"in the working tree that have not yet been staged (i.e., like the output of "
-"`git diff`)."
+"`git diff --cached`). If `-v` is specified twice, then also show the changes"
+" in the working tree that have not yet been staged (i.e., like the output of"
+" `git diff`)."
msgstr ""
#. type: Plain text
#: en/git-status.txt:62
msgid ""
"The mode parameter is used to specify the handling of untracked files. It "
-"is optional: it defaults to 'all', and if specified, it must be stuck to the "
-"option (e.g. `-uno`, but not `-u no`)."
+"is optional: it defaults to 'all', and if specified, it must be stuck to the"
+" option (e.g. `-uno`, but not `-u no`)."
msgstr ""
#. type: Plain text
@@ -58777,10 +58607,10 @@ msgstr "'normal' - Montrer les fichiers et les dossiers non-suivis\n"
#. type: Plain text
#: en/git-status.txt:78
msgid ""
-"When `-u` option is not used, untracked files and directories are shown (i."
-"e. the same as specifying `normal`), to help you avoid forgetting to add "
-"newly created files. Because it takes extra work to find untracked files in "
-"the filesystem, this mode may take some time in a large working tree. "
+"When `-u` option is not used, untracked files and directories are shown "
+"(i.e. the same as specifying `normal`), to help you avoid forgetting to add "
+"newly created files. Because it takes extra work to find untracked files in"
+" the filesystem, this mode may take some time in a large working tree. "
"Consider enabling untracked cache and split index if supported (see `git "
"update-index --untracked-cache` and `git update-index --split-index`), "
"Otherwise you can use `no` to have `git status` return more quickly without "
@@ -58795,14 +58625,14 @@ msgid ""
"\"none\" will consider the submodule modified when it either contains "
"untracked or modified files or its HEAD differs from the commit recorded in "
"the superproject and can be used to override any settings of the 'ignore' "
-"option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" "
-"is used submodules are not considered dirty when they only contain untracked "
-"content (but they are still scanned for modified content). Using \"dirty\" "
-"ignores all changes to the work tree of submodules, only changes to the "
-"commits stored in the superproject are shown (this was the behavior before "
-"1.7.0). Using \"all\" hides all changes to submodules (and suppresses the "
-"output of submodule summaries when the config option `status."
-"submoduleSummary` is set)."
+"option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\""
+" is used submodules are not considered dirty when they only contain "
+"untracked content (but they are still scanned for modified content). Using "
+"\"dirty\" ignores all changes to the work tree of submodules, only changes "
+"to the commits stored in the superproject are shown (this was the behavior "
+"before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses"
+" the output of submodule summaries when the config option "
+"`status.submoduleSummary` is set)."
msgstr ""
#. type: Plain text
@@ -58821,15 +58651,15 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:103
msgid ""
-"Terminate entries with NUL, instead of LF. This implies the `--"
-"porcelain=v1` output format if no other format is given."
+"Terminate entries with NUL, instead of LF. This implies the "
+"`--porcelain=v1` output format if no other format is given."
msgstr ""
#. type: Plain text
#: en/git-status.txt:110
msgid ""
-"Display untracked files in columns. See configuration variable column.status "
-"for option syntax.`--column` and `--no-column` without options are "
+"Display untracked files in columns. See configuration variable column.status"
+" for option syntax.`--column` and `--no-column` without options are "
"equivalent to 'always' and 'never' respectively."
msgstr ""
@@ -58846,8 +58676,8 @@ msgstr ""
#: en/git-status.txt:124
msgid ""
"The paths mentioned in the output, unlike many other Git commands, are made "
-"relative to the current directory if you are working in a subdirectory (this "
-"is on purpose, to help cutting and pasting). See the status.relativePaths "
+"relative to the current directory if you are working in a subdirectory (this"
+" is on purpose, to help cutting and pasting). See the status.relativePaths "
"config option below."
msgstr ""
@@ -58873,8 +58703,9 @@ msgstr ""
#: en/git-status.txt:136
msgid ""
"where `PATH1` is the path in the `HEAD`, and the \" `-> PATH2`\" part is "
-"shown only when `PATH1` corresponds to a different path in the index/"
-"worktree (i.e. the file is renamed). The `XY` is a two-letter status code."
+"shown only when `PATH1` corresponds to a different path in the "
+"index/worktree (i.e. the file is renamed). The `XY` is a two-letter status "
+"code."
msgstr ""
#. type: Plain text
@@ -58882,8 +58713,8 @@ msgstr ""
msgid ""
"The fields (including the `->`) are separated from each other by a single "
"space. If a filename contains whitespace or other nonprintable characters, "
-"that field will be quoted in the manner of a C string literal: surrounded by "
-"ASCII double quote (34) characters, and with interior special characters "
+"that field will be quoted in the manner of a C string literal: surrounded by"
+" ASCII double quote (34) characters, and with interior special characters "
"backslash-escaped."
msgstr ""
@@ -58988,9 +58819,9 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:196
msgid ""
-"Version 1 porcelain format is similar to the short format, but is guaranteed "
-"not to change in a backwards-incompatible way between Git versions or based "
-"on user configuration. This makes it ideal for parsing by scripts. The "
+"Version 1 porcelain format is similar to the short format, but is guaranteed"
+" not to change in a backwards-incompatible way between Git versions or based"
+" on user configuration. This makes it ideal for parsing by scripts. The "
"description of the short format above also describes the porcelain format, "
"with a few exceptions:"
msgstr ""
@@ -58998,8 +58829,8 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:199
msgid ""
-"The user's color.status configuration is not respected; color will always be "
-"off."
+"The user's color.status configuration is not respected; color will always be"
+" off."
msgstr ""
#. type: Plain text
@@ -59107,7 +58938,8 @@ msgstr "prend en charge les formats de date suivants혻:"
#. type: Plain text
#: en/git-status.txt:253
#, no-wrap
-msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
+msgid ""
+" 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr ""
#. type: Plain text
@@ -59236,8 +59068,8 @@ msgstr ""
#| "The default can be changed by the `commit.cleanup` configuration variable "
#| "(see linkgit:git-config[1])."
msgid ""
-"Without the `-z` option, pathnames with \"unusual\" characters are quoted as "
-"explained for the configuration variable `core.quotePath` (see linkgit:git-"
+"Without the `-z` option, pathnames with \"unusual\" characters are quoted as"
+" explained for the configuration variable `core.quotePath` (see linkgit:git-"
"config[1])."
msgstr ""
"La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration "
@@ -59247,8 +59079,8 @@ msgstr ""
#: en/git-status.txt:337
msgid ""
"The command honors `color.status` (or `status.color` -- they mean the same "
-"thing and the latter is kept for backward compatibility) and `color.status."
-"<slot>` configuration variables to colorize its output."
+"thing and the latter is kept for backward compatibility) and "
+"`color.status.<slot>` configuration variables to colorize its output."
msgstr ""
#. type: Plain text
@@ -59263,14 +59095,14 @@ msgstr ""
#: en/git-status.txt:352
msgid ""
"If `status.submoduleSummary` is set to a non zero number or true (identical "
-"to -1 or an unlimited number), the submodule summary will be enabled for the "
-"long format and a summary of commits for modified submodules will be shown "
+"to -1 or an unlimited number), the submodule summary will be enabled for the"
+" long format and a summary of commits for modified submodules will be shown "
"(see --summary-limit option of linkgit:git-submodule[1]). Please note that "
"the summary output from the status command will be suppressed for all "
"submodules when `diff.ignoreSubmodules` is set to 'all' or only for those "
-"submodules where `submodule.<name>.ignore=all`. To also view the summary for "
-"ignored submodules you can either use the --ignore-submodules=dirty command "
-"line option or the 'git submodule summary' command, which shows a similar "
+"submodules where `submodule.<name>.ignore=all`. To also view the summary for"
+" ignored submodules you can either use the --ignore-submodules=dirty command"
+" line option or the 'git submodule summary' command, which shows a similar "
"output but does not honor these settings."
msgstr ""
@@ -59278,7 +59110,7 @@ msgstr ""
#: en/git-stripspace.txt:2
#, no-wrap
msgid "git-stripspace(1)"
-msgstr ""
+msgstr "git-stripspace(1)"
#. type: Plain text
#: en/git-stripspace.txt:7
@@ -59319,8 +59151,8 @@ msgstr ""
#: en/git-stripspace.txt:27
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid "remove empty lines from the beginning and end of the input"
msgstr ""
"en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et "
@@ -59351,7 +59183,7 @@ msgstr ""
#: en/git-stripspace.txt:39
#, no-wrap
msgid "--strip-comments"
-msgstr ""
+msgstr "--strip-comments"
#. type: Plain text
#: en/git-stripspace.txt:41
@@ -59363,7 +59195,7 @@ msgstr ""
#: en/git-stripspace.txt:43
#, no-wrap
msgid "--comment-lines"
-msgstr ""
+msgstr "--comment-lines"
#. type: Plain text
#: en/git-stripspace.txt:47
@@ -59434,10 +59266,9 @@ msgstr ""
#. type: Title =
#: en/git-submodule.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-submodule(1)"
-msgstr "git-add(1)"
+msgstr "git-submodule(1)"
#. type: Plain text
#: en/git-submodule.txt:7
@@ -59477,9 +59308,9 @@ msgstr ""
#: en/git-submodule.txt:36
msgid ""
"When cloning or pulling a repository containing submodules however, these "
-"will not be checked out by default; the 'init' and 'update' subcommands will "
-"maintain submodules checked out and at appropriate revision in your working "
-"tree."
+"will not be checked out by default; the 'init' and 'update' subcommands will"
+" maintain submodules checked out and at appropriate revision in your working"
+" tree."
msgstr ""
#. type: Plain text
@@ -59488,8 +59319,8 @@ msgid ""
"Submodules are composed from a so-called `gitlink` tree entry in the main "
"repository that refers to a particular commit object within the inner "
"repository that is completely separate. A record in the `.gitmodules` (see "
-"linkgit:gitmodules[5]) file at the root of the source tree assigns a logical "
-"name to the submodule and describes the default URL the submodule shall be "
+"linkgit:gitmodules[5]) file at the root of the source tree assigns a logical"
+" name to the submodule and describes the default URL the submodule shall be "
"cloned from. The logical name can be used for overriding this URL within "
"your local repository configuration (see 'submodule init')."
msgstr ""
@@ -59497,14 +59328,14 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:58
msgid ""
-"Submodules are not to be confused with remotes, which are other repositories "
-"of the same project; submodules are meant for different projects you would "
-"like to make part of your source tree, while the history of the two projects "
-"still stays completely independent and you cannot modify the contents of the "
-"submodule from within the main project. If you want to merge the project "
-"histories and want to treat the aggregated whole as a single project from "
-"then on, you may want to add a remote for the other project and use the "
-"'subtree' merge strategy, instead of treating the other project as a "
+"Submodules are not to be confused with remotes, which are other repositories"
+" of the same project; submodules are meant for different projects you would "
+"like to make part of your source tree, while the history of the two projects"
+" still stays completely independent and you cannot modify the contents of "
+"the submodule from within the main project. If you want to merge the "
+"project histories and want to treat the aggregated whole as a single project"
+" from then on, you may want to add a remote for the other project and use "
+"the 'subtree' merge strategy, instead of treating the other project as a "
"submodule. Directories that come from both projects can be cloned and "
"checked out as a whole if you choose to go that route."
msgstr ""
@@ -59512,7 +59343,9 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:61
#, no-wrap
-msgid "add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--depth <depth>] [--] <repository> [<path>]"
+msgid ""
+"add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] "
+"[--depth <depth>] [--] <repository> [<path>]"
msgstr ""
#. type: Plain text
@@ -59542,9 +59375,9 @@ msgid ""
"be either an absolute URL, or (if it begins with ./ or ../), the location "
"relative to the superproject's default remote repository (Please note that "
"to specify a repository 'foo.git' which is located right next to a "
-"superproject 'bar.git', you'll have to use '../foo.git' instead of './foo."
-"git' - as one might expect when following the rules for relative URLs - "
-"because the evaluation of relative URLs in Git is identical to that of "
+"superproject 'bar.git', you'll have to use '../foo.git' instead of "
+"'./foo.git' - as one might expect when following the rules for relative URLs"
+" - because the evaluation of relative URLs in Git is identical to that of "
"relative directories)."
msgstr ""
@@ -59565,9 +59398,9 @@ msgid ""
"<path> is the relative location for the cloned submodule to exist in the "
"superproject. If <path> does not exist, then the submodule is created by "
"cloning from the named URL. If <path> does exist and is already a valid Git "
-"repository, then this is added to the changeset without cloning. This second "
-"form is provided to ease creating a new submodule from scratch, and presumes "
-"the user will later push the submodule to the given URL."
+"repository, then this is added to the changeset without cloning. This second"
+" form is provided to ease creating a new submodule from scratch, and "
+"presumes the user will later push the submodule to the given URL."
msgstr ""
#. type: Plain text
@@ -59633,15 +59466,15 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:133
msgid ""
-"Optional <path> arguments limit which submodules will be initialized. If no "
-"path is specified, all submodules are initialized."
+"Optional <path> arguments limit which submodules will be initialized. If no"
+" path is specified, all submodules are initialized."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:141
msgid ""
-"When present, it will also copy the value of `submodule.$name.update`. This "
-"command does not alter existing information in .git/config. You can then "
+"When present, it will also copy the value of `submodule.$name.update`. This"
+" command does not alter existing information in .git/config. You can then "
"customize the submodule clone URLs in .git/config for your local setup and "
"proceed to `git submodule update`; you can also just use `git submodule "
"update --init` without the explicit 'init' step if you do not intend to "
@@ -59666,9 +59499,9 @@ msgid ""
"section from .git/config together with their work tree. Further calls to "
"`git submodule update`, `git submodule foreach` and `git submodule sync` "
"will skip any unregistered submodules until they are initialized again, so "
-"use this command if you don't want to have a local checkout of the submodule "
-"in your working tree anymore. If you really want to remove a submodule from "
-"the repository and commit that use linkgit:git-rm[1] instead."
+"use this command if you don't want to have a local checkout of the submodule"
+" in your working tree anymore. If you really want to remove a submodule from"
+" the repository and commit that use linkgit:git-rm[1] instead."
msgstr ""
#. type: Plain text
@@ -59681,14 +59514,17 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:159
msgid ""
-"If `--force` is specified, the submodule's working tree will be removed even "
-"if it contains local modifications."
+"If `--force` is specified, the submodule's working tree will be removed even"
+" if it contains local modifications."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:160
#, no-wrap
-msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+msgid ""
+"update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] "
+"[-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] "
+"[--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -59698,9 +59534,9 @@ msgid ""
"cloning missing submodules and updating the working tree of the submodules. "
"The \"updating\" can be done in several ways depending on command line "
"options and the value of `submodule.<name>.update` configuration variable. "
-"The command line option takes precedence over the configuration variable. if "
-"neither is given, a checkout is performed. update procedures supported both "
-"from the command line as well as setting `submodule.<name>.update`:"
+"The command line option takes precedence over the configuration variable. if"
+" neither is given, a checkout is performed. update procedures supported "
+"both from the command line as well as setting `submodule.<name>.update`:"
msgstr ""
#. type: Labeled list
@@ -59724,8 +59560,8 @@ msgstr ""
#: en/git-submodule.txt:179
msgid ""
"If `--force` is specified, the submodule will be checked out (using `git "
-"checkout --force` if appropriate), even if the commit specified in the index "
-"of the containing repository already matches the commit checked out in the "
+"checkout --force` if appropriate), even if the commit specified in the index"
+" of the containing repository already matches the commit checked out in the "
"submodule."
msgstr ""
@@ -59760,8 +59596,8 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:188
msgid ""
-"The following procedures are only available via the `submodule.<name>."
-"update` configuration variable:"
+"The following procedures are only available via the "
+"`submodule.<name>.update` configuration variable:"
msgstr ""
#. type: Labeled list
@@ -59801,14 +59637,16 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:203
msgid ""
-"If `--recursive` is specified, this command will recurse into the registered "
-"submodules, and update any nested submodules within."
+"If `--recursive` is specified, this command will recurse into the registered"
+" submodules, and update any nested submodules within."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:204
#, no-wrap
-msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
+msgid ""
+"summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] "
+"[<path>...]"
msgstr ""
#. type: Plain text
@@ -59840,17 +59678,18 @@ msgstr ""
#: en/git-submodule.txt:233
msgid ""
"Evaluates an arbitrary shell command in each checked out submodule. The "
-"command has access to the variables $name, $path, $sha1 and $toplevel: $name "
-"is the name of the relevant submodule section in .gitmodules, $path is the "
+"command has access to the variables $name, $path, $sha1 and $toplevel: $name"
+" is the name of the relevant submodule section in .gitmodules, $path is the "
"name of the submodule directory relative to the superproject, $sha1 is the "
"commit as recorded in the superproject, and $toplevel is the absolute path "
"to the top-level of the superproject. Any submodules defined in the "
"superproject but not checked out are ignored by this command. Unless given "
"`--quiet`, foreach prints the name of each submodule before evaluating the "
-"command. If `--recursive` is given, submodules are traversed recursively (i."
-"e. the given shell command is evaluated in nested submodules as well). A "
-"non-zero return from the command in any submodule causes the processing to "
-"terminate. This can be overridden by adding '|| :' to the end of the command."
+"command. If `--recursive` is given, submodules are traversed recursively "
+"(i.e. the given shell command is evaluated in nested submodules as well). "
+"A non-zero return from the command in any submodule causes the processing to"
+" terminate. This can be overridden by adding '|| :' to the end of the "
+"command."
msgstr ""
#. type: Plain text
@@ -59876,9 +59715,9 @@ msgstr ""
#: en/git-submodule.txt:248
msgid ""
"Synchronizes submodules' remote URL configuration setting to the value "
-"specified in .gitmodules. It will only affect those submodules which already "
-"have a URL entry in .git/config (that is the case when they are initialized "
-"or freshly added). This is useful when submodule URLs change upstream and "
+"specified in .gitmodules. It will only affect those submodules which already"
+" have a URL entry in .git/config (that is the case when they are initialized"
+" or freshly added). This is useful when submodule URLs change upstream and "
"you need to update your local repositories accordingly."
msgstr ""
@@ -59892,8 +59731,8 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:254
msgid ""
-"If `--recursive` is specified, this command will recurse into the registered "
-"submodules, and sync any nested submodules within."
+"If `--recursive` is specified, this command will recurse into the registered"
+" submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
@@ -59915,9 +59754,9 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:266
msgid ""
-"A repository that was cloned independently and later added as a submodule or "
-"old setups have the submodules git directory inside the submodule instead of "
-"embedded into the superprojects git directory."
+"A repository that was cloned independently and later added as a submodule or"
+" old setups have the submodules git directory inside the submodule instead "
+"of embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
@@ -59949,21 +59788,21 @@ msgstr ""
#: en/git-submodule.txt:286
msgid ""
"Branch of repository to add as submodule. The name of the branch is "
-"recorded as `submodule.<name>.branch` in `.gitmodules` for `update --"
-"remote`. A special value of `.` is used to indicate that the name of the "
-"branch in the submodule should be the same name as the current branch in the "
-"current repository."
+"recorded as `submodule.<name>.branch` in `.gitmodules` for `update "
+"--remote`. A special value of `.` is used to indicate that the name of the "
+"branch in the submodule should be the same name as the current branch in the"
+" current repository."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:299
msgid ""
-"This option is only valid for add, deinit and update commands. When running "
-"add, allow adding an otherwise ignored submodule path. When running deinit "
-"the submodule working trees will be removed even if they contain local "
+"This option is only valid for add, deinit and update commands. When running"
+" add, allow adding an otherwise ignored submodule path. When running deinit"
+" the submodule working trees will be removed even if they contain local "
"changes. When running update (only effective with the checkout procedure), "
-"throw away local changes in submodules when switching to a different commit; "
-"and always run a checkout operation in the submodule, even if the commit "
+"throw away local changes in submodules when switching to a different commit;"
+" and always run a checkout operation in the submodule, even if the commit "
"listed in the index of the containing repository matches the commit checked "
"out in the submodule."
msgstr ""
@@ -59980,20 +59819,21 @@ msgstr ""
#: en/git-submodule.txt:305
#, no-wrap
msgid "--files"
-msgstr ""
+msgstr "--files"
#. type: Plain text
#: en/git-submodule.txt:309
msgid ""
-"This option is only valid for the summary command. This command compares the "
-"commit in the index with that in the submodule HEAD when this option is used."
+"This option is only valid for the summary command. This command compares the"
+" commit in the index with that in the submodule HEAD when this option is "
+"used."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:311
#, no-wrap
msgid "--summary-limit"
-msgstr ""
+msgstr "--summary-limit"
#. type: Plain text
#: en/git-submodule.txt:317
@@ -60001,23 +59841,22 @@ msgid ""
"This option is only valid for the summary command. Limit the summary size "
"(number of commits shown in total). Giving 0 will disable the summary; a "
"negative number means unlimited (the default). This limit only applies to "
-"modified submodules. The size is always limited to 1 for added/deleted/"
-"typechanged submodules."
+"modified submodules. The size is always limited to 1 for "
+"added/deleted/typechanged submodules."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:318
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--remote"
-msgstr "git-commit(1)"
+msgstr "--remote"
#. type: Plain text
#: en/git-submodule.txt:327
msgid ""
"This option is only valid for the update command. Instead of using the "
-"superproject's recorded SHA-1 to update the submodule, use the status of the "
-"submodule's remote-tracking branch. The remote used is branch's remote "
+"superproject's recorded SHA-1 to update the submodule, use the status of the"
+" submodule's remote-tracking branch. The remote used is branch's remote "
"(`branch.<name>.remote`), defaulting to `origin`. The remote branch used "
"defaults to `master`, but the branch name may be overridden by setting the "
"`submodule.<name>.branch` option in either `.gitmodules` or `.git/config` "
@@ -60027,8 +59866,8 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:333
msgid ""
-"This works for any of the supported update procedures (`--checkout`, `--"
-"rebase`, etc.). The only change is the source of the target SHA-1. For "
+"This works for any of the supported update procedures (`--checkout`, "
+"`--rebase`, etc.). The only change is the source of the target SHA-1. For "
"example, `submodule update --remote --merge` will merge upstream submodule "
"changes into the submodules, while `submodule update --merge` will merge "
"superproject gitlink changes into the submodules."
@@ -60048,19 +59887,20 @@ msgstr ""
msgid ""
"Use this option to integrate changes from the upstream subproject with your "
"submodule's current HEAD. Alternatively, you can run `git pull` from the "
-"submodule, which is equivalent except for the remote branch name: `update --"
-"remote` uses the default upstream repository and `submodule.<name>.branch`, "
-"while `git pull` uses the submodule's `branch.<name>.merge`. Prefer "
-"`submodule.<name>.branch` if you want to distribute the default upstream "
-"branch with the superproject and `branch.<name>.merge` if you want a more "
-"native feel while working in the submodule itself."
+"submodule, which is equivalent except for the remote branch name: `update "
+"--remote` uses the default upstream repository and "
+"`submodule.<name>.branch`, while `git pull` uses the submodule's "
+"`branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to "
+"distribute the default upstream branch with the superproject and "
+"`branch.<name>.merge` if you want a more native feel while working in the "
+"submodule itself."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:350
#, no-wrap
msgid "--no-fetch"
-msgstr ""
+msgstr "--no-fetch"
#. type: Plain text
#: en/git-submodule.txt:353
@@ -60071,69 +59911,69 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:354
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--checkout"
-msgstr "git-commit(1)"
+msgstr "--checkout"
#. type: Plain text
#: en/git-submodule.txt:362
msgid ""
"This option is only valid for the update command. Checkout the commit "
"recorded in the superproject on a detached HEAD in the submodule. This is "
-"the default behavior, the main use of this option is to override `submodule."
-"$name.update` when set to a value other than `checkout`. If the key "
-"`submodule.$name.update` is either not explicitly set or set to `checkout`, "
-"this option is implicit."
+"the default behavior, the main use of this option is to override "
+"`submodule.$name.update` when set to a value other than `checkout`. If the "
+"key `submodule.$name.update` is either not explicitly set or set to "
+"`checkout`, this option is implicit."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:372
msgid ""
-"This option is only valid for the update command. Merge the commit recorded "
-"in the superproject into the current branch of the submodule. If this option "
-"is given, the submodule's HEAD will not be detached. If a merge failure "
-"prevents this process, you will have to resolve the resulting conflicts "
-"within the submodule with the usual conflict resolution tools. If the key "
-"`submodule.$name.update` is set to `merge`, this option is implicit."
+"This option is only valid for the update command. Merge the commit recorded"
+" in the superproject into the current branch of the submodule. If this "
+"option is given, the submodule's HEAD will not be detached. If a merge "
+"failure prevents this process, you will have to resolve the resulting "
+"conflicts within the submodule with the usual conflict resolution tools. If"
+" the key `submodule.$name.update` is set to `merge`, this option is "
+"implicit."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:373
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "--rebase"
-msgstr "git-add(1)"
+msgstr "--rebase"
#. type: Plain text
#: en/git-submodule.txt:381
msgid ""
-"This option is only valid for the update command. Rebase the current branch "
-"onto the commit recorded in the superproject. If this option is given, the "
+"This option is only valid for the update command. Rebase the current branch"
+" onto the commit recorded in the superproject. If this option is given, the "
"submodule's HEAD will not be detached. If a merge failure prevents this "
-"process, you will have to resolve these failures with linkgit:git-"
-"rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this "
-"option is implicit."
+"process, you will have to resolve these failures with linkgit:git-rebase[1]."
+" If the key `submodule.$name.update` is set to `rebase`, this option is "
+"implicit."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:382
#, no-wrap
msgid "--init"
-msgstr ""
+msgstr "--init"
#. type: Plain text
#: en/git-submodule.txt:386
msgid ""
-"This option is only valid for the update command. Initialize all submodules "
-"for which \"git submodule init\" has not been called so far before updating."
+"This option is only valid for the update command. Initialize all submodules"
+" for which \"git submodule init\" has not been called so far before "
+"updating."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:387
#, no-wrap
msgid "--name"
-msgstr ""
+msgstr "--name"
#. type: Plain text
#: en/git-submodule.txt:391
@@ -60178,28 +60018,28 @@ msgstr ""
#: en/git-submodule.txt:406
#, no-wrap
msgid "--depth"
-msgstr ""
+msgstr "--depth"
#. type: Plain text
#: en/git-submodule.txt:410
msgid ""
"This option is valid for add and update commands. Create a 'shallow' clone "
-"with a history truncated to the specified number of revisions. See linkgit:"
-"git-clone[1]"
+"with a history truncated to the specified number of revisions. See "
+"linkgit:git-clone[1]"
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:411
#, no-wrap
msgid "--[no-]recommend-shallow"
-msgstr ""
+msgstr "--[no-]recommend-shallow"
#. type: Plain text
#: en/git-submodule.txt:416
msgid ""
"This option is only valid for the update command. The initial clone of a "
-"submodule will use the recommended `submodule.<name>.shallow` as provided by "
-"the .gitmodules file by default. To ignore the suggestions use `--no-"
+"submodule will use the recommended `submodule.<name>.shallow` as provided by"
+" the .gitmodules file by default. To ignore the suggestions use `--no-"
"recommend-shallow`."
msgstr ""
@@ -60213,8 +60053,8 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:427
msgid ""
-"Paths to submodule(s). When specified this will restrict the command to only "
-"operate on the submodules found at the specified paths. (This argument is "
+"Paths to submodule(s). When specified this will restrict the command to only"
+" operate on the submodules found at the specified paths. (This argument is "
"required with add)."
msgstr ""
@@ -60224,16 +60064,15 @@ msgid ""
"When initializing submodules, a .gitmodules file in the top-level directory "
"of the containing repository is used to find the url of each submodule. "
"This file should be formatted in the same way as `$GIT_DIR/config`. The key "
-"to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] "
-"for details."
+"to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5]"
+" for details."
msgstr ""
#. type: Title =
#: en/git-svn.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-svn(1)"
-msgstr "git-add(1)"
+msgstr "git-svn(1)"
#. type: Plain text
#: en/git-svn.txt:7
@@ -60250,8 +60089,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:18
msgid ""
-"'git svn' is a simple conduit for changesets between Subversion and Git. It "
-"provides a bidirectional flow of changes between a Subversion and a Git "
+"'git svn' is a simple conduit for changesets between Subversion and Git. It"
+" provides a bidirectional flow of changes between a Subversion and a Git "
"repository."
msgstr ""
@@ -60281,9 +60120,9 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:39
msgid ""
-"Initializes an empty Git repository with additional metadata directories for "
-"'git svn'. The Subversion URL may be specified as a command-line argument, "
-"or as full URL arguments to -T/-t/-b. Optionally, the target directory to "
+"Initializes an empty Git repository with additional metadata directories for"
+" 'git svn'. The Subversion URL may be specified as a command-line argument,"
+" or as full URL arguments to -T/-t/-b. Optionally, the target directory to "
"operate on can be specified as a second argument. Normally this command "
"initializes the current directory."
msgstr ""
@@ -60328,39 +60167,40 @@ msgstr ""
#: en/git-svn.txt:47
#, no-wrap
msgid "--stdlayout"
-msgstr ""
+msgstr "--stdlayout"
#. type: Plain text
#: en/git-svn.txt:58
msgid ""
"These are optional command-line options for init. Each of these flags can "
-"point to a relative repository path (--tags=project/tags) or a full url (--"
-"tags=https://foo.org/project/tags). You can specify more than one --tags "
-"and/or --branches options, in case your Subversion repository places tags or "
-"branches under multiple paths. The option --stdlayout is a shorthand way of "
-"setting trunk,tags,branches as the relative paths, which is the Subversion "
-"default. If any of the other options are given as well, they take precedence."
+"point to a relative repository path (--tags=project/tags) or a full url "
+"(--tags=https://foo.org/project/tags). You can specify more than one --tags"
+" and/or --branches options, in case your Subversion repository places tags "
+"or branches under multiple paths. The option --stdlayout is a shorthand way"
+" of setting trunk,tags,branches as the relative paths, which is the "
+"Subversion default. If any of the other options are given as well, they take"
+" precedence."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:58
#, no-wrap
msgid "--no-metadata"
-msgstr ""
+msgstr "--no-metadata"
#. type: Plain text
#: en/git-svn.txt:62
msgid ""
"Set the 'noMetadata' option in the [svn-remote] config. This option is not "
-"recommended, please read the 'svn.noMetadata' section of this manpage before "
-"using this option."
+"recommended, please read the 'svn.noMetadata' section of this manpage before"
+" using this option."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:62
#, no-wrap
msgid "--use-svm-props"
-msgstr ""
+msgstr "--use-svm-props"
#. type: Plain text
#: en/git-svn.txt:64
@@ -60371,7 +60211,7 @@ msgstr ""
#: en/git-svn.txt:64
#, no-wrap
msgid "--use-svnsync-props"
-msgstr ""
+msgstr "--use-svnsync-props"
#. type: Plain text
#: en/git-svn.txt:66
@@ -60411,8 +60251,8 @@ msgstr ""
msgid ""
"For transports that SVN handles authentication for (http, https, and plain "
"svn), specify the username. For other transports (e.g. `svn+ssh://`), you "
-"must include the username in the URL, e.g. `svn+ssh://foo@svn.bar.com/"
-"project`"
+"must include the username in the URL, e.g. "
+"`svn+ssh://foo@svn.bar.com/project`"
msgstr ""
#. type: Labeled list
@@ -60440,10 +60280,10 @@ msgstr ""
#: en/git-svn.txt:97
msgid ""
"Before Git v2.0, the default prefix was \"\" (no prefix). This meant that "
-"SVN-tracking refs were put at \"refs/remotes/*\", which is incompatible with "
-"how Git's own remote-tracking refs are organized. If you still want the old "
-"default, you can get it by passing `--prefix \"\"` on the command line (`--"
-"prefix=\"\"` may not work if your Perl's Getopt::Long is < v2.37)."
+"SVN-tracking refs were put at \"refs/remotes/*\", which is incompatible with"
+" how Git's own remote-tracking refs are organized. If you still want the "
+"old default, you can get it by passing `--prefix \"\"` on the command line "
+"(`--prefix=\"\"` may not work if your Perl's Getopt::Long is < v2.37)."
msgstr ""
#. type: Labeled list
@@ -60476,17 +60316,17 @@ msgstr ""
#: en/git-svn.txt:106
#, no-wrap
msgid "--no-minimize-url"
-msgstr ""
+msgstr "--no-minimize-url"
#. type: Plain text
#: en/git-svn.txt:117
msgid ""
-"When tracking multiple directories (using --stdlayout, --branches, or --tags "
-"options), git svn will attempt to connect to the root (or highest allowed "
-"level) of the Subversion repository. This default allows better tracking of "
-"history if entire projects are moved within a repository, but may cause "
-"issues on repositories where read access restrictions are in place. Passing "
-"`--no-minimize-url` will allow git svn to accept URLs as-is without "
+"When tracking multiple directories (using --stdlayout, --branches, or --tags"
+" options), git svn will attempt to connect to the root (or highest allowed "
+"level) of the Subversion repository. This default allows better tracking of"
+" history if entire projects are moved within a repository, but may cause "
+"issues on repositories where read access restrictions are in place. Passing"
+" `--no-minimize-url` will allow git svn to accept URLs as-is without "
"attempting to connect to a higher level directory. This option is off by "
"default when only one URL/branch is tracked (it would do little good)."
msgstr ""
@@ -60508,15 +60348,15 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:126 en/git-svn.txt:227
msgid ""
-"This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\*\\*/."
-"rev_map.*' in the FILES section below for details)."
+"This automatically updates the rev_map if needed (see "
+"'$GIT_DIR/svn/\\*\\*/.rev_map.*' in the FILES section below for details)."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:127
#, no-wrap
msgid "--localtime"
-msgstr ""
+msgstr "--localtime"
#. type: Plain text
#: en/git-svn.txt:131
@@ -60530,16 +60370,16 @@ msgstr ""
#: en/git-svn.txt:137
msgid ""
"This doesn't interfere with interoperating with the Subversion repository "
-"you cloned from, but if you wish for your local Git repository to be able to "
-"interoperate with someone else's local Git repository, either don't use this "
-"option or you should both use it in the same local time zone."
+"you cloned from, but if you wish for your local Git repository to be able to"
+" interoperate with someone else's local Git repository, either don't use "
+"this option or you should both use it in the same local time zone."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:138 en/git-svn.txt:505
#, no-wrap
msgid "--parent"
-msgstr ""
+msgstr "--parent"
#. type: Plain text
#: en/git-svn.txt:140
@@ -60550,8 +60390,8 @@ msgstr ""
#: en/git-svn.txt:147
msgid ""
"This allows one to specify a Perl regular expression that will cause "
-"skipping of all matching paths from checkout from SVN. The `--ignore-paths` "
-"option should match for every 'fetch' (including automatic fetches due to "
+"skipping of all matching paths from checkout from SVN. The `--ignore-paths`"
+" option should match for every 'fetch' (including automatic fetches due to "
"'clone', 'dcommit', 'rebase', etc) on a given repository."
msgstr ""
@@ -60564,8 +60404,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:153
msgid ""
-"If the ignore-paths configuration key is set, and the command-line option is "
-"also given, both regular expressions will be used."
+"If the ignore-paths configuration key is set, and the command-line option is"
+" also given, both regular expressions will be used."
msgstr ""
#. type: Labeled list
@@ -60618,9 +60458,9 @@ msgstr ""
#: en/git-svn.txt:187
msgid ""
"Fetch <n> log entries per request when scanning Subversion history. The "
-"default is 100. For very large Subversion repositories, larger values may be "
-"needed for 'clone'/'fetch' to complete in reasonable time. But overly large "
-"values may lead to higher memory usage and request timeouts."
+"default is 100. For very large Subversion repositories, larger values may be"
+" needed for 'clone'/'fetch' to complete in reasonable time. But overly large"
+" values may lead to higher memory usage and request timeouts."
msgstr ""
#. type: Labeled list
@@ -60634,9 +60474,9 @@ msgstr ""
msgid ""
"Runs 'init' and 'fetch'. It will automatically create a directory based on "
"the basename of the URL passed to it; or if a second argument is passed; it "
-"will create a directory and work within that. It accepts all arguments that "
-"the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` "
-"and `--parent`. After a repository is cloned, the 'fetch' command will be "
+"will create a directory and work within that. It accepts all arguments that"
+" the 'init' and 'fetch' commands accept; with the exception of `--fetch-all`"
+" and `--parent`. After a repository is cloned, the 'fetch' command will be "
"able to update revisions without affecting the working tree; and the "
"'rebase' command will be able to update the working tree with the latest "
"changes."
@@ -60646,7 +60486,7 @@ msgstr ""
#: en/git-svn.txt:199
#, no-wrap
msgid "--preserve-empty-dirs"
-msgstr ""
+msgstr "--preserve-empty-dirs"
#. type: Plain text
#: en/git-svn.txt:205
@@ -60710,8 +60550,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:232
msgid ""
-"Do not fetch remotely; only run 'git rebase' against the last fetched commit "
-"from the upstream SVN."
+"Do not fetch remotely; only run 'git rebase' against the last fetched commit"
+" from the upstream SVN."
msgstr ""
#. type: Labeled list
@@ -60723,16 +60563,16 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:238
msgid ""
-"Commit each diff from the current branch directly to the SVN repository, and "
-"then rebase or reset (depending on whether or not there is a diff between "
+"Commit each diff from the current branch directly to the SVN repository, and"
+" then rebase or reset (depending on whether or not there is a diff between "
"SVN and head). This will create a revision in SVN for each commit in Git."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:242
msgid ""
-"When an optional Git branch name (or a Git commit object name) is specified "
-"as an argument, the subcommand works on the specified branch, not on the "
+"When an optional Git branch name (or a Git commit object name) is specified"
+" as an argument, the subcommand works on the specified branch, not on the "
"current branch."
msgstr ""
@@ -60794,12 +60634,12 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:272
msgid ""
-"Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/"
-"branches/foo:1-10\"`). All svn server versions can store this information "
-"(as a property), and svn clients starting from version 1.5 can make use of "
-"it. To specify merge information from multiple branches, use a single space "
-"character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/"
-"bar:3,5-6,8\"`)"
+"Add the given merge information during the dcommit (e.g. "
+"`--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store "
+"this information (as a property), and svn clients starting from version 1.5 "
+"can make use of it. To specify merge information from multiple branches, use"
+" a single space character between the branches "
+"(`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
msgstr ""
#. type: Plain text
@@ -60811,10 +60651,10 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:280
msgid ""
-"This option will cause git-svn to attempt to automatically populate the svn:"
-"mergeinfo property in the SVN repository when possible. Currently, this can "
-"only be done when dcommitting non-fast-forward merges where all parents but "
-"the first have already been pushed into SVN."
+"This option will cause git-svn to attempt to automatically populate the "
+"svn:mergeinfo property in the SVN repository when possible. Currently, this "
+"can only be done when dcommitting non-fast-forward merges where all parents "
+"but the first have already been pushed into SVN."
msgstr ""
#. type: Plain text
@@ -60847,7 +60687,7 @@ msgstr ""
#: en/git-svn.txt:293
#, no-wrap
msgid "--message"
-msgstr ""
+msgstr "--message"
#. type: Plain text
#: en/git-svn.txt:295
@@ -60858,7 +60698,7 @@ msgstr ""
#: en/git-svn.txt:297
#, no-wrap
msgid "--tag"
-msgstr ""
+msgstr "--tag"
#. type: Plain text
#: en/git-svn.txt:300
@@ -60885,9 +60725,9 @@ msgstr ""
msgid ""
"If more than one --branches (or --tags) option was given to the 'init' or "
"'clone' command, you must provide the location of the branch (or tag) you "
-"wish to create in the SVN repository. <path> specifies which path to use to "
-"create the branch or tag and should match the pattern on the left-hand side "
-"of one of the configured branches or tags refspecs. You can see these "
+"wish to create in the SVN repository. <path> specifies which path to use to"
+" create the branch or tag and should match the pattern on the left-hand side"
+" of one of the configured branches or tags refspecs. You can see these "
"refspecs with the commands"
msgstr ""
@@ -60901,15 +60741,15 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:316
msgid ""
-"where <name> is the name of the SVN repository as specified by the -R option "
-"to 'init' (or \"svn\" by default)."
+"where <name> is the name of the SVN repository as specified by the -R option"
+" to 'init' (or \"svn\" by default)."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:317
#, no-wrap
msgid "--username"
-msgstr ""
+msgstr "--username"
#. type: Plain text
#: en/git-svn.txt:320
@@ -60920,10 +60760,9 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:321
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--commit-url"
-msgstr "git-commit(1)"
+msgstr "--commit-url"
#. type: Plain text
#: en/git-svn.txt:326
@@ -60942,13 +60781,14 @@ msgstr ""
#: en/git-svn.txt:330 en/rev-list-options.txt:786
#, no-wrap
msgid "--parents"
-msgstr ""
+msgstr "--parents"
#. type: Plain text
#: en/git-svn.txt:334
msgid ""
-"Create parent folders. This parameter is equivalent to the parameter --"
-"parents on svn cp commands and is useful for non-standard repository layouts."
+"Create parent folders. This parameter is equivalent to the parameter "
+"--parents on svn cp commands and is useful for non-standard repository "
+"layouts."
msgstr ""
#. type: Labeled list
@@ -60972,8 +60812,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:342
msgid ""
-"This should make it easy to look up svn log messages when svn users refer to "
-"-r/--revision numbers."
+"This should make it easy to look up svn log messages when svn users refer to"
+" -r/--revision numbers."
msgstr ""
#. type: Plain text
@@ -60995,7 +60835,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:350
-msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
+msgid ""
+"is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
msgstr ""
#. type: Plain text
@@ -61028,10 +60869,9 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:364
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--show-commit"
-msgstr "git-commit(1)"
+msgstr "--show-commit"
#. type: Plain text
#: en/git-svn.txt:366
@@ -61042,7 +60882,7 @@ msgstr ""
#: en/git-svn.txt:366 en/pretty-options.txt:31
#, no-wrap
msgid "--oneline"
-msgstr ""
+msgstr "--oneline"
#. type: Plain text
#: en/git-svn.txt:368
@@ -61052,8 +60892,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:373
msgid ""
-"SVN itself only stores times in UTC and nothing else. The regular svn client "
-"converts the UTC time to the local time (or based on the TZ= environment). "
+"SVN itself only stores times in UTC and nothing else. The regular svn client"
+" converts the UTC time to the local time (or based on the TZ= environment). "
"This command has the same behaviour."
msgstr ""
@@ -61072,18 +60912,17 @@ msgstr ""
#: en/git-svn.txt:383
msgid ""
"Show what revision and author last modified each line of a file. The output "
-"of this mode is format-compatible with the output of `svn blame' by default. "
-"Like the SVN blame command, local uncommitted changes in the working tree "
+"of this mode is format-compatible with the output of `svn blame' by default."
+" Like the SVN blame command, local uncommitted changes in the working tree "
"are ignored; the version of the file in the HEAD revision is annotated. "
"Unknown arguments are passed directly to 'git blame'."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:384
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--git-format"
-msgstr "git-commit(1)"
+msgstr "--git-format"
#. type: Plain text
#: en/git-svn.txt:389
@@ -61104,9 +60943,9 @@ msgstr ""
#: en/git-svn.txt:395
msgid ""
"When given an SVN revision number of the form 'rN', returns the "
-"corresponding Git commit hash (this can optionally be followed by a tree-ish "
-"to specify which branch should be searched). When given a tree-ish, returns "
-"the corresponding SVN revision number."
+"corresponding Git commit hash (this can optionally be followed by a tree-ish"
+" to specify which branch should be searched). When given a tree-ish, "
+"returns the corresponding SVN revision number."
msgstr ""
#. type: Labeled list
@@ -61119,7 +60958,7 @@ msgstr ""
#: en/git-svn.txt:397
#, no-wrap
msgid "--before"
-msgstr ""
+msgstr "--before"
#. type: Plain text
#: en/git-svn.txt:401
@@ -61133,7 +60972,7 @@ msgstr ""
#: en/git-svn.txt:403
#, no-wrap
msgid "--after"
-msgstr ""
+msgstr "--after"
#. type: Plain text
#: en/git-svn.txt:407
@@ -61152,8 +60991,8 @@ msgstr ""
#: en/git-svn.txt:416
msgid ""
"You should consider using 'dcommit' instead of this command. Commit "
-"specified commit or tree objects to SVN. This relies on your imported fetch "
-"data being up-to-date. This makes absolutely no attempts to do patching "
+"specified commit or tree objects to SVN. This relies on your imported fetch"
+" data being up-to-date. This makes absolutely no attempts to do patching "
"when committing to SVN, it simply overwrites files with those specified in "
"the tree or commit. All merging is assumed to have taken place "
"independently of 'git svn' functions."
@@ -61213,12 +61052,12 @@ msgstr ""
#: en/git-svn.txt:446
msgid ""
"Commits the diff of two tree-ish arguments from the command-line. This "
-"command does not rely on being inside an `git svn init`-ed repository. This "
-"command takes three arguments, (a) the original tree to diff against, (b) "
+"command does not rely on being inside an `git svn init`-ed repository. This"
+" command takes three arguments, (a) the original tree to diff against, (b) "
"the new tree result, (c) the URL of the target Subversion repository. The "
-"final argument (URL) may be omitted if you are working from a 'git svn'-"
-"aware repository (that has been `init`-ed with 'git svn'). The -r<revision> "
-"option is required for this."
+"final argument (URL) may be omitted if you are working from a 'git "
+"svn'-aware repository (that has been `init`-ed with 'git svn'). The "
+"-r<revision> option is required for this."
msgstr ""
#. type: Labeled list
@@ -61231,8 +61070,8 @@ msgstr ""
#: en/git-svn.txt:452
msgid ""
"Shows information about a file or directory similar to what `svn info' "
-"provides. Does not currently support a -r/--revision argument. Use the --"
-"url option to output only the value of the 'URL:' field."
+"provides. Does not currently support a -r/--revision argument. Use the "
+"--url option to output only the value of the 'URL:' field."
msgstr ""
#. type: Labeled list
@@ -61270,8 +61109,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:466
msgid ""
-"Sets the Subversion property given as the first argument, to the value given "
-"as the second argument for the file given as the third argument."
+"Sets the Subversion property given as the first argument, to the value given"
+" as the second argument for the file given as the third argument."
msgstr ""
#. type: delimited block -
@@ -61303,8 +61142,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:483
msgid ""
-"Compress $GIT_DIR/svn/<refname>/unhandled.log files and remove $GIT_DIR/svn/"
-"<refname>/index files."
+"Compress $GIT_DIR/svn/<refname>/unhandled.log files and remove "
+"$GIT_DIR/svn/<refname>/index files."
msgstr ""
#. type: Labeled list
@@ -61317,8 +61156,8 @@ msgstr ""
#: en/git-svn.txt:494
msgid ""
"Undoes the effects of 'fetch' back to the specified revision. This allows "
-"you to re-'fetch' an SVN revision. Normally the contents of an SVN revision "
-"should never change and 'reset' should not be necessary. However, if SVN "
+"you to re-'fetch' an SVN revision. Normally the contents of an SVN revision"
+" should never change and 'reset' should not be necessary. However, if SVN "
"permissions change, or if you alter your --ignore-paths option, a 'fetch' "
"may fail with \"not found in commit\" (file not previously visible) or "
"\"checksum mismatch\" (missed a modification). If the problem file cannot "
@@ -61329,10 +61168,10 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:499
msgid ""
-"Only the rev_map and refs/remotes/git-svn are changed (see '$GIT_DIR/svn/\\*"
-"\\*/.rev_map.*' in the FILES section below for details). Follow 'reset' "
-"with a 'fetch' and then 'git reset' or 'git rebase' to move local branches "
-"onto the new tree."
+"Only the rev_map and refs/remotes/git-svn are changed (see "
+"'$GIT_DIR/svn/\\*\\*/.rev_map.*' in the FILES section below for details). "
+"Follow 'reset' with a 'fetch' and then 'git reset' or 'git rebase' to move "
+"local branches onto the new tree."
msgstr ""
#. type: Labeled list
@@ -61350,7 +61189,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:504
msgid ""
-"Specify the most recent revision to keep. All later revisions are discarded."
+"Specify the most recent revision to keep. All later revisions are "
+"discarded."
msgstr ""
#. type: Plain text
@@ -61361,8 +61201,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:510
-msgid ""
-"Assume you have local changes in \"master\", but you need to refetch \"r2\"."
+msgid "Assume you have local changes in \"master\", but you need to refetch \"r2\"."
msgstr ""
#. type: delimited block -
@@ -61452,9 +61291,9 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:558
msgid ""
-"This allows revision ranges for partial/cauterized history to be supported. "
-"$NUMBER, $NUMBER1:$NUMBER2 (numeric ranges), $NUMBER:HEAD, and BASE:$NUMBER "
-"are all supported."
+"This allows revision ranges for partial/cauterized history to be supported."
+" $NUMBER, $NUMBER1:$NUMBER2 (numeric ranges), $NUMBER:HEAD, and "
+"BASE:$NUMBER are all supported."
msgstr ""
#. type: Plain text
@@ -61487,7 +61326,7 @@ msgstr ""
#: en/git-svn.txt:571
#, no-wrap
msgid "--rmdir"
-msgstr ""
+msgstr "--rmdir"
#. type: Plain text
#: en/git-svn.txt:573 en/git-svn.txt:586 en/git-svn.txt:597
@@ -61497,10 +61336,10 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:579
msgid ""
-"Remove directories from the SVN tree if there are no files left behind. SVN "
-"can version empty directories, and they are not removed by default if there "
-"are no files left in them. Git cannot version empty directories. Enabling "
-"this flag will make the commit to SVN act like Git."
+"Remove directories from the SVN tree if there are no files left behind. SVN"
+" can version empty directories, and they are not removed by default if there"
+" are no files left in them. Git cannot version empty directories. Enabling"
+" this flag will make the commit to SVN act like Git."
msgstr ""
#. type: Plain text
@@ -61564,8 +61403,8 @@ msgstr ""
#: en/git-svn.txt:618
msgid ""
"If this option is specified and 'git svn' encounters an SVN committer name "
-"that does not exist in the authors-file, 'git svn' will abort operation. The "
-"user will then have to add the appropriate entry. Re-running the previous "
+"that does not exist in the authors-file, 'git svn' will abort operation. The"
+" user will then have to add the appropriate entry. Re-running the previous "
"'git svn' command after the authors-file is modified should continue "
"operation."
msgstr ""
@@ -61585,8 +61424,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:628
msgid ""
-"If this option is specified, for each SVN committer name that does not exist "
-"in the authors file, the given file is executed with the committer name as "
+"If this option is specified, for each SVN committer name that does not exist"
+" in the authors file, the given file is executed with the committer name as "
"the first argument. The program is expected to return a single line of the "
"form \"Name <email>\", which will be treated as if included in the authors "
"file."
@@ -61619,8 +61458,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:647
msgid ""
-"Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot "
-"be used (see 'dcommit')."
+"Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot"
+" be used (see 'dcommit')."
msgstr ""
#. type: Plain text
@@ -61655,7 +61494,7 @@ msgstr ""
#: en/git-svn.txt:663
#, no-wrap
msgid "--use-log-author"
-msgstr ""
+msgstr "--use-log-author"
#. type: Plain text
#: en/git-svn.txt:667
@@ -61675,7 +61514,7 @@ msgstr ""
#: en/git-svn.txt:671
#, no-wrap
msgid "--add-author-from"
-msgstr ""
+msgstr "--add-author-from"
#. type: Plain text
#: en/git-svn.txt:677
@@ -61745,15 +61584,15 @@ msgstr ""
#: en/git-svn.txt:697
#, no-wrap
msgid "--follow-parent"
-msgstr ""
+msgstr "--follow-parent"
#. type: Plain text
#: en/git-svn.txt:712
msgid ""
"This option is only relevant if we are tracking branches (using one of the "
"repository layout options --trunk, --tags, --branches, --stdlayout). For "
-"each tracked branch, try to find out where its revision was copied from, and "
-"set a suitable parent in the first Git commit for the branch. This is "
+"each tracked branch, try to find out where its revision was copied from, and"
+" set a suitable parent in the first Git commit for the branch. This is "
"especially helpful when we're tracking a directory that has been moved "
"around within the repository. If this feature is disabled, the branches "
"created by 'git svn' will all be linear and not share any history, meaning "
@@ -61804,9 +61643,9 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:731
msgid ""
-"The 'git svn log' command will not work on repositories using this, either. "
-"Using this conflicts with the 'useSvmProps' option for (hopefully) obvious "
-"reasons."
+"The 'git svn log' command will not work on repositories using this, either."
+" Using this conflicts with the 'useSvmProps' option for (hopefully) obvious"
+" reasons."
msgstr ""
#. type: Plain text
@@ -61907,9 +61746,9 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:781
msgid ""
-"Similar to Git's `remote.<name>.pushurl`, this key is designed to be used in "
-"cases where 'url' points to an SVN repository via a read-only transport, to "
-"provide an alternate read/write transport. It is assumed that both keys "
+"Similar to Git's `remote.<name>.pushurl`, this key is designed to be used in"
+" cases where 'url' points to an SVN repository via a read-only transport, to"
+" provide an alternate read/write transport. It is assumed that both keys "
"point to the same repository. Unlike 'commiturl', 'pushurl' is a base path. "
"If either 'commiturl' or 'pushurl' could be used, 'commiturl' takes "
"precedence."
@@ -61927,8 +61766,8 @@ msgid ""
"This disables potentially expensive checks to workaround broken symlinks "
"checked into SVN by broken clients. Set this option to \"false\" if you "
"track a SVN repository with many empty blobs that are not symlinks. This "
-"option may be changed while 'git svn' is running and take effect on the next "
-"revision fetched. If unset, 'git svn' assumes this option to be \"true\"."
+"option may be changed while 'git svn' is running and take effect on the next"
+" revision fetched. If unset, 'git svn' assumes this option to be \"true\"."
msgstr ""
#. type: Labeled list
@@ -61966,9 +61805,9 @@ msgstr ""
#: en/git-svn.txt:809
msgid ""
"Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and "
-"useSvmProps options all affect the metadata generated and used by 'git svn'; "
-"they *must* be set in the configuration file before any history is imported "
-"and these settings should never be changed once they are set."
+"useSvmProps options all affect the metadata generated and used by 'git svn';"
+" they *must* be set in the configuration file before any history is imported"
+" and these settings should never be changed once they are set."
msgstr ""
#. type: Plain text
@@ -62145,9 +61984,9 @@ msgid ""
"'git svn' will read this commit to get the SVN revision the branch was "
"created from. It will then try to find the Git commit that corresponds to "
"this SVN revision, and use that as the parent of the branch. However, it is "
-"possible that there is no suitable Git commit to serve as parent. This will "
-"happen, among other reasons, if the SVN branch is a copy of a revision that "
-"was not fetched by 'git svn' (e.g. because it is an old revision that was "
+"possible that there is no suitable Git commit to serve as parent. This will"
+" happen, among other reasons, if the SVN branch is a copy of a revision that"
+" was not fetched by 'git svn' (e.g. because it is an old revision that was "
"skipped with `--revision`), or if in SVN a directory was copied that is not "
"tracked by 'git svn' (such as a branch that is not tracked at all, or a "
"subdirectory of a tracked branch). In these cases, 'git svn' will still "
@@ -62177,12 +62016,12 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:958
msgid ""
-"An example: in an SVN repository with a standard trunk/tags/branches layout, "
-"a directory trunk/sub is created in r.100. In r.200, trunk/sub is branched "
-"by copying it to branches/. 'git svn clone -s' will then create a branch "
+"An example: in an SVN repository with a standard trunk/tags/branches layout,"
+" a directory trunk/sub is created in r.100. In r.200, trunk/sub is branched"
+" by copying it to branches/. 'git svn clone -s' will then create a branch "
"'sub'. It will also create new Git commits for r.100 through r.199 and use "
-"these as the history of branch 'sub'. Thus there will be two Git commits for "
-"each revision from r.100 to r.199 (one containing trunk/, one containing "
+"these as the history of branch 'sub'. Thus there will be two Git commits for"
+" each revision from r.100 to r.199 (one containing trunk/, one containing "
"trunk/sub/). Finally, it will create a branch 'sub@200' pointing to the new "
"parent commit of branch 'sub' (i.e. the commit for r.200 and trunk/sub/)."
msgstr ""
@@ -62193,18 +62032,18 @@ msgid ""
"For the sake of simplicity and interoperating with Subversion, it is "
"recommended that all 'git svn' users clone, fetch and dcommit directly from "
"the SVN server, and avoid all 'git clone'/'pull'/'merge'/'push' operations "
-"between Git repositories and branches. The recommended method of exchanging "
-"code between Git branches and users is 'git format-patch' and 'git am', or "
+"between Git repositories and branches. The recommended method of exchanging"
+" code between Git branches and users is 'git format-patch' and 'git am', or "
"just 'dcommit'ing to the SVN repository."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:974
msgid ""
-"Running 'git merge' or 'git pull' is NOT recommended on a branch you plan to "
-"'dcommit' from because Subversion users cannot see any merges you've made. "
-"Furthermore, if you merge or pull from a Git branch that is a mirror of an "
-"SVN branch, 'dcommit' may commit to the wrong branch."
+"Running 'git merge' or 'git pull' is NOT recommended on a branch you plan to"
+" 'dcommit' from because Subversion users cannot see any merges you've made."
+" Furthermore, if you merge or pull from a Git branch that is a mirror of an"
+" SVN branch, 'dcommit' may commit to the wrong branch."
msgstr ""
#. type: Plain text
@@ -62225,15 +62064,15 @@ msgstr ""
msgid ""
"You 'must' therefore ensure that the most recent commit of the branch you "
"want to dcommit to is the 'first' parent of the merge. Chaos will ensue "
-"otherwise, especially if the first parent is an older commit on the same SVN "
-"branch."
+"otherwise, especially if the first parent is an older commit on the same SVN"
+" branch."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:989
msgid ""
-"'git clone' does not clone branches under the refs/remotes/ hierarchy or any "
-"'git svn' metadata, or config. So repositories created and managed with "
+"'git clone' does not clone branches under the refs/remotes/ hierarchy or any"
+" 'git svn' metadata, or config. So repositories created and managed with "
"using 'git svn' should use 'rsync' for cloning, if cloning is to be done at "
"all."
msgstr ""
@@ -62242,8 +62081,8 @@ msgstr ""
#: en/git-svn.txt:994
msgid ""
"Since 'dcommit' uses rebase internally, any Git branches you 'git push' to "
-"before 'dcommit' on will require forcing an overwrite of the existing ref on "
-"the remote repository. This is generally considered bad practice, see the "
+"before 'dcommit' on will require forcing an overwrite of the existing ref on"
+" the remote repository. This is generally considered bad practice, see the "
"linkgit:git-push[1] documentation for details."
msgstr ""
@@ -62251,9 +62090,9 @@ msgstr ""
#: en/git-svn.txt:999
msgid ""
"Do not use the --amend option of linkgit:git-commit[1] on a change you've "
-"already dcommitted. It is considered bad practice to --amend commits you've "
-"already pushed to a remote repository for other users, and dcommit with SVN "
-"is analogous to that."
+"already dcommitted. It is considered bad practice to --amend commits you've"
+" already pushed to a remote repository for other users, and dcommit with SVN"
+" is analogous to that."
msgstr ""
#. type: Plain text
@@ -62262,16 +62101,16 @@ msgid ""
"When cloning an SVN repository, if none of the options for describing the "
"repository layout is used (--trunk, --tags, --branches, --stdlayout), 'git "
"svn clone' will create a Git repository with completely linear history, "
-"where branches and tags appear as separate directories in the working copy. "
-"While this is the easiest way to get a copy of a complete repository, for "
-"projects with many branches it will lead to a working copy many times larger "
-"than just the trunk. Thus for projects using the standard directory "
-"structure (trunk/branches/tags), it is recommended to clone with option `--"
-"stdlayout`. If the project uses a non-standard structure, and/or if branches "
-"and tags are not required, it is easiest to only clone one directory "
-"(typically trunk), without giving any repository layout options. If the "
-"full history with branches and tags is required, the options `--trunk` / `--"
-"branches` / `--tags` must be used."
+"where branches and tags appear as separate directories in the working copy."
+" While this is the easiest way to get a copy of a complete repository, for "
+"projects with many branches it will lead to a working copy many times larger"
+" than just the trunk. Thus for projects using the standard directory "
+"structure (trunk/branches/tags), it is recommended to clone with option "
+"`--stdlayout`. If the project uses a non-standard structure, and/or if "
+"branches and tags are not required, it is easiest to only clone one "
+"directory (typically trunk), without giving any repository layout options. "
+"If the full history with branches and tags is required, the options "
+"`--trunk` / `--branches` / `--tags` must be used."
msgstr ""
#. type: Plain text
@@ -62303,8 +62142,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:1037
msgid ""
-"Renamed and copied directories are not detected by Git and hence not tracked "
-"when committing to SVN. I do not plan on adding support for this as it's "
+"Renamed and copied directories are not detected by Git and hence not tracked"
+" when committing to SVN. I do not plan on adding support for this as it's "
"quite difficult and time-consuming to get working for all the possible "
"corner cases (Git doesn't do it, either). Committing renamed and copied "
"files is fully supported if they're similar enough for Git to detect them."
@@ -62452,8 +62291,8 @@ msgstr ""
msgid ""
"Mapping between Subversion revision numbers and Git commit names. In a "
"repository where the noMetadata option is not set, this can be rebuilt from "
-"the git-svn-id: lines that are at the end of every commit (see the 'svn."
-"noMetadata' section above for details)."
+"the git-svn-id: lines that are at the end of every commit (see the "
+"'svn.noMetadata' section above for details)."
msgstr ""
#. type: Plain text
@@ -62467,7 +62306,7 @@ msgstr ""
#: en/git-symbolic-ref.txt:2
#, no-wrap
msgid "git-symbolic-ref(1)"
-msgstr ""
+msgstr "git-symbolic-ref(1)"
#. type: Plain text
#: en/git-symbolic-ref.txt:7
@@ -62486,8 +62325,8 @@ msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:21
msgid ""
-"Given one argument, reads which branch head the given symbolic ref refers to "
-"and outputs its path, relative to the `.git/` directory. Typically you "
+"Given one argument, reads which branch head the given symbolic ref refers to"
+" and outputs its path, relative to the `.git/` directory. Typically you "
"would give `HEAD` as the <name> argument to see which branch your working "
"tree is on."
msgstr ""
@@ -62508,8 +62347,8 @@ msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:31
msgid ""
-"A symbolic ref is a regular file that stores a string that begins with `ref: "
-"refs/`. For example, your `.git/HEAD` is a regular file whose contents is "
+"A symbolic ref is a regular file that stores a string that begins with `ref:"
+" refs/`. For example, your `.git/HEAD` is a regular file whose contents is "
"`ref: refs/heads/master`."
msgstr ""
@@ -62542,12 +62381,12 @@ msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:62
msgid ""
-"In the past, `.git/HEAD` was a symbolic link pointing at `refs/heads/"
-"master`. When we wanted to switch to another branch, we did `ln -sf refs/"
-"heads/newbranch .git/HEAD`, and when we wanted to find out which branch we "
-"are on, we did `readlink .git/HEAD`. But symbolic links are not entirely "
-"portable, so they are now deprecated and symbolic refs (as described above) "
-"are used by default."
+"In the past, `.git/HEAD` was a symbolic link pointing at "
+"`refs/heads/master`. When we wanted to switch to another branch, we did `ln"
+" -sf refs/heads/newbranch .git/HEAD`, and when we wanted to find out which "
+"branch we are on, we did `readlink .git/HEAD`. But symbolic links are not "
+"entirely portable, so they are now deprecated and symbolic refs (as "
+"described above) are used by default."
msgstr ""
#. type: Plain text
@@ -62560,10 +62399,9 @@ msgstr ""
#. type: Title =
#: en/git-tag.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-tag(1)"
-msgstr "git-add(1)"
+msgstr "git-tag(1)"
#. type: Plain text
#: en/git-tag.txt:7
@@ -62598,8 +62436,8 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:32
msgid ""
-"If one of `-a`, `-s`, or `-u <keyid>` is passed, the command creates a 'tag' "
-"object, and requires a tag message. Unless `-m <msg>` or `-F <file>` is "
+"If one of `-a`, `-s`, or `-u <keyid>` is passed, the command creates a 'tag'"
+" object, and requires a tag message. Unless `-m <msg>` or `-F <file>` is "
"given, an editor is started for the user to type in the tag message."
msgstr ""
@@ -62620,9 +62458,9 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:44
msgid ""
-"A GnuPG signed tag object will be created when `-s` or `-u <keyid>` is "
-"used. When `-u <keyid>` is not used, the committer identity for the current "
-"user is used to find the GnuPG key for signing. \tThe configuration variable "
+"A GnuPG signed tag object will be created when `-s` or `-u <keyid>` is used."
+" When `-u <keyid>` is not used, the committer identity for the current user"
+" is used to find the GnuPG key for signing. \tThe configuration variable "
"`gpg.program` is used to specify custom GnuPG binary."
msgstr ""
@@ -62640,7 +62478,8 @@ msgstr ""
msgid ""
"Annotated tags are meant for release while lightweight tags are meant for "
"private or temporary object labels. For this reason, some git commands for "
-"naming objects (like `git describe`) will ignore lightweight tags by default."
+"naming objects (like `git describe`) will ignore lightweight tags by "
+"default."
msgstr ""
#. type: Plain text
@@ -62652,7 +62491,7 @@ msgstr ""
#: en/git-tag.txt:64
#, no-wrap
msgid "--sign"
-msgstr ""
+msgstr "--sign"
#. type: Plain text
#: en/git-tag.txt:66
@@ -62700,8 +62539,8 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:89
msgid ""
-"<num> specifies how many lines from the annotation, if any, are printed when "
-"using -l. The default is not to print any annotation lines. If no number "
+"<num> specifies how many lines from the annotation, if any, are printed when"
+" using -l. The default is not to print any annotation lines. If no number "
"is given to `-n`, only the first line is printed. If the tag is not "
"annotated, the commit message is displayed instead."
msgstr ""
@@ -62719,10 +62558,10 @@ msgstr ""
#: en/git-tag.txt:110
msgid ""
"Sort based on the key given. Prefix `-` to sort in descending order of the "
-"value. You may use the --sort=<key> option multiple times, in which case the "
-"last key becomes the primary key. Also supports \"version:refname\" or \"v:"
-"refname\" (tag names are treated as versions). The \"version:refname\" sort "
-"order can also be affected by the \"versionsort.suffix\" configuration "
+"value. You may use the --sort=<key> option multiple times, in which case the"
+" last key becomes the primary key. Also supports \"version:refname\" or "
+"\"v:refname\" (tag names are treated as versions). The \"version:refname\" "
+"sort order can also be affected by the \"versionsort.suffix\" configuration "
"variable. The keys supported are the same as those in `git for-each-ref`. "
"Sort order defaults to the value configured for the `tag.sort` variable if "
"it exists, or lexicographic order otherwise. See linkgit:git-config[1]."
@@ -62737,8 +62576,8 @@ msgstr ""
#: en/git-tag.txt:120
msgid ""
"Display tag listing in columns. See configuration variable column.tag for "
-"option syntax.`--column` and `--no-column` without options are equivalent to "
-"'always' and 'never' respectively."
+"option syntax.`--column` and `--no-column` without options are equivalent to"
+" 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
@@ -62769,8 +62608,8 @@ msgstr ""
#| "\tconcatenated as separate paragraphs.\n"
msgid ""
"Use the given tag message (instead of prompting). If multiple `-m` options "
-"are given, their values are concatenated as separate paragraphs. Implies `-"
-"a` if none of `-a`, `-s`, or `-u <keyid>` is given."
+"are given, their values are concatenated as separate paragraphs. Implies "
+"`-a` if none of `-a`, `-s`, or `-u <keyid>` is given."
msgstr ""
"-m <msg>::\n"
"--message=<msg>::\n"
@@ -62799,8 +62638,8 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:151
msgid ""
-"This option sets how the tag message is cleaned up. The '<mode>' can be one "
-"of 'verbatim', 'whitespace' and 'strip'. The 'strip' mode is default. The "
+"This option sets how the tag message is cleaned up. The '<mode>' can be one"
+" of 'verbatim', 'whitespace' and 'strip'. The 'strip' mode is default. The "
"'verbatim' mode does not change message at all, 'whitespace' removes just "
"leading/trailing whitespace lines and 'strip' removes both whitespace and "
"commentary."
@@ -62809,10 +62648,10 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:158
msgid ""
-"Create a reflog for the tag. To globally enable reflogs for tags, see `core."
-"logAllRefUpdates` in linkgit:git-config[1]. The negated form `--no-create-"
-"reflog` only overrides an earlier `--create-reflog`, but currently does not "
-"negate the setting of `core.logallrefupdates`."
+"Create a reflog for the tag. To globally enable reflogs for tags, see "
+"`core.logAllRefUpdates` in linkgit:git-config[1]. The negated form `--no-"
+"create-reflog` only overrides an earlier `--create-reflog`, but currently "
+"does not negate the setting of `core.logallrefupdates`."
msgstr ""
#. type: Labeled list
@@ -62867,8 +62706,8 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:187
msgid ""
-"By default, 'git tag' in sign-with-default mode (-s) will use your committer "
-"identity (of the form `Your Name <your@email.address>`) to find a key. If "
+"By default, 'git tag' in sign-with-default mode (-s) will use your committer"
+" identity (of the form `Your Name <your@email.address>`) to find a key. If "
"you want to use a different default key, you can specify it in the "
"repository configuration as follows:"
msgstr ""
@@ -62903,17 +62742,17 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:209
msgid ""
-"But if you have pushed things out (or others could just read your repository "
-"directly), then others will have already seen the old tag. In that case you "
-"can do one of two things:"
+"But if you have pushed things out (or others could just read your repository"
+" directly), then others will have already seen the old tag. In that case you"
+" can do one of two things:"
msgstr ""
#. type: Plain text
#: en/git-tag.txt:216
msgid ""
-"The sane thing. Just admit you screwed up, and use a different name. Others "
-"have already seen one tag-name, and if you keep the same name, you may be in "
-"the situation that two people both have \"version X\", but they actually "
+"The sane thing. Just admit you screwed up, and use a different name. Others"
+" have already seen one tag-name, and if you keep the same name, you may be "
+"in the situation that two people both have \"version X\", but they actually "
"have 'different' \"X\"'s. So just call it \"X.1\" and be done with it."
msgstr ""
@@ -63003,8 +62842,8 @@ msgstr ""
#: en/git-tag.txt:258
msgid ""
"Does this seem a bit complicated? It *should* be. There is no way that it "
-"would be correct to just \"fix\" it automatically. People need to know that "
-"their tags might have been changed."
+"would be correct to just \"fix\" it automatically. People need to know that"
+" their tags might have been changed."
msgstr ""
#. type: Title ~
@@ -63025,8 +62864,8 @@ msgstr ""
#: en/git-tag.txt:273
msgid ""
"On the other hand, if you are fetching because you would want a one-shot "
-"merge from somebody else, you typically do not want to get tags from there. "
-"This happens more often for people near the toplevel but not limited to "
+"merge from somebody else, you typically do not want to get tags from there."
+" This happens more often for people near the toplevel but not limited to "
"them. Mere mortals when pulling from each other do not necessarily want to "
"automatically get private anchor point tags from the other person."
msgstr ""
@@ -63090,13 +62929,13 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:315
msgid ""
-"A one-shot pull is a sign that a commit history is now crossing the boundary "
-"between one circle of people (e.g. \"people who are primarily interested in "
-"the networking part of the kernel\") who may have their own set of tags (e."
-"g. \"this is the third release candidate from the networking group to be "
-"proposed for general consumption with 2.6.21 release\") to another circle of "
-"people (e.g. \"people who integrate various subsystem improvements\"). The "
-"latter are usually not interested in the detailed tags used internally in "
+"A one-shot pull is a sign that a commit history is now crossing the boundary"
+" between one circle of people (e.g. \"people who are primarily interested in"
+" the networking part of the kernel\") who may have their own set of tags "
+"(e.g. \"this is the third release candidate from the networking group to be "
+"proposed for general consumption with 2.6.21 release\") to another circle of"
+" people (e.g. \"people who integrate various subsystem improvements\"). The"
+" latter are usually not interested in the detailed tags used internally in "
"the former group (that is what \"internal\" means). That is why it is "
"desirable not to follow tags automatically in this case."
msgstr ""
@@ -63120,9 +62959,9 @@ msgstr ""
#: en/git-tag.txt:331
msgid ""
"If you have imported some changes from another VCS and would like to add "
-"tags for major releases of your work, it is useful to be able to specify the "
-"date to embed inside of the tag object; such data in the tag object affects, "
-"for example, the ordering of tags in the gitweb interface."
+"tags for major releases of your work, it is useful to be able to specify the"
+" date to embed inside of the tag object; such data in the tag object "
+"affects, for example, the ordering of tags in the gitweb interface."
msgstr ""
#. type: Plain text
@@ -63139,7 +62978,6 @@ msgstr ""
msgid "$ GIT_COMMITTER_DATE=\"2006-10-02 10:31\" git tag -s v1.0.1\n"
msgstr ""
-#
#. type: Plain text
#: en/git-tag.txt:348
#, fuzzy
@@ -63178,8 +63016,8 @@ msgstr ""
#: en/git.txt:24
msgid ""
"Git is a fast, scalable, distributed revision control system with an "
-"unusually rich command set that provides both high-level operations and full "
-"access to internals."
+"unusually rich command set that provides both high-level operations and full"
+" access to internals."
msgstr ""
#. type: Plain text
@@ -63195,8 +63033,8 @@ msgstr ""
msgid ""
"After you mastered the basic concepts, you can come back to this page to "
"learn what commands Git offers. You can learn more about individual Git "
-"commands with \"git help command\". linkgit:gitcli[7] manual page gives you "
-"an overview of the command-line command syntax."
+"commands with \"git help command\". linkgit:gitcli[7] manual page gives you"
+" an overview of the command-line command syntax."
msgstr ""
#. type: Plain text
@@ -63222,8 +63060,8 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:52
msgid ""
-"release notes for link:RelNotes/2.12.1.txt[2.12.1]. link:RelNotes/2.12.0."
-"txt[2.12]."
+"release notes for link:RelNotes/2.12.1.txt[2.12.1]. "
+"link:RelNotes/2.12.0.txt[2.12]."
msgstr ""
#. type: delimited block =
@@ -63234,8 +63072,8 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:58
msgid ""
-"release notes for link:RelNotes/2.11.1.txt[2.11.1], link:RelNotes/2.11.0."
-"txt[2.11]."
+"release notes for link:RelNotes/2.11.1.txt[2.11.1], "
+"link:RelNotes/2.11.0.txt[2.11]."
msgstr ""
#. type: delimited block =
@@ -63246,8 +63084,8 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:65
msgid ""
-"release notes for link:RelNotes/2.10.2.txt[2.10.2], link:RelNotes/2.10.1."
-"txt[2.10.1], link:RelNotes/2.10.0.txt[2.10]."
+"release notes for link:RelNotes/2.10.2.txt[2.10.2], "
+"link:RelNotes/2.10.1.txt[2.10.1], link:RelNotes/2.10.0.txt[2.10]."
msgstr ""
#. type: delimited block =
@@ -63258,8 +63096,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:73
msgid ""
-"release notes for link:RelNotes/2.9.3.txt[2.9.3], link:RelNotes/2.9.2."
-"txt[2.9.2], link:RelNotes/2.9.1.txt[2.9.1], link:RelNotes/2.9.0.txt[2.9]."
+"release notes for link:RelNotes/2.9.3.txt[2.9.3], "
+"link:RelNotes/2.9.2.txt[2.9.2], link:RelNotes/2.9.1.txt[2.9.1], "
+"link:RelNotes/2.9.0.txt[2.9]."
msgstr ""
#. type: delimited block =
@@ -63270,9 +63109,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:82
msgid ""
-"release notes for link:RelNotes/2.8.4.txt[2.8.4], link:RelNotes/2.8.3."
-"txt[2.8.3], link:RelNotes/2.8.2.txt[2.8.2], link:RelNotes/2.8.1.txt[2.8.1], "
-"link:RelNotes/2.8.0.txt[2.8]."
+"release notes for link:RelNotes/2.8.4.txt[2.8.4], "
+"link:RelNotes/2.8.3.txt[2.8.3], link:RelNotes/2.8.2.txt[2.8.2], "
+"link:RelNotes/2.8.1.txt[2.8.1], link:RelNotes/2.8.0.txt[2.8]."
msgstr ""
#. type: delimited block =
@@ -63283,8 +63122,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:90
msgid ""
-"release notes for link:RelNotes/2.7.3.txt[2.7.3], link:RelNotes/2.7.2."
-"txt[2.7.2], link:RelNotes/2.7.1.txt[2.7.1], link:RelNotes/2.7.0.txt[2.7]."
+"release notes for link:RelNotes/2.7.3.txt[2.7.3], "
+"link:RelNotes/2.7.2.txt[2.7.2], link:RelNotes/2.7.1.txt[2.7.1], "
+"link:RelNotes/2.7.0.txt[2.7]."
msgstr ""
#. type: delimited block =
@@ -63295,10 +63135,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:101
msgid ""
-"release notes for link:RelNotes/2.6.6.txt[2.6.6], link:RelNotes/2.6.5."
-"txt[2.6.5], link:RelNotes/2.6.4.txt[2.6.4], link:RelNotes/2.6.3.txt[2.6.3], "
-"link:RelNotes/2.6.2.txt[2.6.2], link:RelNotes/2.6.1.txt[2.6.1], link:"
-"RelNotes/2.6.0.txt[2.6]."
+"release notes for link:RelNotes/2.6.6.txt[2.6.6], "
+"link:RelNotes/2.6.5.txt[2.6.5], link:RelNotes/2.6.4.txt[2.6.4], "
+"link:RelNotes/2.6.3.txt[2.6.3], link:RelNotes/2.6.2.txt[2.6.2], "
+"link:RelNotes/2.6.1.txt[2.6.1], link:RelNotes/2.6.0.txt[2.6]."
msgstr ""
#. type: delimited block =
@@ -63309,9 +63149,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:111
msgid ""
-"release notes for link:RelNotes/2.5.5.txt[2.5.5], link:RelNotes/2.5.4."
-"txt[2.5.4], link:RelNotes/2.5.3.txt[2.5.3], link:RelNotes/2.5.2.txt[2.5.2], "
-"link:RelNotes/2.5.1.txt[2.5.1], link:RelNotes/2.5.0.txt[2.5]."
+"release notes for link:RelNotes/2.5.5.txt[2.5.5], "
+"link:RelNotes/2.5.4.txt[2.5.4], link:RelNotes/2.5.3.txt[2.5.3], "
+"link:RelNotes/2.5.2.txt[2.5.2], link:RelNotes/2.5.1.txt[2.5.1], "
+"link:RelNotes/2.5.0.txt[2.5]."
msgstr ""
#. type: delimited block =
@@ -63322,12 +63163,13 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:127
msgid ""
-"release notes for link:RelNotes/2.4.11.txt[2.4.11], link:RelNotes/2.4.10."
-"txt[2.4.10], link:RelNotes/2.4.9.txt[2.4.9], link:RelNotes/2.4.8.txt[2.4.8], "
-"link:RelNotes/2.4.7.txt[2.4.7], link:RelNotes/2.4.6.txt[2.4.6], link:"
-"RelNotes/2.4.5.txt[2.4.5], link:RelNotes/2.4.4.txt[2.4.4], link:"
-"RelNotes/2.4.3.txt[2.4.3], link:RelNotes/2.4.2.txt[2.4.2], link:"
-"RelNotes/2.4.1.txt[2.4.1], link:RelNotes/2.4.0.txt[2.4]."
+"release notes for link:RelNotes/2.4.11.txt[2.4.11], "
+"link:RelNotes/2.4.10.txt[2.4.10], link:RelNotes/2.4.9.txt[2.4.9], "
+"link:RelNotes/2.4.8.txt[2.4.8], link:RelNotes/2.4.7.txt[2.4.7], "
+"link:RelNotes/2.4.6.txt[2.4.6], link:RelNotes/2.4.5.txt[2.4.5], "
+"link:RelNotes/2.4.4.txt[2.4.4], link:RelNotes/2.4.3.txt[2.4.3], "
+"link:RelNotes/2.4.2.txt[2.4.2], link:RelNotes/2.4.1.txt[2.4.1], "
+"link:RelNotes/2.4.0.txt[2.4]."
msgstr ""
#. type: delimited block =
@@ -63338,12 +63180,12 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:142
msgid ""
-"release notes for link:RelNotes/2.3.10.txt[2.3.10], link:RelNotes/2.3.9."
-"txt[2.3.9], link:RelNotes/2.3.8.txt[2.3.8], link:RelNotes/2.3.7.txt[2.3.7], "
-"link:RelNotes/2.3.6.txt[2.3.6], link:RelNotes/2.3.5.txt[2.3.5], link:"
-"RelNotes/2.3.4.txt[2.3.4], link:RelNotes/2.3.3.txt[2.3.3], link:"
-"RelNotes/2.3.2.txt[2.3.2], link:RelNotes/2.3.1.txt[2.3.1], link:"
-"RelNotes/2.3.0.txt[2.3]."
+"release notes for link:RelNotes/2.3.10.txt[2.3.10], "
+"link:RelNotes/2.3.9.txt[2.3.9], link:RelNotes/2.3.8.txt[2.3.8], "
+"link:RelNotes/2.3.7.txt[2.3.7], link:RelNotes/2.3.6.txt[2.3.6], "
+"link:RelNotes/2.3.5.txt[2.3.5], link:RelNotes/2.3.4.txt[2.3.4], "
+"link:RelNotes/2.3.3.txt[2.3.3], link:RelNotes/2.3.2.txt[2.3.2], "
+"link:RelNotes/2.3.1.txt[2.3.1], link:RelNotes/2.3.0.txt[2.3]."
msgstr ""
#. type: delimited block =
@@ -63354,8 +63196,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:150
msgid ""
-"release notes for link:RelNotes/2.2.3.txt[2.2.3], link:RelNotes/2.2.2."
-"txt[2.2.2], link:RelNotes/2.2.1.txt[2.2.1], link:RelNotes/2.2.0.txt[2.2]."
+"release notes for link:RelNotes/2.2.3.txt[2.2.3], "
+"link:RelNotes/2.2.2.txt[2.2.2], link:RelNotes/2.2.1.txt[2.2.1], "
+"link:RelNotes/2.2.0.txt[2.2]."
msgstr ""
#. type: delimited block =
@@ -63366,9 +63209,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:159
msgid ""
-"release notes for link:RelNotes/2.1.4.txt[2.1.4], link:RelNotes/2.1.3."
-"txt[2.1.3], link:RelNotes/2.1.2.txt[2.1.2], link:RelNotes/2.1.1.txt[2.1.1], "
-"link:RelNotes/2.1.0.txt[2.1]."
+"release notes for link:RelNotes/2.1.4.txt[2.1.4], "
+"link:RelNotes/2.1.3.txt[2.1.3], link:RelNotes/2.1.2.txt[2.1.2], "
+"link:RelNotes/2.1.1.txt[2.1.1], link:RelNotes/2.1.0.txt[2.1]."
msgstr ""
#. type: delimited block =
@@ -63379,9 +63222,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:169
msgid ""
-"release notes for link:RelNotes/2.0.5.txt[2.0.5], link:RelNotes/2.0.4."
-"txt[2.0.4], link:RelNotes/2.0.3.txt[2.0.3], link:RelNotes/2.0.2.txt[2.0.2], "
-"link:RelNotes/2.0.1.txt[2.0.1], link:RelNotes/2.0.0.txt[2.0.0]."
+"release notes for link:RelNotes/2.0.5.txt[2.0.5], "
+"link:RelNotes/2.0.4.txt[2.0.4], link:RelNotes/2.0.3.txt[2.0.3], "
+"link:RelNotes/2.0.2.txt[2.0.2], link:RelNotes/2.0.1.txt[2.0.1], "
+"link:RelNotes/2.0.0.txt[2.0.0]."
msgstr ""
#. type: delimited block =
@@ -63392,9 +63236,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:179
msgid ""
-"release notes for link:RelNotes/1.9.5.txt[1.9.5], link:RelNotes/1.9.4."
-"txt[1.9.4], link:RelNotes/1.9.3.txt[1.9.3], link:RelNotes/1.9.2.txt[1.9.2], "
-"link:RelNotes/1.9.1.txt[1.9.1], link:RelNotes/1.9.0.txt[1.9.0]."
+"release notes for link:RelNotes/1.9.5.txt[1.9.5], "
+"link:RelNotes/1.9.4.txt[1.9.4], link:RelNotes/1.9.3.txt[1.9.3], "
+"link:RelNotes/1.9.2.txt[1.9.2], link:RelNotes/1.9.1.txt[1.9.1], "
+"link:RelNotes/1.9.0.txt[1.9.0]."
msgstr ""
#. type: delimited block =
@@ -63405,10 +63250,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:190
msgid ""
-"release notes for link:RelNotes/1.8.5.6.txt[1.8.5.6], link:RelNotes/1.8.5.5."
-"txt[1.8.5.5], link:RelNotes/1.8.5.4.txt[1.8.5.4], link:RelNotes/1.8.5.3."
-"txt[1.8.5.3], link:RelNotes/1.8.5.2.txt[1.8.5.2], link:RelNotes/1.8.5.1."
-"txt[1.8.5.1], link:RelNotes/1.8.5.txt[1.8.5]."
+"release notes for link:RelNotes/1.8.5.6.txt[1.8.5.6], "
+"link:RelNotes/1.8.5.5.txt[1.8.5.5], link:RelNotes/1.8.5.4.txt[1.8.5.4], "
+"link:RelNotes/1.8.5.3.txt[1.8.5.3], link:RelNotes/1.8.5.2.txt[1.8.5.2], "
+"link:RelNotes/1.8.5.1.txt[1.8.5.1], link:RelNotes/1.8.5.txt[1.8.5]."
msgstr ""
#. type: delimited block =
@@ -63419,10 +63264,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:200
msgid ""
-"release notes for link:RelNotes/1.8.4.5.txt[1.8.4.5], link:RelNotes/1.8.4.4."
-"txt[1.8.4.4], link:RelNotes/1.8.4.3.txt[1.8.4.3], link:RelNotes/1.8.4.2."
-"txt[1.8.4.2], link:RelNotes/1.8.4.1.txt[1.8.4.1], link:RelNotes/1.8.4."
-"txt[1.8.4]."
+"release notes for link:RelNotes/1.8.4.5.txt[1.8.4.5], "
+"link:RelNotes/1.8.4.4.txt[1.8.4.4], link:RelNotes/1.8.4.3.txt[1.8.4.3], "
+"link:RelNotes/1.8.4.2.txt[1.8.4.2], link:RelNotes/1.8.4.1.txt[1.8.4.1], "
+"link:RelNotes/1.8.4.txt[1.8.4]."
msgstr ""
#. type: delimited block =
@@ -63433,9 +63278,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:209
msgid ""
-"release notes for link:RelNotes/1.8.3.4.txt[1.8.3.4], link:RelNotes/1.8.3.3."
-"txt[1.8.3.3], link:RelNotes/1.8.3.2.txt[1.8.3.2], link:RelNotes/1.8.3.1."
-"txt[1.8.3.1], link:RelNotes/1.8.3.txt[1.8.3]."
+"release notes for link:RelNotes/1.8.3.4.txt[1.8.3.4], "
+"link:RelNotes/1.8.3.3.txt[1.8.3.3], link:RelNotes/1.8.3.2.txt[1.8.3.2], "
+"link:RelNotes/1.8.3.1.txt[1.8.3.1], link:RelNotes/1.8.3.txt[1.8.3]."
msgstr ""
#. type: delimited block =
@@ -63446,9 +63291,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:217
msgid ""
-"release notes for link:RelNotes/1.8.2.3.txt[1.8.2.3], link:RelNotes/1.8.2.2."
-"txt[1.8.2.2], link:RelNotes/1.8.2.1.txt[1.8.2.1], link:RelNotes/1.8.2."
-"txt[1.8.2]."
+"release notes for link:RelNotes/1.8.2.3.txt[1.8.2.3], "
+"link:RelNotes/1.8.2.2.txt[1.8.2.2], link:RelNotes/1.8.2.1.txt[1.8.2.1], "
+"link:RelNotes/1.8.2.txt[1.8.2]."
msgstr ""
#. type: delimited block =
@@ -63459,10 +63304,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:228
msgid ""
-"release notes for link:RelNotes/1.8.1.6.txt[1.8.1.6], link:RelNotes/1.8.1.5."
-"txt[1.8.1.5], link:RelNotes/1.8.1.4.txt[1.8.1.4], link:RelNotes/1.8.1.3."
-"txt[1.8.1.3], link:RelNotes/1.8.1.2.txt[1.8.1.2], link:RelNotes/1.8.1.1."
-"txt[1.8.1.1], link:RelNotes/1.8.1.txt[1.8.1]."
+"release notes for link:RelNotes/1.8.1.6.txt[1.8.1.6], "
+"link:RelNotes/1.8.1.5.txt[1.8.1.5], link:RelNotes/1.8.1.4.txt[1.8.1.4], "
+"link:RelNotes/1.8.1.3.txt[1.8.1.3], link:RelNotes/1.8.1.2.txt[1.8.1.2], "
+"link:RelNotes/1.8.1.1.txt[1.8.1.1], link:RelNotes/1.8.1.txt[1.8.1]."
msgstr ""
#. type: delimited block =
@@ -63473,9 +63318,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:236
msgid ""
-"release notes for link:RelNotes/1.8.0.3.txt[1.8.0.3], link:RelNotes/1.8.0.2."
-"txt[1.8.0.2], link:RelNotes/1.8.0.1.txt[1.8.0.1], link:RelNotes/1.8.0."
-"txt[1.8.0]."
+"release notes for link:RelNotes/1.8.0.3.txt[1.8.0.3], "
+"link:RelNotes/1.8.0.2.txt[1.8.0.2], link:RelNotes/1.8.0.1.txt[1.8.0.1], "
+"link:RelNotes/1.8.0.txt[1.8.0]."
msgstr ""
#. type: delimited block =
@@ -63486,9 +63331,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:245
msgid ""
-"release notes for link:RelNotes/1.7.12.4.txt[1.7.12.4], link:"
-"RelNotes/1.7.12.3.txt[1.7.12.3], link:RelNotes/1.7.12.2.txt[1.7.12.2], link:"
-"RelNotes/1.7.12.1.txt[1.7.12.1], link:RelNotes/1.7.12.txt[1.7.12]."
+"release notes for link:RelNotes/1.7.12.4.txt[1.7.12.4], "
+"link:RelNotes/1.7.12.3.txt[1.7.12.3], link:RelNotes/1.7.12.2.txt[1.7.12.2], "
+"link:RelNotes/1.7.12.1.txt[1.7.12.1], link:RelNotes/1.7.12.txt[1.7.12]."
msgstr ""
#. type: delimited block =
@@ -63499,11 +63344,11 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:257
msgid ""
-"release notes for link:RelNotes/1.7.11.7.txt[1.7.11.7], link:"
-"RelNotes/1.7.11.6.txt[1.7.11.6], link:RelNotes/1.7.11.5.txt[1.7.11.5], link:"
-"RelNotes/1.7.11.4.txt[1.7.11.4], link:RelNotes/1.7.11.3.txt[1.7.11.3], link:"
-"RelNotes/1.7.11.2.txt[1.7.11.2], link:RelNotes/1.7.11.1.txt[1.7.11.1], link:"
-"RelNotes/1.7.11.txt[1.7.11]."
+"release notes for link:RelNotes/1.7.11.7.txt[1.7.11.7], "
+"link:RelNotes/1.7.11.6.txt[1.7.11.6], link:RelNotes/1.7.11.5.txt[1.7.11.5], "
+"link:RelNotes/1.7.11.4.txt[1.7.11.4], link:RelNotes/1.7.11.3.txt[1.7.11.3], "
+"link:RelNotes/1.7.11.2.txt[1.7.11.2], link:RelNotes/1.7.11.1.txt[1.7.11.1], "
+"link:RelNotes/1.7.11.txt[1.7.11]."
msgstr ""
#. type: delimited block =
@@ -63514,10 +63359,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:267
msgid ""
-"release notes for link:RelNotes/1.7.10.5.txt[1.7.10.5], link:"
-"RelNotes/1.7.10.4.txt[1.7.10.4], link:RelNotes/1.7.10.3.txt[1.7.10.3], link:"
-"RelNotes/1.7.10.2.txt[1.7.10.2], link:RelNotes/1.7.10.1.txt[1.7.10.1], link:"
-"RelNotes/1.7.10.txt[1.7.10]."
+"release notes for link:RelNotes/1.7.10.5.txt[1.7.10.5], "
+"link:RelNotes/1.7.10.4.txt[1.7.10.4], link:RelNotes/1.7.10.3.txt[1.7.10.3], "
+"link:RelNotes/1.7.10.2.txt[1.7.10.2], link:RelNotes/1.7.10.1.txt[1.7.10.1], "
+"link:RelNotes/1.7.10.txt[1.7.10]."
msgstr ""
#. type: delimited block =
@@ -63528,11 +63373,11 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:279
msgid ""
-"release notes for link:RelNotes/1.7.9.7.txt[1.7.9.7], link:RelNotes/1.7.9.6."
-"txt[1.7.9.6], link:RelNotes/1.7.9.5.txt[1.7.9.5], link:RelNotes/1.7.9.4."
-"txt[1.7.9.4], link:RelNotes/1.7.9.3.txt[1.7.9.3], link:RelNotes/1.7.9.2."
-"txt[1.7.9.2], link:RelNotes/1.7.9.1.txt[1.7.9.1], link:RelNotes/1.7.9."
-"txt[1.7.9]."
+"release notes for link:RelNotes/1.7.9.7.txt[1.7.9.7], "
+"link:RelNotes/1.7.9.6.txt[1.7.9.6], link:RelNotes/1.7.9.5.txt[1.7.9.5], "
+"link:RelNotes/1.7.9.4.txt[1.7.9.4], link:RelNotes/1.7.9.3.txt[1.7.9.3], "
+"link:RelNotes/1.7.9.2.txt[1.7.9.2], link:RelNotes/1.7.9.1.txt[1.7.9.1], "
+"link:RelNotes/1.7.9.txt[1.7.9]."
msgstr ""
#. type: delimited block =
@@ -63543,10 +63388,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:290
msgid ""
-"release notes for link:RelNotes/1.7.8.6.txt[1.7.8.6], link:RelNotes/1.7.8.5."
-"txt[1.7.8.5], link:RelNotes/1.7.8.4.txt[1.7.8.4], link:RelNotes/1.7.8.3."
-"txt[1.7.8.3], link:RelNotes/1.7.8.2.txt[1.7.8.2], link:RelNotes/1.7.8.1."
-"txt[1.7.8.1], link:RelNotes/1.7.8.txt[1.7.8]."
+"release notes for link:RelNotes/1.7.8.6.txt[1.7.8.6], "
+"link:RelNotes/1.7.8.5.txt[1.7.8.5], link:RelNotes/1.7.8.4.txt[1.7.8.4], "
+"link:RelNotes/1.7.8.3.txt[1.7.8.3], link:RelNotes/1.7.8.2.txt[1.7.8.2], "
+"link:RelNotes/1.7.8.1.txt[1.7.8.1], link:RelNotes/1.7.8.txt[1.7.8]."
msgstr ""
#. type: delimited block =
@@ -63557,11 +63402,11 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:302
msgid ""
-"release notes for link:RelNotes/1.7.7.7.txt[1.7.7.7], link:RelNotes/1.7.7.6."
-"txt[1.7.7.6], link:RelNotes/1.7.7.5.txt[1.7.7.5], link:RelNotes/1.7.7.4."
-"txt[1.7.7.4], link:RelNotes/1.7.7.3.txt[1.7.7.3], link:RelNotes/1.7.7.2."
-"txt[1.7.7.2], link:RelNotes/1.7.7.1.txt[1.7.7.1], link:RelNotes/1.7.7."
-"txt[1.7.7]."
+"release notes for link:RelNotes/1.7.7.7.txt[1.7.7.7], "
+"link:RelNotes/1.7.7.6.txt[1.7.7.6], link:RelNotes/1.7.7.5.txt[1.7.7.5], "
+"link:RelNotes/1.7.7.4.txt[1.7.7.4], link:RelNotes/1.7.7.3.txt[1.7.7.3], "
+"link:RelNotes/1.7.7.2.txt[1.7.7.2], link:RelNotes/1.7.7.1.txt[1.7.7.1], "
+"link:RelNotes/1.7.7.txt[1.7.7]."
msgstr ""
#. type: delimited block =
@@ -63572,10 +63417,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:313
msgid ""
-"release notes for link:RelNotes/1.7.6.6.txt[1.7.6.6], link:RelNotes/1.7.6.5."
-"txt[1.7.6.5], link:RelNotes/1.7.6.4.txt[1.7.6.4], link:RelNotes/1.7.6.3."
-"txt[1.7.6.3], link:RelNotes/1.7.6.2.txt[1.7.6.2], link:RelNotes/1.7.6.1."
-"txt[1.7.6.1], link:RelNotes/1.7.6.txt[1.7.6]."
+"release notes for link:RelNotes/1.7.6.6.txt[1.7.6.6], "
+"link:RelNotes/1.7.6.5.txt[1.7.6.5], link:RelNotes/1.7.6.4.txt[1.7.6.4], "
+"link:RelNotes/1.7.6.3.txt[1.7.6.3], link:RelNotes/1.7.6.2.txt[1.7.6.2], "
+"link:RelNotes/1.7.6.1.txt[1.7.6.1], link:RelNotes/1.7.6.txt[1.7.6]."
msgstr ""
#. type: delimited block =
@@ -63586,9 +63431,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:322
msgid ""
-"release notes for link:RelNotes/1.7.5.4.txt[1.7.5.4], link:RelNotes/1.7.5.3."
-"txt[1.7.5.3], link:RelNotes/1.7.5.2.txt[1.7.5.2], link:RelNotes/1.7.5.1."
-"txt[1.7.5.1], link:RelNotes/1.7.5.txt[1.7.5]."
+"release notes for link:RelNotes/1.7.5.4.txt[1.7.5.4], "
+"link:RelNotes/1.7.5.3.txt[1.7.5.3], link:RelNotes/1.7.5.2.txt[1.7.5.2], "
+"link:RelNotes/1.7.5.1.txt[1.7.5.1], link:RelNotes/1.7.5.txt[1.7.5]."
msgstr ""
#. type: delimited block =
@@ -63599,10 +63444,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:332
msgid ""
-"release notes for link:RelNotes/1.7.4.5.txt[1.7.4.5], link:RelNotes/1.7.4.4."
-"txt[1.7.4.4], link:RelNotes/1.7.4.3.txt[1.7.4.3], link:RelNotes/1.7.4.2."
-"txt[1.7.4.2], link:RelNotes/1.7.4.1.txt[1.7.4.1], link:RelNotes/1.7.4."
-"txt[1.7.4]."
+"release notes for link:RelNotes/1.7.4.5.txt[1.7.4.5], "
+"link:RelNotes/1.7.4.4.txt[1.7.4.4], link:RelNotes/1.7.4.3.txt[1.7.4.3], "
+"link:RelNotes/1.7.4.2.txt[1.7.4.2], link:RelNotes/1.7.4.1.txt[1.7.4.1], "
+"link:RelNotes/1.7.4.txt[1.7.4]."
msgstr ""
#. type: delimited block =
@@ -63613,10 +63458,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:342
msgid ""
-"release notes for link:RelNotes/1.7.3.5.txt[1.7.3.5], link:RelNotes/1.7.3.4."
-"txt[1.7.3.4], link:RelNotes/1.7.3.3.txt[1.7.3.3], link:RelNotes/1.7.3.2."
-"txt[1.7.3.2], link:RelNotes/1.7.3.1.txt[1.7.3.1], link:RelNotes/1.7.3."
-"txt[1.7.3]."
+"release notes for link:RelNotes/1.7.3.5.txt[1.7.3.5], "
+"link:RelNotes/1.7.3.4.txt[1.7.3.4], link:RelNotes/1.7.3.3.txt[1.7.3.3], "
+"link:RelNotes/1.7.3.2.txt[1.7.3.2], link:RelNotes/1.7.3.1.txt[1.7.3.1], "
+"link:RelNotes/1.7.3.txt[1.7.3]."
msgstr ""
#. type: delimited block =
@@ -63627,10 +63472,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:352
msgid ""
-"release notes for link:RelNotes/1.7.2.5.txt[1.7.2.5], link:RelNotes/1.7.2.4."
-"txt[1.7.2.4], link:RelNotes/1.7.2.3.txt[1.7.2.3], link:RelNotes/1.7.2.2."
-"txt[1.7.2.2], link:RelNotes/1.7.2.1.txt[1.7.2.1], link:RelNotes/1.7.2."
-"txt[1.7.2]."
+"release notes for link:RelNotes/1.7.2.5.txt[1.7.2.5], "
+"link:RelNotes/1.7.2.4.txt[1.7.2.4], link:RelNotes/1.7.2.3.txt[1.7.2.3], "
+"link:RelNotes/1.7.2.2.txt[1.7.2.2], link:RelNotes/1.7.2.1.txt[1.7.2.1], "
+"link:RelNotes/1.7.2.txt[1.7.2]."
msgstr ""
#. type: delimited block =
@@ -63641,9 +63486,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:361
msgid ""
-"release notes for link:RelNotes/1.7.1.4.txt[1.7.1.4], link:RelNotes/1.7.1.3."
-"txt[1.7.1.3], link:RelNotes/1.7.1.2.txt[1.7.1.2], link:RelNotes/1.7.1.1."
-"txt[1.7.1.1], link:RelNotes/1.7.1.txt[1.7.1]."
+"release notes for link:RelNotes/1.7.1.4.txt[1.7.1.4], "
+"link:RelNotes/1.7.1.3.txt[1.7.1.3], link:RelNotes/1.7.1.2.txt[1.7.1.2], "
+"link:RelNotes/1.7.1.1.txt[1.7.1.1], link:RelNotes/1.7.1.txt[1.7.1]."
msgstr ""
#. type: delimited block =
@@ -63654,12 +63499,12 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:375
msgid ""
-"release notes for link:RelNotes/1.7.0.9.txt[1.7.0.9], link:RelNotes/1.7.0.8."
-"txt[1.7.0.8], link:RelNotes/1.7.0.7.txt[1.7.0.7], link:RelNotes/1.7.0.6."
-"txt[1.7.0.6], link:RelNotes/1.7.0.5.txt[1.7.0.5], link:RelNotes/1.7.0.4."
-"txt[1.7.0.4], link:RelNotes/1.7.0.3.txt[1.7.0.3], link:RelNotes/1.7.0.2."
-"txt[1.7.0.2], link:RelNotes/1.7.0.1.txt[1.7.0.1], link:RelNotes/1.7.0."
-"txt[1.7.0]."
+"release notes for link:RelNotes/1.7.0.9.txt[1.7.0.9], "
+"link:RelNotes/1.7.0.8.txt[1.7.0.8], link:RelNotes/1.7.0.7.txt[1.7.0.7], "
+"link:RelNotes/1.7.0.6.txt[1.7.0.6], link:RelNotes/1.7.0.5.txt[1.7.0.5], "
+"link:RelNotes/1.7.0.4.txt[1.7.0.4], link:RelNotes/1.7.0.3.txt[1.7.0.3], "
+"link:RelNotes/1.7.0.2.txt[1.7.0.2], link:RelNotes/1.7.0.1.txt[1.7.0.1], "
+"link:RelNotes/1.7.0.txt[1.7.0]."
msgstr ""
#. type: delimited block =
@@ -63670,9 +63515,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:383
msgid ""
-"release notes for link:RelNotes/1.6.6.3.txt[1.6.6.3], link:RelNotes/1.6.6.2."
-"txt[1.6.6.2], link:RelNotes/1.6.6.1.txt[1.6.6.1], link:RelNotes/1.6.6."
-"txt[1.6.6]."
+"release notes for link:RelNotes/1.6.6.3.txt[1.6.6.3], "
+"link:RelNotes/1.6.6.2.txt[1.6.6.2], link:RelNotes/1.6.6.1.txt[1.6.6.1], "
+"link:RelNotes/1.6.6.txt[1.6.6]."
msgstr ""
#. type: delimited block =
@@ -63683,12 +63528,12 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:397
msgid ""
-"release notes for link:RelNotes/1.6.5.9.txt[1.6.5.9], link:RelNotes/1.6.5.8."
-"txt[1.6.5.8], link:RelNotes/1.6.5.7.txt[1.6.5.7], link:RelNotes/1.6.5.6."
-"txt[1.6.5.6], link:RelNotes/1.6.5.5.txt[1.6.5.5], link:RelNotes/1.6.5.4."
-"txt[1.6.5.4], link:RelNotes/1.6.5.3.txt[1.6.5.3], link:RelNotes/1.6.5.2."
-"txt[1.6.5.2], link:RelNotes/1.6.5.1.txt[1.6.5.1], link:RelNotes/1.6.5."
-"txt[1.6.5]."
+"release notes for link:RelNotes/1.6.5.9.txt[1.6.5.9], "
+"link:RelNotes/1.6.5.8.txt[1.6.5.8], link:RelNotes/1.6.5.7.txt[1.6.5.7], "
+"link:RelNotes/1.6.5.6.txt[1.6.5.6], link:RelNotes/1.6.5.5.txt[1.6.5.5], "
+"link:RelNotes/1.6.5.4.txt[1.6.5.4], link:RelNotes/1.6.5.3.txt[1.6.5.3], "
+"link:RelNotes/1.6.5.2.txt[1.6.5.2], link:RelNotes/1.6.5.1.txt[1.6.5.1], "
+"link:RelNotes/1.6.5.txt[1.6.5]."
msgstr ""
#. type: delimited block =
@@ -63699,10 +63544,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:407
msgid ""
-"release notes for link:RelNotes/1.6.4.5.txt[1.6.4.5], link:RelNotes/1.6.4.4."
-"txt[1.6.4.4], link:RelNotes/1.6.4.3.txt[1.6.4.3], link:RelNotes/1.6.4.2."
-"txt[1.6.4.2], link:RelNotes/1.6.4.1.txt[1.6.4.1], link:RelNotes/1.6.4."
-"txt[1.6.4]."
+"release notes for link:RelNotes/1.6.4.5.txt[1.6.4.5], "
+"link:RelNotes/1.6.4.4.txt[1.6.4.4], link:RelNotes/1.6.4.3.txt[1.6.4.3], "
+"link:RelNotes/1.6.4.2.txt[1.6.4.2], link:RelNotes/1.6.4.1.txt[1.6.4.1], "
+"link:RelNotes/1.6.4.txt[1.6.4]."
msgstr ""
#. type: delimited block =
@@ -63713,18 +63558,18 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:416
msgid ""
-"release notes for link:RelNotes/1.6.3.4.txt[1.6.3.4], link:RelNotes/1.6.3.3."
-"txt[1.6.3.3], link:RelNotes/1.6.3.2.txt[1.6.3.2], link:RelNotes/1.6.3.1."
-"txt[1.6.3.1], link:RelNotes/1.6.3.txt[1.6.3]."
+"release notes for link:RelNotes/1.6.3.4.txt[1.6.3.4], "
+"link:RelNotes/1.6.3.3.txt[1.6.3.3], link:RelNotes/1.6.3.2.txt[1.6.3.2], "
+"link:RelNotes/1.6.3.1.txt[1.6.3.1], link:RelNotes/1.6.3.txt[1.6.3]."
msgstr ""
#. type: delimited block =
#: en/git.txt:424
msgid ""
-"release notes for link:RelNotes/1.6.2.5.txt[1.6.2.5], link:RelNotes/1.6.2.4."
-"txt[1.6.2.4], link:RelNotes/1.6.2.3.txt[1.6.2.3], link:RelNotes/1.6.2.2."
-"txt[1.6.2.2], link:RelNotes/1.6.2.1.txt[1.6.2.1], link:RelNotes/1.6.2."
-"txt[1.6.2]."
+"release notes for link:RelNotes/1.6.2.5.txt[1.6.2.5], "
+"link:RelNotes/1.6.2.4.txt[1.6.2.4], link:RelNotes/1.6.2.3.txt[1.6.2.3], "
+"link:RelNotes/1.6.2.2.txt[1.6.2.2], link:RelNotes/1.6.2.1.txt[1.6.2.1], "
+"link:RelNotes/1.6.2.txt[1.6.2]."
msgstr ""
#. type: delimited block =
@@ -63735,9 +63580,9 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:432
msgid ""
-"release notes for link:RelNotes/1.6.1.3.txt[1.6.1.3], link:RelNotes/1.6.1.2."
-"txt[1.6.1.2], link:RelNotes/1.6.1.1.txt[1.6.1.1], link:RelNotes/1.6.1."
-"txt[1.6.1]."
+"release notes for link:RelNotes/1.6.1.3.txt[1.6.1.3], "
+"link:RelNotes/1.6.1.2.txt[1.6.1.2], link:RelNotes/1.6.1.1.txt[1.6.1.1], "
+"link:RelNotes/1.6.1.txt[1.6.1]."
msgstr ""
#. type: delimited block =
@@ -63748,10 +63593,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:443
msgid ""
-"release notes for link:RelNotes/1.6.0.6.txt[1.6.0.6], link:RelNotes/1.6.0.5."
-"txt[1.6.0.5], link:RelNotes/1.6.0.4.txt[1.6.0.4], link:RelNotes/1.6.0.3."
-"txt[1.6.0.3], link:RelNotes/1.6.0.2.txt[1.6.0.2], link:RelNotes/1.6.0.1."
-"txt[1.6.0.1], link:RelNotes/1.6.0.txt[1.6.0]."
+"release notes for link:RelNotes/1.6.0.6.txt[1.6.0.6], "
+"link:RelNotes/1.6.0.5.txt[1.6.0.5], link:RelNotes/1.6.0.4.txt[1.6.0.4], "
+"link:RelNotes/1.6.0.3.txt[1.6.0.3], link:RelNotes/1.6.0.2.txt[1.6.0.2], "
+"link:RelNotes/1.6.0.1.txt[1.6.0.1], link:RelNotes/1.6.0.txt[1.6.0]."
msgstr ""
#. type: delimited block =
@@ -63762,10 +63607,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:454
msgid ""
-"release notes for link:RelNotes/1.5.6.6.txt[1.5.6.6], link:RelNotes/1.5.6.5."
-"txt[1.5.6.5], link:RelNotes/1.5.6.4.txt[1.5.6.4], link:RelNotes/1.5.6.3."
-"txt[1.5.6.3], link:RelNotes/1.5.6.2.txt[1.5.6.2], link:RelNotes/1.5.6.1."
-"txt[1.5.6.1], link:RelNotes/1.5.6.txt[1.5.6]."
+"release notes for link:RelNotes/1.5.6.6.txt[1.5.6.6], "
+"link:RelNotes/1.5.6.5.txt[1.5.6.5], link:RelNotes/1.5.6.4.txt[1.5.6.4], "
+"link:RelNotes/1.5.6.3.txt[1.5.6.3], link:RelNotes/1.5.6.2.txt[1.5.6.2], "
+"link:RelNotes/1.5.6.1.txt[1.5.6.1], link:RelNotes/1.5.6.txt[1.5.6]."
msgstr ""
#. type: delimited block =
@@ -63776,10 +63621,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:465
msgid ""
-"release notes for link:RelNotes/1.5.5.6.txt[1.5.5.6], link:RelNotes/1.5.5.5."
-"txt[1.5.5.5], link:RelNotes/1.5.5.4.txt[1.5.5.4], link:RelNotes/1.5.5.3."
-"txt[1.5.5.3], link:RelNotes/1.5.5.2.txt[1.5.5.2], link:RelNotes/1.5.5.1."
-"txt[1.5.5.1], link:RelNotes/1.5.5.txt[1.5.5]."
+"release notes for link:RelNotes/1.5.5.6.txt[1.5.5.6], "
+"link:RelNotes/1.5.5.5.txt[1.5.5.5], link:RelNotes/1.5.5.4.txt[1.5.5.4], "
+"link:RelNotes/1.5.5.3.txt[1.5.5.3], link:RelNotes/1.5.5.2.txt[1.5.5.2], "
+"link:RelNotes/1.5.5.1.txt[1.5.5.1], link:RelNotes/1.5.5.txt[1.5.5]."
msgstr ""
#. type: delimited block =
@@ -63790,11 +63635,11 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:477
msgid ""
-"release notes for link:RelNotes/1.5.4.7.txt[1.5.4.7], link:RelNotes/1.5.4.6."
-"txt[1.5.4.6], link:RelNotes/1.5.4.5.txt[1.5.4.5], link:RelNotes/1.5.4.4."
-"txt[1.5.4.4], link:RelNotes/1.5.4.3.txt[1.5.4.3], link:RelNotes/1.5.4.2."
-"txt[1.5.4.2], link:RelNotes/1.5.4.1.txt[1.5.4.1], link:RelNotes/1.5.4."
-"txt[1.5.4]."
+"release notes for link:RelNotes/1.5.4.7.txt[1.5.4.7], "
+"link:RelNotes/1.5.4.6.txt[1.5.4.6], link:RelNotes/1.5.4.5.txt[1.5.4.5], "
+"link:RelNotes/1.5.4.4.txt[1.5.4.4], link:RelNotes/1.5.4.3.txt[1.5.4.3], "
+"link:RelNotes/1.5.4.2.txt[1.5.4.2], link:RelNotes/1.5.4.1.txt[1.5.4.1], "
+"link:RelNotes/1.5.4.txt[1.5.4]."
msgstr ""
#. type: delimited block =
@@ -63805,11 +63650,11 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:490
msgid ""
-"release notes for link:RelNotes/1.5.3.8.txt[1.5.3.8], link:RelNotes/1.5.3.7."
-"txt[1.5.3.7], link:RelNotes/1.5.3.6.txt[1.5.3.6], link:RelNotes/1.5.3.5."
-"txt[1.5.3.5], link:RelNotes/1.5.3.4.txt[1.5.3.4], link:RelNotes/1.5.3.3."
-"txt[1.5.3.3], link:RelNotes/1.5.3.2.txt[1.5.3.2], link:RelNotes/1.5.3.1."
-"txt[1.5.3.1], link:RelNotes/1.5.3.txt[1.5.3]."
+"release notes for link:RelNotes/1.5.3.8.txt[1.5.3.8], "
+"link:RelNotes/1.5.3.7.txt[1.5.3.7], link:RelNotes/1.5.3.6.txt[1.5.3.6], "
+"link:RelNotes/1.5.3.5.txt[1.5.3.5], link:RelNotes/1.5.3.4.txt[1.5.3.4], "
+"link:RelNotes/1.5.3.3.txt[1.5.3.3], link:RelNotes/1.5.3.2.txt[1.5.3.2], "
+"link:RelNotes/1.5.3.1.txt[1.5.3.1], link:RelNotes/1.5.3.txt[1.5.3]."
msgstr ""
#. type: delimited block =
@@ -63820,10 +63665,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:500
msgid ""
-"release notes for link:RelNotes/1.5.2.5.txt[1.5.2.5], link:RelNotes/1.5.2.4."
-"txt[1.5.2.4], link:RelNotes/1.5.2.3.txt[1.5.2.3], link:RelNotes/1.5.2.2."
-"txt[1.5.2.2], link:RelNotes/1.5.2.1.txt[1.5.2.1], link:RelNotes/1.5.2."
-"txt[1.5.2]."
+"release notes for link:RelNotes/1.5.2.5.txt[1.5.2.5], "
+"link:RelNotes/1.5.2.4.txt[1.5.2.4], link:RelNotes/1.5.2.3.txt[1.5.2.3], "
+"link:RelNotes/1.5.2.2.txt[1.5.2.2], link:RelNotes/1.5.2.1.txt[1.5.2.1], "
+"link:RelNotes/1.5.2.txt[1.5.2]."
msgstr ""
#. type: delimited block =
@@ -63834,10 +63679,10 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:511
msgid ""
-"release notes for link:RelNotes/1.5.1.6.txt[1.5.1.6], link:RelNotes/1.5.1.5."
-"txt[1.5.1.5], link:RelNotes/1.5.1.4.txt[1.5.1.4], link:RelNotes/1.5.1.3."
-"txt[1.5.1.3], link:RelNotes/1.5.1.2.txt[1.5.1.2], link:RelNotes/1.5.1.1."
-"txt[1.5.1.1], link:RelNotes/1.5.1.txt[1.5.1]."
+"release notes for link:RelNotes/1.5.1.6.txt[1.5.1.6], "
+"link:RelNotes/1.5.1.5.txt[1.5.1.5], link:RelNotes/1.5.1.4.txt[1.5.1.4], "
+"link:RelNotes/1.5.1.3.txt[1.5.1.3], link:RelNotes/1.5.1.2.txt[1.5.1.2], "
+"link:RelNotes/1.5.1.1.txt[1.5.1.1], link:RelNotes/1.5.1.txt[1.5.1]."
msgstr ""
#. type: delimited block =
@@ -63848,17 +63693,18 @@ msgstr ""
#. type: delimited block =
#: en/git.txt:522
msgid ""
-"release notes for link:RelNotes/1.5.0.7.txt[1.5.0.7], link:RelNotes/1.5.0.6."
-"txt[1.5.0.6], link:RelNotes/1.5.0.5.txt[1.5.0.5], link:RelNotes/1.5.0.3."
-"txt[1.5.0.3], link:RelNotes/1.5.0.2.txt[1.5.0.2], link:RelNotes/1.5.0.1."
-"txt[1.5.0.1], link:RelNotes/1.5.0.txt[1.5.0]."
+"release notes for link:RelNotes/1.5.0.7.txt[1.5.0.7], "
+"link:RelNotes/1.5.0.6.txt[1.5.0.6], link:RelNotes/1.5.0.5.txt[1.5.0.5], "
+"link:RelNotes/1.5.0.3.txt[1.5.0.3], link:RelNotes/1.5.0.2.txt[1.5.0.2], "
+"link:RelNotes/1.5.0.1.txt[1.5.0.1], link:RelNotes/1.5.0.txt[1.5.0]."
msgstr ""
#. type: delimited block =
#: en/git.txt:527
msgid ""
-"documentation for release link:v1.4.4.4/git.html[1.4.4.4], link:v1.3.3/git."
-"html[1.3.3], link:v1.2.6/git.html[1.2.6], link:v1.0.13/git.html[1.0.13]."
+"documentation for release link:v1.4.4.4/git.html[1.4.4.4], "
+"link:v1.3.3/git.html[1.3.3], link:v1.2.6/git.html[1.2.6], "
+"link:v1.0.13/git.html[1.0.13]."
msgstr ""
#. type: Plain text
@@ -63878,8 +63724,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:547
msgid ""
-"Other options are available to control how the manual page is displayed. See "
-"linkgit:git-help[1] for more information, because `git --help ...` is "
+"Other options are available to control how the manual page is displayed. See"
+" linkgit:git-help[1] for more information, because `git --help ...` is "
"converted internally into `git help ...`."
msgstr ""
@@ -63901,10 +63747,10 @@ msgstr ""
#. type: Plain text
#: en/git.txt:558
msgid ""
-"This option affects options that expect path name like `--git-dir` and `--"
-"work-tree` in that their interpretations of the path names would be made "
-"relative to the working directory caused by the `-C` option. For example the "
-"following invocations are equivalent:"
+"This option affects options that expect path name like `--git-dir` and "
+"`--work-tree` in that their interpretations of the path names would be made "
+"relative to the working directory caused by the `-C` option. For example the"
+" following invocations are equivalent:"
msgstr ""
#. type: Plain text
@@ -63924,18 +63770,18 @@ msgstr ""
#. type: Plain text
#: en/git.txt:567
msgid ""
-"Pass a configuration parameter to the command. The value given will override "
-"values from configuration files. The <name> is expected in the same format "
-"as listed by 'git config' (subkeys separated by dots)."
+"Pass a configuration parameter to the command. The value given will override"
+" values from configuration files. The <name> is expected in the same format"
+" as listed by 'git config' (subkeys separated by dots)."
msgstr ""
#. type: Plain text
#: en/git.txt:572
msgid ""
-"Note that omitting the `=` in `git -c foo.bar ...` is allowed and sets `foo."
-"bar` to the boolean true value (just like `[foo]bar` would in a config "
-"file). Including the equals but with an empty value (like `git -c foo."
-"bar= ...`) sets `foo.bar` to the empty string."
+"Note that omitting the `=` in `git -c foo.bar ...` is allowed and sets "
+"`foo.bar` to the boolean true value (just like `[foo]bar` would in a config "
+"file). Including the equals but with an empty value (like `git -c foo.bar= "
+"...`) sets `foo.bar` to the empty string."
msgstr ""
#. type: Labeled list
@@ -63956,7 +63802,7 @@ msgstr ""
#: en/git.txt:579
#, no-wrap
msgid "--html-path"
-msgstr ""
+msgstr "--html-path"
#. type: Plain text
#: en/git.txt:582
@@ -63969,7 +63815,7 @@ msgstr ""
#: en/git.txt:583
#, no-wrap
msgid "--man-path"
-msgstr ""
+msgstr "--man-path"
#. type: Plain text
#: en/git.txt:586
@@ -63982,7 +63828,7 @@ msgstr ""
#: en/git.txt:587
#, no-wrap
msgid "--info-path"
-msgstr ""
+msgstr "--info-path"
#. type: Plain text
#: en/git.txt:590
@@ -63995,7 +63841,7 @@ msgstr ""
#: en/git.txt:592
#, no-wrap
msgid "--paginate"
-msgstr ""
+msgstr "--paginate"
#. type: Plain text
#: en/git.txt:597
@@ -64069,9 +63915,9 @@ msgstr ""
#. type: Plain text
#: en/git.txt:623
msgid ""
-"Currently for internal use only. Set a prefix which gives a path from above "
-"a repository down to its root. One use is to give submodules context about "
-"the superproject that invoked it."
+"Currently for internal use only. Set a prefix which gives a path from above"
+" a repository down to its root. One use is to give submodules context about"
+" the superproject that invoked it."
msgstr ""
#. type: Plain text
@@ -64083,10 +63929,9 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:629
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--no-replace-objects"
-msgstr "git-commit(1)"
+msgstr "--no-replace-objects"
#. type: Plain text
#: en/git.txt:632
@@ -64099,7 +63944,7 @@ msgstr ""
#: en/git.txt:633
#, no-wrap
msgid "--literal-pathspecs"
-msgstr ""
+msgstr "--literal-pathspecs"
#. type: Plain text
#: en/git.txt:637
@@ -64113,7 +63958,7 @@ msgstr ""
#: en/git.txt:638
#, no-wrap
msgid "--glob-pathspecs"
-msgstr ""
+msgstr "--glob-pathspecs"
#. type: Plain text
#: en/git.txt:643
@@ -64127,7 +63972,7 @@ msgstr ""
#: en/git.txt:644
#, no-wrap
msgid "--noglob-pathspecs"
-msgstr ""
+msgstr "--noglob-pathspecs"
#. type: Plain text
#: en/git.txt:649
@@ -64141,7 +63986,7 @@ msgstr ""
#: en/git.txt:650
#, no-wrap
msgid "--icase-pathspecs"
-msgstr ""
+msgstr "--icase-pathspecs"
#. type: Plain text
#: en/git.txt:653
@@ -64172,8 +64017,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:665
msgid ""
-"We separate the porcelain commands into the main commands and some ancillary "
-"user utilities."
+"We separate the porcelain commands into the main commands and some ancillary"
+" user utilities."
msgstr ""
#. type: Title ~
@@ -64222,8 +64067,8 @@ msgstr ""
msgid ""
"Although Git includes its own porcelain layer, its low-level commands are "
"sufficient to support development of alternative porcelains. Developers of "
-"such porcelains might start by reading about linkgit:git-update-index[1] and "
-"linkgit:git-read-tree[1]."
+"such porcelains might start by reading about linkgit:git-update-index[1] and"
+" linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
@@ -64336,8 +64181,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:776
msgid ""
-"Various commands read from the configuration file and adjust their operation "
-"accordingly. See linkgit:git-config[1] for a list and more details about "
+"Various commands read from the configuration file and adjust their operation"
+" accordingly. See linkgit:git-config[1] for a list and more details about "
"the configuration mechanism."
msgstr ""
@@ -64378,7 +64223,8 @@ msgstr ""
msgid ""
"Indicates a tree, commit or tag object name. A command that takes a <tree-"
"ish> argument ultimately wants to operate on a <tree> object but "
-"automatically dereferences <commit> and <tag> objects that point at a <tree>."
+"automatically dereferences <commit> and <tag> objects that point at a "
+"<tree>."
msgstr ""
#. type: Labeled list
@@ -64470,8 +64316,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:841
msgid ""
-"Higher level SCMs may provide and manage additional information in the `"
-"$GIT_DIR`."
+"Higher level SCMs may provide and manage additional information in the "
+"`$GIT_DIR`."
msgstr ""
#. type: Title -
@@ -64513,8 +64359,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:862
msgid ""
-"This environment allows the specification of an alternate index file. If not "
-"specified, the default of `$GIT_DIR/index` is used."
+"This environment allows the specification of an alternate index file. If not"
+" specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
@@ -64542,8 +64388,8 @@ msgstr ""
#: en/git.txt:874
msgid ""
"If the object storage directory is specified via this environment variable "
-"then the sha1 directories are created underneath - otherwise the default `"
-"$GIT_DIR/objects` directory is used."
+"then the sha1 directories are created underneath - otherwise the default "
+"`$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
@@ -64555,10 +64401,11 @@ msgstr ""
#. type: Plain text
#: en/git.txt:881
msgid ""
-"Due to the immutable nature of Git objects, old objects can be archived into "
-"shared, read-only directories. This variable specifies a \":\" separated (on "
-"Windows \";\" separated) list of Git object directories which can be used to "
-"search for Git objects. New objects will not be written to these directories."
+"Due to the immutable nature of Git objects, old objects can be archived into"
+" shared, read-only directories. This variable specifies a \":\" separated "
+"(on Windows \";\" separated) list of Git object directories which can be "
+"used to search for Git objects. New objects will not be written to these "
+"directories."
msgstr ""
#. type: Plain text
@@ -64579,8 +64426,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:893
msgid ""
-"If the `GIT_DIR` environment variable is set then it specifies a path to use "
-"instead of the default `.git` for the base of the repository. The `--git-"
+"If the `GIT_DIR` environment variable is set then it specifies a path to use"
+" instead of the default `.git` for the base of the repository. The `--git-"
"dir` command-line option also sets this value."
msgstr ""
@@ -64594,8 +64441,8 @@ msgstr ""
#: en/git.txt:898
msgid ""
"Set the path to the root of the working tree. This can also be controlled "
-"by the `--work-tree` command-line option and the core.worktree configuration "
-"variable."
+"by the `--work-tree` command-line option and the core.worktree configuration"
+" variable."
msgstr ""
#. type: Labeled list
@@ -64607,8 +64454,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:902
msgid ""
-"Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--"
-"namespace` command-line option also sets this value."
+"Set the Git namespace; see linkgit:gitnamespaces[7] for details. The "
+"`--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
@@ -64624,11 +64471,11 @@ msgid ""
"list of directories that Git should not chdir up into while looking for a "
"repository directory (useful for excluding slow-loading network "
"directories). It will not exclude the current working directory or a "
-"GIT_DIR set on the command line or in the environment. Normally, Git has to "
-"read the entries in this list and resolve any symlink that might be present "
-"in order to compare them with the current directory. However, if even this "
-"access is slow, you can add an empty entry to the list to tell Git that the "
-"subsequent entries are not symlinks and needn't be resolved; e.g., "
+"GIT_DIR set on the command line or in the environment. Normally, Git has to"
+" read the entries in this list and resolve any symlink that might be present"
+" in order to compare them with the current directory. However, if even this"
+" access is slow, you can add an empty entry to the list to tell Git that the"
+" subsequent entries are not symlinks and needn't be resolved; e.g., "
"`GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
@@ -64642,10 +64489,10 @@ msgstr ""
#: en/git.txt:927
msgid ""
"When run in a directory that does not have \".git\" repository directory, "
-"Git tries to find such a directory in the parent directories to find the top "
-"of the working tree, but by default it does not cross filesystem "
-"boundaries. This environment variable can be set to true to tell Git not to "
-"stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will "
+"Git tries to find such a directory in the parent directories to find the top"
+" of the working tree, but by default it does not cross filesystem "
+"boundaries. This environment variable can be set to true to tell Git not to"
+" stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will "
"not affect an explicit repository directory set via `GIT_DIR` or on the "
"command line."
msgstr ""
@@ -64748,8 +64595,8 @@ msgstr ""
msgid ""
"Only valid setting is \"--unified=??\" or \"-u??\" to set the number of "
"context lines shown when a unified diff is created. This takes precedence "
-"over any \"-U\" or \"--unified\" option value passed on the Git diff command "
-"line."
+"over any \"-U\" or \"--unified\" option value passed on the Git diff command"
+" line."
msgstr ""
#. type: Labeled list
@@ -64762,8 +64609,8 @@ msgstr ""
#: en/git.txt:961
msgid ""
"When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named "
-"by it is called, instead of the diff invocation described above. For a path "
-"that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 "
+"by it is called, instead of the diff invocation described above. For a path"
+" that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 "
"parameters:"
msgstr ""
@@ -64819,18 +64666,18 @@ msgstr ""
#. type: Plain text
#: en/git.txt:976
msgid ""
-"The file parameters can point at the user's working file (e.g. `new-file` in "
-"\"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), "
-"or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` "
-"should not worry about unlinking the temporary file --- it is removed when "
-"`GIT_EXTERNAL_DIFF` exits."
+"The file parameters can point at the user's working file (e.g. `new-file` in"
+" \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is "
+"added), or a temporary file (e.g. `old-file` in the index). "
+"`GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- "
+"it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
#: en/git.txt:979
msgid ""
-"For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, "
-"<path>."
+"For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter,"
+" <path>."
msgstr ""
#. type: Plain text
@@ -64900,8 +64747,8 @@ msgstr "`$GIT_DIR/COMMIT_EDITMSG`"
#: en/git.txt:1007
msgid ""
"This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by "
-"several Git commands when, on interactive mode, an editor is to be launched. "
-"See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-"
+"several Git commands when, on interactive mode, an editor is to be launched."
+" See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-"
"config[1]."
msgstr ""
@@ -64958,8 +64805,8 @@ msgstr ""
msgid ""
"If this environment variable is set, it overrides Git's autodetection "
"whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, "
-"plink or tortoiseplink. This variable overrides the config setting `ssh."
-"variant` that serves the same purpose."
+"plink or tortoiseplink. This variable overrides the config setting "
+"`ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
@@ -64971,8 +64818,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:1041
msgid ""
-"If this environment variable is set, then Git commands which need to acquire "
-"passwords or passphrases (e.g. for HTTP or IMAP authentication) will call "
+"If this environment variable is set, then Git commands which need to acquire"
+" passwords or passphrases (e.g. for HTTP or IMAP authentication) will call "
"this program with a suitable prompt as command-line argument and read the "
"password from its STDOUT. See also the `core.askPass` option in linkgit:git-"
"config[1]."
@@ -65000,12 +64847,12 @@ msgstr ""
#. type: Plain text
#: en/git.txt:1053
msgid ""
-"Whether to skip reading settings from the system-wide `$(prefix)/etc/"
-"gitconfig` file. This environment variable can be used along with `$HOME` "
-"and `$XDG_CONFIG_HOME` to create a predictable environment for a picky "
-"script, or you can set it temporarily to avoid using a buggy `/etc/"
-"gitconfig` file while waiting for someone with sufficient permissions to fix "
-"it."
+"Whether to skip reading settings from the system-wide "
+"`$(prefix)/etc/gitconfig` file. This environment variable can be used along"
+" with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for"
+" a picky script, or you can set it temporarily to avoid using a buggy "
+"`/etc/gitconfig` file while waiting for someone with sufficient permissions "
+"to fix it."
msgstr ""
#. type: Labeled list
@@ -65054,16 +64901,16 @@ msgstr ""
#: en/git.txt:1077
msgid ""
"If the variable is set to an integer value greater than 2 and lower than 10 "
-"(strictly) then Git will interpret this value as an open file descriptor and "
-"will try to write the trace messages into this file descriptor."
+"(strictly) then Git will interpret this value as an open file descriptor and"
+" will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
#: en/git.txt:1082
msgid ""
"Alternatively, if the variable is set to an absolute path (starting with a "
-"'/' character), Git will interpret this as a file path and will try to write "
-"the trace messages into it."
+"'/' character), Git will interpret this as a file path and will try to write"
+" the trace messages into it."
msgstr ""
#. type: Plain text
@@ -65084,8 +64931,8 @@ msgstr ""
msgid ""
"Enables trace messages for all accesses to any packs. For each access, the "
"pack file name and an offset in the pack is recorded. This may be helpful "
-"for troubleshooting some pack-related performance problems. See `GIT_TRACE` "
-"for available trace output options."
+"for troubleshooting some pack-related performance problems. See `GIT_TRACE`"
+" for available trace output options."
msgstr ""
#. type: Labeled list
@@ -65116,8 +64963,8 @@ msgid ""
"Enables tracing of packfiles sent or received by a given program. Unlike "
"other trace output, this trace is verbatim: no headers, and no quoting of "
"binary data. You almost certainly want to direct into a file (e.g., "
-"`GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal "
-"or mixing it with other trace output."
+"`GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal"
+" or mixing it with other trace output."
msgstr ""
#. type: Plain text
@@ -65163,8 +65010,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:1125
msgid ""
-"Enables trace messages that can help debugging fetching / cloning of shallow "
-"repositories. See `GIT_TRACE` for available trace output options."
+"Enables trace messages that can help debugging fetching / cloning of shallow"
+" repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
@@ -65254,8 +65101,8 @@ msgid ""
"level command that updated the ref), in addition to the old and new values "
"of the ref. A scripted Porcelain command can use set_reflog_action helper "
"function in `git-sh-setup` to set its name to this variable when it is "
-"invoked as the top level command by the end user, to be recorded in the body "
-"of the reflog."
+"invoked as the top level command by the end user, to be recorded in the body"
+" of the reflog."
msgstr ""
#. type: Labeled list
@@ -65269,10 +65116,10 @@ msgstr ""
msgid ""
"If set to `1`, include broken or badly named refs when iterating over lists "
"of refs. In a normal, non-corrupted repository, this does nothing. However, "
-"enabling it may help git to detect and abort some operations in the presence "
-"of broken refs. Git sets this variable automatically when performing "
-"destructive operations like linkgit:git-prune[1]. You should not need to set "
-"it yourself unless you want to be paranoid about making sure an operation "
+"enabling it may help git to detect and abort some operations in the presence"
+" of broken refs. Git sets this variable automatically when performing "
+"destructive operations like linkgit:git-prune[1]. You should not need to set"
+" it yourself unless you want to be paranoid about making sure an operation "
"has touched every ref (e.g., because you are cloning a repository to make a "
"backup)."
msgstr ""
@@ -65286,12 +65133,12 @@ msgstr ""
#. type: Plain text
#: en/git.txt:1184
msgid ""
-"If set to a colon-separated list of protocols, behave as if `protocol.allow` "
-"is set to `never`, and each of the listed protocols has `protocol.<name>."
-"allow` set to `always` (overriding any existing configuration). In other "
-"words, any protocol not mentioned will be disallowed (i.e., this is a "
-"whitelist, not a blacklist). See the description of `protocol.allow` in "
-"linkgit:git-config[1] for more details."
+"If set to a colon-separated list of protocols, behave as if `protocol.allow`"
+" is set to `never`, and each of the listed protocols has "
+"`protocol.<name>.allow` set to `always` (overriding any existing "
+"configuration). In other words, any protocol not mentioned will be "
+"disallowed (i.e., this is a whitelist, not a blacklist). See the description"
+" of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
@@ -65319,9 +65166,9 @@ msgstr ""
#. type: Plain text
#: en/git.txt:1198
msgid ""
-"More detail on the following is available from the link:user-manual.html#git-"
-"concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-"
-"tutorial[7]."
+"More detail on the following is available from the link:user-"
+"manual.html#git-concepts[Git concepts chapter of the user-manual] and "
+"linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
@@ -65339,9 +65186,9 @@ msgstr ""
#: en/git.txt:1210
msgid ""
"The object database contains objects of three main types: blobs, which hold "
-"file data; trees, which point to blobs and other trees to build up directory "
-"hierarchies; and commits, which each reference a single tree and some number "
-"of parent commits."
+"file data; trees, which point to blobs and other trees to build up directory"
+" hierarchies; and commits, which each reference a single tree and some "
+"number of parent commits."
msgstr ""
#. type: Plain text
@@ -65349,8 +65196,8 @@ msgstr ""
msgid ""
"The commit, equivalent to what other systems call a \"changeset\" or "
"\"version\", represents a step in the project's history, and each parent "
-"represents an immediately preceding step. Commits with more than one parent "
-"represent merges of independent lines of development."
+"represents an immediately preceding step. Commits with more than one parent"
+" represent merges of independent lines of development."
msgstr ""
#. type: Plain text
@@ -65374,8 +65221,8 @@ msgstr ""
msgid ""
"Named pointers called refs mark interesting points in history. A ref may "
"contain the SHA-1 name of an object or the name of another ref. Refs with "
-"names beginning `ref/head/` contain the SHA-1 name of the most recent commit "
-"(or \"head\") of a branch under development. SHA-1 names of tags of "
+"names beginning `ref/head/` contain the SHA-1 name of the most recent commit"
+" (or \"head\") of a branch under development. SHA-1 names of tags of "
"interest are stored under `ref/tags/`. A special ref named `HEAD` contains "
"the name of the currently checked-out branch."
msgstr ""
@@ -65383,8 +65230,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:1240
msgid ""
-"The index file is initialized with a list of all paths and, for each path, a "
-"blob object and a set of attributes. The blob object represents the "
+"The index file is initialized with a list of all paths and, for each path, a"
+" blob object and a set of attributes. The blob object represents the "
"contents of the file as of the head of the current branch. The attributes "
"(last modified time, size, etc.) are taken from the corresponding file in "
"the working tree. Subsequent changes to the working tree can be found by "
@@ -65409,8 +65256,9 @@ msgstr ""
#. type: Plain text
#: en/git.txt:1251
msgid ""
-"See the references in the \"description\" section to get started using Git. "
-"The following is probably more detail than necessary for a first-time user."
+"See the references in the \"description\" section to get started using Git."
+" The following is probably more detail than necessary for a first-time "
+"user."
msgstr ""
#. type: Plain text
@@ -65429,7 +65277,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:1260
msgid ""
-"See also the link:howto-index.html[howto] documents for some useful examples."
+"See also the link:howto-index.html[howto] documents for some useful "
+"examples."
msgstr ""
#. type: Plain text
@@ -65455,17 +65304,17 @@ msgstr ""
#: en/git.txt:1274
msgid ""
"Git was started by Linus Torvalds, and is currently maintained by Junio C "
-"Hamano. Numerous contributions have come from the Git mailing list <git@vger."
-"kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a "
-"more complete list of contributors."
+"Hamano. Numerous contributions have come from the Git mailing list "
+"<git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary "
+"gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
#: en/git.txt:1278
msgid ""
-"If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] "
-"and linkgit:git-blame[1] can show you the authors for specific parts of the "
-"project."
+"If you have a clone of git.git itself, the output of linkgit:git-shortlog[1]"
+" and linkgit:git-blame[1] can show you the authors for specific parts of the"
+" project."
msgstr ""
#. type: Title -
@@ -65482,7 +65331,6 @@ msgid ""
"subscribed to the list to send a message there."
msgstr ""
-#
#. type: Plain text
#: en/git.txt:1293
#, fuzzy
@@ -65502,7 +65350,7 @@ msgstr ""
#: en/git-unpack-file.txt:2
#, no-wrap
msgid "git-unpack-file(1)"
-msgstr ""
+msgstr "git-unpack-file(1)"
#. type: Plain text
#: en/git-unpack-file.txt:7
@@ -65533,7 +65381,7 @@ msgstr ""
#: en/git-unpack-objects.txt:2
#, no-wrap
msgid "git-unpack-objects(1)"
-msgstr ""
+msgstr "git-unpack-objects(1)"
#. type: Plain text
#: en/git-unpack-objects.txt:7
@@ -65549,17 +65397,17 @@ msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:20
msgid ""
-"Read a packed archive (.pack) from the standard input, expanding the objects "
-"contained within and writing them into the repository in \"loose\" (one "
+"Read a packed archive (.pack) from the standard input, expanding the objects"
+" contained within and writing them into the repository in \"loose\" (one "
"object per file) format."
msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:24
msgid ""
-"Objects that already exist in the repository will *not* be unpacked from the "
-"packfile. Therefore, nothing will be unpacked if you use this command on a "
-"packfile that exists within the target repository."
+"Objects that already exist in the repository will *not* be unpacked from the"
+" packfile. Therefore, nothing will be unpacked if you use this command on a"
+" packfile that exists within the target repository."
msgstr ""
#. type: Plain text
@@ -65588,9 +65436,9 @@ msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:43
msgid ""
-"When unpacking a corrupt packfile, the command dies at the first "
-"corruption. This flag tells it to keep going and make the best effort to "
-"recover as many objects as possible."
+"When unpacking a corrupt packfile, the command dies at the first corruption."
+" This flag tells it to keep going and make the best effort to recover as "
+"many objects as possible."
msgstr ""
#. type: Plain text
@@ -65600,12 +65448,10 @@ msgstr ""
#. type: Title =
#: en/git-update-index.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-update-index(1)"
-msgstr "git-add(1)"
+msgstr "git-update-index(1)"
-#
#. type: Plain text
#: en/git-update-index.txt:7
#, fuzzy
@@ -65667,7 +65513,7 @@ msgstr ""
#: en/git-update-index.txt:47
#, no-wrap
msgid "--remove"
-msgstr ""
+msgstr "--remove"
#. type: Plain text
#: en/git-update-index.txt:51
@@ -65679,8 +65525,8 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:55
msgid ""
-"Looks at the current index and checks to see if merges or updates are needed "
-"by checking stat() information."
+"Looks at the current index and checks to see if merges or updates are needed"
+" by checking stat() information."
msgstr ""
#. type: Plain text
@@ -65697,10 +65543,9 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:61
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "--ignore-submodules"
-msgstr "git-add(1)"
+msgstr "--ignore-submodules"
#. type: Plain text
#: en/git-update-index.txt:64
@@ -65754,9 +65599,8 @@ msgstr ""
#: en/git-update-index.txt:80
#, no-wrap
msgid "--index-info"
-msgstr ""
+msgstr "--index-info"
-#
#. type: Plain text
#: en/git-update-index.txt:82
#, fuzzy
@@ -65773,26 +65617,26 @@ msgstr ""
#: en/git-update-index.txt:86
#, no-wrap
msgid "--[no-]assume-unchanged"
-msgstr ""
+msgstr "--[no-]assume-unchanged"
#. type: Plain text
#: en/git-update-index.txt:98
msgid ""
-"When this flag is specified, the object names recorded for the paths are not "
-"updated. Instead, this option sets/unsets the \"assume unchanged\" bit for "
-"the paths. When the \"assume unchanged\" bit is on, the user promises not "
+"When this flag is specified, the object names recorded for the paths are not"
+" updated. Instead, this option sets/unsets the \"assume unchanged\" bit for"
+" the paths. When the \"assume unchanged\" bit is on, the user promises not "
"to change the file and allows Git to assume that the working tree file "
"matches what is recorded in the index. If you want to change the working "
-"tree file, you need to unset the bit to tell Git. This is sometimes helpful "
-"when working with a big project on a filesystem that has very slow lstat(2) "
-"system call (e.g. cifs)."
+"tree file, you need to unset the bit to tell Git. This is sometimes helpful"
+" when working with a big project on a filesystem that has very slow lstat(2)"
+" system call (e.g. cifs)."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:103
msgid ""
-"Git will fail (gracefully) in case it needs to modify this file in the index "
-"e.g. when merging in a commit; thus, in case the assumed-untracked file is "
+"Git will fail (gracefully) in case it needs to modify this file in the index"
+" e.g. when merging in a commit; thus, in case the assumed-untracked file is "
"changed upstream, you will need to handle the situation manually."
msgstr ""
@@ -65800,7 +65644,7 @@ msgstr ""
#: en/git-update-index.txt:104
#, no-wrap
msgid "--really-refresh"
-msgstr ""
+msgstr "--really-refresh"
#. type: Plain text
#: en/git-update-index.txt:107
@@ -65811,17 +65655,16 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:108
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--[no-]skip-worktree"
-msgstr "git-commit(1)"
+msgstr "--[no-]skip-worktree"
#. type: Plain text
#: en/git-update-index.txt:113
msgid ""
-"When one of these flags is specified, the object name recorded for the paths "
-"are not updated. Instead, these options set and unset the \"skip-worktree\" "
-"bit for the paths. See section \"Skip-worktree bit\" below for more "
+"When one of these flags is specified, the object name recorded for the paths"
+" are not updated. Instead, these options set and unset the \"skip-worktree\""
+" bit for the paths. See section \"Skip-worktree bit\" below for more "
"information."
msgstr ""
@@ -65829,7 +65672,7 @@ msgstr ""
#: en/git-update-index.txt:115
#, no-wrap
msgid "--again"
-msgstr ""
+msgstr "--again"
#. type: Plain text
#: en/git-update-index.txt:118
@@ -65842,7 +65685,7 @@ msgstr ""
#: en/git-update-index.txt:119
#, no-wrap
msgid "--unresolve"
-msgstr ""
+msgstr "--unresolve"
#. type: Plain text
#: en/git-update-index.txt:122
@@ -65855,7 +65698,7 @@ msgstr ""
#: en/git-update-index.txt:123
#, no-wrap
msgid "--info-only"
-msgstr ""
+msgstr "--info-only"
#. type: Plain text
#: en/git-update-index.txt:127
@@ -65868,14 +65711,14 @@ msgstr ""
#: en/git-update-index.txt:128
#, no-wrap
msgid "--force-remove"
-msgstr ""
+msgstr "--force-remove"
#. type: Plain text
#: en/git-update-index.txt:131
#, fuzzy
#| msgid ""
-#| "by using 'git rm' to remove files from the working tree and the index, "
-#| "again before using the 'commit' command;"
+#| "by using 'git rm' to remove files from the working tree and the index, again"
+#| " before using the 'commit' command;"
msgid ""
"Remove the file from the index even when the working directory still has "
"such a file. (Implies --remove.)"
@@ -65885,10 +65728,9 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:132
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "--replace"
-msgstr "git-add(1)"
+msgstr "--replace"
#. type: Plain text
#: en/git-update-index.txt:139
@@ -65939,44 +65781,43 @@ msgstr ""
#: en/git-update-index.txt:164
#, no-wrap
msgid "--split-index"
-msgstr ""
+msgstr "--split-index"
#. type: Labeled list
#: en/git-update-index.txt:165
#, no-wrap
msgid "--no-split-index"
-msgstr ""
+msgstr "--no-split-index"
#. type: Plain text
#: en/git-update-index.txt:170
msgid ""
"Enable or disable split index mode. If split-index mode is already enabled "
-"and `--split-index` is given again, all changes in $GIT_DIR/index are pushed "
-"back to the shared index file."
+"and `--split-index` is given again, all changes in $GIT_DIR/index are pushed"
+" back to the shared index file."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:176
msgid ""
"These options take effect whatever the value of the `core.splitIndex` "
-"configuration variable (see linkgit:git-config[1]). But a warning is emitted "
-"when the change goes against the configured value, as the configured value "
+"configuration variable (see linkgit:git-config[1]). But a warning is emitted"
+" when the change goes against the configured value, as the configured value "
"will take effect next time the index is read and this will remove the "
"intended effect of the option."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:177
-#, fuzzy, no-wrap
-#| msgid "add untracked"
+#, no-wrap
msgid "--untracked-cache"
-msgstr "add untracked"
+msgstr "--untracked-cache"
#. type: Labeled list
#: en/git-update-index.txt:178
#, no-wrap
msgid "--no-untracked-cache"
-msgstr ""
+msgstr "--no-untracked-cache"
#. type: Plain text
#: en/git-update-index.txt:181
@@ -65989,8 +65830,8 @@ msgstr ""
#: en/git-update-index.txt:187
msgid ""
"These options take effect whatever the value of the `core.untrackedCache` "
-"configuration variable (see linkgit:git-config[1]). But a warning is emitted "
-"when the change goes against the configured value, as the configured value "
+"configuration variable (see linkgit:git-config[1]). But a warning is emitted"
+" when the change goes against the configured value, as the configured value "
"will take effect next time the index is read and this will remove the "
"intended effect of the option."
msgstr ""
@@ -65999,13 +65840,13 @@ msgstr ""
#: en/git-update-index.txt:188
#, no-wrap
msgid "--test-untracked-cache"
-msgstr ""
+msgstr "--test-untracked-cache"
#. type: Plain text
#: en/git-update-index.txt:197
msgid ""
-"Only perform tests on the working directory to make sure untracked cache can "
-"be used. You have to manually enable untracked cache using `--untracked-"
+"Only perform tests on the working directory to make sure untracked cache can"
+" be used. You have to manually enable untracked cache using `--untracked-"
"cache` or `--force-untracked-cache` or the `core.untrackedCache` "
"configuration variable afterwards if you really want to use it. If a test "
"fails the exit code is 1 and a message explains what is not working as "
@@ -66016,13 +65857,13 @@ msgstr ""
#: en/git-update-index.txt:198
#, no-wrap
msgid "--force-untracked-cache"
-msgstr ""
+msgstr "--force-untracked-cache"
#. type: Plain text
#: en/git-update-index.txt:203
msgid ""
-"Same as `--untracked-cache`. Provided for backwards compatibility with older "
-"versions of Git where `--untracked-cache` used to imply `--test-untracked-"
+"Same as `--untracked-cache`. Provided for backwards compatibility with older"
+" versions of Git where `--untracked-cache` used to imply `--test-untracked-"
"cache` but this option would enable the extension unconditionally."
msgstr ""
@@ -66030,8 +65871,8 @@ msgstr ""
#: en/git-update-index.txt:213
msgid ""
"Files to act on. Note that files beginning with '.' are discarded. This "
-"includes `./file` and `dir/./file`. If you don't want this, then use cleaner "
-"names. The same applies to directories ending '/' and paths with '//'"
+"includes `./file` and `dir/./file`. If you don't want this, then use cleaner"
+" names. The same applies to directories ending '/' and paths with '//'"
msgstr ""
#. type: Title -
@@ -66043,17 +65884,17 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:221
msgid ""
-"`--refresh` does not calculate a new sha1 file or bring the index up-to-date "
-"for mode/content changes. But what it *does* do is to \"re-match\" the stat "
-"information of a file with the index, so that you can refresh the index for "
-"a file that hasn't been changed but where the stat entry is out of date."
+"`--refresh` does not calculate a new sha1 file or bring the index up-to-date"
+" for mode/content changes. But what it *does* do is to \"re-match\" the stat"
+" information of a file with the index, so that you can refresh the index for"
+" a file that hasn't been changed but where the stat entry is out of date."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:224
msgid ""
-"For example, you'd want to do this after doing a 'git read-tree', to link up "
-"the stat index details with the proper files."
+"For example, you'd want to do this after doing a 'git read-tree', to link up"
+" the stat index details with the proper files."
msgstr ""
#. type: Title -
@@ -66133,7 +65974,8 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:265
-msgid "The second format is to stuff 'git ls-tree' output into the index file."
+msgid ""
+"The second format is to stuff 'git ls-tree' output into the index file."
msgstr ""
#. type: Plain text
@@ -66152,8 +65994,8 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:274
msgid ""
-"To place a higher stage entry to the index, the path should first be removed "
-"by feeding a mode=0 entry for the path, and then feeding necessary input "
+"To place a higher stage entry to the index, the path should first be removed"
+" by feeding a mode=0 entry for the path, and then feeding necessary input "
"lines in the third format."
msgstr ""
@@ -66216,12 +66058,12 @@ msgid ""
"`lstat(2)` implementation, so that `st_mtime` information for working tree "
"files can be cheaply checked to see if the file contents have changed from "
"the version recorded in the index file. Unfortunately, some filesystems "
-"have inefficient `lstat(2)`. If your filesystem is one of them, you can set "
-"\"assume unchanged\" bit to paths you have not changed to cause Git not to "
+"have inefficient `lstat(2)`. If your filesystem is one of them, you can set"
+" \"assume unchanged\" bit to paths you have not changed to cause Git not to "
"do this check. Note that setting this bit on a path does not mean Git will "
"check the contents of the file to see if it has changed -- it makes Git to "
-"omit any checking and assume it has *not* changed. When you make changes to "
-"working tree files, you have to explicitly tell Git about it by dropping "
+"omit any checking and assume it has *not* changed. When you make changes to"
+" working tree files, you have to explicitly tell Git about it by dropping "
"\"assume unchanged\" bit, either before or after you modify them."
msgstr ""
@@ -66236,14 +66078,14 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:334
msgid ""
-"The command looks at `core.ignorestat` configuration variable. When this is "
-"true, paths updated with `git update-index paths...` and paths updated with "
-"other Git commands that update both index and working tree (e.g. 'git apply "
-"--index', 'git checkout-index -u', and 'git read-tree -u') are automatically "
-"marked as \"assume unchanged\". Note that \"assume unchanged\" bit is *not* "
-"set if `git update-index --refresh` finds the working tree file matches the "
-"index (use `git update-index --really-refresh` if you want to mark them as "
-"\"assume unchanged\")."
+"The command looks at `core.ignorestat` configuration variable. When this is"
+" true, paths updated with `git update-index paths...` and paths updated with"
+" other Git commands that update both index and working tree (e.g. 'git apply"
+" --index', 'git checkout-index -u', and 'git read-tree -u') are "
+"automatically marked as \"assume unchanged\". Note that \"assume "
+"unchanged\" bit is *not* set if `git update-index --refresh` finds the "
+"working tree file matches the index (use `git update-index --really-refresh`"
+" if you want to mark them as \"assume unchanged\")."
msgstr ""
#. type: Plain text
@@ -66343,8 +66185,8 @@ msgid ""
"To elaborate, \"reading\" means checking for file existence, reading file "
"attributes or file content. The working directory version may be present or "
"absent. If present, its content may match against the index version or not. "
-"Writing is not affected by this bit, content safety is still first priority. "
-"Note that Git _can_ update working directory file, that is marked skip-"
+"Writing is not affected by this bit, content safety is still first priority."
+" Note that Git _can_ update working directory file, that is marked skip-"
"worktree, if it is safe to do so (i.e. working directory version matches "
"index version)"
msgstr ""
@@ -66373,25 +66215,25 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:403
msgid ""
-"In this mode, the index is split into two files, $GIT_DIR/index and $GIT_DIR/"
-"sharedindex.<SHA-1>. Changes are accumulated in $GIT_DIR/index, the split "
-"index, while the shared index file contains all index entries and stays "
-"unchanged."
+"In this mode, the index is split into two files, $GIT_DIR/index and "
+"$GIT_DIR/sharedindex.<SHA-1>. Changes are accumulated in $GIT_DIR/index, the"
+" split index, while the shared index file contains all index entries and "
+"stays unchanged."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:408
msgid ""
-"All changes in the split index are pushed back to the shared index file when "
-"the number of entries in the split index reaches a level specified by the "
+"All changes in the split index are pushed back to the shared index file when"
+" the number of entries in the split index reaches a level specified by the "
"splitIndex.maxPercentChange config variable (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:413
msgid ""
-"Each time a new shared index file is created, the old shared index files are "
-"deleted if their modification time is older than what is specified by the "
+"Each time a new shared index file is created, the old shared index files are"
+" deleted if their modification time is older than what is specified by the "
"splitIndex.sharedIndexExpire config variable (see linkgit:git-config[1])."
msgstr ""
@@ -66399,8 +66241,8 @@ msgstr ""
#: en/git-update-index.txt:417
msgid ""
"To avoid deleting a shared index file that is still used, its modification "
-"time is updated to the current time everytime a new split index based on the "
-"shared index file is either created or read from."
+"time is updated to the current time everytime a new split index based on the"
+" shared index file is either created or read from."
msgstr ""
#. type: Title -
@@ -66429,9 +66271,9 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:435
msgid ""
-"You can test whether the filesystem supports that with the `--test-untracked-"
-"cache` option. The `--untracked-cache` option used to implicitly perform "
-"that test in older versions of Git, but that's no longer the case."
+"You can test whether the filesystem supports that with the `--test-"
+"untracked-cache` option. The `--untracked-cache` option used to implicitly "
+"perform that test in older versions of Git, but that's no longer the case."
msgstr ""
#. type: Plain text
@@ -66440,8 +66282,8 @@ msgid ""
"If you want to enable (or disable) this feature, it is easier to use the "
"`core.untrackedCache` configuration variable (see linkgit:git-config[1]) "
"than using the `--untracked-cache` option to `git update-index` in each "
-"repository, especially if you want to do so across all repositories you use, "
-"because you can set the configuration variable to `true` (or `false`) in "
+"repository, especially if you want to do so across all repositories you use,"
+" because you can set the configuration variable to `true` (or `false`) in "
"your `$HOME/.gitconfig` just once and have it affect all repositories you "
"touch."
msgstr ""
@@ -66471,10 +66313,10 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:465
msgid ""
-"Quite similarly, if `core.symlinks` configuration variable is set to "
-"'false' (see linkgit:git-config[1]), symbolic links are checked out as plain "
-"files, and this command does not modify a recorded file mode from symbolic "
-"link to regular file."
+"Quite similarly, if `core.symlinks` configuration variable is set to 'false'"
+" (see linkgit:git-config[1]), symbolic links are checked out as plain files,"
+" and this command does not modify a recorded file mode from symbolic link to"
+" regular file."
msgstr ""
#. type: Plain text
@@ -66506,7 +66348,6 @@ msgstr ""
"La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration "
"`commit.cleanup` (voir linkgit:git-config[1])."
-#
#. type: Plain text
#: en/git-update-index.txt:483
#, fuzzy
@@ -66522,7 +66363,7 @@ msgstr ""
#: en/git-update-ref.txt:2
#, no-wrap
msgid "git-update-ref(1)"
-msgstr ""
+msgstr "git-update-ref(1)"
#. type: Plain text
#: en/git-update-ref.txt:7
@@ -66532,7 +66373,9 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:12
#, no-wrap
-msgid "'git update-ref' [-m <reason>] (-d <ref> [<oldvalue>] | [--no-deref] [--create-reflog] <ref> <newvalue> [<oldvalue>] | --stdin [-z])\n"
+msgid ""
+"'git update-ref' [-m <reason>] (-d <ref> [<oldvalue>] | [--no-deref] "
+"[--create-reflog] <ref> <newvalue> [<oldvalue>] | --stdin [-z])\n"
msgstr ""
#. type: Plain text
@@ -66567,10 +66410,10 @@ msgstr ""
msgid ""
"More importantly, it allows the update of a ref file to follow these "
"symbolic pointers, whether they are symlinks or these \"regular file "
-"symbolic refs\". It follows *real* symlinks only if they start with \"refs/"
-"\": otherwise it will just try to read them and update them as a regular "
-"file (i.e. it will allow the filesystem to follow them, but will overwrite "
-"such a symlink to somewhere else with a regular filename)."
+"symbolic refs\". It follows *real* symlinks only if they start with "
+"\"refs/\": otherwise it will just try to read them and update them as a "
+"regular file (i.e. it will allow the filesystem to follow them, but will "
+"overwrite such a symlink to somewhere else with a regular filename)."
msgstr ""
#. type: Plain text
@@ -66605,18 +66448,18 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:57
msgid ""
-"both from a symlink following standpoint *and* an error checking "
-"standpoint. The \"refs/\" rule for symlinks means that symlinks that point "
-"to \"outside\" the tree are safe: they'll be followed for reading but not "
-"for writing (so we'll never write through a ref symlink to some other tree, "
-"if you have copied a whole archive by creating a symlink tree)."
+"both from a symlink following standpoint *and* an error checking standpoint."
+" The \"refs/\" rule for symlinks means that symlinks that point to "
+"\"outside\" the tree are safe: they'll be followed for reading but not for "
+"writing (so we'll never write through a ref symlink to some other tree, if "
+"you have copied a whole archive by creating a symlink tree)."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:60
msgid ""
-"With `-d` flag, it deletes the named <ref> after verifying it still contains "
-"<oldvalue>."
+"With `-d` flag, it deletes the named <ref> after verifying it still contains"
+" <oldvalue>."
msgstr ""
#. type: Plain text
@@ -66640,23 +66483,24 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:72
msgid ""
-"With `--create-reflog`, update-ref will create a reflog for each ref even if "
-"one would not ordinarily be created."
+"With `--create-reflog`, update-ref will create a reflog for each ref even if"
+" one would not ordinarily be created."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:77
msgid ""
-"Quote fields containing whitespace as if they were strings in C source code; "
-"i.e., surrounded by double-quotes and with backslash escapes. Use 40 \"0\" "
-"characters or the empty string to specify a zero value. To specify a "
+"Quote fields containing whitespace as if they were strings in C source code;"
+" i.e., surrounded by double-quotes and with backslash escapes. Use 40 \"0\""
+" characters or the empty string to specify a zero value. To specify a "
"missing value, omit the value and its preceding SP entirely."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:80
msgid ""
-"Alternatively, use `-z` to specify in NUL-terminated format, without quoting:"
+"Alternatively, use `-z` to specify in NUL-terminated format, without "
+"quoting:"
msgstr ""
#. type: Plain text
@@ -66680,9 +66524,9 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:93
msgid ""
-"In either format, values can be specified in any form that Git recognizes as "
-"an object name. Commands in any other format or a repeated <ref> produce an "
-"error. Command meanings are:"
+"In either format, values can be specified in any form that Git recognizes as"
+" an object name. Commands in any other format or a repeated <ref> produce "
+"an error. Command meanings are:"
msgstr ""
#. type: Plain text
@@ -66709,8 +66553,8 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:107
msgid ""
-"Delete <ref> after verifying it exists with <oldvalue>, if given. If given, "
-"<oldvalue> may not be zero."
+"Delete <ref> after verifying it exists with <oldvalue>, if given. If given,"
+" <oldvalue> may not be zero."
msgstr ""
#. type: Labeled list
@@ -66722,8 +66566,8 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:111
msgid ""
-"Verify <ref> against <oldvalue> but do not change it. If <oldvalue> zero or "
-"missing, the ref must not exist."
+"Verify <ref> against <oldvalue> but do not change it. If <oldvalue> zero or"
+" missing, the ref must not exist."
msgstr ""
#. type: Labeled list
@@ -66762,8 +66606,8 @@ msgid ""
"under \"refs/heads/\", \"refs/remotes/\", \"refs/notes/\", or the symbolic "
"ref HEAD; or the file \"$GIT_DIR/logs/<ref>\" exists then `git update-ref` "
"will append a line to the log file \"$GIT_DIR/logs/<ref>\" (dereferencing "
-"all symbolic refs before creating the log name) describing the change in ref "
-"value. Log lines are formatted as:"
+"all symbolic refs before creating the log name) describing the change in ref"
+" value. Log lines are formatted as:"
msgstr ""
#. type: Plain text
@@ -66774,8 +66618,8 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:138
msgid ""
-"Where \"oldsha1\" is the 40 character hexadecimal value previously stored in "
-"<ref>, \"newsha1\" is the 40 character hexadecimal value of <newvalue> and "
+"Where \"oldsha1\" is the 40 character hexadecimal value previously stored in"
+" <ref>, \"newsha1\" is the 40 character hexadecimal value of <newvalue> and "
"\"committer\" is the committer's name, email address and date in the "
"standard Git committer ident format."
msgstr ""
@@ -66809,7 +66653,7 @@ msgstr ""
#: en/git-update-server-info.txt:2
#, no-wrap
msgid "git-update-server-info(1)"
-msgstr ""
+msgstr "git-update-server-info(1)"
#. type: Plain text
#: en/git-update-server-info.txt:7
@@ -66848,8 +66692,8 @@ msgstr ""
#. type: Plain text
#: en/git-update-server-info.txt:37
msgid ""
-"Currently the command updates the following files. Please see linkgit:"
-"gitrepository-layout[5] for description of what they are for:"
+"Currently the command updates the following files. Please see "
+"linkgit:gitrepository-layout[5] for description of what they are for:"
msgstr ""
#. type: Plain text
@@ -66866,7 +66710,7 @@ msgstr ""
#: en/git-upload-archive.txt:2
#, no-wrap
msgid "git-upload-archive(1)"
-msgstr ""
+msgstr "git-upload-archive(1)"
#. type: Plain text
#: en/git-upload-archive.txt:7
@@ -66882,8 +66726,8 @@ msgstr ""
#. type: Plain text
#: en/git-upload-archive.txt:18
msgid ""
-"Invoked by 'git archive --remote' and sends a generated archive to the other "
-"end over the Git protocol."
+"Invoked by 'git archive --remote' and sends a generated archive to the other"
+" end over the Git protocol."
msgstr ""
#. type: Plain text
@@ -66914,8 +66758,8 @@ msgstr ""
#. type: Plain text
#: en/git-upload-archive.txt:35
msgid ""
-"Clients may request a commit or tree that is pointed to directly by a ref. E."
-"g., `git archive --remote=origin v1.0`."
+"Clients may request a commit or tree that is pointed to directly by a ref. "
+"E.g., `git archive --remote=origin v1.0`."
msgstr ""
#. type: Plain text
@@ -66929,8 +66773,8 @@ msgstr ""
#: en/git-upload-archive.txt:43
msgid ""
"Clients may _not_ use other sha1 expressions, even if the end result is "
-"reachable. E.g., neither a relative commit like `master^` nor a literal sha1 "
-"like `abcd1234` is allowed, even if the result is reachable from the refs."
+"reachable. E.g., neither a relative commit like `master^` nor a literal sha1"
+" like `abcd1234` is allowed, even if the result is reachable from the refs."
msgstr ""
#. type: Plain text
@@ -66946,8 +66790,8 @@ msgstr ""
#: en/git-upload-archive.txt:54
msgid ""
"If the config option `uploadArchive.allowUnreachable` is true, these rules "
-"are ignored, and clients may use arbitrary sha1 expressions. This is useful "
-"if you do not care about the privacy of unreachable objects, or if your "
+"are ignored, and clients may use arbitrary sha1 expressions. This is useful"
+" if you do not care about the privacy of unreachable objects, or if your "
"object database is already publicly available for access via non-smart-http."
msgstr ""
@@ -66958,10 +66802,9 @@ msgstr ""
#. type: Title =
#: en/git-upload-pack.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-upload-pack(1)"
-msgstr "git-add(1)"
+msgstr "git-upload-pack(1)"
#. type: Plain text
#: en/git-upload-pack.txt:7
@@ -67006,7 +66849,7 @@ msgstr "OPTIONS"
#: en/git-upload-pack.txt:28
#, no-wrap
msgid "--[no-]strict"
-msgstr ""
+msgstr "--[no-]strict"
#. type: Plain text
#: en/git-upload-pack.txt:30
@@ -67022,7 +66865,7 @@ msgstr ""
#: en/git-upload-pack.txt:34
#, no-wrap
msgid "--stateless-rpc"
-msgstr ""
+msgstr "--stateless-rpc"
#. type: Plain text
#: en/git-upload-pack.txt:38
@@ -67036,7 +66879,7 @@ msgstr ""
#: en/git-upload-pack.txt:39
#, no-wrap
msgid "--advertise-refs"
-msgstr ""
+msgstr "--advertise-refs"
#. type: Plain text
#: en/git-upload-pack.txt:43
@@ -67060,10 +66903,9 @@ msgstr "git-commit(1)"
#. type: Title =
#: en/git-var.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-var(1)"
-msgstr "git-add(1)"
+msgstr "git-var(1)"
#. type: Plain text
#: en/git-var.txt:7
@@ -67086,8 +66928,8 @@ msgstr ""
msgid ""
"Cause the logical variables to be listed. In addition, all the variables of "
"the Git configuration file .git/config are listed as well. (However, the "
-"configuration variables listing functionality is deprecated in favor of `git "
-"config -l`.)"
+"configuration variables listing functionality is deprecated in favor of `git"
+" config -l`.)"
msgstr ""
#. type: delimited block -
@@ -67136,17 +66978,18 @@ msgstr ""
#: en/git-var.txt:48
msgid ""
"Text editor for use by Git commands. The value is meant to be interpreted "
-"by the shell when it is used. Examples: `~/bin/vi`, `"
-"$SOME_ENVIRONMENT_VARIABLE`, `\"C:\\Program Files\\Vim\\gvim.exe\" --"
-"nofork`. The order of preference is the `$GIT_EDITOR` environment variable, "
-"then `core.editor` configuration, then `$VISUAL`, then `$EDITOR`, and then "
-"the default chosen at compile time, which is usually 'vi'."
+"by the shell when it is used. Examples: `~/bin/vi`, "
+"`$SOME_ENVIRONMENT_VARIABLE`, `\"C:\\Program Files\\Vim\\gvim.exe\" "
+"--nofork`. The order of preference is the `$GIT_EDITOR` environment "
+"variable, then `core.editor` configuration, then `$VISUAL`, then `$EDITOR`, "
+"and then the default chosen at compile time, which is usually 'vi'."
msgstr ""
#. type: Plain text
#: en/git-var.txt:50
#, no-wrap
-msgid " The build you are using chose '{git-default-editor}' as the default.\n"
+msgid ""
+" The build you are using chose '{git-default-editor}' as the default.\n"
msgstr ""
#. type: Labeled list
@@ -67158,10 +67001,10 @@ msgstr ""
#. type: Plain text
#: en/git-var.txt:60
#, no-wrap
-msgid " The build you are using chose '{git-default-pager}' as the default.\n"
+msgid ""
+" The build you are using chose '{git-default-pager}' as the default.\n"
msgstr ""
-#
#. type: Plain text
#: en/git-var.txt:67
#, fuzzy
@@ -67175,10 +67018,9 @@ msgstr ""
#. type: Title =
#: en/git-verify-commit.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-verify-commit(1)"
-msgstr "git-commit(1)"
+msgstr "git-verify-commit(1)"
#. type: Plain text
#: en/git-verify-commit.txt:7
@@ -67217,7 +67059,7 @@ msgstr ""
#: en/git-verify-pack.txt:2
#, no-wrap
msgid "git-verify-pack(1)"
-msgstr ""
+msgstr "git-verify-pack(1)"
#. type: Plain text
#: en/git-verify-pack.txt:7
@@ -67259,7 +67101,7 @@ msgstr ""
#: en/git-verify-pack.txt:32
#, no-wrap
msgid "--stat-only"
-msgstr ""
+msgstr "--stat-only"
#. type: Plain text
#: en/git-verify-pack.txt:35
@@ -67304,10 +67146,9 @@ msgstr ""
#. type: Title =
#: en/git-verify-tag.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-verify-tag(1)"
-msgstr "git-commit(1)"
+msgstr "git-verify-tag(1)"
#. type: Plain text
#: en/git-verify-tag.txt:7
@@ -67521,8 +67362,8 @@ msgstr ""
#: en/git-web--browse.txt:67
msgid ""
"The web browser can be specified using a configuration variable passed with "
-"the -c (or --config) command-line option, or the `web.browser` configuration "
-"variable if the former is not used."
+"the -c (or --config) command-line option, or the `web.browser` configuration"
+" variable if the former is not used."
msgstr ""
#. type: Plain text
@@ -67540,8 +67381,8 @@ msgid ""
"When the browser, specified by options or configuration variables, is not "
"among the supported ones, then the corresponding `browser.<tool>.cmd` "
"configuration variable will be looked up. If this variable exists then 'git "
-"web{litdd}browse' will treat the specified tool as a custom command and will "
-"use a shell eval to run the command with the URLs passed as arguments."
+"web{litdd}browse' will treat the specified tool as a custom command and will"
+" use a shell eval to run the command with the URLs passed as arguments."
msgstr ""
#. type: Plain text
@@ -67555,8 +67396,8 @@ msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:97
msgid ""
-"For consistency, we also try such a trick if 'browser.konqueror.path' is set "
-"to something like 'A_PATH_TO/konqueror'. That means we will try to launch "
+"For consistency, we also try such a trick if 'browser.konqueror.path' is set"
+" to something like 'A_PATH_TO/konqueror'. That means we will try to launch "
"'A_PATH_TO/kfmclient' instead."
msgstr ""
@@ -67585,8 +67426,8 @@ msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:114
msgid ""
-"Note that these configuration variables should probably be set using the `--"
-"global` flag, for example like this:"
+"Note that these configuration variables should probably be set using the "
+"`--global` flag, for example like this:"
msgstr ""
#. type: delimited block -
@@ -67597,10 +67438,9 @@ msgstr ""
#. type: Title =
#: en/git-whatchanged.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-add(1)"
+#, no-wrap
msgid "git-whatchanged(1)"
-msgstr "git-add(1)"
+msgstr "git-whatchanged(1)"
#. type: Plain text
#: en/git-whatchanged.txt:7
@@ -67629,8 +67469,8 @@ msgstr ""
#. type: Plain text
#: en/git-whatchanged.txt:26
msgid ""
-"The command is kept primarily for historical reasons; fingers of many people "
-"who learned Git long before `git log` was invented by reading Linux kernel "
+"The command is kept primarily for historical reasons; fingers of many people"
+" who learned Git long before `git log` was invented by reading Linux kernel "
"mailing list are trained to type it."
msgstr ""
@@ -67643,8 +67483,8 @@ msgstr ""
#. type: Plain text
#: en/git-whatchanged.txt:34
msgid ""
-"Show as patches the commits since version 'v2.6.12' that changed any file in "
-"the include/scsi or drivers/scsi subdirectories"
+"Show as patches the commits since version 'v2.6.12' that changed any file in"
+" the include/scsi or drivers/scsi subdirectories"
msgstr ""
#. type: Labeled list
@@ -67662,10 +67502,9 @@ msgstr ""
#. type: Title =
#: en/git-worktree.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-worktree(1)"
-msgstr "git-commit(1)"
+msgstr "git-worktree(1)"
#. type: Plain text
#: en/git-worktree.txt:7
@@ -67704,10 +67543,10 @@ msgstr ""
msgid ""
"When you are done with a linked working tree you can simply delete it. The "
"working tree's administrative files in the repository (see \"DETAILS\" "
-"below) will eventually be removed automatically (see `gc."
-"worktreePruneExpire` in linkgit:git-config[1]), or you can run `git worktree "
-"prune` in the main or any linked working tree to clean up any stale "
-"administrative files."
+"below) will eventually be removed automatically (see "
+"`gc.worktreePruneExpire` in linkgit:git-config[1]), or you can run `git "
+"worktree prune` in the main or any linked working tree to clean up any stale"
+" administrative files."
msgstr ""
#. type: Plain text
@@ -67738,24 +67577,24 @@ msgstr ""
msgid ""
"Create `<path>` and checkout `<branch>` into it. The new working directory "
"is linked to the current repository, sharing everything except working "
-"directory specific files such as HEAD, index, etc. `-` may also be specified "
-"as `<branch>`; it is synonymous with `@{-1}`."
+"directory specific files such as HEAD, index, etc. `-` may also be specified"
+" as `<branch>`; it is synonymous with `@{-1}`."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:58
msgid ""
"If `<branch>` is omitted and neither `-b` nor `-B` nor `--detach` used, "
-"then, as a convenience, a new branch based at HEAD is created automatically, "
-"as if `-b $(basename <path>)` was specified."
+"then, as a convenience, a new branch based at HEAD is created automatically,"
+" as if `-b $(basename <path>)` was specified."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:65
msgid ""
"List details of each worktree. The main worktree is listed first, followed "
-"by each of the linked worktrees. The output details include if the worktree "
-"is bare, the revision currently checked out, and the branch currently "
+"by each of the linked worktrees. The output details include if the worktree"
+" is bare, the revision currently checked out, and the branch currently "
"checked out (or 'detached HEAD' if none)."
msgstr ""
@@ -67815,8 +67654,8 @@ msgstr "Mode interactif"
#. type: Plain text
#: en/git-worktree.txt:99
msgid ""
-"With `add`, create a new branch named `<new-branch>` starting at `<branch>`, "
-"and check out `<new-branch>` into the new working tree. If `<branch>` is "
+"With `add`, create a new branch named `<new-branch>` starting at `<branch>`,"
+" and check out `<new-branch>` into the new working tree. If `<branch>` is "
"omitted, it defaults to HEAD. By default, `-b` refuses to create a new "
"branch if it already exists. `-B` overrides this safeguard, resetting `<new-"
"branch>` to `<branch>`."
@@ -67831,10 +67670,9 @@ msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:104
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--[no-]checkout"
-msgstr "git-commit(1)"
+msgstr "--[no-]checkout"
#. type: Plain text
#: en/git-worktree.txt:109
@@ -67847,15 +67685,16 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:114
-msgid "With `prune`, do not remove anything; just report what it would remove."
+msgid ""
+"With `prune`, do not remove anything; just report what it would remove."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:119
msgid ""
"With `list`, output in an easy-to-parse format for scripts. This format "
-"will remain stable across Git versions and regardless of user "
-"configuration. See below for details."
+"will remain stable across Git versions and regardless of user configuration."
+" See below for details."
msgstr ""
#. type: Plain text
@@ -67895,9 +67734,9 @@ msgstr ""
#: en/git-worktree.txt:138
msgid ""
"If the last path components in the working tree's path is unique among "
-"working trees, it can be used to identify worktrees. For example if you only "
-"have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi"
-"\" or \"def/ghi\" is enough to point to the former working tree."
+"working trees, it can be used to identify worktrees. For example if you only"
+" have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then "
+"\"ghi\" or \"def/ghi\" is enough to point to the former working tree."
msgstr ""
#. type: Title -
@@ -67914,9 +67753,9 @@ msgid ""
"the base name of the linked working tree's path, possibly appended with a "
"number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the "
"command `git worktree add /path/other/test-next next` creates the linked "
-"working tree in `/path/other/test-next` and also creates a `$GIT_DIR/"
-"worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-"
-"next` is already taken)."
+"working tree in `/path/other/test-next` and also creates a "
+"`$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1`"
+" if `test-next` is already taken)."
msgstr ""
#. type: Plain text
@@ -67924,9 +67763,9 @@ msgstr ""
msgid ""
"Within a linked working tree, $GIT_DIR is set to point to this private "
"directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and "
-"$GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e."
-"g. `/path/main/.git`). These settings are made in a `.git` file located at "
-"the top directory of the linked working tree."
+"$GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR "
+"(e.g. `/path/main/.git`). These settings are made in a `.git` file located "
+"at the top directory of the linked working tree."
msgstr ""
#. type: Plain text
@@ -67934,11 +67773,12 @@ msgstr ""
msgid ""
"Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or "
"$GIT_COMMON_DIR depending on the path. For example, in the linked working "
-"tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-"
-"next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) "
-"while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and "
-"returns `/path/main/.git/refs/heads/master`, since refs are shared across "
-"all working trees."
+"tree `git rev-parse --git-path HEAD` returns "
+"`/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-"
+"next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path "
+"refs/heads/master` uses $GIT_COMMON_DIR and returns "
+"`/path/main/.git/refs/heads/master`, since refs are shared across all "
+"working trees."
msgstr ""
#. type: Plain text
@@ -67954,23 +67794,24 @@ msgstr ""
#: en/git-worktree.txt:176
msgid ""
"If you move a linked working tree, you need to update the 'gitdir' file in "
-"the entry's directory. For example, if a linked working tree is moved to `/"
-"newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/"
-"test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to "
-"reference `/newpath/test-next` instead."
+"the entry's directory. For example, if a linked working tree is moved to "
+"`/newpath/test-next` and its `.git` file points to "
+"`/path/main/.git/worktrees/test-next`, then update "
+"`/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-"
+"next` instead."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:187
msgid ""
-"To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful "
-"in some situations, such as when the entry's working tree is stored on a "
+"To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful"
+" in some situations, such as when the entry's working tree is stored on a "
"portable device), use the `git worktree lock` command, which adds a file "
"named 'locked' to the entry's directory. The file contains the reason in "
-"plain text. For example, if a linked working tree's `.git` file points to `/"
-"path/main/.git/worktrees/test-next` then a file named `/path/main/.git/"
-"worktrees/test-next/locked` will prevent the `test-next` entry from being "
-"pruned. See linkgit:gitrepository-layout[5] for details."
+"plain text. For example, if a linked working tree's `.git` file points to "
+"`/path/main/.git/worktrees/test-next` then a file named "
+"`/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` "
+"entry from being pruned. See linkgit:gitrepository-layout[5] for details."
msgstr ""
#. type: Title -
@@ -68005,8 +67846,8 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:207
msgid ""
-"The porcelain format has a line per attribute. Attributes are listed with a "
-"label and value separated by a single space. Boolean attributes (like "
+"The porcelain format has a line per attribute. Attributes are listed with a"
+" label and value separated by a single space. Boolean attributes (like "
"'bare' and 'detached') are listed as a label only, and are only present if "
"and only if the value is true. An empty line indicates the end of a "
"worktree. For example:"
@@ -68043,13 +67884,13 @@ msgstr ""
#: en/git-worktree.txt:233
msgid ""
"You are in the middle of a refactoring session and your boss comes in and "
-"demands that you fix something immediately. You might typically use linkgit:"
-"git-stash[1] to store your changes away temporarily, however, your working "
-"tree is in such a state of disarray (with new, moved, and removed files, and "
-"other bits and pieces strewn around) that you don't want to risk disturbing "
-"any of it. Instead, you create a temporary linked working tree to make the "
-"emergency fix, remove it when done, and then resume your earlier refactoring "
-"session."
+"demands that you fix something immediately. You might typically use "
+"linkgit:git-stash[1] to store your changes away temporarily, however, your "
+"working tree is in such a state of disarray (with new, moved, and removed "
+"files, and other bits and pieces strewn around) that you don't want to risk "
+"disturbing any of it. Instead, you create a temporary linked working tree to"
+" make the emergency fix, remove it when done, and then resume your earlier "
+"refactoring session."
msgstr ""
#. type: delimited block -
@@ -68095,12 +67936,10 @@ msgstr ""
#. type: Title =
#: en/git-write-tree.txt:2
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "git-write-tree(1)"
-msgstr "git-commit(1)"
+msgstr "git-write-tree(1)"
-#
#. type: Plain text
#: en/git-write-tree.txt:7
#, fuzzy
@@ -68129,17 +67968,17 @@ msgstr ""
#. type: Plain text
#: en/git-write-tree.txt:26
msgid ""
-"Conceptually, 'git write-tree' sync()s the current index contents into a set "
-"of tree files. In order to have that match what is actually in your "
-"directory right now, you need to have done a 'git update-index' phase before "
-"you did the 'git write-tree'."
+"Conceptually, 'git write-tree' sync()s the current index contents into a set"
+" of tree files. In order to have that match what is actually in your "
+"directory right now, you need to have done a 'git update-index' phase before"
+" you did the 'git write-tree'."
msgstr ""
#. type: Labeled list
#: en/git-write-tree.txt:30
#, no-wrap
msgid "--missing-ok"
-msgstr ""
+msgstr "--missing-ok"
#. type: Plain text
#: en/git-write-tree.txt:34
@@ -68151,8 +67990,8 @@ msgstr ""
#. type: Plain text
#: en/git-write-tree.txt:39
msgid ""
-"Writes a tree object that represents a subdirectory `<prefix>`. This can be "
-"used to write the tree object for a subproject that is in the named "
+"Writes a tree object that represents a subdirectory `<prefix>`. This can be"
+" used to write the tree object for a subproject that is in the named "
"subdirectory."
msgstr ""
@@ -68169,8 +68008,8 @@ msgid ""
"The contents of the blob objects are uninterpreted sequences of bytes. "
"There is no encoding translation at the core level."
msgstr ""
-"Le contenu des objets blob est une s챕quence d'octets non interpr챕t챕s. Il n'y "
-"a pas de conversion d'encodage au niveau de base."
+"Le contenu des objets blob est une s챕quence d'octets non interpr챕t챕s. Il n'y"
+" a pas de conversion d'encodage au niveau de base."
#. type: Plain text
#: en/i18n.txt:13
@@ -68182,8 +68021,8 @@ msgid ""
"linkgit:gitmodules[5])."
msgstr ""
"Les noms de chemins sont encod챕s en forme C de normalisation UTF-8. Ceci "
-"s'applique aux objets arbre, au fichier d'index, au noms de r챕f챕rences ainsi "
-"qu'aux noms de chemin en argument de ligne de commande, aux variables "
+"s'applique aux objets arbre, au fichier d'index, au noms de r챕f챕rences ainsi"
+" qu'aux noms de chemin en argument de ligne de commande, aux variables "
"d'environnement et aux fichiers de configuration (`.git/config` (voir "
"linkgit:git-config[1]), linkgit:gitignore[5], linkgit:gitattributes[5] and "
"linkgit:gitmodules[5])."
@@ -68191,10 +68030,10 @@ msgstr ""
#. type: Plain text
#: en/i18n.txt:23
msgid ""
-"Note that Git at the core level treats path names simply as sequences of non-"
-"NUL bytes, there are no path name encoding conversions (except on Mac and "
-"Windows). Therefore, using non-ASCII path names will mostly work even on "
-"platforms and file systems that use legacy extended ASCII encodings. "
+"Note that Git at the core level treats path names simply as sequences of "
+"non-NUL bytes, there are no path name encoding conversions (except on Mac "
+"and Windows). Therefore, using non-ASCII path names will mostly work even on"
+" platforms and file systems that use legacy extended ASCII encodings. "
"However, repositories created on such systems will not work properly on "
"UTF-8-based systems (e.g. Linux, Mac, Windows) and vice versa. "
"Additionally, many Git-based tools simply assume path names to be UTF-8 and "
@@ -68209,29 +68048,29 @@ msgstr ""
#. type: Plain text
#: en/i18n.txt:29
msgid ""
-"Commit log messages are typically encoded in UTF-8, but other extended ASCII "
-"encodings are also supported. This includes ISO-8859-x, CP125x and many "
-"others, but _not_ UTF-16/32, EBCDIC and CJK multi-byte encodings (GBK, Shift-"
-"JIS, Big5, EUC-x, CP9xx etc.)."
+"Commit log messages are typically encoded in UTF-8, but other extended ASCII"
+" encodings are also supported. This includes ISO-8859-x, CP125x and many "
+"others, but _not_ UTF-16/32, EBCDIC and CJK multi-byte encodings (GBK, "
+"Shift-JIS, Big5, EUC-x, CP9xx etc.)."
msgstr ""
"Les messages du journal des validations sont typiquement encod챕s en UTF-8, "
"mais les autres encodages d'ASCII 챕tendu sont aussi pris en charge. Ceci "
"inclut ISO-8859-x, CP125x et de nombreux autres, mais _pas_ UTF-16/32, "
-"EBCDIC ni les encodages multi-octets CJK (GBK, Shift-JIS, Big5, EUC-x, CP9xx "
-"etc.)."
+"EBCDIC ni les encodages multi-octets CJK (GBK, Shift-JIS, Big5, EUC-x, CP9xx"
+" etc.)."
#. type: Plain text
#: en/i18n.txt:36
msgid ""
"Although we encourage that the commit log messages are encoded in UTF-8, "
-"both the core and Git Porcelain are designed not to force UTF-8 on "
-"projects. If all participants of a particular project find it more "
-"convenient to use legacy encodings, Git does not forbid it. However, there "
-"are a few things to keep in mind."
-msgstr ""
-"Bien que l'usage de UTF-8 dans les messages de validation soit encourag챕, le "
-"c흹ur de Git et la porcelaine sont con챌us pour ne pas forcer l'usage d'UTF-8 "
-"dans les projets. Si tous les participants d'un projet donn챕 trouvent plus "
+"both the core and Git Porcelain are designed not to force UTF-8 on projects."
+" If all participants of a particular project find it more convenient to use"
+" legacy encodings, Git does not forbid it. However, there are a few things "
+"to keep in mind."
+msgstr ""
+"Bien que l'usage de UTF-8 dans les messages de validation soit encourag챕, le"
+" c흹ur de Git et la porcelaine sont con챌us pour ne pas forcer l'usage d'UTF-8"
+" dans les projets. Si tous les participants d'un projet donn챕 trouvent plus "
"simple d'utiliser des encodages anciens, Git ne l'interdit pas. Cependant, "
"il y a quelques d챕tails 횪 garder en t챗te."
@@ -68246,8 +68085,8 @@ msgstr ""
"`git commit` et `git commit-tree` affichent un avertissement si le message "
"de validation fourni ne semble pas 챗tre une cha챤ne de caract챔res UTF-8 "
"valide, 횪 moins que vous n'indiquiez explicitement que votre projet utilise "
-"un encodage ancien. La mani챔re de l'indiquer est d'avoir i18n.commitencoding "
-"dans `.git/config`, comme ceci혻:"
+"un encodage ancien. La mani챔re de l'indiquer est d'avoir i18n.commitencoding"
+" dans `.git/config`, comme ceci혻:"
#. type: delimited block -
#: en/i18n.txt:46
@@ -68262,10 +68101,10 @@ msgstr ""
#. type: Plain text
#: en/i18n.txt:52
msgid ""
-"Commit objects created with the above setting record the value of `i18n."
-"commitencoding` in its `encoding` header. This is to help other people who "
-"look at them later. Lack of this header implies that the commit log message "
-"is encoded in UTF-8."
+"Commit objects created with the above setting record the value of "
+"`i18n.commitencoding` in its `encoding` header. This is to help other "
+"people who look at them later. Lack of this header implies that the commit "
+"log message is encoded in UTF-8."
msgstr ""
"Les objets commit cr챕챕s avec le r챕glage ci-dessus enregistrent la valeur de "
"`i18n.commitencoding` dans leur ent챗te d'encodage `encoding`. Ceci permet "
@@ -68275,16 +68114,16 @@ msgstr ""
#. type: Plain text
#: en/i18n.txt:58
msgid ""
-"'git log', 'git show', 'git blame' and friends look at the `encoding` header "
-"of a commit object, and try to re-code the log message into UTF-8 unless "
-"otherwise specified. You can specify the desired output encoding with `i18n."
-"logoutputencoding` in `.git/config` file, like this:"
+"'git log', 'git show', 'git blame' and friends look at the `encoding` header"
+" of a commit object, and try to re-code the log message into UTF-8 unless "
+"otherwise specified. You can specify the desired output encoding with "
+"`i18n.logoutputencoding` in `.git/config` file, like this:"
msgstr ""
"Sauf indication contraire, 'git log', 'git show', 'git blame' et consort "
"lisent l'ent챗te `encoding` d'un objet commit et essaient de r챕-encoder le "
"message de validation en UTF-8. Vous pouvez sp챕cifier l'encodage de sortie "
-"que vous souhaitez avec `i18n.logoutputencoding` dans le fichier `.git/"
-"config`, comme ceci혻:"
+"que vous souhaitez avec `i18n.logoutputencoding` dans le fichier "
+"`.git/config`, comme ceci혻:"
#. type: delimited block -
#: en/i18n.txt:62
@@ -68299,8 +68138,8 @@ msgstr ""
#. type: Plain text
#: en/i18n.txt:66
msgid ""
-"If you do not have this configuration variable, the value of `i18n."
-"commitencoding` is used instead."
+"If you do not have this configuration variable, the value of "
+"`i18n.commitencoding` is used instead."
msgstr ""
"Si vous n'avez pas chang챕 cette variable de configuration, c'est la valeur "
"de `i18n.commitencoding` qui est utilis챕e."
@@ -68308,14 +68147,14 @@ msgstr ""
#. type: Plain text
#: en/i18n.txt:70
msgid ""
-"Note that we deliberately chose not to re-code the commit log message when a "
-"commit is made to force UTF-8 at the commit object level, because re-coding "
-"to UTF-8 is not necessarily a reversible operation."
+"Note that we deliberately chose not to re-code the commit log message when a"
+" commit is made to force UTF-8 at the commit object level, because re-coding"
+" to UTF-8 is not necessarily a reversible operation."
msgstr ""
-"Remarquez qu'il a 챕t챕 d챕lib챕r챕ment choisi de ne pas r챕-encoder le message de "
-"validation quand le commit est cr챕챕 pour forcer l'UTF-8 au niveau de l'objet "
-"commit parce que r챕-encoder en UTF-8 n'est pas n챕cessairement une op챕ration "
-"r챕versible."
+"Remarquez qu'il a 챕t챕 d챕lib챕r챕ment choisi de ne pas r챕-encoder le message de"
+" validation quand le commit est cr챕챕 pour forcer l'UTF-8 au niveau de "
+"l'objet commit parce que r챕-encoder en UTF-8 n'est pas n챕cessairement une "
+"op챕ration r챕versible."
#. type: Plain text
#: en/line-range-format.txt:2
@@ -68330,8 +68169,8 @@ msgstr ""
#. type: Plain text
#: en/line-range-format.txt:7
msgid ""
-"If <start> or <end> is a number, it specifies an absolute line number (lines "
-"count from 1)."
+"If <start> or <end> is a number, it specifies an absolute line number (lines"
+" count from 1)."
msgstr ""
#. type: Plain text
@@ -68342,11 +68181,11 @@ msgstr ""
#. type: Plain text
#: en/line-range-format.txt:17
msgid ""
-"This form will use the first line matching the given POSIX regex. If <start> "
-"is a regex, it will search from the end of the previous `-L` range, if any, "
-"otherwise from the start of file. If <start> is ``^/regex/'', it will "
-"search from the start of file. If <end> is a regex, it will search starting "
-"at the line given by <start>."
+"This form will use the first line matching the given POSIX regex. If <start>"
+" is a regex, it will search from the end of the previous `-L` range, if any,"
+" otherwise from the start of file. If <start> is ``^/regex/'', it will "
+"search from the start of file. If <end> is a regex, it will search starting"
+" at the line given by <start>."
msgstr ""
#. type: Plain text
@@ -68376,8 +68215,8 @@ msgstr ""
msgid ""
"If the file `.mailmap` exists at the toplevel of the repository, or at the "
"location pointed to by the mailmap.file or mailmap.blob configuration "
-"options, it is used to map author and committer names and email addresses to "
-"canonical real names and email addresses."
+"options, it is used to map author and committer names and email addresses to"
+" canonical real names and email addresses."
msgstr ""
#. type: Plain text
@@ -68441,8 +68280,8 @@ msgstr ""
#. type: Plain text
#: en/mailmap.txt:32
msgid ""
-"Example 1: Your history contains commits by two authors, Jane and Joe, whose "
-"names appear in the repository under several forms:"
+"Example 1: Your history contains commits by two authors, Jane and Joe, whose"
+" names appear in the repository under several forms:"
msgstr ""
#. type: delimited block -
@@ -68480,7 +68319,8 @@ msgstr ""
#. type: Plain text
#: en/mailmap.txt:55
-msgid "Example 2: Your repository contains commits from the following authors:"
+msgid ""
+"Example 2: Your repository contains commits from the following authors:"
msgstr ""
#. type: delimited block -
@@ -68545,12 +68385,12 @@ msgstr ""
#: en/merge-config.txt:18
msgid ""
"If merge is called without any commit argument, merge the upstream branches "
-"configured for the current branch by using their last observed values stored "
-"in their remote-tracking branches. The values of the `branch.<current "
-"branch>.merge` that name the branches at the remote named by `branch."
-"<current branch>.remote` are consulted, and then they are mapped via `remote."
-"<remote>.fetch` to their corresponding remote-tracking branches, and the "
-"tips of these tracking branches are merged."
+"configured for the current branch by using their last observed values stored"
+" in their remote-tracking branches. The values of the `branch.<current "
+"branch>.merge` that name the branches at the remote named by "
+"`branch.<current branch>.remote` are consulted, and then they are mapped via"
+" `remote.<remote>.fetch` to their corresponding remote-tracking branches, "
+"and the tips of these tracking branches are merged."
msgstr ""
#. type: Labeled list
@@ -68567,8 +68407,8 @@ msgid ""
"branch is fast-forwarded. When set to `false`, this variable tells Git to "
"create an extra merge commit in such a case (equivalent to giving the `--no-"
"ff` option from the command line). When set to `only`, only such fast-"
-"forward merges are allowed (equivalent to giving the `--ff-only` option from "
-"the command line)."
+"forward merges are allowed (equivalent to giving the `--ff-only` option from"
+" the command line)."
msgstr ""
#. type: Labeled list
@@ -68642,9 +68482,9 @@ msgstr ""
msgid ""
"Controls the amount of output shown by the recursive merge strategy. Level "
"0 outputs nothing except a final error message if conflicts were detected. "
-"Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level "
-"5 and above outputs debugging information. The default is level 2. Can be "
-"overridden by the `GIT_MERGE_VERBOSITY` environment variable."
+"Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level"
+" 5 and above outputs debugging information. The default is level 2. Can be"
+" overridden by the `GIT_MERGE_VERBOSITY` environment variable."
msgstr ""
#. type: Labeled list
@@ -68689,16 +68529,16 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:5
msgid ""
-"Perform the merge and commit the result. This option can be used to override "
-"--no-commit."
+"Perform the merge and commit the result. This option can be used to override"
+" --no-commit."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:9
msgid ""
"With --no-commit perform the merge but pretend the merge failed and do not "
-"autocommit, to give the user a chance to inspect and further tweak the merge "
-"result before committing."
+"autocommit, to give the user a chance to inspect and further tweak the merge"
+" result before committing."
msgstr ""
#. type: Plain text
@@ -68722,8 +68562,8 @@ msgstr ""
#: en/merge-options.txt:29
msgid ""
"Older scripts may depend on the historical behaviour of not allowing the "
-"user to edit the merge log message. They will see an editor opened when they "
-"run `git merge`. To make it easier to adjust such scripts to the updated "
+"user to edit the merge log message. They will see an editor opened when they"
+" run `git merge`. To make it easier to adjust such scripts to the updated "
"behaviour, the environment variable `GIT_MERGE_AUTOEDIT` can be set to `no` "
"at the beginning of them."
msgstr ""
@@ -68739,28 +68579,29 @@ msgstr ""
#: en/merge-options.txt:39
msgid ""
"Create a merge commit even when the merge resolves as a fast-forward. This "
-"is the default behaviour when merging an annotated (and possibly signed) tag."
+"is the default behaviour when merging an annotated (and possibly signed) "
+"tag."
msgstr ""
#. type: Labeled list
#: en/merge-options.txt:40
#, no-wrap
msgid "--ff-only"
-msgstr ""
+msgstr "--ff-only"
#. type: Plain text
#: en/merge-options.txt:44
msgid ""
-"Refuse to merge and exit with a non-zero status unless the current `HEAD` is "
-"already up-to-date or the merge can be resolved as a fast-forward."
+"Refuse to merge and exit with a non-zero status unless the current `HEAD` is"
+" already up-to-date or the merge can be resolved as a fast-forward."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:50
msgid ""
"In addition to branch names, populate the log message with one-line "
-"descriptions from at most <n> actual commits that are being merged. See also "
-"linkgit:git-fmt-merge-msg[1]."
+"descriptions from at most <n> actual commits that are being merged. See also"
+" linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
@@ -68786,19 +68627,19 @@ msgstr ""
#: en/merge-options.txt:64
#, no-wrap
msgid "--squash"
-msgstr ""
+msgstr "--squash"
#. type: Labeled list
#: en/merge-options.txt:65
#, no-wrap
msgid "--no-squash"
-msgstr ""
+msgstr "--no-squash"
#. type: Plain text
#: en/merge-options.txt:73
msgid ""
-"Produce the working tree and index state as if a real merge happened (except "
-"for the merge information), but do not actually make a commit, move the "
+"Produce the working tree and index state as if a real merge happened (except"
+" for the merge information), but do not actually make a commit, move the "
"`HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` "
"command to create a merge commit). This allows you to create a single "
"commit on top of the current branch whose effect is the same as merging "
@@ -68808,15 +68649,15 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:76
msgid ""
-"With --no-squash perform the merge and commit the result. This option can be "
-"used to override --squash."
+"With --no-squash perform the merge and commit the result. This option can be"
+" used to override --squash."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:84
msgid ""
-"Use the given merge strategy; can be supplied more than once to specify them "
-"in the order they should be tried. If there is no `-s` option, a built-in "
+"Use the given merge strategy; can be supplied more than once to specify them"
+" in the order they should be tried. If there is no `-s` option, a built-in "
"list of strategies is used instead ('git merge-recursive' when merging a "
"single head, 'git merge-octopus' otherwise)."
msgstr ""
@@ -68837,20 +68678,20 @@ msgstr ""
#: en/merge-options.txt:90
#, no-wrap
msgid "--verify-signatures"
-msgstr ""
+msgstr "--verify-signatures"
#. type: Labeled list
#: en/merge-options.txt:91
#, no-wrap
msgid "--no-verify-signatures"
-msgstr ""
+msgstr "--no-verify-signatures"
#. type: Plain text
#: en/merge-options.txt:97
msgid ""
"Verify that the tip commit of the side branch being merged is signed with a "
-"valid key, i.e. a key that has a valid uid: in the default trust model, this "
-"means the signing key has been signed by a trusted key. If the tip commit "
+"valid key, i.e. a key that has a valid uid: in the default trust model, this"
+" means the signing key has been signed by a trusted key. If the tip commit "
"of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
@@ -68858,7 +68699,7 @@ msgstr ""
#: en/merge-options.txt:99
#, no-wrap
msgid "--no-summary"
-msgstr ""
+msgstr "--no-summary"
#. type: Plain text
#: en/merge-options.txt:102
@@ -68892,15 +68733,15 @@ msgstr ""
#: en/merge-options.txt:121
#, no-wrap
msgid "--allow-unrelated-histories"
-msgstr ""
+msgstr "--allow-unrelated-histories"
#. type: Plain text
#: en/merge-options.txt:127
msgid ""
-"By default, `git merge` command refuses to merge histories that do not share "
-"a common ancestor. This option can be used to override this safety when "
-"merging histories of two projects that started their lives independently. As "
-"that is a very rare occasion, no configuration variable to enable this by "
+"By default, `git merge` command refuses to merge histories that do not share"
+" a common ancestor. This option can be used to override this safety when "
+"merging histories of two projects that started their lives independently. As"
+" that is a very rare occasion, no configuration variable to enable this by "
"default exists and will not be added."
msgstr ""
@@ -68913,10 +68754,10 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:8
msgid ""
-"The merge mechanism (`git merge` and `git pull` commands) allows the backend "
-"'merge strategies' to be chosen with `-s` option. Some strategies can also "
-"take their own options, which can be passed by giving `-X<option>` arguments "
-"to `git merge` and/or `git pull`."
+"The merge mechanism (`git merge` and `git pull` commands) allows the backend"
+" 'merge strategies' to be chosen with `-s` option. Some strategies can also"
+" take their own options, which can be passed by giving `-X<option>` "
+"arguments to `git merge` and/or `git pull`."
msgstr ""
#. type: Labeled list
@@ -68945,8 +68786,8 @@ msgstr ""
msgid ""
"This can only resolve two heads using a 3-way merge algorithm. When there "
"is more than one common ancestor that can be used for 3-way merge, it "
-"creates a merged tree of the common ancestors and uses that as the reference "
-"tree for the 3-way merge. This has been reported to result in fewer merge "
+"creates a merged tree of the common ancestors and uses that as the reference"
+" tree for the 3-way merge. This has been reported to result in fewer merge "
"conflicts without causing mismerges by tests done on actual merge commits "
"taken from Linux 2.6 kernel development history. Additionally this can "
"detect and handle merges involving renames. This is the default merge "
@@ -68967,8 +68808,8 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:36
msgid ""
-"This option forces conflicting hunks to be auto-resolved cleanly by favoring "
-"'our' version. Changes from the other tree that do not conflict with our "
+"This option forces conflicting hunks to be auto-resolved cleanly by favoring"
+" 'our' version. Changes from the other tree that do not conflict with our "
"side are reflected to the merge result. For a binary file, the entire "
"contents are taken from our side."
msgstr ""
@@ -68978,7 +68819,8 @@ msgstr ""
msgid ""
"This should not be confused with the 'ours' merge strategy, which does not "
"even look at what the other tree contains at all. It discards everything "
-"the other tree did, declaring 'our' history contains all that happened in it."
+"the other tree did, declaring 'our' history contains all that happened in "
+"it."
msgstr ""
#. type: Labeled list
@@ -69017,8 +68859,8 @@ msgstr ""
#: en/merge-strategies.txt:56
msgid ""
"Tells 'merge-recursive' to use a different diff algorithm, which can help "
-"avoid mismerges that occur due to unimportant matching lines (such as braces "
-"from distinct functions). See also linkgit:git-diff[1] `--diff-algorithm`."
+"avoid mismerges that occur due to unimportant matching lines (such as braces"
+" from distinct functions). See also linkgit:git-diff[1] `--diff-algorithm`."
msgstr ""
#. type: Labeled list
@@ -69044,8 +68886,8 @@ msgstr ""
msgid ""
"Treats lines with the indicated type of whitespace change as unchanged for "
"the sake of a three-way merge. Whitespace changes mixed with other changes "
-"to a line are not ignored. See also linkgit:git-diff[1] `-b`, `-w`, and `--"
-"ignore-space-at-eol`."
+"to a line are not ignored. See also linkgit:git-diff[1] `-b`, `-w`, and "
+"`--ignore-space-at-eol`."
msgstr ""
#. type: Plain text
@@ -69117,8 +68959,8 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:92
msgid ""
-"Turn on rename detection, optionally setting the similarity threshold. This "
-"is the default. See also linkgit:git-diff[1] `--find-renames`."
+"Turn on rename detection, optionally setting the similarity threshold. This"
+" is the default. See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
#. type: Labeled list
@@ -69168,8 +69010,8 @@ msgid ""
"This resolves any number of heads, but the resulting tree of the merge is "
"always that of the current branch head, effectively ignoring all changes "
"from all other branches. It is meant to be used to supersede old "
-"development history of side branches. Note that this is different from the -"
-"Xours option to the 'recursive' merge strategy."
+"development history of side branches. Note that this is different from the "
+"-Xours option to the 'recursive' merge strategy."
msgstr ""
#. type: Labeled list
@@ -69259,91 +69101,96 @@ msgstr "diff"
#. type: Plain text
#: en/mergetools-merge.txt:12
+msgid "guiffy"
+msgstr ""
+
+#. type: Plain text
+#: en/mergetools-merge.txt:13
#, fuzzy
#| msgid "diff"
msgid "gvimdiff"
msgstr "diff"
#. type: Plain text
-#: en/mergetools-merge.txt:13
+#: en/mergetools-merge.txt:14
#, fuzzy
#| msgid "diff"
msgid "gvimdiff2"
msgstr "diff"
#. type: Plain text
-#: en/mergetools-merge.txt:14
+#: en/mergetools-merge.txt:15
#, fuzzy
#| msgid "diff"
msgid "gvimdiff3"
msgstr "diff"
#. type: Plain text
-#: en/mergetools-merge.txt:15
+#: en/mergetools-merge.txt:16
#, fuzzy
#| msgid "diff"
msgid "kdiff3"
msgstr "diff"
#. type: Plain text
-#: en/mergetools-merge.txt:16
+#: en/mergetools-merge.txt:17
msgid "meld"
msgstr ""
#. type: Plain text
-#: en/mergetools-merge.txt:17
+#: en/mergetools-merge.txt:18
#, fuzzy
#| msgid "diff"
msgid "opendiff"
msgstr "diff"
#. type: Plain text
-#: en/mergetools-merge.txt:18
+#: en/mergetools-merge.txt:19
msgid "p4merge"
msgstr ""
#. type: Plain text
-#: en/mergetools-merge.txt:19
+#: en/mergetools-merge.txt:20
#, fuzzy
#| msgid "diff"
msgid "tkdiff"
msgstr "diff"
#. type: Plain text
-#: en/mergetools-merge.txt:20
+#: en/mergetools-merge.txt:21
msgid "tortoisemerge"
msgstr ""
#. type: Plain text
-#: en/mergetools-merge.txt:21
+#: en/mergetools-merge.txt:22
#, fuzzy
#| msgid "diff"
msgid "vimdiff"
msgstr "diff"
#. type: Plain text
-#: en/mergetools-merge.txt:22
+#: en/mergetools-merge.txt:23
#, fuzzy
#| msgid "diff"
msgid "vimdiff2"
msgstr "diff"
#. type: Plain text
-#: en/mergetools-merge.txt:23
+#: en/mergetools-merge.txt:24
#, fuzzy
#| msgid "diff"
msgid "vimdiff3"
msgstr "diff"
#. type: Plain text
-#: en/mergetools-merge.txt:24
+#: en/mergetools-merge.txt:25
#, fuzzy
#| msgid "git-commit(1)"
msgid "winmerge"
msgstr "git-commit(1)"
#. type: Plain text
-#: en/mergetools-merge.txt:24
+#: en/mergetools-merge.txt:25
#, fuzzy
#| msgid "diff"
msgid "xxdiff"
@@ -69359,10 +69206,10 @@ msgstr "FORMATS DE DATE"
#. type: Plain text
#: en/pretty-formats.txt:13
msgid ""
-"If the commit is a merge, and if the pretty-format is not 'oneline', 'email' "
-"or 'raw', an additional line is inserted before the 'Author:' line. This "
-"line begins with \"Merge: \" and the sha1s of ancestral commits are printed, "
-"separated by spaces. Note that the listed commits may not necessarily be "
+"If the commit is a merge, and if the pretty-format is not 'oneline', 'email'"
+" or 'raw', an additional line is inserted before the 'Author:' line. This "
+"line begins with \"Merge: \" and the sha1s of ancestral commits are printed,"
+" separated by spaces. Note that the listed commits may not necessarily be "
"the list of the *direct* parent commits if you have limited your view of "
"history: for example, if you are only interested in changes related to a "
"certain directory or file."
@@ -69371,8 +69218,8 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:20
msgid ""
-"There are several built-in formats, and you can define additional formats by "
-"setting a pretty.<name> config option to either another format name, or a "
+"There are several built-in formats, and you can define additional formats by"
+" setting a pretty.<name> config option to either another format name, or a "
"'format:' string, as described below (see linkgit:git-config[1]). Here are "
"the details of the built-in formats:"
msgstr ""
@@ -69487,8 +69334,8 @@ msgstr ""
#: en/pretty-formats.txt:86
msgid ""
"The 'raw' format shows the entire commit exactly as stored in the commit "
-"object. Notably, the SHA-1s are displayed in full, regardless of whether --"
-"abbrev or --no-abbrev are used, and 'parents' information show the true "
+"object. Notably, the SHA-1s are displayed in full, regardless of whether "
+"--abbrev or --no-abbrev are used, and 'parents' information show the true "
"parent commits, without taking grafts or history simplification into "
"account. Note that this format affects the way commits are displayed, but "
"not the way the diff is shown e.g. with `git log --raw`. To get full object "
@@ -69719,10 +69566,10 @@ msgstr ""
#: en/pretty-formats.txt:154
msgid ""
"'%G?': 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"
+"\"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: Plain text
@@ -69808,8 +69655,8 @@ msgid ""
"\"CONFIGURATION FILE\" section of linkgit:git-config[1]; adding `auto,` at "
"the beginning will emit color only when colors are 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). `auto` alone (i.e. `"
-"%C(auto)`) will turn on auto coloring on the next placeholders until the "
+"settings of the former if we are going to a terminal). `auto` alone (i.e. "
+"`%C(auto)`) will turn on auto coloring on the next placeholders until the "
"color is switched again."
msgstr ""
@@ -69875,8 +69722,8 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:204
msgid ""
-"'%><(<N>)', '%><|(<N>)': similar to '% <(<N>)', '%<|(<N>)' respectively, but "
-"padding both sides (i.e. the text is centered) -%(trailers): display the "
+"'%><(<N>)', '%><|(<N>)': similar to '% <(<N>)', '%<|(<N>)' respectively, but"
+" padding both sides (i.e. the text is centered) -%(trailers): display the "
"trailers of the body as interpreted by linkgit:git-interpret-trailers[1]"
msgstr ""
@@ -69884,10 +69731,10 @@ msgstr ""
#: en/pretty-formats.txt:211
msgid ""
"Some placeholders may depend on other options given to the revision "
-"traversal engine. For example, the `%g*` reflog options will insert an empty "
-"string unless we are traversing reflog entries (e.g., by `git log -g`). The `"
-"%d` and `%D` placeholders will use the \"short\" decoration format if `--"
-"decorate` was not already provided on the command line."
+"traversal engine. For example, the `%g*` reflog options will insert an empty"
+" string unless we are traversing reflog entries (e.g., by `git log -g`). The"
+" `%d` and `%D` placeholders will use the \"short\" decoration format if "
+"`--decorate` was not already provided on the command line."
msgstr ""
#. type: Plain text
@@ -69902,16 +69749,16 @@ msgstr ""
#: en/pretty-formats.txt:219
msgid ""
"If you add a `-` (minus sign) after '%' of a placeholder, line-feeds that "
-"immediately precede the expansion are deleted if and only if the placeholder "
-"expands to an empty string."
+"immediately precede the expansion are deleted if and only if the placeholder"
+" expands to an empty string."
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:223
msgid ""
"If you add a ` ` (space) after '%' of a placeholder, a space is inserted "
-"immediately before the expansion if and only if the placeholder expands to a "
-"non-empty string."
+"immediately before the expansion if and only if the placeholder expands to a"
+" non-empty string."
msgstr ""
#. type: Plain text
@@ -69925,8 +69772,8 @@ msgstr "Configuration"
#: en/pretty-formats.txt:233
msgid ""
"The 'tformat:' format works exactly like 'format:', except that it provides "
-"\"terminator\" semantics instead of \"separator\" semantics. In other words, "
-"each commit has the message terminator character (usually a newline) "
+"\"terminator\" semantics instead of \"separator\" semantics. In other words,"
+" each commit has the message terminator character (usually a newline) "
"appended, rather than a separator placed between entries. This means that "
"the final entry of a single-line format will be properly terminated with a "
"new line, just as the \"oneline\" format does. For example:"
@@ -70007,7 +69854,7 @@ msgstr ""
#: en/pretty-options.txt:17
#, no-wrap
msgid "--abbrev-commit"
-msgstr ""
+msgstr "--abbrev-commit"
#. type: Plain text
#: en/pretty-options.txt:22
@@ -70028,14 +69875,14 @@ msgstr ""
#: en/pretty-options.txt:26
#, no-wrap
msgid "--no-abbrev-commit"
-msgstr ""
+msgstr "--no-abbrev-commit"
#. type: Plain text
#: en/pretty-options.txt:30
msgid ""
-"Show the full 40-byte hexadecimal commit object name. This negates `--abbrev-"
-"commit` and those options which imply it such as \"--oneline\". It also "
-"overrides the `log.abbrevCommit` variable."
+"Show the full 40-byte hexadecimal commit object name. This negates "
+"`--abbrev-commit` and those options which imply it such as \"--oneline\". It"
+" also overrides the `log.abbrevCommit` variable."
msgstr ""
#. type: Plain text
@@ -70050,8 +69897,8 @@ msgid ""
"The commit objects record the encoding used for the log message in their "
"encoding header; this option can be used to tell the command to re-code the "
"commit log message in the encoding preferred by the user. For non plumbing "
-"commands this defaults to UTF-8. Note that if an object claims to be encoded "
-"in `X` and we are outputting in `X`, we will output the object verbatim; "
+"commands this defaults to UTF-8. Note that if an object claims to be encoded"
+" in `X` and we are outputting in `X`, we will output the object verbatim; "
"this means that invalid sequences in the original commit may be copied to "
"the output."
msgstr ""
@@ -70066,13 +69913,13 @@ msgstr ""
#: en/pretty-options.txt:46
#, no-wrap
msgid "--expand-tabs"
-msgstr ""
+msgstr "--expand-tabs"
#. type: Labeled list
#: en/pretty-options.txt:47
#, no-wrap
msgid "--no-expand-tabs"
-msgstr ""
+msgstr "--no-expand-tabs"
#. type: Plain text
#: en/pretty-options.txt:54
@@ -70080,8 +69927,8 @@ msgid ""
"Perform a tab expansion (replace each tab with enough spaces to fill to the "
"next display column that is multiple of '<n>') in the log message before "
"showing it in the output. `--expand-tabs` is a short-hand for `--expand-"
-"tabs=8`, and `--no-expand-tabs` is a short-hand for `--expand-tabs=0`, which "
-"disables tab expansion."
+"tabs=8`, and `--no-expand-tabs` is a short-hand for `--expand-tabs=0`, which"
+" disables tab expansion."
msgstr ""
#. type: Plain text
@@ -70102,49 +69949,49 @@ msgstr ""
msgid ""
"Show the notes (see linkgit:git-notes[1]) that annotate the commit, when "
"showing the commit log message. This is the default for `git log`, `git "
-"show` and `git whatchanged` commands when there is no `--pretty`, `--"
-"format`, or `--oneline` option given on the command line."
+"show` and `git whatchanged` commands when there is no `--pretty`, "
+"`--format`, or `--oneline` option given on the command line."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:70
msgid ""
-"By default, the notes shown are from the notes refs listed in the `core."
-"notesRef` and `notes.displayRef` variables (or corresponding environment "
-"overrides). See linkgit:git-config[1] for more details."
+"By default, the notes shown are from the notes refs listed in the "
+"`core.notesRef` and `notes.displayRef` variables (or corresponding "
+"environment overrides). See linkgit:git-config[1] for more details."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:75
msgid ""
"With an optional '<treeish>' argument, use the treeish to find the notes to "
-"display. The treeish can specify the full refname when it begins with `refs/"
-"notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` "
-"is prefixed to form a full name of the ref."
+"display. The treeish can specify the full refname when it begins with "
+"`refs/notes/`; when it begins with `notes/`, `refs/` and otherwise "
+"`refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:80
msgid ""
"Multiple --notes options can be combined to control which notes are being "
-"displayed. Examples: \"--notes=foo\" will show only notes from \"refs/notes/"
-"foo\"; \"--notes=foo --notes\" will show both notes from \"refs/notes/foo\" "
-"and from the default notes ref(s)."
+"displayed. Examples: \"--notes=foo\" will show only notes from "
+"\"refs/notes/foo\"; \"--notes=foo --notes\" will show both notes from "
+"\"refs/notes/foo\" and from the default notes ref(s)."
msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:81
#, no-wrap
msgid "--no-notes"
-msgstr ""
+msgstr "--no-notes"
#. type: Plain text
#: en/pretty-options.txt:87
msgid ""
-"Do not show notes. This negates the above `--notes` option, by resetting the "
-"list of notes refs from which notes are shown. Options are parsed in the "
-"order given on the command line, so e.g. \"--notes --notes=foo --no-notes --"
-"notes=bar\" will only show notes from \"refs/notes/bar\"."
+"Do not show notes. This negates the above `--notes` option, by resetting the"
+" list of notes refs from which notes are shown. Options are parsed in the "
+"order given on the command line, so e.g. \"--notes --notes=foo --no-notes "
+"--notes=bar\" will only show notes from \"refs/notes/bar\"."
msgstr ""
#. type: Labeled list
@@ -70157,7 +70004,7 @@ msgstr ""
#: en/pretty-options.txt:89
#, no-wrap
msgid "--[no-]standard-notes"
-msgstr ""
+msgstr "--[no-]standard-notes"
#. type: Plain text
#: en/pretty-options.txt:92
@@ -70168,10 +70015,9 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:94
-#, fuzzy, no-wrap
-#| msgid "Configuration"
+#, no-wrap
msgid "--show-signature"
-msgstr "Configuration"
+msgstr "--show-signature"
#. type: Plain text
#: en/pretty-options.txt:96
@@ -70184,8 +70030,8 @@ msgstr ""
#: en/pull-fetch-param.txt:6
msgid ""
"The \"remote\" repository that is the source of a fetch or pull operation. "
-"This parameter can be either a URL (see the section <<URLS,GIT URLS>> below) "
-"or the name of a remote (see the section <<REMOTES,REMOTES>> below)."
+"This parameter can be either a URL (see the section <<URLS,GIT URLS>> below)"
+" or the name of a remote (see the section <<REMOTES,REMOTES>> below)."
msgstr ""
#. type: Labeled list
@@ -70236,24 +70082,24 @@ msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:29
msgid ""
-"The format of a <refspec> parameter is an optional plus `+`, followed by the "
-"source ref <src>, followed by a colon `:`, followed by the destination ref "
+"The format of a <refspec> parameter is an optional plus `+`, followed by the"
+" source ref <src>, followed by a colon `:`, followed by the destination ref "
"<dst>. The colon can be omitted when <dst> is empty."
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:32
msgid ""
-"`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`; it requests "
-"fetching everything up to the given tag."
+"`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`; it requests"
+" fetching everything up to the given tag."
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:39
msgid ""
"The remote ref that matches <src> is fetched, and if <dst> is not empty "
-"string, the local ref that matches it is fast-forwarded using <src>. If the "
-"optional plus `+` is used, the local ref is updated even if it does not "
+"string, the local ref that matches it is fast-forwarded using <src>. If the"
+" optional plus `+` is used, the local ref is updated even if it does not "
"result in a fast-forward update."
msgstr ""
@@ -70278,8 +70124,8 @@ msgid ""
"in your configuration for a <repository> and running a 'git pull' command "
"without any explicit <refspec> parameters. <refspec>s listed explicitly on "
"the command line are always merged into the current branch after fetching. "
-"In other words, if you list more than one remote ref, 'git pull' will create "
-"an Octopus merge. On the other hand, if you do not list any explicit "
+"In other words, if you list more than one remote ref, 'git pull' will create"
+" an Octopus merge. On the other hand, if you do not list any explicit "
"<refspec> parameter on the command line, 'git pull' will fetch all the "
"<refspec>s it finds in the `remote.<repository>.fetch` configuration and "
"merge only the first <refspec> found into the current branch. This is "
@@ -70343,10 +70189,10 @@ msgstr ""
#: en/revisions.txt:29
msgid ""
"A symbolic ref name. E.g. 'master' typically means the commit object "
-"referenced by 'refs/heads/master'. If you happen to have both 'heads/"
-"master' and 'tags/master', you can explicitly say 'heads/master' to tell Git "
-"which one you mean. When ambiguous, a '<refname>' is disambiguated by "
-"taking the first match in the following rules:"
+"referenced by 'refs/heads/master'. If you happen to have both "
+"'heads/master' and 'tags/master', you can explicitly say 'heads/master' to "
+"tell Git which one you mean. When ambiguous, a '<refname>' is disambiguated"
+" by taking the first match in the following rules:"
msgstr ""
#. type: Plain text
@@ -70385,12 +70231,12 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:55
msgid ""
-"`HEAD` names the commit on which you based the changes in the working tree. "
-"`FETCH_HEAD` records the branch which you fetched from a remote repository "
-"with your last `git fetch` invocation. `ORIG_HEAD` is created by commands "
-"that move your `HEAD` in a drastic way, to record the position of the `HEAD` "
-"before their operation, so that you can easily change the tip of the branch "
-"back to the state before you ran them. `MERGE_HEAD` records the commit(s) "
+"`HEAD` names the commit on which you based the changes in the working tree."
+" `FETCH_HEAD` records the branch which you fetched from a remote repository"
+" with your last `git fetch` invocation. `ORIG_HEAD` is created by commands "
+"that move your `HEAD` in a drastic way, to record the position of the `HEAD`"
+" before their operation, so that you can easily change the tip of the branch"
+" back to the state before you ran them. `MERGE_HEAD` records the commit(s) "
"which you are merging into your branch when you run `git merge`. "
"`CHERRY_PICK_HEAD` records the commit which you are cherry-picking when you "
"run `git cherry-pick`."
@@ -70399,10 +70245,10 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:60
msgid ""
-"Note that any of the 'refs/*' cases above may come either from the '$GIT_DIR/"
-"refs' directory or from the '$GIT_DIR/packed-refs' file. While the ref name "
-"encoding is unspecified, UTF-8 is preferred as some output processing may "
-"assume ref names in UTF-8."
+"Note that any of the 'refs/*' cases above may come either from the "
+"'$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file. While "
+"the ref name encoding is unspecified, UTF-8 is preferred as some output "
+"processing may assume ref names in UTF-8."
msgstr ""
#. type: Labeled list
@@ -70419,20 +70265,21 @@ msgstr ""
#. type: Labeled list
#: en/revisions.txt:64
#, no-wrap
-msgid "'<refname>@{<date>}', e.g. 'master@\\{yesterday\\}', 'HEAD@{5 minutes ago}'"
+msgid ""
+"'<refname>@{<date>}', e.g. 'master@\\{yesterday\\}', 'HEAD@{5 minutes ago}'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:75
msgid ""
"A ref followed by the suffix '@' with a date specification enclosed in a "
-"brace pair (e.g. '\\{yesterday\\}', '{1 month 2 weeks 3 days 1 hour 1 second "
-"ago}' or '{1979-02-26 18:30:00}') specifies the value of the ref at a prior "
-"point in time. This suffix may only be used immediately following a ref "
+"brace pair (e.g. '\\{yesterday\\}', '{1 month 2 weeks 3 days 1 hour 1 second"
+" ago}' or '{1979-02-26 18:30:00}') specifies the value of the ref at a prior"
+" point in time. This suffix may only be used immediately following a ref "
"name and the ref must have an existing log ('$GIT_DIR/logs/<ref>'). Note "
-"that this looks up the state of your *local* ref at a given time; e.g., what "
-"was in your local 'master' branch last week. If you want to look at commits "
-"made during certain times, see `--since` and `--until`."
+"that this looks up the state of your *local* ref at a given time; e.g., what"
+" was in your local 'master' branch last week. If you want to look at commits"
+" made during certain times, see `--since` and `--until`."
msgstr ""
#. type: Labeled list
@@ -70444,8 +70291,8 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:84
msgid ""
-"A ref followed by the suffix '@' with an ordinal specification enclosed in a "
-"brace pair (e.g. '\\{1\\}', '\\{15\\}') specifies the n-th prior value of "
+"A ref followed by the suffix '@' with an ordinal specification enclosed in a"
+" brace pair (e.g. '\\{1\\}', '\\{15\\}') specifies the n-th prior value of "
"that ref. For example 'master@\\{1\\}' is the immediate prior value of "
"'master' while 'master@\\{5\\}' is the 5th prior value of 'master'. This "
"suffix may only be used immediately following a ref name and the ref must "
@@ -70462,8 +70309,8 @@ msgstr ""
#: en/revisions.txt:89
msgid ""
"You can use the '@' construct with an empty ref part to get at a reflog "
-"entry of the current branch. For example, if you are on branch 'blabla' then "
-"'@\\{1\\}' means the same as 'blabla@\\{1\\}'."
+"entry of the current branch. For example, if you are on branch 'blabla' then"
+" '@\\{1\\}' means the same as 'blabla@\\{1\\}'."
msgstr ""
#. type: Labeled list
@@ -70475,8 +70322,8 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:93
msgid ""
-"The construct '@{-<n>}' means the <n>th branch/commit checked out before the "
-"current one."
+"The construct '@{-<n>}' means the <n>th branch/commit checked out before the"
+" current one."
msgstr ""
#. type: Labeled list
@@ -70488,10 +70335,11 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:100
msgid ""
-"The suffix '@\\{upstream\\}' to a branchname (short form '<branchname>@\\{u"
-"\\}') refers to the branch that the branch specified by branchname is set "
-"to build on top of (configured with `branch.<name>.remote` and `branch."
-"<name>.merge`). A missing branchname defaults to the current one."
+"The suffix '@\\{upstream\\}' to a branchname (short form "
+"'<branchname>@\\{u\\}') refers to the branch that the branch specified by "
+"branchname is set to build on top of (configured with `branch.<name>.remote`"
+" and `branch.<name>.merge`). A missing branchname defaults to the current "
+"one."
msgstr ""
#. type: Labeled list
@@ -70503,9 +70351,9 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:107
msgid ""
-"The suffix '@\\{push}' reports the branch \"where we would push to\" if `git "
-"push` were run while `branchname` was checked out (or the current `HEAD` if "
-"no branchname is specified). Since our push destination is in a remote "
+"The suffix '@\\{push}' reports the branch \"where we would push to\" if `git"
+" push` were run while `branchname` was checked out (or the current `HEAD` if"
+" no branchname is specified). Since our push destination is in a remote "
"repository, of course, we report the local tracking branch that corresponds "
"to that branch (i.e., something in 'refs/remotes/')."
msgstr ""
@@ -70543,9 +70391,9 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:125
msgid ""
-"Note in the example that we set up a triangular workflow, where we pull from "
-"one location and push to another. In a non-triangular workflow, '@\\{push}' "
-"is the same as '@\\{upstream}', and there is no need for it."
+"Note in the example that we set up a triangular workflow, where we pull from"
+" one location and push to another. In a non-triangular workflow, '@\\{push}'"
+" is the same as '@\\{upstream}', and there is no need for it."
msgstr ""
#. type: Labeled list
@@ -70558,8 +70406,8 @@ msgstr ""
#: en/revisions.txt:133
msgid ""
"A suffix '{caret}' to a revision parameter means the first parent of that "
-"commit object. '{caret}<n>' means the <n>th parent (i.e. '<rev>{caret}' is "
-"equivalent to '<rev>{caret}1'). As a special rule, '<rev>{caret}0' means "
+"commit object. '{caret}<n>' means the <n>th parent (i.e. '<rev>{caret}' is"
+" equivalent to '<rev>{caret}1'). As a special rule, '<rev>{caret}0' means "
"the commit itself and is used when '<rev>' is the object name of a tag "
"object that refers to a commit object."
msgstr ""
@@ -70575,9 +70423,10 @@ msgstr ""
msgid ""
"A suffix '{tilde}<n>' to a revision parameter means the commit object that "
"is the <n>th generation ancestor of the named commit object, following only "
-"the first parents. I.e. '<rev>{tilde}3' is equivalent to '<rev>{caret}"
-"{caret}{caret}' which is equivalent to '<rev>{caret}1{caret}1{caret}1'. See "
-"below for an illustration of the usage of this form."
+"the first parents. I.e. '<rev>{tilde}3' is equivalent to "
+"'<rev>{caret}{caret}{caret}' which is equivalent to "
+"'<rev>{caret}1{caret}1{caret}1'. See below for an illustration of the usage"
+" of this form."
msgstr ""
#. type: Labeled list
@@ -70592,17 +70441,18 @@ msgid ""
"A suffix '{caret}' followed by an object type name enclosed in brace pair "
"means dereference the object at '<rev>' recursively until an object of type "
"'<type>' is found or the object cannot be dereferenced anymore (in which "
-"case, barf). For example, if '<rev>' is a commit-ish, '<rev>{caret}\\{commit"
-"\\}' describes the corresponding commit object. Similarly, if '<rev>' is a "
-"tree-ish, '<rev>{caret}\\{tree\\}' describes the corresponding tree object. "
-"'<rev>{caret}0' is a short-hand for '<rev>{caret}\\{commit\\}'."
+"case, barf). For example, if '<rev>' is a commit-ish, "
+"'<rev>{caret}\\{commit\\}' describes the corresponding commit object. "
+"Similarly, if '<rev>' is a tree-ish, '<rev>{caret}\\{tree\\}' describes the "
+"corresponding tree object. '<rev>{caret}0' is a short-hand for "
+"'<rev>{caret}\\{commit\\}'."
msgstr ""
#. type: Plain text
#: en/revisions.txt:158
msgid ""
-"'rev{caret}\\{object\\}' can be used to make sure 'rev' names an object that "
-"exists, without requiring 'rev' to be a tag, and without dereferencing "
+"'rev{caret}\\{object\\}' can be used to make sure 'rev' names an object that"
+" exists, without requiring 'rev' to be a tag, and without dereferencing "
"'rev'; because a tag is already an object, it does not have to be "
"dereferenced even once to get to an object."
msgstr ""
@@ -70623,8 +70473,8 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:167
msgid ""
-"A suffix '{caret}' followed by an empty brace pair means the object could be "
-"a tag, and dereference the tag recursively until a non-tag object is found."
+"A suffix '{caret}' followed by an empty brace pair means the object could be"
+" a tag, and dereference the tag recursively until a non-tag object is found."
msgstr ""
#. type: Labeled list
@@ -70638,8 +70488,8 @@ msgstr ""
msgid ""
"A suffix '{caret}' to a revision parameter, followed by a brace pair that "
"contains a text led by a slash, is the same as the ':/fix nasty bug' syntax "
-"below except that it returns the youngest matching commit which is reachable "
-"from the '<rev>' before '{caret}'."
+"below except that it returns the youngest matching commit which is reachable"
+" from the '<rev>' before '{caret}'."
msgstr ""
#. type: Labeled list
@@ -70657,8 +70507,8 @@ msgid ""
"expression can match any part of the commit message. To match messages "
"starting with a string, one can use e.g. ':/^foo'. The special sequence "
"':/!' is reserved for modifiers to what is matched. ':/!-foo' performs a "
-"negative match, while ':/!!foo' matches a literal '!' character, followed by "
-"'foo'. Any other sequence beginning with ':/!' is reserved for now."
+"negative match, while ':/!!foo' matches a literal '!' character, followed by"
+" 'foo'. Any other sequence beginning with ':/!' is reserved for now."
msgstr ""
#. type: Labeled list
@@ -70673,11 +70523,11 @@ msgid ""
"A suffix ':' followed by a path names the blob or tree at the given path in "
"the tree-ish object named by the part before the colon. ':path' (with an "
"empty part before the colon) is a special case of the syntax described "
-"next: content recorded in the index at the given path. A path starting with "
-"'./' or '../' is relative to the current working directory. The given path "
-"will be converted to be relative to the working tree's root directory. This "
-"is most useful to address a blob or tree from a commit or tree that has the "
-"same tree structure as the working tree."
+"next: content recorded in the index at the given path. A path starting with"
+" './' or '../' is relative to the current working directory. The given path"
+" will be converted to be relative to the working tree's root directory. "
+"This is most useful to address a blob or tree from a commit or tree that has"
+" the same tree structure as the working tree."
msgstr ""
#. type: Labeled list
@@ -70747,8 +70597,8 @@ msgstr ""
#: en/revisions.txt:246
msgid ""
"For these commands, specifying a single revision, using the notation "
-"described in the previous section, means the set of commits `reachable` from "
-"the given commit."
+"described in the previous section, means the set of commits `reachable` from"
+" the given commit."
msgstr ""
#. type: Plain text
@@ -70774,8 +70624,8 @@ msgstr ""
#: en/revisions.txt:259
msgid ""
"To exclude commits reachable from a commit, a prefix '{caret}' notation is "
-"used. E.g. '{caret}r1 r2' means commits reachable from 'r2' but exclude the "
-"ones reachable from 'r1' (i.e. 'r1' and its ancestors)."
+"used. E.g. '{caret}r1 r2' means commits reachable from 'r2' but exclude the"
+" ones reachable from 'r1' (i.e. 'r1' and its ancestors)."
msgstr ""
#. type: Title ~
@@ -70811,19 +70661,19 @@ msgstr ""
msgid ""
"A similar notation 'r1\\...r2' is called symmetric difference of 'r1' and "
"'r2' and is defined as 'r1 r2 --not $(git merge-base --all r1 r2)'. It is "
-"the set of commits that are reachable from either one of 'r1' (left side) or "
-"'r2' (right side) but not from both."
+"the set of commits that are reachable from either one of 'r1' (left side) or"
+" 'r2' (right side) but not from both."
msgstr ""
#. type: Plain text
#: en/revisions.txt:283
msgid ""
-"In these two shorthand notations, you can omit one end and let it default to "
-"HEAD. For example, 'origin..' is a shorthand for 'origin..HEAD' and asks "
-"\"What did I do since I forked from the origin branch?\" Similarly, '.."
-"origin' is a shorthand for 'HEAD..origin' and asks \"What did the origin do "
-"since I forked from them?\" Note that '..' would mean 'HEAD..HEAD' which is "
-"an empty range that is both reachable and unreachable from HEAD."
+"In these two shorthand notations, you can omit one end and let it default to"
+" HEAD. For example, 'origin..' is a shorthand for 'origin..HEAD' and asks "
+"\"What did I do since I forked from the origin branch?\" Similarly, "
+"'..origin' is a shorthand for 'HEAD..origin' and asks \"What did the origin "
+"do since I forked from them?\" Note that '..' would mean 'HEAD..HEAD' which "
+"is an empty range that is both reachable and unreachable from HEAD."
msgstr ""
#. type: Title ~
@@ -70857,8 +70707,8 @@ msgid ""
"The '<rev>{caret}-{<n>}' notation includes '<rev>' but excludes the <n>th "
"parent (i.e. a shorthand for '<rev>{caret}<n>..<rev>'), with '<n>' = 1 if "
"not given. This is typically useful for merge commits where you can just "
-"pass '<commit>{caret}-' to get all the commits in the branch that was merged "
-"in merge commit '<commit>' (including '<commit>' itself)."
+"pass '<commit>{caret}-' to get all the commits in the branch that was merged"
+" in merge commit '<commit>' (including '<commit>' itself)."
msgstr ""
#. type: Plain text
@@ -70884,7 +70734,8 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:311
msgid ""
-"Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
+"Include commits that are reachable from <rev> (i.e. <rev> and its "
+"ancestors)."
msgstr ""
#. type: Labeled list
@@ -70896,7 +70747,8 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:315
msgid ""
-"Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
+"Exclude commits that are reachable from <rev> (i.e. <rev> and its "
+"ancestors)."
msgstr ""
#. type: Labeled list
@@ -70909,8 +70761,8 @@ msgstr ""
#: en/revisions.txt:320
msgid ""
"Include commits that are reachable from <rev2> but exclude those that are "
-"reachable from <rev1>. When either <rev1> or <rev2> is omitted, it defaults "
-"to `HEAD`."
+"reachable from <rev1>. When either <rev1> or <rev2> is omitted, it defaults"
+" to `HEAD`."
msgstr ""
#. type: Labeled list
@@ -70936,8 +70788,8 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:330
msgid ""
-"A suffix '{caret}' followed by an at sign is the same as listing all parents "
-"of '<rev>' (meaning, include anything reachable from its parents, but not "
+"A suffix '{caret}' followed by an at sign is the same as listing all parents"
+" of '<rev>' (meaning, include anything reachable from its parents, but not "
"the commit itself)."
msgstr ""
@@ -71019,10 +70871,10 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:12
msgid ""
-"Using more options generally further limits the output (e.g. `--"
-"since=<date1>` limits to commits newer than `<date1>`, and using it with `--"
-"grep=<pattern>` further limits to commits whose log message has a line that "
-"matches `<pattern>`), unless otherwise noted."
+"Using more options generally further limits the output (e.g. "
+"`--since=<date1>` limits to commits newer than `<date1>`, and using it with "
+"`--grep=<pattern>` further limits to commits whose log message has a line "
+"that matches `<pattern>`), unless otherwise noted."
msgstr ""
#. type: Plain text
@@ -71136,9 +70988,9 @@ msgstr "status"
#: en/rev-list-options.txt:47
msgid ""
"Limit the commits output to ones with author/committer header lines that "
-"match the specified pattern (regular expression). With more than one `--"
-"author=<pattern>`, commits whose author matches any of the given patterns "
-"are chosen (similarly for multiple `--committer=<pattern>`)."
+"match the specified pattern (regular expression). With more than one "
+"`--author=<pattern>`, commits whose author matches any of the given patterns"
+" are chosen (similarly for multiple `--committer=<pattern>`)."
msgstr ""
#. type: Labeled list
@@ -71165,8 +71017,8 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:61
msgid ""
-"Limit the commits output to ones with log message that matches the specified "
-"pattern (regular expression). With more than one `--grep=<pattern>`, "
+"Limit the commits output to ones with log message that matches the specified"
+" pattern (regular expression). With more than one `--grep=<pattern>`, "
"commits whose message matches any of the given patterns are chosen (but see "
"`--all-match`)."
msgstr ""
@@ -71189,7 +71041,7 @@ msgstr ""
#: en/rev-list-options.txt:71
#, no-wrap
msgid "--invert-grep"
-msgstr ""
+msgstr "--invert-grep"
#. type: Plain text
#: en/rev-list-options.txt:74
@@ -71200,15 +71052,15 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:76
-#, fuzzy, no-wrap
-#| msgid "whitespace"
+#, no-wrap
msgid "--regexp-ignore-case"
-msgstr "whitespace"
+msgstr "--regexp-ignore-case"
#. type: Plain text
#: en/rev-list-options.txt:79
msgid ""
-"Match the regular expression limiting patterns without regard to letter case."
+"Match the regular expression limiting patterns without regard to letter "
+"case."
msgstr ""
#. type: Plain text
@@ -71221,8 +71073,8 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:88
msgid ""
-"Consider the limiting patterns to be extended regular expressions instead of "
-"the default basic regular expressions."
+"Consider the limiting patterns to be extended regular expressions instead of"
+" the default basic regular expressions."
msgstr ""
#. type: Plain text
@@ -71243,7 +71095,7 @@ msgstr ""
#: en/rev-list-options.txt:98
#, no-wrap
msgid "--remove-empty"
-msgstr ""
+msgstr "--remove-empty"
#. type: Plain text
#: en/rev-list-options.txt:100
@@ -71252,10 +71104,9 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:101
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--merges"
-msgstr "git-commit(1)"
+msgstr "--merges"
#. type: Plain text
#: en/rev-list-options.txt:103
@@ -71265,10 +71116,9 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:104
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--no-merges"
-msgstr "git-commit(1)"
+msgstr "--no-merges"
#. type: Plain text
#: en/rev-list-options.txt:107
@@ -71293,19 +71143,19 @@ msgstr ""
#: en/rev-list-options.txt:110
#, no-wrap
msgid "--no-min-parents"
-msgstr ""
+msgstr "--no-min-parents"
#. type: Labeled list
#: en/rev-list-options.txt:111
#, no-wrap
msgid "--no-max-parents"
-msgstr ""
+msgstr "--no-max-parents"
#. type: Plain text
#: en/rev-list-options.txt:116
msgid ""
-"Show only commits which have at least (or at most) that many parent commits. "
-"In particular, `--max-parents=1` is the same as `--no-merges`, `--min-"
+"Show only commits which have at least (or at most) that many parent commits."
+" In particular, `--max-parents=1` is the same as `--no-merges`, `--min-"
"parents=2` is the same as `--merges`. `--max-parents=0` gives all root "
"commits and `--min-parents=3` all octopus merges."
msgstr ""
@@ -71321,12 +71171,12 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:130
msgid ""
-"Follow only the first parent commit upon seeing a merge commit. This option "
-"can give a better overview when viewing the evolution of a particular topic "
-"branch, because merges into a topic branch tend to be only about adjusting "
+"Follow only the first parent commit upon seeing a merge commit. This option"
+" can give a better overview when viewing the evolution of a particular topic"
+" branch, because merges into a topic branch tend to be only about adjusting "
"to updated upstream from time to time, and this option allows you to ignore "
-"the individual commits brought in to your history by such a merge. Cannot be "
-"combined with --bisect."
+"the individual commits brought in to your history by such a merge. Cannot be"
+" combined with --bisect."
msgstr ""
#. type: Plain text
@@ -71352,10 +71202,10 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:144
msgid ""
-"Pretend as if all the refs in `refs/heads` are listed on the command line as "
-"'<commit>'. If '<pattern>' is given, limit branches to ones matching given "
-"shell glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the "
-"end is implied."
+"Pretend as if all the refs in `refs/heads` are listed on the command line as"
+" '<commit>'. If '<pattern>' is given, limit branches to ones matching given "
+"shell glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the"
+" end is implied."
msgstr ""
#. type: Labeled list
@@ -71368,8 +71218,8 @@ msgstr ""
#: en/rev-list-options.txt:150
msgid ""
"Pretend as if all the refs in `refs/tags` are listed on the command line as "
-"'<commit>'. If '<pattern>' is given, limit tags to ones matching given shell "
-"glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end "
+"'<commit>'. If '<pattern>' is given, limit tags to ones matching given shell"
+" glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end "
"is implied."
msgstr ""
@@ -71384,8 +71234,8 @@ msgstr ""
msgid ""
"Pretend as if all the refs in `refs/remotes` are listed on the command line "
"as '<commit>'. If '<pattern>' is given, limit remote-tracking branches to "
-"ones matching given shell glob. If pattern lacks '?', '{asterisk}', or '[', "
-"'/{asterisk}' at the end is implied."
+"ones matching given shell glob. If pattern lacks '?', '{asterisk}', or '[',"
+" '/{asterisk}' at the end is implied."
msgstr ""
#. type: Labeled list
@@ -71399,16 +71249,15 @@ msgstr ""
msgid ""
"Pretend as if all the refs matching shell glob '<glob-pattern>' are listed "
"on the command line as '<commit>'. Leading 'refs/', is automatically "
-"prepended if missing. If pattern lacks '?', '{asterisk}', or '[', '/"
-"{asterisk}' at the end is implied."
+"prepended if missing. If pattern lacks '?', '{asterisk}', or '[', "
+"'/{asterisk}' at the end is implied."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:178
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--reflog"
-msgstr "git-commit(1)"
+msgstr "--reflog"
#. type: Plain text
#: en/rev-list-options.txt:181
@@ -71420,16 +71269,15 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:185
msgid ""
-"Upon seeing an invalid object name in the input, pretend as if the bad input "
-"was not given."
+"Upon seeing an invalid object name in the input, pretend as if the bad input"
+" was not given."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:187 en/rev-list-options.txt:569
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--bisect"
-msgstr "git-commit(1)"
+msgstr "--bisect"
#. type: Plain text
#: en/rev-list-options.txt:192
@@ -71442,9 +71290,9 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:199
msgid ""
-"In addition to the '<commit>' listed on the command line, read them from the "
-"standard input. If a `--` separator is seen, stop reading commits and start "
-"reading paths to limit the result."
+"In addition to the '<commit>' listed on the command line, read them from the"
+" standard input. If a `--` separator is seen, stop reading commits and start"
+" reading paths to limit the result."
msgstr ""
#. type: Plain text
@@ -71452,35 +71300,35 @@ msgstr ""
msgid ""
"Don't print anything to standard output. This form is primarily meant to "
"allow the caller to test the exit status to see if a range of objects is "
-"fully connected (or not). It is faster than redirecting stdout to `/dev/"
-"null` as the output does not have to be formatted."
+"fully connected (or not). It is faster than redirecting stdout to "
+"`/dev/null` as the output does not have to be formatted."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:209
#, no-wrap
msgid "--cherry-mark"
-msgstr ""
+msgstr "--cherry-mark"
#. type: Plain text
#: en/rev-list-options.txt:212
msgid ""
-"Like `--cherry-pick` (see below) but mark equivalent commits with `=` rather "
-"than omitting them, and inequivalent ones with `+`."
+"Like `--cherry-pick` (see below) but mark equivalent commits with `=` rather"
+" than omitting them, and inequivalent ones with `+`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:213
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--cherry-pick"
-msgstr "git-commit(1)"
+msgstr "--cherry-pick"
#. type: Plain text
#: en/rev-list-options.txt:217
msgid ""
"Omit any commit that introduces the same change as another commit on the "
-"``other side'' when the set of commits are limited with symmetric difference."
+"``other side'' when the set of commits are limited with symmetric "
+"difference."
msgstr ""
#. type: Plain text
@@ -71498,13 +71346,13 @@ msgstr ""
#: en/rev-list-options.txt:226
#, no-wrap
msgid "--left-only"
-msgstr ""
+msgstr "--left-only"
#. type: Labeled list
#: en/rev-list-options.txt:227
#, no-wrap
msgid "--right-only"
-msgstr ""
+msgstr "--right-only"
#. type: Plain text
#: en/rev-list-options.txt:231
@@ -71516,33 +71364,32 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:237
msgid ""
-"For example, `--cherry-pick --right-only A...B` omits those commits from `B` "
-"which are in `A` or are patch-equivalent to a commit in `A`. In other words, "
-"this lists the `+` commits from `git cherry A B`. More precisely, `--cherry-"
-"pick --right-only --no-merges` gives the exact list."
+"For example, `--cherry-pick --right-only A...B` omits those commits from `B`"
+" which are in `A` or are patch-equivalent to a commit in `A`. In other "
+"words, this lists the `+` commits from `git cherry A B`. More precisely, "
+"`--cherry-pick --right-only --no-merges` gives the exact list."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:238
-#, fuzzy, no-wrap
-#| msgid "git-commit(1)"
+#, no-wrap
msgid "--cherry"
-msgstr "git-commit(1)"
+msgstr "--cherry"
#. type: Plain text
#: en/rev-list-options.txt:244
msgid ""
"A synonym for `--right-only --cherry-mark --no-merges`; useful to limit the "
"output to the commits on our side and mark those that have been applied to "
-"the other side of a forked history with `git log --cherry upstream..."
-"mybranch`, similar to `git cherry upstream mybranch`."
+"the other side of a forked history with `git log --cherry "
+"upstream...mybranch`, similar to `git cherry upstream mybranch`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:246
#, no-wrap
msgid "--walk-reflogs"
-msgstr ""
+msgstr "--walk-reflogs"
#. type: Plain text
#: en/rev-list-options.txt:252
@@ -71593,22 +71440,22 @@ msgstr ""
#: en/rev-list-options.txt:277
msgid ""
"Under `--pretty=oneline`, the commit message is prefixed with this "
-"information on the same line. This option cannot be combined with `--"
-"reverse`. See also linkgit:git-reflog[1]."
+"information on the same line. This option cannot be combined with "
+"`--reverse`. See also linkgit:git-reflog[1]."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:281
msgid ""
-"After a failed merge, show refs that touch files having a conflict and don't "
-"exist on all heads to merge."
+"After a failed merge, show refs that touch files having a conflict and don't"
+" exist on all heads to merge."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:282
#, no-wrap
msgid "--boundary"
-msgstr ""
+msgstr "--boundary"
#. type: Plain text
#: en/rev-list-options.txt:285
@@ -71620,14 +71467,14 @@ msgstr ""
#: en/rev-list-options.txt:287
#, no-wrap
msgid "--use-bitmap-index"
-msgstr ""
+msgstr "--use-bitmap-index"
#. type: Plain text
#: en/rev-list-options.txt:292
msgid ""
"Try to speed up the traversal using the pack bitmap index (if one is "
-"available). Note that when traversing with `--objects`, trees and blobs will "
-"not have their associated path printed."
+"available). Note that when traversing with `--objects`, trees and blobs will"
+" not have their associated path printed."
msgstr ""
#. type: Labeled list
@@ -71678,7 +71525,7 @@ msgstr ""
#: en/rev-list-options.txt:313
#, no-wrap
msgid "--simplify-by-decoration"
-msgstr ""
+msgstr "--simplify-by-decoration"
#. type: Plain text
#: en/rev-list-options.txt:315
@@ -71705,16 +71552,16 @@ msgstr "default"
#. type: Plain text
#: en/rev-list-options.txt:325
msgid ""
-"Simplifies the history to the simplest history explaining the final state of "
-"the tree. Simplest because it prunes some side branches if the end result is "
-"the same (i.e. merging branches with the same content)"
+"Simplifies the history to the simplest history explaining the final state of"
+" the tree. Simplest because it prunes some side branches if the end result "
+"is the same (i.e. merging branches with the same content)"
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:326
#, no-wrap
msgid "--full-history"
-msgstr ""
+msgstr "--full-history"
#. type: Plain text
#: en/rev-list-options.txt:328
@@ -71725,7 +71572,7 @@ msgstr ""
#: en/rev-list-options.txt:329 en/rev-list-options.txt:462
#, no-wrap
msgid "--dense"
-msgstr ""
+msgstr "--dense"
#. type: Plain text
#: en/rev-list-options.txt:332
@@ -71742,21 +71589,21 @@ msgstr ""
#: en/rev-list-options.txt:336 en/rev-list-options.txt:473
#, no-wrap
msgid "--simplify-merges"
-msgstr ""
+msgstr "--simplify-merges"
#. type: Plain text
#: en/rev-list-options.txt:340
msgid ""
"Additional option to `--full-history` to remove some needless merges from "
-"the resulting history, as there are no selected commits contributing to this "
-"merge."
+"the resulting history, as there are no selected commits contributing to this"
+" merge."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:341 en/rev-list-options.txt:520
#, no-wrap
msgid "--ancestry-path"
-msgstr ""
+msgstr "--ancestry-path"
#. type: Plain text
#: en/rev-list-options.txt:347
@@ -71802,16 +71649,16 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:366
msgid ""
-"The horizontal line of history A---Q is taken to be the first parent of each "
-"merge. The commits are:"
+"The horizontal line of history A---Q is taken to be the first parent of each"
+" merge. The commits are:"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:370
msgid ""
-"`I` is the initial commit, in which `foo` exists with contents ``asdf'', and "
-"a file `quux` exists with contents ``quux''. Initial commits are compared to "
-"an empty tree, so `I` is !TREESAME."
+"`I` is the initial commit, in which `foo` exists with contents ``asdf'', and"
+" a file `quux` exists with contents ``quux''. Initial commits are compared "
+"to an empty tree, so `I` is !TREESAME."
msgstr ""
#. type: Plain text
@@ -71829,8 +71676,8 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:378
msgid ""
-"`C` does not change `foo`, but its merge `N` changes it to ``foobar'', so it "
-"is not TREESAME to any parent."
+"`C` does not change `foo`, but its merge `N` changes it to ``foobar'', so it"
+" is not TREESAME to any parent."
msgstr ""
#. type: Plain text
@@ -71866,10 +71713,10 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:401
msgid ""
-"Commits are included if they are not TREESAME to any parent (though this can "
-"be changed, see `--sparse` below). If the commit was a merge, and it was "
-"TREESAME to one parent, follow only that parent. (Even if there are several "
-"TREESAME parents, follow only one of them.) Otherwise, follow all parents."
+"Commits are included if they are not TREESAME to any parent (though this can"
+" be changed, see `--sparse` below). If the commit was a merge, and it was "
+"TREESAME to one parent, follow only that parent. (Even if there are several"
+" TREESAME parents, follow only one of them.) Otherwise, follow all parents."
msgstr ""
#. type: Plain text
@@ -71890,8 +71737,8 @@ msgstr ""
#: en/rev-list-options.txt:414
msgid ""
"Note how the rule to only follow the TREESAME parent, if one is available, "
-"removed `B` from consideration entirely. `C` was considered via `N`, but is "
-"TREESAME. Root commits are compared to an empty tree, so `I` is !TREESAME."
+"removed `B` from consideration entirely. `C` was considered via `N`, but is"
+" TREESAME. Root commits are compared to an empty tree, so `I` is !TREESAME."
msgstr ""
#. type: Plain text
@@ -71947,8 +71794,8 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:441
msgid ""
-"Ordinary commits are only included if they are !TREESAME (though this can be "
-"changed, see `--sparse` below)."
+"Ordinary commits are only included if they are !TREESAME (though this can be"
+" changed, see `--sparse` below)."
msgstr ""
#. type: Plain text
@@ -72095,8 +71942,8 @@ msgstr ""
#: en/rev-list-options.txt:525
msgid ""
"Limit the displayed commits to those directly on the ancestry chain between "
-"the ``from'' and ``to'' commits in the given commit range. I.e. only display "
-"commits that are ancestor of the ``to'' commit and descendants of the "
+"the ``from'' and ``to'' commits in the given commit range. I.e. only display"
+" commits that are ancestor of the ``to'' commit and descendants of the "
"``from'' commit."
msgstr ""
@@ -72169,10 +72016,10 @@ msgstr ""
#: en/rev-list-options.txt:576
msgid ""
"Limit output to the one commit object which is roughly halfway between "
-"included and excluded commits. Note that the bad bisection ref `refs/bisect/"
-"bad` is added to the included commits (if it exists) and the good bisection "
-"refs `refs/bisect/good-*` are added to the excluded commits (if they exist). "
-"Thus, supposing there are no refs in `refs/bisect/`, if"
+"included and excluded commits. Note that the bad bisection ref "
+"`refs/bisect/bad` is added to the included commits (if it exists) and the "
+"good bisection refs `refs/bisect/good-*` are added to the excluded commits "
+"(if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
@@ -72207,7 +72054,7 @@ msgstr ""
#: en/rev-list-options.txt:593
#, no-wrap
msgid "--bisect-vars"
-msgstr ""
+msgstr "--bisect-vars"
#. type: Plain text
#: en/rev-list-options.txt:604
@@ -72215,9 +72062,9 @@ msgid ""
"This calculates the same as `--bisect`, except that refs in `refs/bisect/` "
"are not used, and except that this outputs text ready to be eval'ed by the "
"shell. These lines will assign the name of the midpoint revision to the "
-"variable `bisect_rev`, and the expected number of commits to be tested after "
-"`bisect_rev` is tested to `bisect_nr`, the expected number of commits to be "
-"tested if `bisect_rev` turns out to be good to `bisect_good`, the expected "
+"variable `bisect_rev`, and the expected number of commits to be tested after"
+" `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be"
+" tested if `bisect_rev` turns out to be good to `bisect_good`, the expected "
"number of commits to be tested if `bisect_rev` turns out to be bad to "
"`bisect_bad`, and the number of commits we are bisecting right now to "
"`bisect_all`."
@@ -72227,7 +72074,7 @@ msgstr ""
#: en/rev-list-options.txt:605
#, no-wrap
msgid "--bisect-all"
-msgstr ""
+msgstr "--bisect-all"
#. type: Plain text
#: en/rev-list-options.txt:611
@@ -72241,17 +72088,17 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:615
msgid ""
-"This is useful because it makes it easy to choose a good commit to test when "
-"you want to avoid to test some of them for some reason (they may not compile "
-"for example)."
+"This is useful because it makes it easy to choose a good commit to test when"
+" you want to avoid to test some of them for some reason (they may not "
+"compile for example)."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:619
msgid ""
"This option can be used along with `--bisect-vars`, in this case, after all "
-"the sorted commit objects, there will be the same text as if `--bisect-vars` "
-"had been used alone."
+"the sorted commit objects, there will be the same text as if `--bisect-vars`"
+" had been used alone."
msgstr ""
#. type: Title ~
@@ -72277,7 +72124,7 @@ msgstr ""
#: en/rev-list-options.txt:631
#, no-wrap
msgid "--author-date-order"
-msgstr ""
+msgstr "--author-date-order"
#. type: Plain text
#: en/rev-list-options.txt:634
@@ -72311,23 +72158,23 @@ msgstr ""
#: en/rev-list-options.txt:653
msgid ""
"where the numbers denote the order of commit timestamps, `git rev-list` and "
-"friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 "
-"4 3 2 1."
+"friends with `--date-order` show the commits in the timestamp order: 8 7 6 5"
+" 4 3 2 1."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:658
msgid ""
"With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); "
-"some older commits are shown before newer ones in order to avoid showing the "
-"commits from two parallel development track mixed together."
+"some older commits are shown before newer ones in order to avoid showing the"
+" commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:663
msgid ""
-"Output the commits chosen to be shown (see Commit Limiting section above) in "
-"reverse order. Cannot be combined with `--walk-reflogs`."
+"Output the commits chosen to be shown (see Commit Limiting section above) in"
+" reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
@@ -72343,16 +72190,15 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:670
-#, fuzzy, no-wrap
-#| msgid "git-fsck-objects(1)"
+#, no-wrap
msgid "--objects"
-msgstr "git-fsck-objects(1)"
+msgstr "--objects"
#. type: Plain text
#: en/rev-list-options.txt:675
msgid ""
-"Print the object IDs of any object referenced by the listed commits. `--"
-"objects foo ^bar` thus means ``send me all object IDs which I need to "
+"Print the object IDs of any object referenced by the listed commits. "
+"`--objects foo ^bar` thus means ``send me all object IDs which I need to "
"download if I have the commit object _bar_ but not _foo_''."
msgstr ""
@@ -72360,7 +72206,7 @@ msgstr ""
#: en/rev-list-options.txt:676
#, no-wrap
msgid "--objects-edge"
-msgstr ""
+msgstr "--objects-edge"
#. type: Plain text
#: en/rev-list-options.txt:682
@@ -72375,13 +72221,13 @@ msgstr ""
#: en/rev-list-options.txt:683
#, no-wrap
msgid "--objects-edge-aggressive"
-msgstr ""
+msgstr "--objects-edge-aggressive"
#. type: Plain text
#: en/rev-list-options.txt:687
msgid ""
-"Similar to `--objects-edge`, but it tries harder to find excluded commits at "
-"the cost of increased time. This is used instead of `--objects-edge` to "
+"Similar to `--objects-edge`, but it tries harder to find excluded commits at"
+" the cost of increased time. This is used instead of `--objects-edge` to "
"build ``thin'' packs for shallow repositories."
msgstr ""
@@ -72389,7 +72235,7 @@ msgstr ""
#: en/rev-list-options.txt:688
#, no-wrap
msgid "--indexed-objects"
-msgstr ""
+msgstr "--indexed-objects"
#. type: Plain text
#: en/rev-list-options.txt:692
@@ -72417,15 +72263,15 @@ msgid ""
"no effect if a range is specified. If the argument `unsorted` is given, the "
"commits are shown in the order they were given on the command line. "
"Otherwise (if `sorted` or no argument was given), the commits are shown in "
-"reverse chronological order by commit time. Cannot be combined with `--"
-"graph`."
+"reverse chronological order by commit time. Cannot be combined with "
+"`--graph`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:707
#, no-wrap
msgid "--do-walk"
-msgstr ""
+msgstr "--do-walk"
#. type: Plain text
#: en/rev-list-options.txt:709
@@ -72451,7 +72297,7 @@ msgstr ""
#: en/rev-list-options.txt:721
#, no-wrap
msgid "--relative-date"
-msgstr ""
+msgstr "--relative-date"
#. type: Plain text
#: en/rev-list-options.txt:723
@@ -72526,17 +72372,18 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:753
msgid ""
-"`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
+"`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` "
+"format."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:762
msgid ""
"`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 "
-"UTC), followed by a space, and then the timezone as an offset from UTC (a `"
-"+` or `-` with four digits; the first two are hours, and the second two are "
-"minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z"
-"\")`). Note that the `-local` option does not affect the seconds-since-"
+"UTC), followed by a space, and then the timezone as an offset from UTC (a "
+"`+` or `-` with four digits; the first two are hours, and the second two are"
+" minutes). I.e., as if the timestamp were formatted with `strftime(\"%s "
+"%z\")`). Note that the `-local` option does not affect the seconds-since-"
"epoch value (which is always measured in UTC), but does switch the "
"accompanying timezone value."
msgstr ""
@@ -72544,8 +72391,8 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:766
msgid ""
-"`--date=unix` shows the date as a Unix epoch timestamp (seconds since "
-"1970). As with `--raw`, this is always in UTC and therefore `-local` has no "
+"`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970)."
+" As with `--raw`, this is always in UTC and therefore `-local` has no "
"effect."
msgstr ""
@@ -72580,7 +72427,7 @@ msgstr ""
#: en/rev-list-options.txt:781
#, no-wrap
msgid "--header"
-msgstr ""
+msgstr "--header"
#. type: Plain text
#: en/rev-list-options.txt:784
@@ -72600,7 +72447,7 @@ msgstr ""
#: en/rev-list-options.txt:790
#, no-wrap
msgid "--children"
-msgstr ""
+msgstr "--children"
#. type: Plain text
#: en/rev-list-options.txt:793
@@ -72613,7 +72460,7 @@ msgstr ""
#: en/rev-list-options.txt:795
#, no-wrap
msgid "--timestamp"
-msgstr ""
+msgstr "--timestamp"
#. type: Plain text
#: en/rev-list-options.txt:797
@@ -72624,15 +72471,15 @@ msgstr ""
#: en/rev-list-options.txt:799
#, no-wrap
msgid "--left-right"
-msgstr ""
+msgstr "--left-right"
#. type: Plain text
#: en/rev-list-options.txt:804
msgid ""
"Mark which side of a symmetric difference a commit is reachable from. "
"Commits from the left side are prefixed with `<` and those from the right "
-"with `>`. If combined with `--boundary`, those commits are prefixed with `-"
-"`."
+"with `>`. If combined with `--boundary`, those commits are prefixed with "
+"`-`."
msgstr ""
#. type: Plain text
@@ -72678,13 +72525,13 @@ msgstr ""
#: en/rev-list-options.txt:828
#, no-wrap
msgid "--graph"
-msgstr ""
+msgstr "--graph"
#. type: Plain text
#: en/rev-list-options.txt:834
msgid ""
-"Draw a text-based graphical representation of the commit history on the left "
-"hand side of the output. This may cause extra lines to be printed in "
+"Draw a text-based graphical representation of the commit history on the left"
+" hand side of the output. This may cause extra lines to be printed in "
"between commits, in order for the graph history to be drawn properly. "
"Cannot be combined with `--no-walk`."
msgstr ""
@@ -72713,18 +72560,18 @@ msgid ""
"When --graph is not used, all history branches are flattened which can make "
"it hard to see that the two consecutive commits do not belong to a linear "
"branch. This option puts a barrier in between them in that case. If "
-"`<barrier>` is specified, it is the string that will be shown instead of the "
-"default one."
+"`<barrier>` is specified, it is the string that will be shown instead of the"
+" default one."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:856
msgid ""
-"Print a number stating how many commits would have been listed, and suppress "
-"all other output. When used together with `--left-right`, instead print the "
-"counts for left and right commits, separated by a tab. When used together "
-"with `--cherry-mark`, omit patch equivalent commits from these counts and "
-"print the count for equivalent commits separated by a tab."
+"Print a number stating how many commits would have been listed, and suppress"
+" all other output. When used together with `--left-right`, instead print "
+"the counts for left and right commits, separated by a tab. When used "
+"together with `--cherry-mark`, omit patch equivalent commits from these "
+"counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
@@ -72747,15 +72594,15 @@ msgstr ""
msgid ""
"With this option, diff output for a merge commit shows the differences from "
"each of the parents to the merge result simultaneously instead of showing "
-"pairwise diff between a parent and the result one at a time. Furthermore, it "
-"lists only files which were modified from all parents."
+"pairwise diff between a parent and the result one at a time. Furthermore, it"
+" lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:878
msgid ""
-"This flag implies the `-c` option and further compresses the patch output by "
-"omitting uninteresting hunks whose contents in the parents have only two "
+"This flag implies the `-c` option and further compresses the patch output by"
+" omitting uninteresting hunks whose contents in the parents have only two "
"variants and the merge result picks one of them without modification."
msgstr ""
@@ -72765,8 +72612,8 @@ msgid ""
"This flag makes the merge commits show the full diff like regular commits; "
"for each merge parent, a separate log entry and diff is generated. An "
"exception is that only diff against the first parent is shown when `--first-"
-"parent` option is given; in that case, the output represents the changes the "
-"merge brought _into_ the then-current branch."
+"parent` option is given; in that case, the output represents the changes the"
+" merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
@@ -72782,9 +72629,9 @@ msgstr ""
#. type: Plain text
#: en/sequencer.txt:5
msgid ""
-"Continue the operation in progress using the information in '.git/"
-"sequencer'. Can be used to continue after resolving conflicts in a failed "
-"cherry-pick or revert."
+"Continue the operation in progress using the information in "
+"'.git/sequencer'. Can be used to continue after resolving conflicts in a "
+"failed cherry-pick or revert."
msgstr ""
#. type: Plain text
@@ -72806,9 +72653,9 @@ msgid ""
"stealing data from the other repository that was not intended to be shared. "
"If you have private data that you need to protect from a malicious peer, "
"your best option is to store it in another repository. This applies to both "
-"clients and servers. In particular, namespaces on a server are not effective "
-"for read access control; you should only grant read access to a namespace to "
-"clients that you would trust with read access to the entire repository."
+"clients and servers. In particular, namespaces on a server are not effective"
+" for read access control; you should only grant read access to a namespace "
+"to clients that you would trust with read access to the entire repository."
msgstr ""
#. type: Plain text
@@ -72823,8 +72670,8 @@ msgid ""
"are not explicitly intended to be shared but can be used to optimize the "
"transfer if the peer also has them. The attacker chooses an object ID X to "
"steal and sends a ref to X, but isn't required to send the content of X "
-"because the victim already has it. Now the victim believes that the attacker "
-"has X, and it sends the content of X back to the attacker later. (This "
+"because the victim already has it. Now the victim believes that the attacker"
+" has X, and it sends the content of X back to the attacker later. (This "
"attack is most straightforward for a client to perform on a server, by "
"creating a ref to X in the namespace the client has access to and then "
"fetching it. The most likely way for a server to perform it on a client is "
@@ -72890,8 +72737,8 @@ msgid ""
"configured using linkgit:git-remote[1], linkgit:git-config[1] or even by a "
"manual edit to the `$GIT_DIR/config` file. The URL of this remote will be "
"used to access the repository. The refspec of this remote will be used by "
-"default when you do not provide a refspec on the command line. The entry in "
-"the config file would appear like this:"
+"default when you do not provide a refspec on the command line. The entry in"
+" the config file would appear like this:"
msgstr ""
#. type: delimited block -
@@ -72921,8 +72768,8 @@ msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:47
msgid ""
-"You can choose to provide the name of a file in `$GIT_DIR/remotes`. The URL "
-"in this file will be used to access the repository. The refspec in this "
+"You can choose to provide the name of a file in `$GIT_DIR/remotes`. The URL"
+" in this file will be used to access the repository. The refspec in this "
"file will be used as default when you do not provide a refspec on the "
"command line. This file should have the following format:"
msgstr ""
@@ -73016,9 +72863,9 @@ msgstr ""
#. type: Plain text
#: en/urls.txt:12
msgid ""
-"Git supports ssh, git, http, and https protocols (in addition, ftp, and ftps "
-"can be used for fetching, but this is inefficient and deprecated; do not use "
-"it)."
+"Git supports ssh, git, http, and https protocols (in addition, ftp, and ftps"
+" can be used for fetching, but this is inefficient and deprecated; do not "
+"use it)."
msgstr ""
#. type: Plain text
@@ -73081,8 +72928,7 @@ msgstr ""
#. type: Plain text
#: en/urls.txt:36
msgid ""
-"ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/~{startsb}"
-"user{endsb}/path/to/repo.git/"
+"ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/"
msgstr ""
#. type: Plain text
@@ -73144,8 +72990,8 @@ msgstr ""
#: en/urls.txt:66
msgid ""
"where <address> may be a path, a server and path, or an arbitrary URL-like "
-"string recognized by the specific remote helper being invoked. See linkgit:"
-"gitremote-helpers[1] for details."
+"string recognized by the specific remote helper being invoked. See "
+"linkgit:gitremote-helpers[1] for details."
msgstr ""
#. type: Plain text
@@ -73183,8 +73029,8 @@ msgstr ""
#: en/urls.txt:87
msgid ""
"a URL like \"work:repo.git\" or like \"host.xz:/path/to/repo.git\" will be "
-"rewritten in any context that takes a URL to be \"git://git.host.xz/repo.git"
-"\"."
+"rewritten in any context that takes a URL to be "
+"\"git://git.host.xz/repo.git\"."
msgstr ""
#. type: Plain text
@@ -73256,10 +73102,6 @@ msgstr ""
#~ "\tMontrer les fichiers non-suivis.\n"
#, fuzzy
-#~| msgid ""
-#~| "-v::\n"
-#~| "--verbose::\n"
-#~| " Be verbose.\n"
#~ msgid ""
#~ "-v::\n"
#~ "--verbose::\n"
@@ -73270,10 +73112,6 @@ msgstr ""
#~ " Mode bavard.\n"
#, fuzzy
-#~| msgid ""
-#~| "-v::\n"
-#~| "--verbose::\n"
-#~| " Be verbose.\n"
#~ msgid ""
#~ "-v::\n"
#~ "--verbose::\n"
@@ -73284,84 +73122,61 @@ msgstr ""
#~ " Mode bavard.\n"
#, fuzzy
-#~| msgid ""
-#~| "--branch::\n"
-#~| "\tShow the branch and tracking info even in short-format.\n"
#~ msgid ""
#~ "-b::\n"
#~ "--branch::\n"
#~ "\tShow the branch and tracking info even in short-format.\n"
#~ msgstr ""
#~ "--branch::\n"
-#~ "\tMontrer la branche et l'information de suivi, y compris en format "
-#~ "court.\n"
+#~ "\tMontrer la branche et l'information de suivi, y compris en format court.\n"
#, fuzzy
-#~| msgid "`$GIT_DIR/COMMIT_EDITMSG`"
#~ msgid "`GIT_TRACE_FSMONITOR`"
#~ msgstr "`$GIT_DIR/COMMIT_EDITMSG`"
#, fuzzy
-#~| msgid "`$GIT_DIR/COMMIT_EDITMSG`"
#~ msgid "`GIT_REDIRECT_STDIN`"
#~ msgstr "`$GIT_DIR/COMMIT_EDITMSG`"
#, fuzzy
-#~| msgid "`$GIT_DIR/COMMIT_EDITMSG`"
#~ msgid "`GIT_REDIRECT_STDOUT`"
#~ msgstr "`$GIT_DIR/COMMIT_EDITMSG`"
#, fuzzy
-#~| msgid "$ git add Documentation/\\*.txt\n"
#~ msgid "`git grep solution -- :^Documentation`"
#~ msgstr "$ git add Documentation/\\*.txt\n"
#, fuzzy
-#~| msgid ""
-#~| "The mode parameter is optional (defaults to 'all'), and is used to "
-#~| "specify the handling of untracked files; when -u is not used, the "
-#~| "default is 'normal', i.e. show untracked files and directories."
#~ msgid ""
-#~ "The mode parameter is used to specify the handling of ignored files. It "
-#~ "is optional: it defaults to 'traditional'."
+#~ "The mode parameter is used to specify the handling of ignored files. It is "
+#~ "optional: it defaults to 'traditional'."
#~ msgstr ""
-#~ "Le param챔tre de mode est optionnel (par d챕faut, 'all') et sert 횪 "
-#~ "sp챕cifier la gestion des fichiers non suivis ; quand -u n'est pas "
-#~ "utilis챕, le mode par d챕faut est 'normal', c'est-횪-dire montrer les "
-#~ "fichiers et les dossiers non-suivis."
+#~ "Le param챔tre de mode est optionnel (par d챕faut, 'all') et sert 횪 sp챕cifier "
+#~ "la gestion des fichiers non suivis ; quand -u n'est pas utilis챕, le mode par"
+#~ " d챕faut est 'normal', c'est-횪-dire montrer les fichiers et les dossiers non-"
+#~ "suivis."
#, fuzzy
-#~| msgid "'normal' - Shows untracked files and directories\n"
#~ msgid "'traditional' - Shows ignored files and directories, unless"
#~ msgstr "'normal' - Montrer les fichiers et les dossiers non-suivis\n"
#, fuzzy
-#~| msgid "'no' - Show no untracked files\n"
#~ msgid "'no'\t - Show no ignored files.\n"
#~ msgstr "'no' - Ne montrer aucun fichier non-suivi\n"
#, fuzzy
-#~| msgid "'normal' - Shows untracked files and directories\n"
#~ msgid "'matching' - Shows ignored files and directories matching an\n"
#~ msgstr "'normal' - Montrer les fichiers et les dossiers non-suivis\n"
#, fuzzy
-#~| msgid "git-add(1)"
#~ msgid "For more information about submodules, see linkgit:gitsubmodules[7]."
#~ msgstr "git-add(1)"
#, fuzzy
-#~| msgid "git-add(1)"
#~ msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
#~ msgstr "git-add(1)"
#, fuzzy
-#~| msgid ""
-#~| "-m <msg>::\n"
-#~| "--message=<msg>::\n"
-#~| "\tUse the given <msg> as the commit message.\n"
-#~| "\tIf multiple `-m` options are given, their values are\n"
-#~| "\tconcatenated as separate paragraphs.\n"
#~ msgid ""
#~ "-m <msg>;;\n"
#~ "--message=<msg>;;\n"
@@ -73375,11 +73190,6 @@ msgstr ""
#~ "\tsont concat챕n챕es comme paragraphes s챕par챕s.\n"
#, fuzzy
-#~| msgid ""
-#~| "-F <file>::\n"
-#~| "--file=<file>::\n"
-#~| "\tTake the commit message from the given file. Use '-' to\n"
-#~| "\tread the message from the standard input.\n"
#~ msgid ""
#~ "-F <filename>;;\n"
#~ "--file=<filename>;;\n"
@@ -73391,11 +73201,7 @@ msgstr ""
#~ "\tPrendre le message de validation depuis le fichier indiqu챕.\n"
#~ "\tUtilisez '-' pour lire le message depuis l'entr챕e standard.\n"
-#
#, fuzzy
-#~| msgid ""
-#~| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-#~| "merge[1], linkgit:git-commit-tree[1]"
#~ msgid ""
#~ "If true, makes linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-"
#~ "whatchanged[1] assume `--show-signature`."
@@ -73404,60 +73210,40 @@ msgstr ""
#~ "merge[1], linkgit:git-commit-tree[1]"
#, fuzzy
-#~| msgid "git-commit(1)"
#~ msgid "sendemail.tocmd"
#~ msgstr "git-commit(1)"
#, fuzzy
-#~| msgid "git-commit(1)"
#~ msgid "sendemail.smtpBatchSize"
#~ msgstr "git-commit(1)"
#, fuzzy
-#~| msgid "git-commit(1)"
#~ msgid "sendemail.smtpReloginDelay"
#~ msgstr "git-commit(1)"
#, fuzzy
-#~| msgid "status"
#~ msgid "status.showStash"
#~ msgstr "status"
#, fuzzy
-#~| msgid "git-add(1)"
#~ msgid "submodule.<name>.active"
#~ msgstr "git-add(1)"
#, fuzzy
-#~| msgid "git-add(1)"
#~ msgid "submodule.active"
#~ msgstr "git-add(1)"
#, fuzzy
-#~| msgid "git-add(1)"
#~ msgid "submodule.recurse"
#~ msgstr "git-add(1)"
#, fuzzy
-#~| msgid ""
-#~| "The default can be changed by the `commit.cleanup` configuration "
-#~| "variable (see linkgit:git-config[1])."
-#~ msgid ""
-#~ "\tIt can be changed by the `diff.colorMoved` configuration setting.\n"
+#~ msgid "\tIt can be changed by the `diff.colorMoved` configuration setting.\n"
#~ msgstr ""
#~ "La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration "
#~ "`commit.cleanup` (voir linkgit:git-config[1])."
#, fuzzy
-#~| msgid ""
-#~| "-s::\n"
-#~| "--signoff::\n"
-#~| "\tAdd Signed-off-by line by the committer at the end of the commit\n"
-#~| "\tlog message. The meaning of a signoff depends on the project,\n"
-#~| "\tbut it typically certifies that committer has\n"
-#~| "\tthe rights to submit this work under the same license and\n"
-#~| "\tagrees to a Developer Certificate of Origin\n"
-#~| "\t(see http://developercertificate.org/ for more information).\n"
#~ msgid ""
#~ "--signoff::\n"
#~ "--no-signoff::\n"
@@ -73478,20 +73264,14 @@ msgstr ""
#~ "\thttp://developercertificate.org/ pour plus d'information).\n"
#, fuzzy
-#~| msgid "EXAMPLES"
#~ msgid "EXAMPLES\n"
#~ msgstr "EXEMPLES"
#, fuzzy
-#~| msgid "status"
#~ msgid "status::\n"
#~ msgstr "status"
#, fuzzy
-#~| msgid ""
-#~| " staged unstaged path\n"
-#~| " 1: binary nothing foo.png\n"
-#~| "* 2: +403/-35 +1/-1 git-add--interactive.perl\n"
#~ msgid ""
#~ " staged unstaged path\n"
#~ " 1: binary nothing foo.png\n"
@@ -73501,97 +73281,66 @@ msgstr ""
#~ "* 2: +403/-35 +1/-1 git-add--interactive.perl\n"
#, fuzzy
-#~| msgid "diff"
#~ msgid "diff::\n"
#~ msgstr "diff"
#, fuzzy
-#~| msgid "HOOKS"
#~ msgid "HOOKS\n"
#~ msgstr "CROCHETS"
-#, fuzzy
-#~| msgid "git-commit(1)"
#~ msgid "linkgit:git-blame[1]\n"
-#~ msgstr "git-commit(1)"
+#~ msgstr "linkgit:git-blame[1]\n"
#, fuzzy
-#~| msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
#~ msgid "CONFIGURATION\n"
#~ msgstr "ENVIRONNEMENT ET VARIABLES DE CONFIGURATION"
#, fuzzy
-#~| msgid "SEE ALSO"
#~ msgid "SEE ALSO\n"
#~ msgstr "VOIR AUSSI"
-#, fuzzy
-#~| msgid "git-commit(1)"
#~ msgid "linkgit:git-annotate[1]\n"
-#~ msgstr "git-commit(1)"
+#~ msgstr "linkgit:git-annotate[1]\n"
#, fuzzy
-#~| msgid "EXAMPLES"
#~ msgid "EXAMPLE\n"
#~ msgstr "EXEMPLES"
-#, fuzzy
-#~| msgid "git-commit(1)"
#~ msgid "linkgit:git-revert[1]\n"
-#~ msgstr "git-commit(1)"
+#~ msgstr "linkgit:git-revert[1]\n"
#, fuzzy
-#~| msgid "DISCUSSION"
#~ msgid "DISCUSSION\n"
#~ msgstr "DISCUSSION"
#, fuzzy
-#~| msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
#~ msgid "ENVIRONMENT\n"
#~ msgstr "ENVIRONNEMENT ET VARIABLES DE CONFIGURATION"
#, fuzzy
-#~| msgid "DESCRIPTION"
#~ msgid "DESCRIPTION\n"
#~ msgstr "DESCRIPTION"
-#, fuzzy
-#~| msgid "git-commit(1)"
#~ msgid "linkgit:git-fast-export[1]\n"
-#~ msgstr "git-commit(1)"
+#~ msgstr "linkgit:git-fast-export[1]\n"
-#, fuzzy
-#~| msgid "git-commit(1)"
#~ msgid "linkgit:git-fetch[1]\n"
-#~ msgstr "git-commit(1)"
+#~ msgstr "linkgit:git-fetch[1]\n"
-#, fuzzy
-#~| msgid "git-commit(1)"
#~ msgid "linkgit:git-pull[1]\n"
-#~ msgstr "git-commit(1)"
+#~ msgstr "linkgit:git-pull[1]\n"
-#, fuzzy
-#~| msgid "git-commit(1)"
#~ msgid "linkgit:git-merge[1]\n"
-#~ msgstr "git-commit(1)"
+#~ msgstr "linkgit:git-merge[1]\n"
-#, fuzzy
-#~| msgid "git-commit(1)"
#~ msgid "linkgit:git-show-ref[1]\n"
-#~ msgstr "git-commit(1)"
+#~ msgstr "linkgit:git-show-ref[1]\n"
#, fuzzy
-#~| msgid ""
-#~| "Verifies the connectivity and validity of the objects in the database."
-#~ msgid ""
-#~ "Verifies the connectivity and validity of the objects in the database.\n"
-#~ msgstr ""
-#~ "V챕rifie la connectivit챕 et la validit챕 des objets en base de donn챕es."
+#~ msgid "Verifies the connectivity and validity of the objects in the database.\n"
+#~ msgstr "V챕rifie la connectivit챕 et la validit챕 des objets en base de donn챕es."
#, fuzzy
-#~| msgid ""
-#~| "The default can be changed by the `commit.cleanup` configuration "
-#~| "variable (see linkgit:git-config[1])."
#~ msgid ""
#~ "Without the `-z` option, pathnames with \"unusual\" characters are\n"
#~ "quoted as explained for the configuration variable `core.quotePath`\n"
@@ -73602,21 +73351,17 @@ msgstr ""
#~ "`commit.cleanup` (voir linkgit:git-config[1])."
#, fuzzy
-#~| msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
#~ msgid "CONFIGURATION VARIABLES\n"
#~ msgstr "ENVIRONNEMENT ET VARIABLES DE CONFIGURATION"
#, fuzzy
-#~| msgid "git-commit(1)"
#~ msgid "linkgit:gitremote-helpers[1]\n"
#~ msgstr "git-commit(1)"
#, fuzzy
-#~| msgid "git-commit(1)"
#~ msgid "linkgit:gitignore[5]\n"
#~ msgstr "git-commit(1)"
#, fuzzy
-#~| msgid "FILES"
#~ msgid "FILES\n"
#~ msgstr "FICHIERS"
diff --git a/po/documentation.pot b/po/documentation.pot
index c6c6d438e88b39eeb6448d5b3887d3312f396cd9..f9fb955536de159915625631b2370a3f3a380f7b 100644
--- a/po/documentation.pot
+++ b/po/documentation.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-01-03 23:03+0100\n"
+"POT-Creation-Date: 2019-01-04 23:29+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66576,71 +66576,76 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:12
-msgid "gvimdiff"
+msgid "guiffy"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:13
-msgid "gvimdiff2"
+msgid "gvimdiff"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:14
-msgid "gvimdiff3"
+msgid "gvimdiff2"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:15
-msgid "kdiff3"
+msgid "gvimdiff3"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:16
-msgid "meld"
+msgid "kdiff3"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:17
-msgid "opendiff"
+msgid "meld"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:18
-msgid "p4merge"
+msgid "opendiff"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:19
-msgid "tkdiff"
+msgid "p4merge"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:20
-msgid "tortoisemerge"
+msgid "tkdiff"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:21
-msgid "vimdiff"
+msgid "tortoisemerge"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:22
-msgid "vimdiff2"
+msgid "vimdiff"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:23
-msgid "vimdiff3"
+msgid "vimdiff2"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:24
+msgid "vimdiff3"
+msgstr ""
+
+#. type: Plain text
+#: en/mergetools-merge.txt:25
msgid "winmerge"
msgstr ""
#. type: Plain text
-#: en/mergetools-merge.txt:24
+#: en/mergetools-merge.txt:25
msgid "xxdiff"
msgstr ""