diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index 9153313026f1380788ecc6dd0dc3b206d1012008..9f84ea7447f1c224e58b36629511716cce80f53d 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -19,34 +19,30 @@ msgstr ""
#: en/blame-options.txt:1 en/diff-options.txt:525 en/git-instaweb.txt:44
#: en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:116
#: en/git-status.txt:31 en/git-submodule.txt:279
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-b"
msgstr "-b"
#. type: Plain text
#: en/blame-options.txt:4
-msgid ""
-"Show blank SHA-1 for boundary commits. This can also be controlled via the "
-"`blame.blankboundary` config option."
+msgid "Show blank SHA-1 for boundary commits. This can also be controlled via the `blame.blankboundary` config option."
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:5 en/git-diff-tree.txt:45 en/git-format-patch.txt:279
#: en/git-fsck.txt:38 en/git-rebase.txt:415
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--root"
msgstr "--root"
#. type: Plain text
#: en/blame-options.txt:8
-msgid ""
-"Do not treat root commits as boundaries. This can also be controlled via "
-"the `blame.showRoot` config option."
+msgid "Do not treat root commits as boundaries. This can also be controlled via the `blame.showRoot` config option."
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:9
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--show-stats"
msgstr "--show-stats"
@@ -69,16 +65,12 @@ msgstr ""
#. type: Plain text
#: en/blame-options.txt:16
-msgid ""
-"Annotate only the given line range. May be specified multiple times. "
-"Overlapping ranges are allowed."
+msgid "Annotate only the given line range. May be specified multiple times. Overlapping ranges are allowed."
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>."
+msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans from <start> to end of file. ``-L ,<end>'' spans from start of file to <end>."
msgstr ""
#. type: Labeled list
@@ -86,7 +78,7 @@ msgstr ""
#: en/git-checkout.txt:174 en/git-clone.txt:44 en/git-config.txt:159
#: en/git-grep.txt:176 en/git-instaweb.txt:23 en/git-ls-tree.txt:51
#: en/git-repack.txt:61 en/git-svn.txt:228 en/git-var.txt:20
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-l"
msgstr "-l"
@@ -100,7 +92,7 @@ msgstr ""
#: en/git-cat-file.txt:36 en/git-checkout.txt:155 en/git-diff-tree.txt:42
#: en/git-http-fetch.txt:29 en/git-ls-files.txt:112 en/git-ls-remote.txt:26
#: en/git-ls-tree.txt:47 en/git-svn.txt:296 en/rev-list-options.txt:890
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-t"
msgstr "-t"
@@ -117,8 +109,7 @@ msgstr ""
#. type: Plain text
#: en/blame-options.txt:30
-msgid ""
-"Use revisions from revs-file instead of calling linkgit:git-rev-list[1]."
+msgid "Use revisions from revs-file instead of calling linkgit:git-rev-list[1]."
msgstr ""
#. type: Labeled list
@@ -129,12 +120,7 @@ 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."
+msgid "Walk history forward instead of backward. Instead of showing the revision in which a line appeared, this shows the last revision in which a line has existed. This requires a range of revision like START..END where the path to blame exists in START. `git blame --reverse START` is taken as `git blame --reverse START..HEAD` for convenience."
msgstr ""
#. type: Labeled list
@@ -144,14 +130,14 @@ msgstr ""
#: en/git-grep.txt:222 en/git-instaweb.txt:40 en/git-merge-file.txt:63
#: en/git-rebase.txt:383 en/git-request-pull.txt:29 en/git-svn.txt:504
#: en/git-svn.txt:641 en/git.txt:591
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-p"
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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--porcelain"
msgstr "--porcelain"
@@ -162,27 +148,24 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:43
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--line-porcelain"
msgstr "--line-porcelain"
#. type: Plain text
#: en/blame-options.txt:47
-msgid ""
-"Show the porcelain format, but output commit information for each line, not "
-"just the first time a commit is referenced. Implies --porcelain."
+msgid "Show the porcelain format, but output commit information for each line, not just the first time a commit is referenced. Implies --porcelain."
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:48 en/git-pack-objects.txt:123 en/git-svn.txt:357
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--incremental"
msgstr "--incremental"
#. type: Plain text
#: en/blame-options.txt:51
-msgid ""
-"Show the result incrementally in a format designed for machine consumption."
+msgid "Show the result incrementally in a format designed for machine consumption."
msgstr ""
#. type: Labeled list
@@ -193,11 +176,7 @@ msgstr ""
#. type: Plain text
#: en/blame-options.txt:58
-msgid ""
-"Specifies the encoding used to output author names and commit summaries. "
-"Setting it to `none` makes blame output unconverted data. For more "
-"information see the discussion about encoding in the linkgit:git-log[1] "
-"manual page."
+msgid "Specifies the encoding used to output author names and commit summaries. Setting it to `none` makes blame output unconverted data. For more information see the discussion about encoding in the linkgit:git-log[1] manual page."
msgstr ""
#. type: Labeled list
@@ -208,11 +187,7 @@ msgstr ""
#. type: Plain text
#: en/blame-options.txt:65
-msgid ""
-"When <rev> is not specified, the command annotates the changes starting "
-"backwards from the working tree copy. This flag makes the command pretend "
-"as if the working tree copy has the contents of the named file (specify `-` "
-"to make the command read from the standard input)."
+msgid "When <rev> is not specified, the command annotates the changes starting backwards from the working tree copy. This flag makes the command pretend as if the working tree copy has the contents of the named file (specify `-` to make the command read from the standard input)."
msgstr ""
#. type: Labeled list
@@ -223,26 +198,18 @@ msgstr "--date <format>"
#. type: Plain text
#: en/blame-options.txt:72
-msgid ""
-"Specifies the format used to output dates. If --date is not provided, the "
-"value of the blame.date config variable is used. If the blame.date config "
-"variable is also not set, the iso format is used. For supported values, see "
-"the discussion of the --date option at linkgit:git-log[1]."
+msgid "Specifies the format used to output dates. If --date is not provided, the value of the blame.date config variable is used. If the blame.date config variable is also not set, the iso format is used. For supported values, see the discussion of the --date option at linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:73 en/git-checkout.txt:110 en/git-fsck.txt:92
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]progress"
msgstr "--[no-]progress"
#. type: Plain text
#: en/blame-options.txt:79
-msgid ""
-"Progress status is reported on the standard error stream by default when it "
-"is attached to a terminal. This flag enables progress reporting even if not "
-"attached to a terminal. Can't use `--progress` together with `--porcelain` "
-"or `--incremental`."
+msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal. This flag enables progress reporting even if not attached to a terminal. Can't use `--progress` together with `--porcelain` or `--incremental`."
msgstr ""
#. type: Labeled list
@@ -253,22 +220,12 @@ msgstr ""
#. type: Plain text
#: en/blame-options.txt:90
-msgid ""
-"Detect moved or copied lines within a file. When a commit moves or copies a "
-"block of lines (e.g. the original file has A and then B, and the commit "
-"changes it to B and then A), the traditional 'blame' algorithm notices only "
-"half of the movement and typically blames the lines that were moved up (i.e."
-" B) to the parent and assigns blame to the lines that were moved down (i.e. "
-"A) to the child commit. With this option, both groups of lines are blamed "
-"on the parent by running extra passes of inspection."
+msgid "Detect moved or copied lines within a file. When a commit moves or copies a block of lines (e.g. the original file has A and then B, and the commit changes it to B and then A), the traditional 'blame' algorithm notices only half of the movement and typically blames the lines that were moved up (i.e. B) to the parent and assigns blame to the lines that were moved down (i.e. A) to the child commit. With this option, both groups of lines are blamed on the parent by running extra passes of inspection."
msgstr ""
#. type: Plain text
#: en/blame-options.txt:95
-msgid ""
-"<num> is optional but it is the lower bound on the number of alphanumeric "
-"characters that Git must detect as moving/copying within a file for it to "
-"associate those lines with the parent commit. The default value is 20."
+msgid "<num> is optional but it is the lower bound on the number of alphanumeric characters that Git must detect as moving/copying within a file for it to associate those lines with the parent commit. The default value is 20."
msgstr ""
#. type: Labeled list
@@ -279,29 +236,18 @@ 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 "
-"that creates the file. When this option is given three times, the command "
-"additionally looks for copies from other files in any commit."
+msgid "In addition to `-M`, detect lines moved or copied from other files that were modified in the same commit. This is useful when you reorganize your program and move code around across files. When this option is given twice, the command additionally looks for copies from other files in the commit that creates the file. When this option is given three times, the command additionally looks for copies from other files in any commit."
msgstr ""
#. type: Plain text
#: en/blame-options.txt:112
-msgid ""
-"<num> is optional but it is the lower bound on the number of alphanumeric "
-"characters that Git must detect as moving/copying between files for it to "
-"associate those lines with the parent commit. And the default value is 40. "
-"If there are more than one `-C` options given, the <num> argument of the "
-"last `-C` will take effect."
+msgid "<num> is optional but it is the lower bound on the number of alphanumeric characters that Git must detect as moving/copying between files for it to associate those lines with the parent commit. And the default value is 40. If there are more than one `-C` options given, the <num> argument of the last `-C` will take effect."
msgstr ""
#. type: Labeled list
#: en/blame-options.txt:113 en/git-archimport.txt:70 en/git-cvsimport.txt:184
#: en/git-cvsserver.txt:48 en/git-grep.txt:141 en/git-ls-remote.txt:24
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-h"
msgstr "-h"
@@ -312,7 +258,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:234
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-annotate[1]"
msgstr "linkgit:git-annotate[1]"
@@ -323,7 +269,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:4 en/git-annotate.txt:31
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-blame[1]"
msgstr "linkgit:git-blame[1]"
@@ -334,7 +280,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-cherry[1]"
msgstr "linkgit:git-cherry[1]"
@@ -345,7 +291,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:10
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
@@ -356,7 +302,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:13
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
@@ -367,7 +313,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:16
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
@@ -378,7 +324,7 @@ msgstr "V챕rifie la connectivit챕 et la validit챕 des objets en base de donn챕es
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:19
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-get-tar-commit-id[1]"
msgstr "linkgit:git-get-tar-commit-id[1]"
@@ -389,7 +335,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:22
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
@@ -400,7 +346,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:25
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
@@ -411,7 +357,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:28
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
@@ -422,7 +368,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:31
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
@@ -433,7 +379,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:34
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-rev-parse[1]"
msgstr "linkgit:git-rev-parse[1]"
@@ -444,7 +390,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:37
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
@@ -455,7 +401,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:40
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
@@ -466,7 +412,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:43
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
@@ -477,7 +423,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:46
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
@@ -499,7 +445,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:142
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
@@ -510,7 +456,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1472
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -521,7 +467,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:215
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -532,7 +478,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:10
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-filter-branch[1]"
msgstr "linkgit:git-filter-branch[1]"
@@ -543,7 +489,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:139
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-mergetool[1]"
msgstr "linkgit:git-mergetool[1]"
@@ -554,7 +500,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:16
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-pack-refs[1]"
msgstr "linkgit:git-pack-refs[1]"
@@ -565,7 +511,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:19
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-prune[1]"
msgstr "linkgit:git-prune[1]"
@@ -576,7 +522,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:22
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-reflog[1]"
msgstr "linkgit:git-reflog[1]"
@@ -587,7 +533,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:25
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-remote[1]"
msgstr "linkgit:git-remote[1]"
@@ -598,7 +544,7 @@ msgstr "Gerer un ensemble de d챕p척ts suivis."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:28
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-repack[1]"
msgstr "linkgit:git-repack[1]"
@@ -609,7 +555,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:31
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-replace[1]"
msgstr "linkgit:git-replace[1]"
@@ -620,7 +566,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:1
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-archimport[1]"
msgstr "linkgit:git-archimport[1]"
@@ -631,7 +577,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:4
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-cvsexportcommit[1]"
msgstr "linkgit:git-cvsexportcommit[1]"
@@ -642,7 +588,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:7
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-cvsimport[1]"
msgstr "linkgit:git-cvsimport[1]"
@@ -653,7 +599,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:10
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-cvsserver[1]"
msgstr "linkgit:git-cvsserver[1]"
@@ -664,7 +610,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:13
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-imap-send[1]"
msgstr "linkgit:git-imap-send[1]"
@@ -675,7 +621,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:16
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-p4[1]"
msgstr "linkgit:git-p4[1]"
@@ -686,7 +632,7 @@ msgstr "Importer depuis et soumettre vers des d챕p척ts Perforce."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:19
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-quiltimport[1]"
msgstr "linkgit:git-quiltimport[1]"
@@ -697,7 +643,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:22
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-request-pull[1]"
msgstr "linkgit:git-request-pull[1]"
@@ -708,7 +654,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:25
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-send-email[1]"
msgstr "linkgit:git-send-email[1]"
@@ -719,7 +665,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:28
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-svn[1]"
msgstr "linkgit:git-svn[1]"
@@ -730,7 +676,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:185
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -741,7 +687,7 @@ msgstr "Ajouter le contenu de fichiers 횪 l'index."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:4
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-am[1]"
msgstr "linkgit:git-am[1]"
@@ -752,7 +698,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:7
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-archive[1]"
msgstr "linkgit:git-archive[1]"
@@ -763,7 +709,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:10
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-bisect[1]"
msgstr "linkgit:git-bisect[1]"
@@ -774,7 +720,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:13
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-branch[1]"
msgstr "linkgit:git-branch[1]"
@@ -785,7 +731,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:16
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-bundle[1]"
msgstr "linkgit:git-bundle[1]"
@@ -796,7 +742,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:19
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-checkout[1]"
msgstr "linkgit:git-checkout[1]"
@@ -807,7 +753,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:22 en/git-revert.txt:126
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-cherry-pick[1]"
msgstr "linkgit:git-cherry-pick[1]"
@@ -818,7 +764,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:25
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-citool[1]"
msgstr "linkgit:git-citool[1]"
@@ -829,7 +775,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:28
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-clean[1]"
msgstr "linkgit:git-clean[1]"
@@ -840,7 +786,7 @@ msgstr "Supprimer des fichiers non-suivis depuis un arbre de travail."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:31
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-clone[1]"
msgstr "linkgit:git-clone[1]"
@@ -851,7 +797,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:34
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-commit[1]"
msgstr "linkgit:git-commit[1]"
@@ -862,7 +808,7 @@ msgstr "Enregistrer les modifications dans le d챕p척t."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:37
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-describe[1]"
msgstr "linkgit:git-describe[1]"
@@ -873,7 +819,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:136
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-diff[1]"
msgstr "linkgit:git-diff[1]"
@@ -884,7 +830,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-fetch[1]"
msgstr "linkgit:git-fetch[1]"
@@ -895,7 +841,7 @@ msgstr "T챕l챕charger les objets et r챕f챕rences depuis un autre d챕p척t."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:46
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-format-patch[1]"
msgstr "linkgit:git-format-patch[1]"
@@ -906,7 +852,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:49
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-gc[1]"
msgstr "linkgit:git-gc[1]"
@@ -917,7 +863,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:52
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-grep[1]"
msgstr "linkgit:git-grep[1]"
@@ -928,7 +874,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:55
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-gui[1]"
msgstr "linkgit:git-gui[1]"
@@ -939,7 +885,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:58
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-init[1]"
msgstr "linkgit:git-init[1]"
@@ -950,7 +896,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:61
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-log[1]"
msgstr "linkgit:git-log[1]"
@@ -961,7 +907,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:64 en/git-fmt-merge-msg.txt:75
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-merge[1]"
msgstr "linkgit:git-merge[1]"
@@ -972,7 +918,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:67
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-mv[1]"
msgstr "linkgit:git-mv[1]"
@@ -983,7 +929,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:70
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-notes[1]"
msgstr "linkgit:git-notes[1]"
@@ -994,7 +940,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:73 en/git-fetch.txt:209
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-pull[1]"
msgstr "linkgit:git-pull[1]"
@@ -1005,7 +951,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:76
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-push[1]"
msgstr "linkgit:git-push[1]"
@@ -1016,7 +962,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:79 en/git-svn.txt:1133
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-rebase[1]"
msgstr "linkgit:git-rebase[1]"
@@ -1027,7 +973,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:82
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-reset[1]"
msgstr "linkgit:git-reset[1]"
@@ -1038,7 +984,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:85 en/git-cherry-pick.txt:230
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-revert[1]"
msgstr "linkgit:git-revert[1]"
@@ -1049,7 +995,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:88
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-rm[1]"
msgstr "linkgit:git-rm[1]"
@@ -1060,7 +1006,7 @@ msgstr "Supprimer des fichiers d'un arbre de travail ou de l'index."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:91
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-shortlog[1]"
msgstr "linkgit:git-shortlog[1]"
@@ -1071,7 +1017,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:94
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-show[1]"
msgstr "linkgit:git-show[1]"
@@ -1082,7 +1028,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:97
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
@@ -1093,7 +1039,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:100
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
@@ -1104,7 +1050,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
@@ -1115,7 +1061,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:106
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
@@ -1126,7 +1072,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:109
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
@@ -1148,7 +1094,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:1
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-cat-file[1]"
msgstr "linkgit:git-cat-file[1]"
@@ -1159,7 +1105,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:4
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-diff-files[1]"
msgstr "linkgit:git-diff-files[1]"
@@ -1170,7 +1116,7 @@ msgstr "Comparer des fichiers dans l'arbre de travail et l'index."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:7
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-diff-index[1]"
msgstr "linkgit:git-diff-index[1]"
@@ -1181,7 +1127,7 @@ msgstr "Comparer un arbre 횪 l'arbre de travail ou l'index."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:10
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-diff-tree[1]"
msgstr "linkgit:git-diff-tree[1]"
@@ -1192,7 +1138,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:13
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-for-each-ref[1]"
msgstr "linkgit:git-for-each-ref[1]"
@@ -1203,7 +1149,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:16
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-ls-files[1]"
msgstr "linkgit:git-ls-files[1]"
@@ -1214,7 +1160,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:19
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-ls-remote[1]"
msgstr "linkgit:git-ls-remote[1]"
@@ -1225,7 +1171,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:22
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-ls-tree[1]"
msgstr "linkgit:git-ls-tree[1]"
@@ -1236,7 +1182,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:25
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-merge-base[1]"
msgstr "linkgit:git-merge-base[1]"
@@ -1247,7 +1193,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:28
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-name-rev[1]"
msgstr "linkgit:git-name-rev[1]"
@@ -1258,7 +1204,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:31
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-pack-redundant[1]"
msgstr "linkgit:git-pack-redundant[1]"
@@ -1269,7 +1215,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:34
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-rev-list[1]"
msgstr "linkgit:git-rev-list[1]"
@@ -1280,7 +1226,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:37
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-show-index[1]"
msgstr "linkgit:git-show-index[1]"
@@ -1291,7 +1237,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:40 en/git-for-each-ref.txt:341
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-show-ref[1]"
msgstr "linkgit:git-show-ref[1]"
@@ -1302,7 +1248,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:43
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-unpack-file[1]"
msgstr "linkgit:git-unpack-file[1]"
@@ -1313,7 +1259,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:46
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-var[1]"
msgstr "linkgit:git-var[1]"
@@ -1324,7 +1270,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:49
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-verify-pack[1]"
msgstr "linkgit:git-verify-pack[1]"
@@ -1335,7 +1281,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:1
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-apply[1]"
msgstr "linkgit:git-apply[1]"
@@ -1346,7 +1292,7 @@ msgstr "Appliquer une rustine 횪 des fichiers et/ou 횪 l'index."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:4
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-checkout-index[1]"
msgstr "linkgit:git-checkout-index[1]"
@@ -1357,7 +1303,7 @@ msgstr "Copier des fichiers depuis l'index dans l'arbre de travail."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:7
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-commit-tree[1]"
msgstr "linkgit:git-commit-tree[1]"
@@ -1368,7 +1314,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:10
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-hash-object[1]"
msgstr "linkgit:git-hash-object[1]"
@@ -1379,7 +1325,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:13
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-index-pack[1]"
msgstr "linkgit:git-index-pack[1]"
@@ -1390,7 +1336,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:16
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-merge-file[1]"
msgstr "linkgit:git-merge-file[1]"
@@ -1401,7 +1347,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:19
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-merge-index[1]"
msgstr "linkgit:git-merge-index[1]"
@@ -1412,7 +1358,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:22
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-mktag[1]"
msgstr "linkgit:git-mktag[1]"
@@ -1423,7 +1369,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:25
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-mktree[1]"
msgstr "linkgit:git-mktree[1]"
@@ -1434,7 +1380,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:28
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-pack-objects[1]"
msgstr "linkgit:git-pack-objects[1]"
@@ -1445,7 +1391,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:31
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-prune-packed[1]"
msgstr "linkgit:git-prune-packed[1]"
@@ -1456,7 +1402,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:34
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-read-tree[1]"
msgstr "linkgit:git-read-tree[1]"
@@ -1467,7 +1413,7 @@ msgstr "Lire l'information d'arbre dans l'index."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:37
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-symbolic-ref[1]"
msgstr "linkgit:git-symbolic-ref[1]"
@@ -1478,7 +1424,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:40
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-unpack-objects[1]"
msgstr "linkgit:git-unpack-objects[1]"
@@ -1489,7 +1435,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:43
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-update-index[1]"
msgstr "linkgit:git-update-index[1]"
@@ -1500,7 +1446,7 @@ msgstr "Enregistrer le contenu de fichiers de l'arbre de travail dans l'index."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:46
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-update-ref[1]"
msgstr "linkgit:git-update-ref[1]"
@@ -1511,7 +1457,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:49 en/git-commit-tree.txt:115
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -1522,7 +1468,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:1
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-check-attr[1]"
msgstr "linkgit:git-check-attr[1]"
@@ -1533,7 +1479,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:4
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-check-ignore[1]"
msgstr "linkgit:git-check-ignore[1]"
@@ -1544,7 +1490,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:7
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-check-mailmap[1]"
msgstr "linkgit:git-check-mailmap[1]"
@@ -1555,7 +1501,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:10
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-check-ref-format[1]"
msgstr "linkgit:git-check-ref-format[1]"
@@ -1566,7 +1512,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:13
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-column[1]"
msgstr "linkgit:git-column[1]"
@@ -1577,7 +1523,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:16
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-credential[1]"
msgstr "linkgit:git-credential[1]"
@@ -1588,7 +1534,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:19
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-credential-cache[1]"
msgstr "linkgit:git-credential-cache[1]"
@@ -1599,7 +1545,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:22
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-credential-store[1]"
msgstr "linkgit:git-credential-store[1]"
@@ -1610,7 +1556,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:25
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-fmt-merge-msg[1]"
msgstr "linkgit:git-fmt-merge-msg[1]"
@@ -1621,7 +1567,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:28
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-interpret-trailers[1]"
msgstr "linkgit:git-interpret-trailers[1]"
@@ -1632,7 +1578,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:31
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-mailinfo[1]"
msgstr "linkgit:git-mailinfo[1]"
@@ -1643,7 +1589,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:34
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-mailsplit[1]"
msgstr "linkgit:git-mailsplit[1]"
@@ -1654,7 +1600,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:37
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-merge-one-file[1]"
msgstr "linkgit:git-merge-one-file[1]"
@@ -1665,7 +1611,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-patch-id[1]"
msgstr "linkgit:git-patch-id[1]"
@@ -1676,7 +1622,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:43
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-sh-i18n[1]"
msgstr "linkgit:git-sh-i18n[1]"
@@ -1687,7 +1633,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:46
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-sh-setup[1]"
msgstr "linkgit:git-sh-setup[1]"
@@ -1698,7 +1644,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:49
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-stripspace[1]"
msgstr "linkgit:git-stripspace[1]"
@@ -1709,7 +1655,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:1
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-http-fetch[1]"
msgstr "linkgit:git-http-fetch[1]"
@@ -1720,7 +1666,7 @@ msgstr "T챕l챕charger depuis une d챕p척t Git distant via HTTP."
#. type: Labeled list
#: en/cmds-synchelpers.txt:4
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-http-push[1]"
msgstr "linkgit:git-http-push[1]"
@@ -1731,7 +1677,7 @@ msgstr "Pousser des objets par HTTP/DAV vers un autre d챕p척t."
#. type: Labeled list
#: en/cmds-synchelpers.txt:7
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-parse-remote[1]"
msgstr "linkgit:git-parse-remote[1]"
@@ -1742,7 +1688,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:10
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-receive-pack[1]"
msgstr "linkgit:git-receive-pack[1]"
@@ -1753,7 +1699,7 @@ msgstr "Recevoir ce qui est pouss챕 dans un d챕p척t."
#. type: Labeled list
#: en/cmds-synchelpers.txt:13
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-shell[1]"
msgstr "linkgit:git-shell[1]"
@@ -1764,7 +1710,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:16
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-upload-archive[1]"
msgstr "linkgit:git-upload-archive[1]"
@@ -1775,7 +1721,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:19
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-upload-pack[1]"
msgstr "linkgit:git-upload-pack[1]"
@@ -1786,7 +1732,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:1
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-daemon[1]"
msgstr "linkgit:git-daemon[1]"
@@ -1797,7 +1743,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:4
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-fetch-pack[1]"
msgstr "linkgit:git-fetch-pack[1]"
@@ -1808,7 +1754,7 @@ msgstr "Recevoir des objets manquants depuis un autre d챕p척t."
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:7
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-http-backend[1]"
msgstr "linkgit:git-http-backend[1]"
@@ -1819,7 +1765,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:10
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-send-pack[1]"
msgstr "linkgit:git-send-pack[1]"
@@ -1830,7 +1776,7 @@ msgstr "Pousser des objets sur le protocole Git sur un autre d챕p척t."
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:13
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "linkgit:git-update-server-info[1]"
msgstr "linkgit:git-update-server-info[1]"
@@ -1847,25 +1793,12 @@ msgstr "FICHIER DE CONFIGURATION"
#. type: Plain text
#: 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` "
-"file. The file `/etc/gitconfig` can be used to store a system-wide default "
-"configuration."
+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` file. The file `/etc/gitconfig` can be used to store a system-wide default configuration."
msgstr ""
#. type: Plain text
#: en/config.txt:19
-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."
+msgid "The configuration variables are used by both the Git plumbing and the porcelains. The variables are divided into sections, wherein the fully qualified variable name of the variable itself is the last dot-separated segment and the section name is everything before the last dot. The variable names are case-insensitive, allow only alphanumeric characters and `-`, and must start with an alphabetic character. Some variables may appear multiple times; we say then that the variable is multivalued."
msgstr ""
#. type: Title ~
@@ -1876,29 +1809,17 @@ msgstr ""
#. type: Plain text
#: en/config.txt:26
-msgid ""
-"The syntax is fairly flexible and permissive; whitespaces are mostly "
-"ignored. The '#' and ';' characters begin comments to the end of line, "
-"blank lines are ignored."
+msgid "The syntax is fairly flexible and permissive; whitespaces are mostly ignored. The '#' and ';' characters begin comments to the end of line, blank lines are ignored."
msgstr ""
#. 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 "
-"begins. Section names are case-insensitive. Only alphanumeric characters, "
-"`-` and `.` are allowed in section names. Each variable must belong to some"
-" section, which means that there must be a section header before the first "
-"setting of a variable."
+msgid "The file consists of sections and variables. A section begins with the name of the section in square brackets and continues until the next section begins. Section names are case-insensitive. Only alphanumeric characters, `-` and `.` are allowed in section names. Each variable must belong to some section, which means that there must be a section header before the first setting of a variable."
msgstr ""
#. 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:"
+msgid "Sections can be further divided into subsections. To begin a subsection put its name in double quotes, separated by space from the section name, in the section header, like in the example below:"
msgstr ""
#. type: delimited block -
@@ -1909,59 +1830,32 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/config.txt:54
-msgid ""
-"There is also a deprecated `[section.subsection]` syntax. With this syntax, "
-"the subsection name is converted to lower-case and is also compared case "
-"sensitively. These subsection names follow the same restrictions as section "
-"names."
+msgid "There is also a deprecated `[section.subsection]` syntax. With this syntax, the subsection name is converted to lower-case and is also compared case sensitively. These subsection names follow the same restrictions as section names."
msgstr ""
#. 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."
+msgid "All the other lines (and the remainder of the line after the section header) are recognized as setting variables, in the form 'name = value' (or just 'name', which is a short-hand to say that the variable is the boolean \"true\"). The variable names are case-insensitive, allow only alphanumeric characters and `-`, and must start with an alphabetic character."
msgstr ""
#. type: Plain text
#: en/config.txt:69
-msgid ""
-"A line that defines a value can be continued to the next line by ending it "
-"with a `\\`; the backquote and the end-of-line are stripped. Leading "
-"whitespaces after 'name =', the remainder of the line after the first "
-"comment character '#' or ';', and trailing whitespaces of the line are "
-"discarded unless they are enclosed in double quotes. Internal whitespaces "
-"within the value are retained verbatim."
+msgid "A line that defines a value can be continued to the next line by ending it with a `\\`; the backquote and the end-of-line are stripped. Leading whitespaces after 'name =', the remainder of the line after the first comment character '#' or ';', and trailing whitespaces of the line are discarded unless they are enclosed in double quotes. Internal whitespaces within the value are retained verbatim."
msgstr ""
#. type: Plain text
#: en/config.txt:72
-msgid ""
-"Inside double quotes, double quote `\"` and backslash `\\` characters must "
-"be escaped: use `\\\"` for `\"` and `\\\\` for `\\`."
+msgid "Inside double quotes, double quote `\"` and backslash `\\` characters must be escaped: use `\\\"` for `\"` and `\\\\` for `\\`."
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."
+msgid "The following escape sequences (beside `\\\"` and `\\\\`) are recognized: `\\n` for newline character (NL), `\\t` for horizontal tabulation (HT, TAB) and `\\b` for backspace (BS). Other char escape sequences (including octal escape sequences) are invalid."
msgstr ""
#. type: Title ~
@@ -1972,21 +1866,12 @@ 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."
+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."
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."
+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."
msgstr ""
#. type: Title ~
@@ -1997,41 +1882,28 @@ msgstr ""
#. type: Plain text
#: en/config.txt:100
-msgid ""
-"You can include a config file from another conditionally by setting a "
-"`includeIf.<condition>.path` variable to the name of the file to be "
-"included. The variable's value is treated the same way as `include.path`. "
-"`includeIf.<condition>.path` can be given multiple times."
+msgid "You can include a config file from another conditionally by setting a `includeIf.<condition>.path` variable to the name of the file to be included. The variable's value is treated the same way as `include.path`. `includeIf.<condition>.path` can be given multiple times."
msgstr ""
#. type: Plain text
#: en/config.txt:104
-msgid ""
-"The condition starts with a keyword followed by a colon and some data whose "
-"format and meaning depends on the keyword. Supported keywords are:"
+msgid "The condition starts with a keyword followed by a colon and some data whose format and meaning depends on the keyword. Supported keywords are:"
msgstr ""
#. type: Labeled list
#: en/config.txt:105
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`gitdir`"
msgstr "`gitdir`"
#. type: Plain text
#: en/config.txt:110
-msgid ""
-"The data that follows the keyword `gitdir:` is used as a glob pattern. If "
-"the location of the .git directory matches the pattern, the include "
-"condition is met."
+msgid "The data that follows the keyword `gitdir:` is used as a glob pattern. If the location of the .git directory matches the pattern, the include condition is met."
msgstr ""
#. type: Plain text
#: en/config.txt:115
-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"
+msgid "The .git location may be auto-discovered, or come from `$GIT_DIR` environment variable. If the repository is auto discovered via a .git file (e.g. from submodules, or a linked worktree), the .git location would be the final location where the .git directory is, not where the"
msgstr ""
#. type: Block title
@@ -2042,40 +1914,27 @@ 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 "
-"linkgit:gitignore[5] for details. For convenience:"
+msgid "The pattern can contain standard globbing wildcards and two additional ones, `**/` and `/**`, that can match multiple path components. Please refer to linkgit:gitignore[5] for details. For convenience:"
msgstr ""
#. type: Plain text
#: en/config.txt:123
-msgid ""
-"If the pattern starts with `~/`, `~` will be substituted with the content of"
-" the environment variable `HOME`."
+msgid "If the pattern starts with `~/`, `~` will be substituted with the content of the environment variable `HOME`."
msgstr ""
#. type: Plain text
#: en/config.txt:126
-msgid ""
-"If the pattern starts with `./`, it is replaced with the directory "
-"containing the current config file."
+msgid "If the pattern starts with `./`, it is replaced with the directory containing the current config file."
msgstr ""
#. type: Plain text
#: 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`."
+msgid "If the pattern does not start with either `~/`, `./` or `/`, `**/` will be automatically prepended. For example, the pattern `foo/bar` becomes `**/foo/bar` and would match `/any/path/to/foo/bar`."
msgstr ""
#. 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."
+msgid "If the pattern ends with `/`, `**` will be automatically added. For example, the pattern `foo/` becomes `foo/**`. In other words, it matches \"foo\" and everything inside, recursively."
msgstr ""
#. type: Labeled list
@@ -2086,9 +1945,7 @@ msgstr "`gitdir/i`"
#. 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)"
+msgid "This is the same as `gitdir` except that matching is done case-insensitively (e.g. on case-insensitive file sytems)"
msgstr ""
#. type: Plain text
@@ -2103,9 +1960,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:145
-msgid ""
-"Note that \"../\" is not special and will match literally, which is unlikely"
-" what you want."
+msgid "Note that \"../\" is not special and will match literally, which is unlikely what you want."
msgstr ""
#. type: Title ~
@@ -2198,10 +2053,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:191
-msgid ""
-"Values of many variables are treated as a simple string, but there are "
-"variables that take values of specific types and there are rules as to how "
-"to spell them."
+msgid "Values of many variables are treated as a simple string, but there are variables that take values of specific types and there are rules as to how to spell them."
msgstr ""
#. type: Labeled list
@@ -2212,9 +2064,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:197
-msgid ""
-"When a variable is said to take a boolean value, many synonyms are accepted "
-"for 'true' and 'false'; these are all case-insensitive."
+msgid "When a variable is said to take a boolean value, many synonyms are accepted for 'true' and 'false'; these are all case-insensitive."
msgstr ""
#. type: Labeled list
@@ -2230,8 +2080,7 @@ 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
@@ -2252,10 +2101,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:208
-msgid ""
-"When converting value to the canonical form using `--bool` type specifier; "
-"'git config' will ensure that the output is \"true\" or \"false\" (spelled "
-"in lowercase)."
+msgid "When converting value to the canonical form using `--bool` type specifier; 'git config' will ensure that the output is \"true\" or \"false\" (spelled in lowercase)."
msgstr ""
#. type: Labeled list
@@ -2266,9 +2112,7 @@ 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."
+msgid "The value for many variables that specify various sizes can be suffixed with `k`, `M`,... to mean \"scale the number by 1024\", \"by 1024x1024\", etc."
msgstr ""
#. type: Labeled list
@@ -2279,57 +2123,32 @@ msgstr ""
#. type: Plain text
#: en/config.txt:218
-msgid ""
-"The value for a variable that takes a color is a list of colors (at most "
-"two, one for foreground and one for background) and attributes (as many as "
-"you want), separated by spaces."
+msgid "The value for a variable that takes a color is a list of colors (at most two, one for foreground and one for background) and attributes (as many as you want), separated by spaces."
msgstr ""
#. type: Plain text
#: en/config.txt:222
-msgid ""
-"The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, "
-"`blue`, `magenta`, `cyan` and `white`. The first color given is the "
-"foreground; the second is the background."
+msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background."
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 "
-"terminal supports it, you may also specify 24-bit RGB values as hex, like "
-"`#ff0ab3`."
+msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr ""
#. type: Plain text
#: en/config.txt:234
-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)."
+msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
#. type: Plain text
#: en/config.txt:237
-msgid ""
-"An empty color string produces no color effect at all. This can be used to "
-"avoid coloring specific elements without disabling color entirely."
+msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr ""
#. type: Plain text
#: 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."
+msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr ""
#. type: Labeled list
@@ -2340,11 +2159,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"specified user's home directory."
+msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr ""
#. type: Title ~
@@ -2355,19 +2170,12 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr ""
#. type: Plain text
#: en/config.txt:266
-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."
+msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr ""
#. type: Labeled list
@@ -2378,10 +2186,7 @@ msgstr ""
#. type: Plain text
#: 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':"
+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':"
msgstr ""
#. type: Labeled list
@@ -2596,408 +2401,265 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:332
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.fileMode"
msgstr "core.fileMode"
#. type: Plain text
#: en/config.txt:335
-msgid ""
-"Tells Git if the executable bit of files in the working tree is to be "
-"honored."
-msgstr ""
-"Indique 횪 Git si le bit ex챕cutable de fichiers dans l'arbre de travail doit "
-"챗tre honor챕."
+msgid "Tells Git if the executable bit of files in the working tree is to be honored."
+msgstr "Indique 횪 Git si le bit ex챕cutable de fichiers dans l'arbre de travail doit 챗tre honor챕."
#. type: Plain text
#: en/config.txt:342
-msgid ""
-"Some filesystems lose the executable bit when a file that is marked as "
-"executable is checked out, or checks out an non-executable file with "
-"executable bit on. linkgit:git-clone[1] or linkgit:git-init[1] probe the "
-"filesystem to see if it handles the executable bit correctly and this "
-"variable is automatically set as necessary."
+msgid "Some filesystems lose the executable bit when a file that is marked as executable is checked out, or checks out an non-executable file with executable bit on. linkgit:git-clone[1] or linkgit:git-init[1] probe the filesystem to see if it handles the executable bit correctly and this variable is automatically set as necessary."
msgstr ""
#. type: Plain text
#: 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 "
-"variable to 'false'. See linkgit:git-update-index[1]."
+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 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)."
+msgid "The default is true (when core.filemode is not specified in the config file)."
msgstr ""
#. type: Labeled list
#: en/config.txt:354
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.hideDotFiles"
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 "
-"'dotGitOnly'."
+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 'dotGitOnly'."
msgstr ""
#. type: Labeled list
#: en/config.txt:360
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.ignoreCase"
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 "
-"will assume it is really the same file, and continue to remember it as "
-"\"Makefile\"."
+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 will assume it is really the same file, and continue to remember it as \"Makefile\"."
msgstr ""
#. type: Plain text
#: en/config.txt:371
-msgid ""
-"The default is false, except linkgit:git-clone[1] or linkgit:git-init[1] "
-"will probe and set core.ignoreCase true if appropriate when the repository "
-"is created."
+msgid "The default is false, except linkgit:git-clone[1] or linkgit:git-init[1] will probe and set core.ignoreCase true if appropriate when the repository is created."
msgstr ""
#. type: Labeled list
#: en/config.txt:372
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.precomposeUnicode"
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."
+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."
msgstr ""
#. type: Labeled list
#: en/config.txt:381
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.protectHFS"
msgstr "core.protectHFS"
#. type: Plain text
#: en/config.txt:385
-msgid ""
-"If set to true, do not allow checkout of paths that would be considered "
-"equivalent to `.git` on an HFS+ filesystem. Defaults to `true` on Mac OS, "
-"and `false` elsewhere."
+msgid "If set to true, do not allow checkout of paths that would be considered equivalent to `.git` on an HFS+ filesystem. Defaults to `true` on Mac OS, and `false` elsewhere."
msgstr ""
#. type: Labeled list
#: en/config.txt:386
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.protectNTFS"
msgstr "core.protectNTFS"
#. type: Plain text
#: en/config.txt:391
-msgid ""
-"If set to true, do not allow checkout of paths that would cause problems "
-"with the NTFS filesystem, e.g. conflict with 8.3 \"short\" names. Defaults "
-"to `true` on Windows, and `false` elsewhere."
+msgid "If set to true, do not allow checkout of paths that would cause problems with the NTFS filesystem, e.g. conflict with 8.3 \"short\" names. Defaults to `true` on Windows, and `false` elsewhere."
msgstr ""
#. type: Labeled list
#: en/config.txt:392
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.trustctime"
msgstr "core.trustctime"
#. type: Plain text
#: en/config.txt:398
-msgid ""
-"If false, the ctime differences between the index and the working tree are "
-"ignored; useful when the inode change time is regularly modified by "
-"something outside Git (file system crawlers and some backup systems). See "
-"linkgit:git-update-index[1]. True by default."
+msgid "If false, the ctime differences between the index and the working tree are ignored; useful when the inode change time is regularly modified by something outside Git (file system crawlers and some backup systems). See linkgit:git-update-index[1]. True by default."
msgstr ""
#. type: Labeled list
#: en/config.txt:399
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.splitIndex"
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."
+msgid "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, ignore-translated
+#, no-wrap
msgid "core.untrackedCache"
msgstr "core.untrackedCache"
#. type: Plain text
#: en/config.txt:411
-msgid ""
-"Determines what to do about the untracked cache feature of the index. It "
-"will be kept, if this variable is unset or set to `keep`. It will "
-"automatically be added if set to `true`. And it will automatically be "
-"removed, if set to `false`. Before setting it to `true`, you should check "
-"that mtime is working properly on your system. See linkgit:git-update-"
-"index[1]. `keep` by default."
+msgid "Determines what to do about the untracked cache feature of the index. It will be kept, if this variable is unset or set to `keep`. It will automatically be added if set to `true`. And it will automatically be removed, if set to `false`. Before setting it to `true`, you should check that mtime is working properly on your system. See linkgit:git-update-index[1]. `keep` by default."
msgstr ""
#. type: Labeled list
#: en/config.txt:412
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.checkStat"
msgstr "core.checkStat"
#. type: Plain text
#: en/config.txt:417
-msgid ""
-"Determines which stat fields to match between the index and work tree. The "
-"user can set this to 'default' or 'minimal'. Default (or explicitly "
-"'default'), is to check all fields, including the sub-second part of mtime "
-"and ctime."
+msgid "Determines which stat fields to match between the index and work tree. The user can set this to 'default' or 'minimal'. Default (or explicitly 'default'), is to check all fields, including the sub-second part of mtime and ctime."
msgstr ""
#. type: Labeled list
#: en/config.txt:418
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.quotePath"
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 "
-"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 "
-"output pathnames completely verbatim using the `-z` option. The default "
-"value is true."
+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 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 output pathnames completely verbatim using the `-z` option. The default value is true."
msgstr ""
#. type: Labeled list
#: en/config.txt:433
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.eol"
msgstr "core.eol"
#. type: Plain text
#: en/config.txt:440
-msgid ""
-"Sets the line ending type to use in the working directory for files that "
-"have the `text` property set when core.autocrlf is false. Alternatives are "
-"'lf', 'crlf' and 'native', which uses the platform's native line ending. "
-"The default value is `native`. See linkgit:gitattributes[5] for more "
-"information on end-of-line conversion."
+msgid "Sets the line ending type to use in the working directory for files that have the `text` property set when core.autocrlf is false. Alternatives are 'lf', 'crlf' and 'native', which uses the platform's native line ending. The default value is `native`. See linkgit:gitattributes[5] for more information on end-of-line conversion."
msgstr ""
#. type: Labeled list
#: en/config.txt:441
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.safecrlf"
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 "
-"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."
+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 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."
msgstr ""
#. type: Plain text
#: en/config.txt:460
-msgid ""
-"CRLF conversion bears a slight chance of corrupting data. When it is "
-"enabled, Git will convert CRLF to LF during commit and LF to CRLF during "
-"checkout. A file that contains a mixture of LF and CRLF before the commit "
-"cannot be recreated by Git. For text files this is the right thing to do: "
-"it corrects line endings such that we have only LF line endings in the "
-"repository. But for binary files that are accidentally classified as text "
-"the conversion can corrupt data."
+msgid "CRLF conversion bears a slight chance of corrupting data. When it is enabled, Git will convert CRLF to LF during commit and LF to CRLF during checkout. A file that contains a mixture of LF and CRLF before the commit cannot be recreated by Git. For text files this is the right thing to do: it corrects line endings such that we have only LF line endings in the repository. But for binary files that are accidentally classified as text the conversion can corrupt data."
msgstr ""
#. type: Plain text
#: en/config.txt:467
-msgid ""
-"If you recognize such corruption early you can easily fix it by setting the "
-"conversion type explicitly in .gitattributes. Right after committing you "
-"still have the original file in your work tree and this file is not yet "
-"corrupted. You can explicitly tell Git that this file is binary and Git "
-"will handle the file appropriately."
+msgid "If you recognize such corruption early you can easily fix it by setting the conversion type explicitly in .gitattributes. Right after committing you still have the original file in your work tree and this file is not yet corrupted. You can explicitly tell Git that this file is binary and Git will handle the file appropriately."
msgstr ""
#. type: Plain text
#: en/config.txt:474
-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, "
-"while for binary files converting CRLFs corrupts data."
+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, while for binary files converting CRLFs corrupts data."
msgstr ""
#. type: Plain text
#: en/config.txt:485
-msgid ""
-"Note, this safety check does not mean that a checkout will generate a file "
-"identical to the original file for a different setting of `core.eol` and "
-"`core.autocrlf`, but only for the current one. For example, a text file "
-"with `LF` would be accepted with `core.eol=lf` and could later be checked "
-"out with `core.eol=crlf`, in which case the resulting file would contain "
-"`CRLF`, although the original file contained `LF`. However, in both work "
-"trees the line endings would be consistent, that is either all `LF` or all "
-"`CRLF`, but never mixed. A file with mixed line endings would be reported "
-"by the `core.safecrlf` mechanism."
+msgid "Note, this safety check does not mean that a checkout will generate a file identical to the original file for a different setting of `core.eol` and `core.autocrlf`, but only for the current one. For example, a text file with `LF` would be accepted with `core.eol=lf` and could later be checked out with `core.eol=crlf`, in which case the resulting file would contain `CRLF`, although the original file contained `LF`. However, in both work trees the line endings would be consistent, that is either all `LF` or all `CRLF`, but never mixed. A file with mixed line endings would be reported by the `core.safecrlf` mechanism."
msgstr ""
#. type: Labeled list
#: en/config.txt:486
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.autocrlf"
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 "
-"repository has LF line endings. This variable can be set to 'input', in "
-"which case no output conversion is performed."
+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 repository has LF line endings. This variable can be set to 'input', in which case no output conversion is performed."
msgstr ""
#. type: Labeled list
#: en/config.txt:494
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.symlinks"
msgstr "core.symlinks"
#. type: Plain text
#: en/config.txt:500
-msgid ""
-"If false, symbolic links are checked out as small plain files that contain "
-"the link text. linkgit:git-update-index[1] and linkgit:git-add[1] will not "
-"change the recorded type to regular file. Useful on filesystems like FAT "
-"that do not support symbolic links."
+msgid "If false, symbolic links are checked out as small plain files that contain the link text. linkgit:git-update-index[1] and linkgit:git-add[1] will not change the recorded type to regular file. Useful on filesystems like FAT that do not support symbolic links."
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 "
-"created."
+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 created."
msgstr ""
#. type: Labeled list
#: en/config.txt:505
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.gitProxy"
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 "
-"specified domain string. This variable may be set multiple times and is "
-"matched in the given order; the first match wins."
+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 specified domain string. This variable may be set multiple times and is matched in the given order; the first match wins."
msgstr ""
#. type: Plain text
#: en/config.txt:517
-msgid ""
-"Can be overridden by the `GIT_PROXY_COMMAND` environment variable (which "
-"always applies universally, without the special \"for\" handling)."
+msgid "Can be overridden by the `GIT_PROXY_COMMAND` environment variable (which always applies universally, without the special \"for\" handling)."
msgstr ""
#. type: Plain text
#: en/config.txt:522
-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."
+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."
msgstr ""
#. type: Labeled list
#: en/config.txt:523
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.sshCommand"
msgstr "core.sshCommand"
#. type: Plain text
#: en/config.txt:529
-msgid ""
-"If this variable is set, `git fetch` and `git push` will use the specified "
-"command instead of `ssh` when they need to connect to a remote system. The "
-"command is in the same form as the `GIT_SSH_COMMAND` environment variable "
-"and is overridden when the environment variable is set."
+msgid "If this variable is set, `git fetch` and `git push` will use the specified command instead of `ssh` when they need to connect to a remote system. The command is in the same form as the `GIT_SSH_COMMAND` environment variable and is overridden when the environment variable is set."
msgstr ""
#. type: Labeled list
#: en/config.txt:530
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.ignoreStat"
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."
+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."
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."
+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."
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."
+msgid "This is useful on systems where lstat() calls are very slow, such as CIFS/Microsoft Windows."
msgstr ""
#. type: Plain text
@@ -3007,40 +2669,29 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:545
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.preferSymlinkRefs"
msgstr "core.preferSymlinkRefs"
#. type: Plain text
#: en/config.txt:550
-msgid ""
-"Instead of the default \"symref\" format for HEAD and other symbolic "
-"reference files, use symbolic links. This is sometimes needed to work with "
-"old scripts that expect HEAD to be a symbolic link."
+msgid "Instead of the default \"symref\" format for HEAD and other symbolic reference files, use symbolic links. This is sometimes needed to work with old scripts that expect HEAD to be a symbolic link."
msgstr ""
#. type: Labeled list
#: en/config.txt:551
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.bare"
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]."
+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]."
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"
+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"
msgstr ""
#. type: Title =
@@ -3051,171 +2702,110 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:563
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.worktree"
msgstr "core.worktree"
#. type: Plain text
#: en/config.txt:576
-msgid ""
-"Set the path to the root of the working tree. If `GIT_COMMON_DIR` "
-"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 "
-"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."
+msgid "Set the path to the root of the working tree. If `GIT_COMMON_DIR` 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 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."
msgstr ""
#. type: Plain text
#: 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)."
+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)."
msgstr ""
#. type: Labeled list
#: en/config.txt:587
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.logAllRefUpdates"
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/`."
+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/`."
msgstr ""
#. type: Plain text
#: en/config.txt:601
-msgid ""
-"This information can be used to determine what commit was the tip of a "
-"branch \"2 days ago\"."
+msgid "This information can be used to determine what commit was the tip of a branch \"2 days ago\"."
msgstr ""
#. type: Plain text
#: en/config.txt:605
-msgid ""
-"This value is true by default in a repository that has a working directory "
-"associated with it, and false by default in a bare repository."
+msgid "This value is true by default in a repository that has a working directory associated with it, and false by default in a bare repository."
msgstr ""
#. type: Labeled list
#: en/config.txt:606
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.repositoryFormatVersion"
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, ignore-translated
+#, no-wrap
msgid "core.sharedRepository"
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' "
-"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 "
-"others (equivalent to 'group' unless umask is e.g. '0022'). '0640' is a "
-"repository that is group-readable but not group-writable. See linkgit:git-"
-"init[1]. False by default."
+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' 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 others (equivalent to 'group' unless umask is e.g. '0022'). '0640' is a repository that is group-readable but not group-writable. See linkgit:git-init[1]. False by default."
msgstr ""
#. type: Labeled list
#: en/config.txt:625
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.warnAmbiguousRefs"
msgstr "core.warnAmbiguousRefs"
#. type: Plain text
#: en/config.txt:628
-msgid ""
-"If true, Git will warn you if the ref name you passed it is ambiguous and "
-"might match multiple refs in the repository. True by default."
+msgid "If true, Git will warn you if the ref name you passed it is ambiguous and might match multiple refs in the repository. True by default."
msgstr ""
#. type: Labeled list
#: en/config.txt:629
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.compression"
msgstr "core.compression"
#. type: Plain text
#: en/config.txt:635
-msgid ""
-"An integer -1..9, indicating a default compression level. -1 is the zlib "
-"default. 0 means no compression, and 1..9 are various speed/size tradeoffs, "
-"9 being slowest. If set, this provides a default to other compression "
-"variables, such as `core.looseCompression` and `pack.compression`."
+msgid "An integer -1..9, indicating a default compression level. -1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. If set, this provides a default to other compression variables, such as `core.looseCompression` and `pack.compression`."
msgstr ""
#. type: Labeled list
#: en/config.txt:636
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.looseCompression"
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)."
+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)."
msgstr ""
#. type: Labeled list
#: en/config.txt:643
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.packedGitWindowSize"
msgstr "core.packedGitWindowSize"
#. type: Plain text
#: en/config.txt:651
-msgid ""
-"Number of bytes of a pack file to map into memory in a single mapping "
-"operation. Larger window sizes may allow your system to process a smaller "
-"number of large pack files more quickly. Smaller window sizes will "
-"negatively affect performance due to increased calls to the operating "
-"system's memory manager, but may improve performance when accessing a large "
-"number of large pack files."
+msgid "Number of bytes of a pack file to map into memory in a single mapping operation. Larger window sizes may allow your system to process a smaller number of large pack files more quickly. Smaller window sizes will negatively affect performance due to increased calls to the operating system's memory manager, but may improve performance when accessing a large number of large pack files."
msgstr ""
#. type: Plain text
#: en/config.txt:656
-msgid ""
-"Default is 1 MiB if NO_MMAP was set at compile time, otherwise 32 MiB on 32 "
-"bit platforms and 1 GiB on 64 bit platforms. This should be reasonable for "
-"all users/operating systems. You probably do not need to adjust this value."
+msgid "Default is 1 MiB if NO_MMAP was set at compile time, otherwise 32 MiB on 32 bit platforms and 1 GiB on 64 bit platforms. This should be reasonable for all users/operating systems. You probably do not need to adjust this value."
msgstr ""
#. type: Plain text
@@ -3225,202 +2815,142 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:659
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.packedGitLimit"
msgstr "core.packedGitLimit"
#. type: Plain text
#: en/config.txt:664
-msgid ""
-"Maximum number of bytes to map simultaneously into memory from pack files. "
-"If Git needs to access more than this many bytes at once to complete an "
-"operation it will unmap existing regions to reclaim virtual address space "
-"within the process."
+msgid "Maximum number of bytes to map simultaneously into memory from pack files. If Git needs to access more than this many bytes at once to complete an operation it will unmap existing regions to reclaim virtual address space within the process."
msgstr ""
#. type: Plain text
#: en/config.txt:668
-msgid ""
-"Default is 256 MiB on 32 bit platforms and 8 GiB on 64 bit platforms. This "
-"should be reasonable for all users/operating systems, except on the largest "
-"projects. You probably do not need to adjust this value."
+msgid "Default is 256 MiB on 32 bit platforms and 8 GiB on 64 bit 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:671
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.deltaBaseCacheLimit"
msgstr "core.deltaBaseCacheLimit"
#. type: Plain text
#: en/config.txt:677
-msgid ""
-"Maximum number of bytes to reserve for caching base objects that may be "
-"referenced by multiple deltified objects. By storing the entire "
-"decompressed base objects in a cache Git is able to avoid unpacking and "
-"decompressing frequently used base objects multiple times."
+msgid "Maximum number of bytes to reserve for caching base objects that may be referenced by multiple deltified objects. By storing the entire decompressed base objects in a cache Git is able to avoid unpacking and decompressing frequently used base objects multiple times."
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."
+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."
msgstr ""
#. type: Labeled list
#: en/config.txt:684
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.bigFileThreshold"
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 "
-"files larger than this size are always treated as binary."
+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 files larger than this size are always treated as binary."
msgstr ""
#. type: Plain text
#: en/config.txt:694
-msgid ""
-"Default is 512 MiB on all platforms. This should be reasonable for most "
-"projects as source code and other text files can still be delta compressed, "
-"but larger binary media files won't be."
+msgid "Default is 512 MiB on all platforms. This should be reasonable for most projects as source code and other text files can still be delta compressed, but larger binary media files won't be."
msgstr ""
#. type: Labeled list
#: en/config.txt:697
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.excludesFile"
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]."
+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]."
msgstr ""
#. type: Labeled list
#: en/config.txt:705
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.askPass"
msgstr "core.askPass"
#. type: Plain text
#: en/config.txt:713
-msgid ""
-"Some commands (e.g. svn and http interfaces) that interactively ask for a "
-"password can be told to use an external program given via the value of this "
-"variable. Can be overridden by the `GIT_ASKPASS` environment variable. If "
-"not set, fall back to the value of the `SSH_ASKPASS` environment variable "
-"or, failing that, a simple password prompt. The external program shall be "
-"given a suitable prompt as command-line argument and write the password on "
-"its STDOUT."
+msgid "Some commands (e.g. svn and http interfaces) that interactively ask for a password can be told to use an external program given via the value of this variable. Can be overridden by the `GIT_ASKPASS` environment variable. If not set, fall back to the value of the `SSH_ASKPASS` environment variable or, failing that, a simple password prompt. The external program shall be given a suitable prompt as command-line argument and write the password on its STDOUT."
msgstr ""
#. type: Labeled list
#: en/config.txt:714
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.attributesFile"
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 "
-"value is `$XDG_CONFIG_HOME/git/attributes`. If `$XDG_CONFIG_HOME` is either "
-"not set or empty, `$HOME/.config/git/attributes` is used instead."
+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 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 ""
#. type: Labeled list
#: en/config.txt:722
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.hooksPath"
msgstr "core.hooksPath"
#. type: Plain text
#: en/config.txt:728
-msgid ""
-"By default Git will look for your hooks in the '$GIT_DIR/hooks' directory. "
-"Set this to different path, e.g. '/etc/git/hooks', and Git will try to find "
-"your hooks in that directory, e.g. '/etc/git/hooks/pre-receive' instead of "
-"in '$GIT_DIR/hooks/pre-receive'."
+msgid "By default Git will look for your hooks in the '$GIT_DIR/hooks' directory. Set this to different path, e.g. '/etc/git/hooks', and Git will try to find your hooks in that directory, e.g. '/etc/git/hooks/pre-receive' instead of in '$GIT_DIR/hooks/pre-receive'."
msgstr ""
#. type: Plain text
#: en/config.txt:732
-msgid ""
-"The path can be either absolute or relative. A relative path is taken as "
-"relative to the directory where the hooks are run (see the \"DESCRIPTION\" "
-"section of linkgit:githooks[5])."
+msgid "The path can be either absolute or relative. A relative path is taken as relative to the directory where the hooks are run (see the \"DESCRIPTION\" section of linkgit:githooks[5])."
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."
+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."
msgstr ""
#. type: Labeled list
#: en/config.txt:739
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.editor"
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 "
-"environment variable `GIT_EDITOR` is not set. See linkgit:git-var[1]."
+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 environment variable `GIT_EDITOR` is not set. See linkgit:git-var[1]."
msgstr ""
#. type: Labeled list
#: en/config.txt:745
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.commentChar"
msgstr "core.commentChar"
#. type: Plain text
#: en/config.txt:750
-msgid ""
-"Commands such as `commit` and `tag` that lets you edit messages consider a "
-"line that begins with this character commented, and removes them after the "
-"editor returns (default '#')."
+msgid "Commands such as `commit` and `tag` that lets you edit messages consider a line that begins with this character commented, and removes them after the editor returns (default '#')."
msgstr ""
#. type: Plain text
#: en/config.txt:753
-msgid ""
-"If set to \"auto\", `git-commit` would select a character that is not the "
-"beginning character of any line in existing commit messages."
+msgid "If set to \"auto\", `git-commit` would select a character that is not the beginning character of any line in existing commit messages."
msgstr ""
#. type: Labeled list
#: en/config.txt:754
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.packedRefsTimeout"
msgstr "core.packedRefsTimeout"
#. type: Plain text
#: en/config.txt:759
-msgid ""
-"The length of time, in milliseconds, to retry when trying to lock the "
-"`packed-refs` file. Value 0 means not to retry at all; -1 means to try "
-"indefinitely. Default is 1000 (i.e., retry for 1 second)."
+msgid "The length of time, in milliseconds, to retry when trying to lock the `packed-refs` file. Value 0 means not to retry at all; -1 means to try indefinitely. Default is 1000 (i.e., retry for 1 second)."
msgstr ""
#. type: Labeled list
@@ -3431,130 +2961,84 @@ 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."
+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."
msgstr ""
#. type: Labeled list
#: en/config.txt:766
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.pager"
msgstr "core.pager"
#. type: Plain text
#: en/config.txt:772 en/git-var.txt:58
-msgid ""
-"Text viewer for use by Git commands (e.g., 'less'). The value is meant to "
-"be interpreted by the shell. The order of preference is the `$GIT_PAGER` "
-"environment variable, then `core.pager` configuration, then `$PAGER`, and "
-"then the default chosen at compile time (usually 'less')."
+msgid "Text viewer for use by Git commands (e.g., 'less'). The value is meant to be interpreted by the shell. The order of preference is the `$GIT_PAGER` environment variable, then `core.pager` configuration, then `$PAGER`, and then the default chosen at compile time (usually 'less')."
msgstr ""
#. type: Plain text
#: en/config.txt:786
-msgid ""
-"When the `LESS` environment variable is unset, Git sets it to `FRX` (if "
-"`LESS` environment variable is set, Git does not change it at all). If you "
-"want to selectively override Git's default setting for `LESS`, you can set "
-"`core.pager` to e.g. `less -S`. This will be passed to the shell by Git, "
-"which will translate the final command to `LESS=FRX less -S`. The "
-"environment does not set the `S` option but the command line does, "
-"instructing less to truncate long lines. Similarly, setting `core.pager` to "
-"`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`."
+msgid "When the `LESS` environment variable is unset, Git sets it to `FRX` (if `LESS` environment variable is set, Git does not change it at all). If you want to selectively override Git's default setting for `LESS`, you can set `core.pager` to e.g. `less -S`. This will be passed to the shell by Git, which will translate the final command to `LESS=FRX less -S`. The environment does not set the `S` option but the command line does, instructing less to truncate long lines. Similarly, setting `core.pager` to `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`."
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 "
-"setting `core.pager` to `lv +c`."
+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 setting `core.pager` to `lv +c`."
msgstr ""
#. type: Labeled list
#: en/config.txt:791
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.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 "
-"disable any of them (e.g. `-trailing-space`):"
+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 disable any of them (e.g. `-trailing-space`):"
msgstr ""
#. type: Plain text
#: en/config.txt:800
-msgid ""
-"`blank-at-eol` treats trailing whitespaces at the end of the line as an "
-"error (enabled by default)."
+msgid "`blank-at-eol` treats trailing whitespaces at the end of the line as an error (enabled by default)."
msgstr ""
#. type: Plain text
#: en/config.txt:803
-msgid ""
-"`space-before-tab` treats a space character that appears immediately before "
-"a tab character in the initial indent part of the line as an error (enabled "
-"by default)."
+msgid "`space-before-tab` treats a space character that appears immediately before a tab character in the initial indent part of the line as an error (enabled by default)."
msgstr ""
#. type: Plain text
#: en/config.txt:806
-msgid ""
-"`indent-with-non-tab` treats a line that is indented with space characters "
-"instead of the equivalent tabs as an error (not enabled by default)."
+msgid "`indent-with-non-tab` treats a line that is indented with space characters instead of the equivalent tabs as an error (not enabled by default)."
msgstr ""
#. type: Plain text
#: en/config.txt:808
-msgid ""
-"`tab-in-indent` treats a tab character in the initial indent part of the "
-"line as an error (not enabled by default)."
+msgid "`tab-in-indent` treats a tab character in the initial indent part of the line as an error (not enabled by default)."
msgstr ""
#. type: Plain text
#: en/config.txt:810
-msgid ""
-"`blank-at-eof` treats blank lines added at the end of file as an error "
-"(enabled by default)."
+msgid "`blank-at-eof` treats blank lines added at the end of file as an error (enabled by default)."
msgstr ""
#. type: Plain text
#: en/config.txt:812
-msgid ""
-"`trailing-space` is a short-hand to cover both `blank-at-eol` and `blank-at-"
-"eof`."
+msgid "`trailing-space` is a short-hand to cover both `blank-at-eol` and `blank-at-eof`."
msgstr ""
#. type: Plain text
#: 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)."
+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)."
msgstr ""
#. type: Plain text
#: en/config.txt:819
-msgid ""
-"`tabwidth=<n>` tells how many character positions a tab occupies; this is "
-"relevant for `indent-with-non-tab` and when Git fixes `tab-in-indent` "
-"errors. The default tab width is 8. Allowed values are 1 to 63."
+msgid "`tabwidth=<n>` tells how many character positions a tab occupies; this is relevant for `indent-with-non-tab` and when Git fixes `tab-in-indent` errors. The default tab width is 8. Allowed values are 1 to 63."
msgstr ""
#. type: Labeled list
#: en/config.txt:820
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.fsyncObjectFiles"
msgstr "core.fsyncObjectFiles"
@@ -3565,16 +3049,12 @@ msgstr ""
#. type: Plain text
#: en/config.txt:827
-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\")."
+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\")."
msgstr ""
#. type: Labeled list
#: en/config.txt:828
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.preloadIndex"
msgstr "core.preloadIndex"
@@ -3585,82 +3065,61 @@ msgstr ""
#. type: Plain text
#: en/config.txt:836
-msgid ""
-"This can speed up operations like 'git diff' and 'git status' especially on "
-"filesystems like NFS that have weak caching semantics and thus relatively "
-"high IO latencies. When enabled, Git will do the index comparison to the "
-"filesystem data in parallel, allowing overlapping IO's. Defaults to true."
+msgid "This can speed up operations like 'git diff' and 'git status' especially on filesystems like NFS that have weak caching semantics and thus relatively high IO latencies. When enabled, Git will do the index comparison to the filesystem data in parallel, allowing overlapping IO's. Defaults to true."
msgstr ""
#. type: Labeled list
#: en/config.txt:837
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.createObject"
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 "
-"existing objects."
+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 existing objects."
msgstr ""
#. type: Plain text
#: en/config.txt:845
-msgid ""
-"On some file system/operating system combinations, this is unreliable. Set "
-"this config setting to 'rename' there; However, This will remove the check "
-"that makes sure that existing object files will not get overwritten."
+msgid "On some file system/operating system combinations, this is unreliable. Set this config setting to 'rename' there; However, This will remove the check that makes sure that existing object files will not get overwritten."
msgstr ""
#. type: Labeled list
#: en/config.txt:846 en/git-notes.txt:313
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/config.txt:851
-msgid ""
-"When showing commit messages, also show notes which are stored in the given "
-"ref. The ref must be fully qualified. If the given ref does not exist, it "
-"is not an error but means that no notes should be printed."
+msgid "When showing commit messages, also show notes which are stored in the given ref. The ref must be fully qualified. If the given ref does not exist, it is not an error but means that no notes should be printed."
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]."
+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]."
msgstr ""
#. type: Labeled list
#: en/config.txt:855
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.sparseCheckout"
msgstr "core.sparseCheckout"
#. type: Plain text
#: en/config.txt:858
-msgid ""
-"Enable \"sparse checkout\" feature. See section \"Sparse checkout\" in "
-"linkgit:git-read-tree[1] for more information."
+msgid "Enable \"sparse checkout\" feature. See section \"Sparse checkout\" in linkgit:git-read-tree[1] for more information."
msgstr ""
#. type: Labeled list
#: en/config.txt:859
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "core.abbrev"
msgstr "core.abbrev"
#. type: Plain text
#: en/config.txt:865
-msgid ""
-"Set the length object names are abbreviated to. If unspecified or set to "
-"\"auto\", an appropriate value is computed based on the approximate number "
-"of packed objects in your repository, which hopefully is enough for "
-"abbreviated object names to stay unique for some time."
+msgid "Set the length object names are abbreviated to. If unspecified or set to \"auto\", an appropriate value is computed based on the approximate number of packed objects in your repository, which hopefully is enough for abbreviated object names to stay unique for some time."
msgstr ""
#. type: Labeled list
@@ -3677,11 +3136,7 @@ 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."
+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."
msgstr ""
#. type: Labeled list
@@ -3692,26 +3147,12 @@ msgstr ""
#. type: Plain text
#: en/config.txt:882
-msgid ""
-"Command aliases for the linkgit:git[1] command wrapper - e.g. after "
-"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."
+msgid "Command aliases for the linkgit:git[1] command wrapper - e.g. after 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."
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 "
-"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]."
+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 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]."
msgstr ""
#. type: Labeled list
@@ -3722,11 +3163,7 @@ msgstr ""
#. type: Plain text
#: 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]."
+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]."
msgstr ""
#. type: Labeled list
@@ -3737,79 +3174,51 @@ 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 "
-"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]."
+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 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]."
msgstr ""
#. type: Labeled list
#: en/config.txt:908 en/git-apply.txt:246
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "apply.ignoreWhitespace"
msgstr "apply.ignoreWhitespace"
#. type: Plain text
#: 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]."
+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]."
msgstr ""
#. type: Labeled list
#: en/config.txt:916 en/git-apply.txt:250
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "apply.whitespace"
msgstr "apply.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]."
+msgid "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, ignore-translated
+#, no-wrap
msgid "branch.autoSetupMerge"
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 "
-"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."
+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 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."
msgstr ""
#. type: Labeled list
#: en/config.txt:932
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "branch.autoSetupRebase"
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 "
-"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 "
-"details on how to set up a branch to track another branch. This option "
-"defaults to never."
+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 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 details on how to set up a branch to track another branch. This option defaults to never."
msgstr ""
#. type: Labeled list
@@ -3820,15 +3229,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -3839,13 +3240,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:966
-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 "
-"override it for a specific branch."
+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 override it for a specific branch."
msgstr ""
#. type: Labeled list
@@ -3856,20 +3251,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:984
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -3880,10 +3262,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:990
-msgid ""
-"Sets default options for merging into branch <name>. The syntax and "
-"supported options are the same as those of linkgit:git-merge[1], but option "
-"values containing whitespace characters are currently not supported."
+msgid "Sets default options for merging into branch <name>. The syntax and supported options are the same as those of linkgit:git-merge[1], but option values containing whitespace characters are currently not supported."
msgstr ""
#. type: Labeled list
@@ -3894,23 +3273,17 @@ 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."
+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."
msgstr ""
#. type: Plain text
#: en/config.txt:1000 en/config.txt:2487
-msgid ""
-"When preserve, also pass `--preserve-merges` along to 'git rebase' so that "
-"locally committed merge commits will not be flattened by running 'git pull'."
+msgid "When preserve, also pass `--preserve-merges` along to 'git rebase' so that locally committed merge commits will not be flattened by running 'git pull'."
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
@@ -3930,10 +3303,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1012
-msgid ""
-"Branch description, can be edited with `git branch --edit-description`. "
-"Branch description is automatically added in the format-patch cover letter "
-"or request-pull summary."
+msgid "Branch description, can be edited with `git branch --edit-description`. Branch description is automatically added in the format-patch cover letter or request-pull summary."
msgstr ""
#. type: Title ~
@@ -3944,10 +3314,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1017
-msgid ""
-"Specify the command to invoke the specified browser. The specified command "
-"is evaluated in shell with the URLs passed as arguments. (See linkgit:git-"
-"web{litdd}browse[1].)"
+msgid "Specify the command to invoke the specified browser. The specified command is evaluated in shell with the URLs passed as arguments. (See linkgit:git-web{litdd}browse[1].)"
msgstr ""
#. type: Title ~
@@ -3958,10 +3325,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1022
-msgid ""
-"Override the path for the given tool that may be used to browse HTML help "
-"(see `-w` option in linkgit:git-help[1]) or a working repository in gitweb "
-"(see linkgit:git-instaweb[1])."
+msgid "Override the path for the given tool that may be used to browse HTML help (see `-w` option in linkgit:git-help[1]) or a working repository in gitweb (see linkgit:git-instaweb[1])."
msgstr ""
#. type: Labeled list
@@ -3980,17 +3344,13 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1027
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "color.branch"
msgstr "color.branch"
#. type: Plain text
#: 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 "
-"the value of `color.ui` is used (`auto` by default)."
+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 the value of `color.ui` is used (`auto` by default)."
msgstr ""
#. type: Labeled list
@@ -4001,35 +3361,23 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1040
-msgid ""
-"Use customized color for branch coloration. `<slot>` is one of `current` "
-"(the current branch), `local` (a local branch), `remote` (a remote-tracking "
-"branch in refs/remotes/), `upstream` (upstream tracking branch), `plain` "
-"(other refs)."
+msgid "Use customized color for branch coloration. `<slot>` is one of `current` (the current branch), `local` (a local branch), `remote` (a remote-tracking branch in refs/remotes/), `upstream` (upstream tracking branch), `plain` (other refs)."
msgstr ""
#. type: Labeled list
#: en/config.txt:1041
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "color.diff"
msgstr "color.diff"
#. type: Plain text
#: en/config.txt:1049
-msgid ""
-"Whether to use ANSI escape sequences to add color to patches. If this is "
-"set to `always`, linkgit:git-diff[1], linkgit:git-log[1], and linkgit:git-"
-"show[1] will use color for all patches. If it is set to `true` or `auto`, "
-"those commands will only use color when output is to the terminal. If "
-"unset, then the value of `color.ui` is used (`auto` by default)."
+msgid "Whether to use ANSI escape sequences to add color to patches. If this is set to `always`, linkgit:git-diff[1], linkgit:git-log[1], and linkgit:git-show[1] will use color for all patches. If it is set to `true` or `auto`, those commands will only use color when output is to the terminal. If unset, then the value of `color.ui` is used (`auto` by default)."
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."
+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."
msgstr ""
#. type: Labeled list
@@ -4040,13 +3388,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1062
-msgid ""
-"Use customized color for diff colorization. `<slot>` specifies which part "
-"of the patch to use the specified color, and is one of `context` (context "
-"text - `plain` is a historical synonym), `meta` (metainformation), `frag` "
-"(hunk header), 'func' (function in hunk header), `old` (removed lines), "
-"`new` (added lines), `commit` (commit headers), or `whitespace` "
-"(highlighting whitespace errors)."
+msgid "Use customized color for diff colorization. `<slot>` specifies which part of the patch to use the specified color, and is one of `context` (context text - `plain` is a historical synonym), `meta` (metainformation), `frag` (hunk header), 'func' (function in hunk header), `old` (removed lines), `new` (added lines), `commit` (commit headers), or `whitespace` (highlighting whitespace errors)."
msgstr ""
#. type: Labeled list
@@ -4057,25 +3399,18 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1067
-msgid ""
-"Use customized color for 'git log --decorate' output. `<slot>` is one of "
-"`branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local branches, "
-"remote-tracking branches, tags, stash and HEAD, respectively."
+msgid "Use customized color for 'git log --decorate' output. `<slot>` is one of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local branches, remote-tracking branches, tags, stash and HEAD, respectively."
msgstr ""
#. type: Labeled list
#: en/config.txt:1068
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "color.grep"
msgstr "color.grep"
#. type: Plain text
#: en/config.txt:1073
-msgid ""
-"When set to `always`, always highlight matches. When `false` (or `never`), "
-"never. When set to `true` or `auto`, use color only when the output is "
-"written to the terminal. If unset, then the value of `color.ui` is used "
-"(`auto` by default)."
+msgid "When set to `always`, always highlight matches. When `false` (or `never`), never. When set to `true` or `auto`, use color only when the output is written to the terminal. If unset, then the value of `color.ui` is used (`auto` by default)."
msgstr ""
#. type: Labeled list
@@ -4086,27 +3421,23 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1077
-msgid ""
-"Use customized color for grep colorization. `<slot>` specifies which part "
-"of the line to use the specified color, and is one of"
+msgid "Use customized color for grep colorization. `<slot>` specifies which part of the line to use the specified color, and is one of"
msgstr ""
#. type: Labeled list
#: en/config.txt:1079
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`context`"
msgstr "`context`"
#. type: Plain text
#: en/config.txt:1081
msgid "non-matching text in context lines (when using `-A`, `-B`, or `-C`)"
-msgstr ""
-"texte sans correspondance dans les lignes de contexte (avec l'utilisation de"
-" `-A`, `-B` ou `-C`)"
+msgstr "texte sans correspondance dans les lignes de contexte (avec l'utilisation de `-A`, `-B` ou `-C`)"
#. type: Labeled list
#: en/config.txt:1081
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`filename`"
msgstr "`filename`"
@@ -4117,7 +3448,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1083
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`function`"
msgstr "`function`"
@@ -4128,7 +3459,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1085
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`linenumber`"
msgstr "`linenumber`"
@@ -4139,7 +3470,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1087
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`match`"
msgstr "`match`"
@@ -4150,7 +3481,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1089
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`matchContext`"
msgstr "`matchContext`"
@@ -4161,7 +3492,7 @@ msgstr "texte correspondant dans les lignes de contexte"
#. type: Labeled list
#: en/config.txt:1091
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`matchSelected`"
msgstr "`matchSelected`"
@@ -4172,7 +3503,7 @@ msgstr "texte correspondant dans les lignes s챕lectionnn챕es"
#. type: Labeled list
#: en/config.txt:1093
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`selected`"
msgstr "`selected`"
@@ -4183,31 +3514,24 @@ msgstr "texte sans correspondance dans les lignes s챕lectionn챕es"
#. type: Labeled list
#: en/config.txt:1095
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`separator`"
msgstr "`separator`"
#. type: Plain text
#: en/config.txt:1098
-msgid ""
-"separators between fields on a line (`:`, `-`, and `=`) and between hunks "
-"(`--`)"
+msgid "separators between fields on a line (`:`, `-`, and `=`) and between hunks (`--`)"
msgstr ""
#. type: Labeled list
#: en/config.txt:1100
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "color.interactive"
msgstr "color.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 "
-"`auto`, use colors only when the output is to the terminal. If unset, then "
-"the value of `color.ui` is used (`auto` by default)."
+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 `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 ""
#. type: Labeled list
@@ -4218,54 +3542,40 @@ msgstr "color.interactive.<cr챕neau>"
#. 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."
+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."
msgstr ""
#. type: Labeled list
#: en/config.txt:1114
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "color.pager"
msgstr "color.pager"
#. type: Plain text
#: en/config.txt:1117
-msgid ""
-"A boolean to enable/disable colored output when the pager is in use (default"
-" is true)."
+msgid "A boolean to enable/disable colored output when the pager is in use (default is true)."
msgstr ""
#. type: Labeled list
#: en/config.txt:1118
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "color.showBranch"
msgstr "color.showBranch"
#. type: Plain text
#: en/config.txt:1124
-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)."
+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)."
msgstr ""
#. type: Labeled list
#: en/config.txt:1125
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "color.status"
msgstr "color.status"
#. type: Plain text
#: 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 "
-"the value of `color.ui` is used (`auto` by default)."
+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 the value of `color.ui` is used (`auto` by default)."
msgstr ""
#. type: Labeled list
@@ -4276,59 +3586,39 @@ msgstr "color.status.<cr챕neau>"
#. type: Plain text
#: en/config.txt:1142
-msgid ""
-"Use customized color for status colorization. `<slot>` is one of `header` "
-"(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 "
-"changes)."
+msgid "Use customized color for status colorization. `<slot>` is one of `header` (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 changes)."
msgstr ""
#. type: Labeled list
#: en/config.txt:1143
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "color.ui"
msgstr "color.ui"
#. 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 "
-"`auto` (this is the default since Git 1.8.4) if you want such output to use "
-"color when written to the terminal."
+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 `auto` (this is the default since Git 1.8.4) if you want such output to use color when written to the terminal."
msgstr ""
#. type: Labeled list
#: en/config.txt:1155
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "column.ui"
msgstr "column.ui"
#. type: Plain text
#: en/config.txt:1159
-msgid ""
-"Specify whether supported commands should output in columns. This variable "
-"consists of a list of tokens separated by spaces or commas:"
+msgid "Specify whether supported commands should output in columns. This variable consists of a list of tokens separated by spaces or commas:"
msgstr ""
#. type: Plain text
#: en/config.txt:1162
-msgid ""
-"These options control when the feature should be enabled (defaults to "
-"'never'):"
+msgid "These options control when the feature should be enabled (defaults to 'never'):"
msgstr ""
#. type: Labeled list
#: en/config.txt:1164
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`always`"
msgstr "`always`"
@@ -4339,7 +3629,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1166
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`never`"
msgstr "`never`"
@@ -4350,7 +3640,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1168
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`auto`"
msgstr "`auto`"
@@ -4361,14 +3651,12 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1175
-msgid ""
-"These options control layout (defaults to 'column'). Setting any of these "
-"implies 'always' if none of 'always', 'never', or 'auto' are specified."
+msgid "These options control layout (defaults to 'column'). Setting any of these implies 'always' if none of 'always', 'never', or 'auto' are specified."
msgstr ""
#. type: Labeled list
#: en/config.txt:1177
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`column`"
msgstr "`column`"
@@ -4379,7 +3667,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1179
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`row`"
msgstr "`row`"
@@ -4390,7 +3678,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1181
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`plain`"
msgstr "`plain`"
@@ -4401,14 +3689,12 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1187
-msgid ""
-"Finally, these options can be combined with a layout option (defaults to "
-"'nodense'):"
+msgid "Finally, these options can be combined with a layout option (defaults to 'nodense'):"
msgstr ""
#. type: Labeled list
#: en/config.txt:1189
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`dense`"
msgstr "`dense`"
@@ -4419,7 +3705,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1191
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`nodense`"
msgstr "`nodense`"
@@ -4430,171 +3716,134 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1195
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "column.branch"
msgstr "column.branch"
#. type: Plain text
#: en/config.txt:1198
-msgid ""
-"Specify whether to output branch listing in `git branch` in columns. See "
-"`column.ui` for details."
+msgid "Specify whether to output branch listing in `git branch` in columns. See `column.ui` for details."
msgstr ""
#. type: Labeled list
#: en/config.txt:1199
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "column.clean"
msgstr "column.clean"
#. type: Plain text
#: en/config.txt:1202
-msgid ""
-"Specify the layout when list items in `git clean -i`, which always shows "
-"files and directories in columns. See `column.ui` for details."
+msgid "Specify the layout when list items in `git clean -i`, which always shows files and directories in columns. See `column.ui` for details."
msgstr ""
#. type: Labeled list
#: en/config.txt:1203
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "column.status"
msgstr "column.status"
#. type: Plain text
#: en/config.txt:1206
-msgid ""
-"Specify whether to output untracked files in `git status` in columns. See "
-"`column.ui` for details."
+msgid "Specify whether to output untracked files in `git status` in columns. See `column.ui` for details."
msgstr ""
#. type: Labeled list
#: en/config.txt:1207
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "column.tag"
msgstr "column.tag"
#. type: Plain text
#: en/config.txt:1210
-msgid ""
-"Specify whether to output tag listing in `git tag` in columns. See "
-"`column.ui` for details."
+msgid "Specify whether to output tag listing in `git tag` in columns. See `column.ui` for details."
msgstr ""
#. type: Labeled list
#: en/config.txt:1211
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "commit.cleanup"
msgstr "commit.cleanup"
#. type: Plain text
#: en/config.txt:1219
-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)."
+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)."
msgstr ""
#. type: Labeled list
#: en/config.txt:1220
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "commit.gpgSign"
msgstr "commit.gpgSign"
#. type: Plain text
#: en/config.txt:1227
-msgid ""
-"A boolean to specify whether all commits should be GPG signed. Use of this "
-"option when doing operations such as rebase can result in a large number of "
-"commits being signed. It may be convenient to use an agent to avoid typing "
-"your GPG passphrase several times."
+msgid "A boolean to specify whether all commits should be GPG signed. Use of this option when doing operations such as rebase can result in a large number of commits being signed. It may be convenient to use an agent to avoid typing your GPG passphrase several times."
msgstr ""
#. type: Labeled list
#: en/config.txt:1228
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "commit.status"
msgstr "commit.status"
#. type: Plain text
#: en/config.txt:1232
-msgid ""
-"A boolean to enable/disable inclusion of status information in the commit "
-"message template when using an editor to prepare the commit message. "
-"Defaults to true."
-msgstr ""
-"Un bool챕en pour activer/d챕sactiver l'inclusion de l'information de statut "
-"dans le mod챔le de message de validation lors de l'utilisation d'un 챕diteur "
-"pour pr챕parer le message de validation. true par d챕faut."
+msgid "A boolean to enable/disable inclusion of status information in the commit message template when using an editor to prepare the commit message. Defaults to true."
+msgstr "Un bool챕en pour activer/d챕sactiver l'inclusion de l'information de statut dans le mod챔le de message de validation lors de l'utilisation d'un 챕diteur pour pr챕parer le message de validation. true par d챕faut."
#. type: Labeled list
#: en/config.txt:1233
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "commit.template"
msgstr "commit.template"
#. type: Plain text
#: en/config.txt:1236
-msgid ""
-"Specify the pathname of a file to use as the template for new commit "
-"messages."
+msgid "Specify the pathname of a file to use as the template for new commit messages."
msgstr ""
#. type: Labeled list
#: en/config.txt:1237
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "commit.verbose"
msgstr "commit.verbose"
#. type: Plain text
#: en/config.txt:1240
-msgid ""
-"A boolean or int to specify the level of verbose with `git commit`. See "
-"linkgit:git-commit[1]."
+msgid "A boolean or int to specify the level of verbose with `git commit`. See linkgit:git-commit[1]."
msgstr ""
#. type: Labeled list
#: en/config.txt:1241
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "credential.helper"
msgstr "credential.helper"
#. type: Plain text
#: en/config.txt:1247
-msgid ""
-"Specify an external helper to be called when a username or password "
-"credential is needed; the helper may consult external storage to avoid "
-"prompting the user for the credentials. Note that multiple helpers may be "
-"defined. See linkgit:gitcredentials[7] for details."
+msgid "Specify an external helper to be called when a username or password credential is needed; the helper may consult external storage to avoid prompting the user for the credentials. Note that multiple helpers may be defined. See linkgit:gitcredentials[7] for details."
msgstr ""
#. type: Labeled list
#: en/config.txt:1248
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "credential.useHttpPath"
msgstr "credential.useHttpPath"
#. type: Plain text
#: en/config.txt:1252
-msgid ""
-"When acquiring credentials, consider the \"path\" component of an http or "
-"https URL to be important. Defaults to false. See linkgit:gitcredentials[7] "
-"for more information."
+msgid "When acquiring credentials, consider the \"path\" component of an http or https URL to be important. Defaults to false. See linkgit:gitcredentials[7] for more information."
msgstr ""
#. type: Labeled list
#: en/config.txt:1253
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "credential.username"
msgstr "credential.username"
#. type: Plain text
#: en/config.txt:1257
-msgid ""
-"If no username is set for a network authentication, use this username by "
-"default. See credential.<context>.* below, and linkgit:gitcredentials[7]."
+msgid "If no username is set for a network authentication, use this username by default. See credential.<context>.* below, and linkgit:gitcredentials[7]."
msgstr ""
#. type: Labeled list
@@ -4605,11 +3854,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1264
-msgid ""
-"Any of the credential.* options above can be applied selectively to some "
-"credentials. For example \"credential.https://example.com.username\" would "
-"set the default username only for https connections to example.com. See "
-"linkgit:gitcredentials[7] for details on how URLs are matched."
+msgid "Any of the credential.* options above can be applied selectively to some credentials. For example \"credential.https://example.com.username\" would set the default username only for https connections to example.com. See linkgit:gitcredentials[7] for details on how URLs are matched."
msgstr ""
#. type: Labeled list
@@ -4620,8 +3865,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1267
-msgid ""
-"Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting."
+msgid "Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting."
msgstr ""
#. type: Labeled list
@@ -4632,9 +3876,7 @@ msgstr "difftool.<outil>.path"
#. type: Plain text
#: en/config.txt:1273 en/config.txt:2188 en/git-difftool.txt:120
-msgid ""
-"Override the path for the given tool. This is useful in case your tool is "
-"not in the PATH."
+msgid "Override the path for the given tool. This is useful in case your tool is not in the PATH."
msgstr ""
#. type: Labeled list
@@ -4645,17 +3887,12 @@ msgstr "difftool.<outil>.cmd"
#. type: Plain text
#: en/config.txt:1281
-msgid ""
-"Specify the command to invoke the specified diff tool. The specified "
-"command is evaluated in shell 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."
+msgid "Specify the command to invoke the specified diff tool. The specified command is evaluated in shell 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."
msgstr ""
#. type: Labeled list
#: en/config.txt:1282 en/git-difftool.txt:126
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "difftool.prompt"
msgstr "difftool.prompt"
@@ -4666,320 +3903,239 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1285 en/git-fast-import.txt:139
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/config.txt:1293
-msgid ""
-"If the number of objects imported by linkgit:git-fast-import[1] is below "
-"this limit, then the objects will be unpacked into loose object files. "
-"However if the number of imported objects equals or exceeds this limit then "
-"the pack will be stored as a pack. Storing the pack from a fast-import can "
-"make the import operation complete faster, especially on slow filesystems. "
-"If not set, the value of `transfer.unpackLimit` is used instead."
+msgid "If the number of objects imported by linkgit:git-fast-import[1] is below this limit, then the objects will be unpacked into loose object files. However if the number of imported objects equals or exceeds this limit then the pack will be stored as a pack. Storing the pack from a fast-import can make the import operation complete faster, especially on slow filesystems. If not set, the value of `transfer.unpackLimit` is used instead."
msgstr ""
#. type: Labeled list
#: en/config.txt:1294
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "fetch.recurseSubmodules"
msgstr "fetch.recurseSubmodules"
#. 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 "
-"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 "
-"commit that updates the submodule's reference."
+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 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 commit that updates the submodule's reference."
msgstr ""
#. type: Labeled list
#: en/config.txt:1303
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "fetch.fsckObjects"
msgstr "fetch.fsckObjects"
#. 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 "
-"abort are only dangling objects. Defaults to false. If not set, the value "
-"of `transfer.fsckObjects` is used instead."
+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 abort are only dangling objects. Defaults to false. If not set, the value of `transfer.fsckObjects` is used instead."
msgstr ""
#. type: Labeled list
#: en/config.txt:1310
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "fetch.unpackLimit"
msgstr "fetch.unpackLimit"
#. type: Plain text
#: 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 "
-"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."
+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 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."
msgstr ""
#. type: Labeled list
#: en/config.txt:1321
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "fetch.prune"
msgstr "fetch.prune"
#. type: Plain text
#: en/config.txt:1324
-msgid ""
-"If true, fetch will automatically behave as if the `--prune` option was "
-"given on the command line. See also `remote.<name>.prune`."
+msgid "If true, fetch will automatically behave as if the `--prune` option was given on the command line. See also `remote.<name>.prune`."
msgstr ""
#. type: Labeled list
#: en/config.txt:1325
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "fetch.output"
msgstr "fetch.output"
#. type: Plain text
#: en/config.txt:1329
-msgid ""
-"Control how ref update status is printed. Valid values are `full` and "
-"`compact`. Default value is `full`. See section OUTPUT in linkgit:git-"
-"fetch[1] for detail."
+msgid "Control how ref update status is printed. Valid values are `full` and `compact`. Default value is `full`. See section OUTPUT in linkgit:git-fetch[1] for detail."
msgstr ""
#. type: Labeled list
#: en/config.txt:1330
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "format.attach"
msgstr "format.attach"
#. type: Plain text
#: en/config.txt:1336
-msgid ""
-"Enable multipart/mixed attachments as the default for 'format-patch'. The "
-"value can also be a double quoted string which will enable attachments as "
-"the default and set the value as the boundary. See the --attach option in "
-"linkgit:git-format-patch[1]."
+msgid "Enable multipart/mixed attachments as the default for 'format-patch'. The value can also be a double quoted string which will enable attachments as the default and set the value as the boundary. See the --attach option in linkgit:git-format-patch[1]."
msgstr ""
#. type: Labeled list
#: en/config.txt:1337
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "format.from"
msgstr "format.from"
#. 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 "
-"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 "
-"a \"From:\" field in the body of the patch mail if different. If set to a "
-"non-boolean value, format-patch uses that value instead of your committer "
-"identity. Defaults to false."
+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 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 a \"From:\" field in the body of the patch mail if different. If set to a non-boolean value, format-patch uses that value instead of your committer identity. Defaults to false."
msgstr ""
#. type: Labeled list
#: en/config.txt:1347
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "format.numbered"
msgstr "format.numbered"
#. type: Plain text
#: en/config.txt:1353
-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]."
+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]."
msgstr ""
#. type: Labeled list
#: en/config.txt:1354
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "format.headers"
msgstr "format.headers"
#. 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]."
+msgid "Additional email headers to include in a patch to be submitted by mail. See linkgit:git-format-patch[1]."
msgstr ""
#. type: Labeled list
#: en/config.txt:1358
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "format.to"
msgstr "format.to"
#. type: Labeled list
#: en/config.txt:1359
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "format.cc"
msgstr "format.cc"
#. type: Plain text
#: en/config.txt:1363
-msgid ""
-"Additional recipients to include in a patch to be submitted by mail. See "
-"the --to and --cc options in linkgit:git-format-patch[1]."
+msgid "Additional recipients to include in a patch to be submitted by mail. See the --to and --cc options in linkgit:git-format-patch[1]."
msgstr ""
#. type: Labeled list
#: en/config.txt:1364
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "format.subjectPrefix"
msgstr "format.subjectPrefix"
#. type: Plain text
#: en/config.txt:1367
-msgid ""
-"The default for format-patch is to output files with the '[PATCH]' subject "
-"prefix. Use this variable to change that prefix."
+msgid "The default for format-patch is to output files with the '[PATCH]' subject prefix. Use this variable to change that prefix."
msgstr ""
#. type: Labeled list
#: en/config.txt:1368
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "format.signature"
msgstr "format.signature"
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
#: en/config.txt:1374
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "format.signatureFile"
msgstr "format.signatureFile"
#. type: Plain text
#: en/config.txt:1377
-msgid ""
-"Works just like format.signature except the contents of the file specified "
-"by this variable will be used as the signature."
+msgid "Works just like format.signature except the contents of the file specified by this variable will be used as the signature."
msgstr ""
#. type: Labeled list
#: en/config.txt:1378
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "format.suffix"
msgstr "format.suffix"
#. type: Plain text
#: 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)."
+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)."
msgstr ""
#. type: Labeled list
#: en/config.txt:1383 en/git-log.txt:175
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "format.pretty"
msgstr "format.pretty"
#. type: Plain text
#: en/config.txt:1387
-msgid ""
-"The default pretty format for log/show/whatchanged command, See linkgit:git-"
-"log[1], linkgit:git-show[1], linkgit:git-whatchanged[1]."
-msgstr ""
-"Le format automatique par d챕faut de la commande log/show/whatchanged, voir "
-"linkgit:git-log[1], linkgit:git-show[1], linkgit:git-whatchanged[1]."
+msgid "The default pretty format for log/show/whatchanged command, See linkgit:git-log[1], linkgit:git-show[1], linkgit:git-whatchanged[1]."
+msgstr "Le format automatique par d챕faut de la commande log/show/whatchanged, voir linkgit:git-log[1], linkgit:git-show[1], linkgit:git-whatchanged[1]."
#. type: Labeled list
#: en/config.txt:1388
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "format.thread"
msgstr "format.thread"
#. 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 "
-"makes every mail a reply to the previous one. A true boolean value is the "
-"same as `shallow`, and a false value disables threading."
+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 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 ""
#. type: Labeled list
#: en/config.txt:1398
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "format.signOff"
msgstr "format.signOff"
#. type: Plain text
#: en/config.txt:1404
-msgid ""
-"A boolean value which lets you enable the `-s/--signoff` option of format-"
-"patch by default. *Note:* Adding the Signed-off-by: line to a patch should "
-"be a conscious act and means that you certify you have the rights to submit "
-"this work under the same open source license. Please see the "
-"'SubmittingPatches' document for further discussion."
+msgid "A boolean value which lets you enable the `-s/--signoff` option of format-patch by default. *Note:* Adding the Signed-off-by: line to a patch should be a conscious act and means that you certify you have the rights to submit this work under the same open source license. Please see the 'SubmittingPatches' document for further discussion."
msgstr ""
#. type: Labeled list
#: en/config.txt:1405
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "format.coverLetter"
msgstr "format.coverLetter"
#. 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-"
-"letter only when there's more than one patch."
+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-letter only when there's more than one patch."
msgstr ""
#. type: Labeled list
#: en/config.txt:1410
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "format.outputDirectory"
msgstr "format.outputDirectory"
#. type: Plain text
#: en/config.txt:1413
-msgid ""
-"Set a custom directory to store the resulting files instead of the current "
-"working directory."
+msgid "Set a custom directory to store the resulting files instead of the current working directory."
msgstr ""
#. type: Labeled list
#: en/config.txt:1414
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "format.useAutoBase"
msgstr "format.useAutoBase"
#. type: Plain text
#: en/config.txt:1417
-msgid ""
-"A boolean value which lets you enable the `--base=auto` option of format-"
-"patch by default."
+msgid "A boolean value which lets you enable the `--base=auto` option of format-patch by default."
msgstr ""
#. type: Labeled list
@@ -4990,9 +4146,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1422
-msgid ""
-"The command which is used to convert the content of a worktree file to a "
-"blob upon checkin. See linkgit:gitattributes[5] for details."
+msgid "The command which is used to convert the content of a worktree file to a blob upon checkin. See linkgit:gitattributes[5] for details."
msgstr ""
#. type: Labeled list
@@ -5003,9 +4157,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1427
-msgid ""
-"The command which is used to convert the content of a blob object to a "
-"worktree file upon checkout. See linkgit:gitattributes[5] for details."
+msgid "The command which is used to convert the content of a blob object to a worktree file upon checkout. See linkgit:gitattributes[5] for details."
msgstr ""
#. type: Labeled list
@@ -5016,24 +4168,17 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1431
-msgid ""
-"Allows overriding the message type (error, warn or ignore) of a specific "
-"message ID such as `missingEmail`."
+msgid "Allows overriding the message type (error, warn or ignore) of a specific message ID such as `missingEmail`."
msgstr ""
#. type: Plain text
#: en/config.txt:1435
-msgid ""
-"For convenience, fsck prefixes the error/warning with the message ID, e.g. "
-"\"missingEmail: invalid author/committer line - missing email\" means that "
-"setting `fsck.missingEmail = ignore` will hide that issue."
+msgid "For convenience, fsck prefixes the error/warning with the message ID, e.g. \"missingEmail: invalid author/committer line - missing email\" means that setting `fsck.missingEmail = ignore` will hide that issue."
msgstr ""
#. type: Plain text
#: en/config.txt:1438
-msgid ""
-"This feature is intended to support working with legacy repositories which "
-"cannot be repaired without disruptive changes."
+msgid "This feature is intended to support working with legacy repositories which cannot be repaired without disruptive changes."
msgstr ""
#. type: Labeled list
@@ -5044,13 +4189,7 @@ 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."
+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."
msgstr ""
#. type: Labeled list
@@ -5061,9 +4200,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1451
-msgid ""
-"The depth parameter used in the delta compression algorithm used by 'git gc "
-"--aggressive'. This defaults to 50."
+msgid "The depth parameter used in the delta compression algorithm used by 'git gc --aggressive'. This defaults to 50."
msgstr ""
#. type: Labeled list
@@ -5074,9 +4211,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1456
-msgid ""
-"The window size parameter used in the delta compression algorithm used by "
-"'git gc --aggressive'. This defaults to 250."
+msgid "The window size parameter used in the delta compression algorithm used by 'git gc --aggressive'. This defaults to 250."
msgstr ""
#. type: Labeled list
@@ -5087,11 +4222,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1463
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -5102,10 +4233,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1469
-msgid ""
-"When there are more than this many packs that are not marked with `*.keep` "
-"file in the repository, `git gc --auto` consolidates them into one larger "
-"pack. The default\tvalue is 50. Setting this to 0 disables it."
+msgid "When there are more than this many packs that are not marked with `*.keep` file in the repository, `git gc --auto` consolidates them into one larger pack. The default\tvalue is 50. Setting this to 0 disables it."
msgstr ""
#. type: Labeled list
@@ -5116,9 +4244,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1473
-msgid ""
-"Make `git gc --auto` return immediately and run in background if the system "
-"supports it. Default is true."
+msgid "Make `git gc --auto` return immediately and run in background if the system supports it. Default is true."
msgstr ""
#. type: Labeled list
@@ -5129,10 +4255,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -5143,12 +4266,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1487
-msgid ""
-"Running `git pack-refs` in a repository renders it unclonable by Git "
-"versions prior to 1.5.1.2 over dumb transports such as HTTP. This variable "
-"determines whether '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. The default is `true`."
+msgid "Running `git pack-refs` in a repository renders it unclonable by Git versions prior to 1.5.1.2 over dumb transports such as HTTP. This variable determines whether '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. The default is `true`."
msgstr ""
#. type: Labeled list
@@ -5159,14 +4277,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1496
-msgid ""
-"When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'. Override "
-"the grace period with this config variable. The value \"now\" may be used "
-"to disable this grace period and always prune unreachable objects "
-"immediately, or \"never\" may be used to suppress pruning. This feature "
-"helps prevent corruption when 'git gc' runs concurrently with another "
-"process writing to the repository; see the \"NOTES\" section of linkgit:git-"
-"gc[1]."
+msgid "When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'. Override the grace period with this config variable. The value \"now\" may be used to disable this grace period and always prune unreachable objects immediately, or \"never\" may be used to suppress pruning. This feature helps prevent corruption when 'git gc' runs concurrently with another process writing to the repository; see the \"NOTES\" section of linkgit:git-gc[1]."
msgstr ""
#. type: Labeled list
@@ -5177,12 +4288,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1504
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -5199,11 +4305,7 @@ 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\" "
-"suppresses expiration altogether. With \"<pattern>\" (e.g. \"refs/stash\") "
-"in the middle the setting applies only to the refs that match the <pattern>."
+msgid "'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 ""
#. type: Labeled list
@@ -5220,12 +4322,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1523
-msgid ""
-"'git reflog expire' removes reflog entries older than this time and are not "
-"reachable from the current tip; defaults to 30 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>."
+msgid "'git reflog expire' removes reflog entries older than this time and are not reachable from the current tip; defaults to 30 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 ""
#. type: Labeled list
@@ -5236,10 +4333,7 @@ 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-"
-"rerere[1]."
+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-rerere[1]."
msgstr ""
#. type: Labeled list
@@ -5250,10 +4344,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1533
-msgid ""
-"Records of conflicted merge you have not resolved are kept for this many "
-"days when 'git rerere gc' is run. The default is 15 days. See linkgit:git-"
-"rerere[1]."
+msgid "Records of conflicted merge you have not resolved are kept for this many days when 'git rerere gc' is run. The default is 15 days. See linkgit:git-rerere[1]."
msgstr ""
#. type: Labeled list
@@ -5264,9 +4355,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1537
-msgid ""
-"Append this string to each commit message. Set to empty string to disable "
-"this feature. Defaults to \"via git-CVS emulator\"."
+msgid "Append this string to each commit message. Set to empty string to disable this feature. Defaults to \"via git-CVS emulator\"."
msgstr ""
#. type: Labeled list
@@ -5277,9 +4366,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1541
-msgid ""
-"Whether the CVS server interface is enabled for this repository. See "
-"linkgit:git-cvsserver[1]."
+msgid "Whether the CVS server interface is enabled for this repository. See linkgit:git-cvsserver[1]."
msgstr ""
#. type: Labeled list
@@ -5290,9 +4377,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1545
-msgid ""
-"Path to a log file where the CVS server interface well... logs various "
-"stuff. See linkgit:git-cvsserver[1]."
+msgid "Path to a log file where the CVS server interface well... logs various stuff. See linkgit:git-cvsserver[1]."
msgstr ""
#. type: Labeled list
@@ -5303,14 +4388,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1556
-msgid ""
-"If true, the server will look up the end-of-line conversion attributes for "
-"files to determine the `-k` modes to use. If the attributes force Git to "
-"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]."
+msgid "If true, the server will look up the end-of-line conversion attributes for files to determine the `-k` modes to use. If the attributes force Git to 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]."
msgstr ""
#. type: Labeled list
@@ -5321,13 +4399,7 @@ 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`."
+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`."
msgstr ""
#. type: Labeled list
@@ -5338,12 +4410,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1574
-msgid ""
-"Database used by git-cvsserver to cache revision information derived from "
-"the Git repository. The exact meaning depends on the used database driver, "
-"for SQLite (which is the default driver) this is a filename. Supports "
-"variable substitution (see linkgit:git-cvsserver[1] for details). May not "
-"contain semicolons (`;`). Default: '%Ggitcvs.%m.sqlite'"
+msgid "Database used by git-cvsserver to cache revision information derived from the Git repository. The exact meaning depends on the used database driver, for SQLite (which is the default driver) this is a filename. Supports variable substitution (see linkgit:git-cvsserver[1] for details). May not contain semicolons (`;`). Default: '%Ggitcvs.%m.sqlite'"
msgstr ""
#. type: Labeled list
@@ -5354,12 +4421,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1582
-msgid ""
-"Used Perl DBI driver. You can specify any available driver for this here, "
-"but it might not work. git-cvsserver is tested with 'DBD::SQLite', reported "
-"to work with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. "
-"Experimental feature. May not contain double colons (`:`). Default: "
-"'SQLite'. See linkgit:git-cvsserver[1]."
+msgid "Used Perl DBI driver. You can specify any available driver for this here, but it might not work. git-cvsserver is tested with 'DBD::SQLite', reported to work with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Experimental feature. May not contain double colons (`:`). Default: 'SQLite'. See linkgit:git-cvsserver[1]."
msgstr ""
#. type: Labeled list
@@ -5370,10 +4432,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1588
-msgid ""
-"Database user and password. Only useful if setting `gitcvs.dbDriver`, since "
-"SQLite has no concept of database users and/or passwords. 'gitcvs.dbUser' "
-"supports variable substitution (see linkgit:git-cvsserver[1] for details)."
+msgid "Database user and password. Only useful if setting `gitcvs.dbDriver`, since SQLite has no concept of database users and/or passwords. 'gitcvs.dbUser' supports variable substitution (see linkgit:git-cvsserver[1] for details)."
msgstr ""
#. type: Labeled list
@@ -5384,43 +4443,35 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1595
-msgid ""
-"Database table name prefix. Prepended to the names of any database tables "
-"used, allowing a single database to be used for several repositories. "
-"Supports variable substitution (see linkgit:git-cvsserver[1] for details). "
-"Any non-alphabetic characters will be replaced with underscores."
+msgid "Database table name prefix. Prepended to the names of any database tables used, allowing a single database to be used for several repositories. Supports variable substitution (see linkgit:git-cvsserver[1] for details). Any non-alphabetic characters will be replaced with underscores."
msgstr ""
#. type: Plain text
#: en/config.txt:1601
-msgid ""
-"All gitcvs variables except for `gitcvs.usecrlfattr` and `gitcvs.allBinary` "
-"can also be specified as 'gitcvs.<access_method>.<varname>' (where "
-"'access_method' is one of \"ext\" and \"pserver\") to make them apply only "
-"for the given access method."
+msgid "All gitcvs variables except for `gitcvs.usecrlfattr` and `gitcvs.allBinary` can also be specified as 'gitcvs.<access_method>.<varname>' (where 'access_method' is one of \"ext\" and \"pserver\") to make them apply only for the given access method."
msgstr ""
#. type: Labeled list
#: en/config.txt:1602
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gitweb.category"
msgstr "gitweb.category"
#. type: Labeled list
#: en/config.txt:1603
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gitweb.description"
msgstr "gitweb.description"
#. type: Labeled list
#: en/config.txt:1604
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gitweb.owner"
msgstr "gitweb.owner"
#. type: Labeled list
#: en/config.txt:1605
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gitweb.url"
msgstr "gitweb.url"
@@ -5431,55 +4482,55 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1608
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gitweb.avatar"
msgstr "gitweb.avatar"
#. type: Labeled list
#: en/config.txt:1609
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gitweb.blame"
msgstr "gitweb.blame"
#. type: Labeled list
#: en/config.txt:1610
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gitweb.grep"
msgstr "gitweb.grep"
#. type: Labeled list
#: en/config.txt:1611
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gitweb.highlight"
msgstr "gitweb.highlight"
#. type: Labeled list
#: en/config.txt:1612
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gitweb.patches"
msgstr "gitweb.patches"
#. type: Labeled list
#: en/config.txt:1613
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gitweb.pickaxe"
msgstr "gitweb.pickaxe"
#. type: Labeled list
#: en/config.txt:1614
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gitweb.remote_heads"
msgstr "gitweb.remote_heads"
#. type: Labeled list
#: en/config.txt:1615
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gitweb.showSizes"
msgstr "gitweb.showSizes"
#. type: Labeled list
#: en/config.txt:1616
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gitweb.snapshot"
msgstr "gitweb.snapshot"
@@ -5507,11 +4558,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"'default' will return to the default matching behavior."
+msgid "Set the default matching behavior. Using a value of 'basic', 'extended', 'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`, `--fixed-strings`, or `--perl-regexp` option accordingly, while the value 'default' will return to the default matching behavior."
msgstr ""
#. type: Labeled list
@@ -5522,10 +4569,7 @@ 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 "
-"'default'."
+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 'default'."
msgstr ""
#. type: Labeled list
@@ -5536,9 +4580,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1636
-msgid ""
-"Number of grep worker threads to use. See `grep.threads` in linkgit:git-"
-"grep[1] for more information."
+msgid "Number of grep worker threads to use. See `grep.threads` in linkgit:git-grep[1] for more information."
msgstr ""
#. type: Labeled list
@@ -5549,9 +4591,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1640 en/git-grep.txt:68
-msgid ""
-"If set to true, fall back to git grep --no-index if git grep is executed "
-"outside of a git repository. Defaults to false."
+msgid "If set to true, fall back to git grep --no-index if git grep is executed outside of a git repository. Defaults to false."
msgstr ""
#. type: Labeled list
@@ -5562,177 +4602,139 @@ 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 "
-"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."
+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 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."
msgstr ""
#. type: Labeled list
#: en/config.txt:1652
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gui.commitMsgWidth"
msgstr "gui.commitMsgWidth"
#. type: Plain text
#: en/config.txt:1655
-msgid ""
-"Defines how wide the commit message window is in the linkgit:git-gui[1]. "
-"\"75\" is the default."
+msgid "Defines how wide the commit message window is in the linkgit:git-gui[1]. \"75\" is the default."
msgstr ""
#. type: Labeled list
#: en/config.txt:1656
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gui.diffContext"
msgstr "gui.diffContext"
#. 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\"."
+msgid "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
#: en/config.txt:1660
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gui.displayUntracked"
msgstr "gui.displayUntracked"
#. 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\"."
+msgid "Determines if linkgit:git-gui[1] shows untracked files in the file list. The default is \"true\"."
msgstr ""
#. type: Labeled list
#: en/config.txt:1664
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gui.encoding"
msgstr "gui.encoding"
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
#: en/config.txt:1672
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gui.matchTrackingBranch"
msgstr "gui.matchTrackingBranch"
#. 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\"."
+msgid "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
#: en/config.txt:1677
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gui.newBranchTemplate"
msgstr "gui.newBranchTemplate"
#. type: Plain text
#: en/config.txt:1680
-msgid ""
-"Is used as suggested name when creating new branches using the linkgit:git-"
-"gui[1]."
+msgid "Is used as suggested name when creating new branches using the linkgit:git-gui[1]."
msgstr ""
#. type: Labeled list
#: en/config.txt:1681
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gui.pruneDuringFetch"
msgstr "gui.pruneDuringFetch"
#. type: Plain text
#: en/config.txt:1684
-msgid ""
-"\"true\" if linkgit:git-gui[1] should prune remote-tracking branches when "
-"performing a fetch. The default value is \"false\"."
+msgid "\"true\" if linkgit:git-gui[1] should prune remote-tracking branches when performing a fetch. The default value is \"false\"."
msgstr ""
#. type: Labeled list
#: en/config.txt:1685
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gui.trustmtime"
msgstr "gui.trustmtime"
#. type: Plain text
#: en/config.txt:1688
-msgid ""
-"Determines if linkgit:git-gui[1] should trust the file modification "
-"timestamp or not. By default the timestamps are not trusted."
+msgid "Determines if linkgit:git-gui[1] should trust the file modification timestamp or not. By default the timestamps are not trusted."
msgstr ""
#. type: Labeled list
#: en/config.txt:1689
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gui.spellingDictionary"
msgstr "gui.spellingDictionary"
#. type: Plain text
#: en/config.txt:1693
-msgid ""
-"Specifies the dictionary used for spell checking commit messages in the "
-"linkgit:git-gui[1]. When set to \"none\" spell checking is turned off."
+msgid "Specifies the dictionary used for spell checking commit messages in the linkgit:git-gui[1]. When set to \"none\" spell checking is turned off."
msgstr ""
#. type: Labeled list
#: en/config.txt:1694
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gui.fastCopyBlame"
msgstr "gui.fastCopyBlame"
#. type: Plain text
#: en/config.txt:1698
-msgid ""
-"If true, 'git gui blame' uses `-C` instead of `-C -C` for original location "
-"detection. It makes blame significantly faster on huge repositories at the "
-"expense of less thorough copy detection."
+msgid "If true, 'git gui blame' uses `-C` instead of `-C -C` for original location detection. It makes blame significantly faster on huge repositories at the expense of less thorough copy detection."
msgstr ""
#. type: Labeled list
#: en/config.txt:1699
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gui.copyBlameThreshold"
msgstr "gui.copyBlameThreshold"
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
#: en/config.txt:1704
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "gui.blamehistoryctx"
msgstr "gui.blamehistoryctx"
#. type: Plain text
#: en/config.txt:1709
-msgid ""
-"Specifies the radius of history context in days to show in linkgit:gitk[1] "
-"for the selected commit, when the `Show History Context` menu item is "
-"invoked from 'git gui blame'. If this variable is set to zero, the whole "
-"history is shown."
+msgid "Specifies the radius of history context in days to show in linkgit:gitk[1] for the selected commit, when the `Show History Context` menu item is invoked from 'git gui blame'. If this variable is set to zero, the whole history is shown."
msgstr ""
#. type: Labeled list
@@ -5743,14 +4745,7 @@ msgstr ""
#. type: Plain text
#: 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 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)."
+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 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)."
msgstr ""
#. type: Labeled list
@@ -5761,9 +4756,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1722
-msgid ""
-"Run the tool only if a diff is selected in the GUI. It guarantees that "
-"'FILENAME' is not empty."
+msgid "Run the tool only if a diff is selected in the GUI. It guarantees that 'FILENAME' is not empty."
msgstr ""
#. type: Labeled list
@@ -5774,8 +4767,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1726
-msgid ""
-"Run the command silently, without creating a window to display its output."
+msgid "Run the command silently, without creating a window to display its output."
msgstr ""
#. type: Labeled list
@@ -5786,9 +4778,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1730
-msgid ""
-"Don't rescan the working directory for changes after the tool finishes "
-"execution."
+msgid "Don't rescan the working directory for changes after the tool finishes execution."
msgstr ""
#. type: Labeled list
@@ -5810,12 +4800,7 @@ 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 "
-"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."
+msgid "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."
msgstr ""
#. type: Labeled list
@@ -5826,10 +4811,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1746
-msgid ""
-"Request a single valid revision from the user, and set the `REVISION` "
-"environment variable. In other aspects this option is similar to "
-"'argPrompt', and can be used together with it."
+msgid "Request a single valid revision from the user, and set the `REVISION` environment variable. In other aspects this option is similar to 'argPrompt', and can be used together with it."
msgstr ""
#. type: Labeled list
@@ -5840,10 +4822,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1751
-msgid ""
-"Show only unmerged branches in the 'revPrompt' subdialog. This is useful "
-"for tools similar to merge or rebase, but not for things like checkout or "
-"reset."
+msgid "Show only unmerged branches in the 'revPrompt' subdialog. This is useful for tools similar to merge or rebase, but not for things like checkout or reset."
msgstr ""
#. type: Labeled list
@@ -5854,9 +4833,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1755
-msgid ""
-"Specifies the title to use for the prompt dialog. The default is the tool "
-"name."
+msgid "Specifies the title to use for the prompt dialog. The default is the tool name."
msgstr ""
#. type: Labeled list
@@ -5867,69 +4844,51 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1760
-msgid ""
-"Specifies the general prompt string to display at the top of the dialog, "
-"before subsections for 'argPrompt' and 'revPrompt'. The default value "
-"includes the actual command."
+msgid "Specifies the general prompt string to display at the top of the dialog, before subsections for 'argPrompt' and 'revPrompt'. The default value includes the actual command."
msgstr ""
#. type: Labeled list
#: en/config.txt:1761
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "help.browser"
msgstr "help.browser"
#. type: Plain text
#: en/config.txt:1764
-msgid ""
-"Specify the browser that will be used to display help in the 'web' format. "
-"See linkgit:git-help[1]."
+msgid "Specify the browser that will be used to display help in the 'web' format. See linkgit:git-help[1]."
msgstr ""
#. type: Title ~
#: en/config.txt:1765 en/git-help.txt:81
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "help.format"
msgstr "help.format"
#. 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 "
-"'html' are the same."
+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 'html' are the same."
msgstr ""
#. type: Labeled list
#: en/config.txt:1770
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "help.autoCorrect"
msgstr "help.autoCorrect"
#. type: Plain text
#: en/config.txt:1778
-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 "
-"is the default."
+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 is the default."
msgstr ""
#. type: Labeled list
#: en/config.txt:1779
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "help.htmlPath"
msgstr "help.htmlPath"
#. 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 "
-"your Git installation."
+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 your Git installation."
msgstr ""
#. type: Labeled list
@@ -5940,15 +4899,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1794
-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"
+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"
msgstr ""
#. type: Labeled list
@@ -5959,22 +4910,12 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1802
-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 "
-"overridden by the `GIT_HTTP_PROXY_AUTHMETHOD` environment variable. "
-"Possible values are:"
+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 overridden by the `GIT_HTTP_PROXY_AUTHMETHOD` environment variable. Possible values are:"
msgstr ""
#. type: Plain text
#: en/config.txt:1808
-msgid ""
-"`anyauth` - Automatically pick a suitable authentication method. It is "
-"assumed that the proxy answers an unauthenticated request with a 407 status "
-"code and one or more Proxy-authenticate headers with supported "
-"authentication methods. This is the default."
+msgid "`anyauth` - Automatically pick a suitable authentication method. It is assumed that the proxy answers an unauthenticated request with a 407 status code and one or more Proxy-authenticate headers with supported authentication methods. This is the default."
msgstr ""
#. type: Plain text
@@ -5984,16 +4925,12 @@ 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"
+msgid "`digest` - HTTP Digest authentication; this prevents the password from being transmitted to the proxy in clear text"
msgstr ""
#. type: Plain text
#: en/config.txt:1813
-msgid ""
-"`negotiate` - GSS-Negotiate authentication (compare the --negotiate option "
-"of `curl(1)`)"
+msgid "`negotiate` - GSS-Negotiate authentication (compare the --negotiate option of `curl(1)`)"
msgstr ""
#. type: Plain text
@@ -6009,10 +4946,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1821
-msgid ""
-"Attempt authentication without seeking a username or password. This can be "
-"used to attempt GSS-Negotiate authentication without specifying a username "
-"in the URL, as libcurl normally requires a username for authentication."
+msgid "Attempt authentication without seeking a username or password. This can be used to attempt GSS-Negotiate authentication without specifying a username in the URL, as libcurl normally requires a username for authentication."
msgstr ""
#. type: Labeled list
@@ -6023,11 +4957,7 @@ msgstr ""
#. type: Plain text
#: 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:"
+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:"
msgstr ""
#. type: Plain text
@@ -6037,9 +4967,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1832
-msgid ""
-"`policy` - Delegates if and only if the OK-AS-DELEGATE flag is set in the "
-"Kerberos service ticket, which is a matter of realm policy."
+msgid "`policy` - Delegates if and only if the OK-AS-DELEGATE flag is set in the Kerberos service ticket, which is a matter of realm policy."
msgstr ""
#. type: Plain text
@@ -6055,11 +4983,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1841
-msgid ""
-"Pass an additional HTTP header when communicating with a server. If more "
-"than one such entry exists, all of them are added as extra headers. To "
-"allow overriding the settings inherited from the system config, an empty "
-"value will reset the extra headers to the empty list."
+msgid "Pass an additional HTTP header when communicating with a server. If more than one such entry exists, all of them are added as extra headers. To allow overriding the settings inherited from the system config, an empty value will reset the extra headers to the empty list."
msgstr ""
#. type: Labeled list
@@ -6070,13 +4994,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1850
-msgid ""
-"The pathname of a file containing previously stored cookie lines, which "
-"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."
+msgid "The pathname of a file containing previously stored cookie lines, which 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."
msgstr ""
#. type: Labeled list
@@ -6087,9 +5005,7 @@ 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."
+msgid "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
@@ -6100,14 +5016,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1864
-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 "
-"this option are:"
+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 this option are:"
msgstr ""
#. type: Plain text
@@ -6142,10 +5051,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -6156,20 +5062,12 @@ msgstr ""
#. type: Plain text
#: 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 "
-"this sets the 'CURLOPT_SSL_CIPHER_LIST' option; see the libcurl "
-"documentation for more details on the format of this list."
+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 this sets the 'CURLOPT_SSL_CIPHER_LIST' option; see the libcurl documentation for more details on the format of this list."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -6180,9 +5078,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1895
-msgid ""
-"Whether to verify the SSL certificate when fetching or pushing over HTTPS. "
-"Can be overridden by the `GIT_SSL_NO_VERIFY` environment variable."
+msgid "Whether to verify the SSL certificate when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_NO_VERIFY` environment variable."
msgstr ""
#. type: Labeled list
@@ -6193,9 +5089,7 @@ 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."
+msgid "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
@@ -6206,9 +5100,7 @@ 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."
+msgid "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
@@ -6219,11 +5111,7 @@ msgstr ""
#. type: Plain text
#: 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` "
-"environment variable."
+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` environment variable."
msgstr ""
#. type: Labeled list
@@ -6234,10 +5122,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1916
-msgid ""
-"File containing the certificates to verify the peer with when fetching or "
-"pushing over HTTPS. Can be overridden by the `GIT_SSL_CAINFO` environment "
-"variable."
+msgid "File containing the certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CAINFO` environment variable."
msgstr ""
#. type: Labeled list
@@ -6248,10 +5133,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1921
-msgid ""
-"Path containing files with the CA certificates to verify the peer with when "
-"fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CAPATH` "
-"environment variable."
+msgid "Path containing files with the CA certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CAPATH` environment variable."
msgstr ""
#. type: Labeled list
@@ -6262,12 +5144,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -6278,12 +5155,7 @@ 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 "
-"verification errors on misconfigured servers."
+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 verification errors on misconfigured servers."
msgstr ""
#. type: Labeled list
@@ -6294,9 +5166,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1941
-msgid ""
-"How many HTTP requests to launch in parallel. Can be overridden by the "
-"`GIT_HTTP_MAX_REQUESTS` environment variable. Default is 5."
+msgid "How many HTTP requests to launch in parallel. Can be overridden by the `GIT_HTTP_MAX_REQUESTS` environment variable. Default is 5."
msgstr ""
#. type: Labeled list
@@ -6307,11 +5177,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1947
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -6322,12 +5188,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1955
-msgid ""
-"Maximum size in bytes of the buffer used by smart HTTP transports when "
-"POSTing data to the remote system. For requests larger than this buffer "
-"size, HTTP/1.1 and Transfer-Encoding: chunked is used to avoid creating a "
-"massive pack file locally. Default is 1 MiB, which is sufficient for most "
-"requests."
+msgid "Maximum size in bytes of the buffer used by smart HTTP transports when POSTing data to the remote system. For requests larger than this buffer size, HTTP/1.1 and Transfer-Encoding: chunked is used to avoid creating a massive pack file locally. Default is 1 MiB, which is sufficient for most requests."
msgstr ""
#. type: Labeled list
@@ -6338,11 +5199,7 @@ 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 "
-"variables."
+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 variables."
msgstr ""
#. type: Labeled list
@@ -6353,11 +5210,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"false (curl will use EPSV)."
+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 false (curl will use EPSV)."
msgstr ""
#. type: Labeled list
@@ -6368,14 +5221,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1976
-msgid ""
-"The HTTP USER_AGENT string presented to an HTTP server. The default value "
-"represents the version of the client Git such as git/1.7.1. This option "
-"allows you to override this value to a more common value such as "
-"Mozilla/4.0. This may be necessary, for instance, if connecting through a "
-"firewall that restricts HTTP connections to a set of common USER_AGENT "
-"strings (but not including those like git/1.7.1). Can be overridden by the "
-"`GIT_HTTP_USER_AGENT` environment variable."
+msgid "The HTTP USER_AGENT string presented to an HTTP server. The default value represents the version of the client Git such as git/1.7.1. This option allows you to override this value to a more common value such as Mozilla/4.0. This may be necessary, for instance, if connecting through a firewall that restricts HTTP connections to a set of common USER_AGENT strings (but not including those like git/1.7.1). Can be overridden by the `GIT_HTTP_USER_AGENT` environment variable."
msgstr ""
#. type: Labeled list
@@ -6386,14 +5232,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1986
-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`."
+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`."
msgstr ""
#. type: Labeled list
@@ -6404,80 +5243,42 @@ msgstr ""
#. type: Plain text
#: en/config.txt:1991
-msgid ""
-"Any of the http.* options above can be applied selectively to some URLs. "
-"For a config key to match a URL, each element of the config key is compared "
-"to that of the URL, in the following order:"
+msgid "Any of the http.* options above can be applied selectively to some URLs. For a config key to match a URL, each element of the config key is compared to that of the URL, in the following order:"
msgstr ""
#. type: Plain text
#: en/config.txt:1995
-msgid ""
-"Scheme (e.g., `https` in `https://example.com/`). This field must match "
-"exactly between the config key and the URL."
+msgid "Scheme (e.g., `https` in `https://example.com/`). This field must match exactly between the config key and the URL."
msgstr ""
#. type: Plain text
#: en/config.txt:2001
-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/`."
+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/`."
msgstr ""
#. type: Plain text
#: en/config.txt:2006
-msgid ""
-"Port number (e.g., `8080` in `http://example.com:8080/`). This field must "
-"match exactly between the config key and the URL. Omitted port numbers are "
-"automatically converted to the correct default for the scheme before "
-"matching."
+msgid "Port number (e.g., `8080` in `http://example.com:8080/`). This field must match exactly between the config key and the URL. Omitted port numbers are automatically converted to the correct default for the scheme before matching."
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 "
-"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/`)."
+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 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/`)."
msgstr ""
#. type: Plain text
#: en/config.txt:2020
-msgid ""
-"User name (e.g., `user` in `https://user@example.com/repo.git`). If the "
-"config key has a user name it must match the user name in the URL exactly. "
-"If the config key does not have a user name, that config key will match a "
-"URL with any user name (including none), but at a lower precedence than a "
-"config key with a user name."
+msgid "User name (e.g., `user` in `https://user@example.com/repo.git`). If the config key has a user name it must match the user name in the URL exactly. If the config key does not have a user name, that config key will match a URL with any user name (including none), but at a lower precedence than a config key with a user name."
msgstr ""
#. type: Plain text
#: en/config.txt:2027
-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 "
-"`https://user@example.com`."
+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 `https://user@example.com`."
msgstr ""
#. type: Plain text
#: en/config.txt:2034
-msgid ""
-"All URLs are normalized before attempting any matching (the password part, "
-"if embedded in the URL, is always ignored for matching purposes) so that "
-"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."
+msgid "All URLs are normalized before attempting any matching (the password part, if embedded in the URL, is always ignored for matching purposes) so that 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."
msgstr ""
#. type: Labeled list
@@ -6488,49 +5289,34 @@ msgstr ""
#. type: Plain text
#: 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 "
-"tortoiseplink, as opposed to the default (OpenSSH)."
+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 tortoiseplink, as opposed to the default (OpenSSH)."
msgstr ""
#. type: Plain text
#: en/config.txt:2045
-msgid ""
-"The config variable `ssh.variant` can be set to override this auto-"
-"detection; valid values are `ssh`, `plink`, `putty` or `tortoiseplink`. Any "
-"other value will be treated as normal ssh. This setting can be overridden "
-"via the environment variable `GIT_SSH_VARIANT`."
+msgid "The config variable `ssh.variant` can be set to override this auto-detection; valid values are `ssh`, `plink`, `putty` or `tortoiseplink`. Any other value will be treated as normal ssh. This setting can be overridden via the environment variable `GIT_SSH_VARIANT`."
msgstr ""
#. type: Labeled list
#: en/config.txt:2046
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "i18n.commitEncoding"
msgstr "i18n.commitEncoding"
#. type: Plain text
#: en/config.txt:2052
-msgid ""
-"Character encoding the commit messages are stored in; Git itself does not "
-"care per se, but this information is necessary e.g. when importing commits "
-"from emails or in the gitk graphical history browser (and possibly at other "
-"places in the future or in other porcelains). See e.g. linkgit:git-"
-"mailinfo[1]. Defaults to 'utf-8'."
+msgid "Character encoding the commit messages are stored in; Git itself does not care per se, but this information is necessary e.g. when importing commits from emails or in the gitk graphical history browser (and possibly at other places in the future or in other porcelains). See e.g. linkgit:git-mailinfo[1]. Defaults to 'utf-8'."
msgstr ""
#. type: Labeled list
#: en/config.txt:2053 en/git-log.txt:179
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "i18n.logOutputEncoding"
msgstr "i18n.logOutputEncoding"
#. type: Plain text
#: en/config.txt:2056
-msgid ""
-"Character encoding the commit messages are converted to when running 'git "
-"log' and friends."
+msgid "Character encoding the commit messages are converted to when running 'git log' and friends."
msgstr ""
#. type: Labeled list
@@ -6541,9 +5327,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2060
-msgid ""
-"The configuration variables in the 'imap' section are described in "
-"linkgit:git-imap-send[1]."
+msgid "The configuration variables in the 'imap' section are described in linkgit:git-imap-send[1]."
msgstr ""
#. type: Labeled list
@@ -6554,9 +5338,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2064
-msgid ""
-"Specify the version with which new index files should be initialized. This "
-"does not affect existing repositories."
+msgid "Specify the version with which new index files should be initialized. This does not affect existing repositories."
msgstr ""
#. type: Labeled list
@@ -6567,228 +5349,172 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2068
-msgid ""
-"Specify the directory from which templates will be copied. (See the "
-"\"TEMPLATE DIRECTORY\" section of linkgit:git-init[1].)"
+msgid "Specify the directory from which templates will be copied. (See the \"TEMPLATE DIRECTORY\" section of linkgit:git-init[1].)"
msgstr ""
#. type: Labeled list
#: en/config.txt:2069
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "instaweb.browser"
msgstr "instaweb.browser"
#. type: Plain text
#: en/config.txt:2072
-msgid ""
-"Specify the program that will be used to browse your working repository in "
-"gitweb. See linkgit:git-instaweb[1]."
+msgid "Specify the program that will be used to browse your working repository in gitweb. See linkgit:git-instaweb[1]."
msgstr ""
#. type: Labeled list
#: en/config.txt:2073
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "instaweb.httpd"
msgstr "instaweb.httpd"
#. 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]."
+msgid "The HTTP daemon command-line to start gitweb on your working repository. See linkgit:git-instaweb[1]."
msgstr ""
#. type: Labeled list
#: en/config.txt:2077
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "instaweb.local"
msgstr "instaweb.local"
#. type: Plain text
#: en/config.txt:2080
-msgid ""
-"If true the web server started by linkgit:git-instaweb[1] will be bound to "
-"the local IP (127.0.0.1)."
+msgid "If true the web server started by linkgit:git-instaweb[1] will be bound to the local IP (127.0.0.1)."
msgstr ""
#. type: Labeled list
#: en/config.txt:2081
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "instaweb.modulePath"
msgstr "instaweb.modulePath"
#. 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."
+msgid "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
#: en/config.txt:2086
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "instaweb.port"
msgstr "instaweb.port"
#. type: Plain text
#: en/config.txt:2089
-msgid ""
-"The port number to bind the gitweb httpd to. See linkgit:git-instaweb[1]."
+msgid "The port number to bind the gitweb httpd to. See linkgit:git-instaweb[1]."
msgstr ""
#. type: Labeled list
#: en/config.txt:2090
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "interactive.singleKey"
msgstr "interactive.singleKey"
#. type: Plain text
#: 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-"
-"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."
+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-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."
msgstr ""
#. type: Labeled list
#: en/config.txt:2099
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "interactive.diffFilter"
msgstr "interactive.diffFilter"
#. type: Plain text
#: en/config.txt:2106
-msgid ""
-"When an interactive command (such as `git add --patch`) shows a colorized "
-"diff, git will pipe the diff through the shell command defined by this "
-"configuration variable. The command may mark up the diff further for human "
-"consumption, provided that it retains a one-to-one correspondence with the "
-"lines in the original diff. Defaults to disabled (no filtering)."
+msgid "When an interactive command (such as `git add --patch`) shows a colorized diff, git will pipe the diff through the shell command defined by this configuration variable. The command may mark up the diff further for human consumption, provided that it retains a one-to-one correspondence with the lines in the original diff. Defaults to disabled (no filtering)."
msgstr ""
#. type: Labeled list
#: en/config.txt:2107
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "log.abbrevCommit"
msgstr "log.abbrevCommit"
#. type: Plain text
#: en/config.txt:2111
-msgid ""
-"If true, makes linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-"
-"whatchanged[1] assume `--abbrev-commit`. You may override this option with "
-"`--no-abbrev-commit`."
-msgstr ""
-"Si true, oblige linkgit:git-log[1], linkgit:git-show[1] et linkgit:git-"
-"whatchanged[1] 횪 supposer `--abbrev-commit`. Vous pouvez surcharger cette "
-"option avec `--no-abbrev-commit`."
+msgid "If true, makes linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1] assume `--abbrev-commit`. You may override this option with `--no-abbrev-commit`."
+msgstr "Si true, oblige linkgit:git-log[1], linkgit:git-show[1] et linkgit:git-whatchanged[1] 횪 supposer `--abbrev-commit`. Vous pouvez surcharger cette option avec `--no-abbrev-commit`."
#. type: Labeled list
#: en/config.txt:2112 en/git-log.txt:184
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "log.date"
msgstr "log.date"
#. type: Plain text
#: en/config.txt:2116
-msgid ""
-"Set the default date-time mode for the 'log' command. Setting a value for "
-"log.date is similar to using 'git log''s `--date` option. See linkgit:git-"
-"log[1] for details."
+msgid "Set the default date-time mode for the 'log' command. Setting a value for log.date is similar to using 'git log''s `--date` option. See linkgit:git-log[1] for details."
msgstr ""
#. type: Labeled list
#: en/config.txt:2117
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "log.decorate"
msgstr "log.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 "
-"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`."
+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 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`."
msgstr ""
#. type: Labeled list
#: en/config.txt:2127 en/git-log.txt:189
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "log.follow"
msgstr "log.follow"
#. type: Plain text
#: en/config.txt:2132 en/git-log.txt:194
-msgid ""
-"If `true`, `git log` will act as if the `--follow` option was used when a "
-"single <path> is given. This has the same limitations as `--follow`, i.e. "
-"it cannot be used to follow multiple files and does not work well on non-"
-"linear history."
+msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given. This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
msgstr ""
#. type: Labeled list
#: en/config.txt:2133
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "log.graphColors"
msgstr "log.graphColors"
#. type: Plain text
#: en/config.txt:2136
-msgid ""
-"A list of colors, separated by commas, that can be used to draw history "
-"lines in `git log --graph`."
+msgid "A list of colors, separated by commas, that can be used to draw history lines in `git log --graph`."
msgstr ""
#. type: Labeled list
#: en/config.txt:2137 en/git-log.txt:195
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "log.showRoot"
msgstr "log.showRoot"
#. type: Plain text
#: en/config.txt:2142
-msgid ""
-"If true, the initial commit will be shown as a big creation event. This is "
-"equivalent to a diff against an empty tree. Tools like linkgit:git-log[1] "
-"or linkgit:git-whatchanged[1], which normally hide the root commit will now "
-"show it. True by default."
+msgid "If true, the initial commit will be shown as a big creation event. This is equivalent to a diff against an empty tree. Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which normally hide the root commit will now show it. True by default."
msgstr ""
#. type: Labeled list
#: en/config.txt:2143
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "log.mailmap"
msgstr "log.mailmap"
#. type: Plain text
#: en/config.txt:2146
-msgid ""
-"If true, makes linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-"
-"whatchanged[1] assume `--use-mailmap`."
-msgstr ""
-"Si true, oblige linkgit:git-log[1], linkgit:git-show[1] et linkgit:git-"
-"whatchanged[1] 횪 supposer `--use-mailmap`."
+msgid "If true, makes linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1] assume `--use-mailmap`."
+msgstr "Si true, oblige linkgit:git-log[1], linkgit:git-show[1] et linkgit:git-whatchanged[1] 횪 supposer `--use-mailmap`."
#. type: Labeled list
#: en/config.txt:2147
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "mailinfo.scissors"
msgstr "mailinfo.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 \"-\")."
+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 \"-\")."
msgstr ""
#. type: Labeled list
@@ -6799,12 +5525,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2161
-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]."
+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]."
msgstr ""
#. type: Labeled list
@@ -6815,12 +5536,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2169
-msgid ""
-"Like `mailmap.file`, but consider the value as a reference to a blob in the "
-"repository. If both `mailmap.file` and `mailmap.blob` are given, both are "
-"parsed, with entries from `mailmap.file` taking precedence. In a bare "
-"repository, this defaults to `HEAD:.mailmap`. In a non-bare repository, it "
-"defaults to empty."
+msgid "Like `mailmap.file`, but consider the value as a reference to a blob in the repository. If both `mailmap.file` and `mailmap.blob` are given, both are parsed, with entries from `mailmap.file` taking precedence. In a bare repository, this defaults to `HEAD:.mailmap`. In a non-bare repository, it defaults to empty."
msgstr ""
#. type: Title ~
@@ -6831,9 +5547,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2173
-msgid ""
-"Specify the programs that may be used to display help in the 'man' format. "
-"See linkgit:git-help[1]."
+msgid "Specify the programs that may be used to display help in the 'man' format. See linkgit:git-help[1]."
msgstr ""
#. type: Title ~
@@ -6844,10 +5558,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2178
-msgid ""
-"Specify the command to invoke the specified man viewer. The specified "
-"command is evaluated in shell with the man page passed as argument. (See "
-"linkgit:git-help[1].)"
+msgid "Specify the command to invoke the specified man viewer. The specified command is evaluated in shell with the man page passed as argument. (See linkgit:git-help[1].)"
msgstr ""
#. type: Title ~
@@ -6858,9 +5569,7 @@ 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]."
+msgid "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
@@ -6877,15 +5586,7 @@ msgstr "mergetool.<outil>.cmd"
#. type: Plain text
#: 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 "
-"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 "
-"merged; 'MERGED' contains the name of the file to which the merge tool "
-"should write the results of a successful merge."
+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 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 merged; 'MERGED' contains the name of the file to which the merge tool should write the results of a successful merge."
msgstr ""
#. type: Labeled list
@@ -6896,78 +5597,56 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2207
-msgid ""
-"For a custom merge command, specify whether the exit code of the merge "
-"command can be used to determine whether the merge was successful. If this "
-"is not set to true then the merge target file timestamp is checked and the "
-"merge assumed to have been successful if the file has been updated, "
-"otherwise the user is prompted to indicate the success of the merge."
+msgid "For a custom merge command, specify whether the exit code of the merge command can be used to determine whether the merge was successful. If this is not set to true then the merge target file timestamp is checked and the merge assumed to have been successful if the file has been updated, otherwise the user is prompted to indicate the success of the merge."
msgstr ""
#. type: Labeled list
#: en/config.txt:2208
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "mergetool.meld.hasOutput"
msgstr "mergetool.meld.hasOutput"
#. type: Plain text
#: en/config.txt:2216
-msgid ""
-"Older versions of `meld` do not support the `--output` option. Git will "
-"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`."
+msgid "Older versions of `meld` do not support the `--output` option. Git will 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`."
msgstr ""
#. type: Labeled list
#: en/config.txt:2217
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "mergetool.keepBackup"
msgstr "mergetool.keepBackup"
#. type: Plain text
#: en/config.txt:2222
-msgid ""
-"After performing a merge, the original file with conflict markers can be "
-"saved as a file with a `.orig` extension. If this variable is set to "
-"`false` then this file is not preserved. Defaults to `true` (i.e. keep the "
-"backup files)."
+msgid "After performing a merge, the original file with conflict markers can be saved as a file with a `.orig` extension. If this variable is set to `false` then this file is not preserved. Defaults to `true` (i.e. keep the backup files)."
msgstr ""
#. type: Labeled list
#: en/config.txt:2223
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "mergetool.keepTemporaries"
msgstr "mergetool.keepTemporaries"
#. 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`."
+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`."
msgstr ""
#. type: Labeled list
#: en/config.txt:2230
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "mergetool.writeToTemp"
msgstr "mergetool.writeToTemp"
#. type: Plain text
#: en/config.txt:2235
-msgid ""
-"Git writes temporary 'BASE', 'LOCAL', and 'REMOTE' versions of conflicting "
-"files in the worktree by default. Git will attempt to use a temporary "
-"directory for these files when set `true`. Defaults to `false`."
+msgid "Git writes temporary 'BASE', 'LOCAL', and 'REMOTE' versions of conflicting files in the worktree by default. Git will attempt to use a temporary directory for these files when set `true`. Defaults to `false`."
msgstr ""
#. type: Labeled list
#: en/config.txt:2236
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "mergetool.prompt"
msgstr "mergetool.prompt"
@@ -6984,11 +5663,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2244
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -6999,11 +5674,7 @@ 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."
+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."
msgstr ""
#. type: Labeled list
@@ -7014,27 +5685,17 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2259
-msgid ""
-"The (fully qualified) refname from which to show notes when showing commit "
-"messages. The value of this variable can be set to a glob, in which case "
-"notes from all matching refs will be shown. You may also specify this "
-"configuration variable several times. A warning will be issued for refs "
-"that do not exist, but a glob that does not match any refs is silently "
-"ignored."
+msgid "The (fully qualified) refname from which to show notes when showing commit messages. The value of this variable can be set to a glob, in which case notes from all matching refs will be shown. You may also specify this configuration variable several 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/config.txt:2263
-msgid ""
-"This setting can be overridden with the `GIT_NOTES_DISPLAY_REF` environment "
-"variable, which must be a colon separated list of refs or globs."
+msgid "This setting can be overridden with the `GIT_NOTES_DISPLAY_REF` environment variable, which must be a colon separated list of refs or globs."
msgstr ""
#. type: Plain text
#: en/config.txt:2267
-msgid ""
-"The effective value of \"core.notesRef\" (possibly overridden by "
-"GIT_NOTES_REF) is also implicitly added to the list of refs to be displayed."
+msgid "The effective value of \"core.notesRef\" (possibly overridden by GIT_NOTES_REF) is also implicitly added to the list of refs to be displayed."
msgstr ""
#. type: Labeled list
@@ -7045,11 +5706,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -7060,18 +5717,12 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2281
-msgid ""
-"When copying notes during a rewrite (see the \"notes.rewrite.<command>\" "
-"option), determines 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`."
+msgid "When copying notes during a rewrite (see the \"notes.rewrite.<command>\" option), determines 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
#: en/config.txt:2284 en/git-notes.txt:359
-msgid ""
-"This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment"
-" variable."
+msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
@@ -7082,26 +5733,17 @@ msgstr ""
#. type: Plain text
#: 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 "
-"several times."
+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 several times."
msgstr ""
#. type: Plain text
#: en/config.txt:2294
-msgid ""
-"Does not have a default value; you must configure this variable to enable "
-"note rewriting. Set it to `refs/notes/commits` to enable rewriting for the "
-"default commit notes."
+msgid "Does not have a default value; you must configure this variable to enable note rewriting. Set it to `refs/notes/commits` to enable rewriting for the default commit notes."
msgstr ""
#. type: Plain text
#: en/config.txt:2298
-msgid ""
-"This setting can be overridden with the `GIT_NOTES_REWRITE_REF` environment "
-"variable, which must be a colon separated list of refs or globs."
+msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable, which must be a colon separated list of refs or globs."
msgstr ""
#. type: Labeled list
@@ -7112,9 +5754,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2302
-msgid ""
-"The size of the window used by linkgit:git-pack-objects[1] when no window "
-"size is given on the command line. Defaults to 10."
+msgid "The size of the window used by linkgit:git-pack-objects[1] when no window size is given on the command line. Defaults to 10."
msgstr ""
#. type: Labeled list
@@ -7125,9 +5765,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2306
-msgid ""
-"The maximum delta depth used by linkgit:git-pack-objects[1] when no maximum "
-"depth is given on the command line. Defaults to 50."
+msgid "The maximum delta depth used by linkgit:git-pack-objects[1] when no maximum depth is given on the command line. Defaults to 50."
msgstr ""
#. type: Labeled list
@@ -7138,11 +5776,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"unconfigured (or set explicitly to 0), there will be no limit."
+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 unconfigured (or set explicitly to 0), there will be no limit."
msgstr ""
#. type: Labeled list
@@ -7153,21 +5787,12 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2322
-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).\""
+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).\""
msgstr ""
#. type: Plain text
#: en/config.txt:2326
-msgid ""
-"Note that changing the compression level will not automatically recompress "
-"all existing objects. You can force recompression by passing the -F option "
-"to linkgit:git-repack[1]."
+msgid "Note that changing the compression level will not automatically recompress all existing objects. You can force recompression by passing the -F option to linkgit:git-repack[1]."
msgstr ""
#. type: Labeled list
@@ -7178,15 +5803,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2337
-msgid ""
-"The maximum memory in bytes used for caching deltas in linkgit:git-pack-"
-"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 "
-"virtually disable this cache. Defaults to 256 MiB."
+msgid "The maximum memory in bytes used for caching deltas in linkgit:git-pack-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 virtually disable this cache. Defaults to 256 MiB."
msgstr ""
#. type: Labeled list
@@ -7197,11 +5814,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2343
-msgid ""
-"The maximum size of a delta, that is cached in linkgit:git-pack-objects[1]. "
-"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. Defaults to 1000."
+msgid "The maximum size of a delta, that is cached in linkgit:git-pack-objects[1]. 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. Defaults to 1000."
msgstr ""
#. type: Labeled list
@@ -7212,14 +5825,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2353
-msgid ""
-"Specifies the number of threads to spawn when searching for best delta "
-"matches. This requires that linkgit:git-pack-objects[1] be compiled with "
-"pthreads otherwise this option is ignored with a warning. This is meant to "
-"reduce packing time on multiprocessor machines. The required amount of "
-"memory for the delta search window is however multiplied by the number of "
-"threads. Specifying 0 will cause Git to auto-detect the number of CPU's and"
-" set the number of threads accordingly."
+msgid "Specifies the number of threads to spawn when searching for best delta matches. This requires that linkgit:git-pack-objects[1] be compiled with pthreads otherwise this option is ignored with a warning. This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. Specifying 0 will cause Git to auto-detect the number of CPU's and set the number of threads accordingly."
msgstr ""
#. type: Labeled list
@@ -7230,24 +5836,12 @@ msgstr ""
#. type: Plain text
#: 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 "
-"corresponding pack is larger than 2 GB."
+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 corresponding pack is larger than 2 GB."
msgstr ""
#. type: Plain text
#: en/config.txt:2370
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -7258,14 +5852,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2382
-msgid ""
-"The maximum size of a pack. This setting only affects packing to a file "
-"when repacking, i.e. the git:// protocol is unaffected. It can be "
-"overridden by the `--max-pack-size` option of linkgit:git-repack[1]. "
-"Reaching this limit results in the creation of multiple packfiles; which in "
-"turn prevents bitmaps from being created. The minimum size allowed is "
-"limited to 1 MiB. The default is unlimited. Common unit suffixes of 'k', "
-"'m', or 'g' are supported."
+msgid "The maximum size of a pack. This setting only affects packing to a file when repacking, i.e. the git:// protocol is unaffected. It can be overridden by the `--max-pack-size` option of linkgit:git-repack[1]. Reaching this limit results in the creation of multiple packfiles; which in turn prevents bitmaps from being created. The minimum size allowed is limited to 1 MiB. The default is unlimited. Common unit suffixes of 'k', 'm', or 'g' are supported."
msgstr ""
#. type: Labeled list
@@ -7276,10 +5863,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2388
-msgid ""
-"When true, git will use pack bitmaps (if available) when packing to stdout "
-"(e.g., during the server side of a fetch). Defaults to true. You should not "
-"generally need to turn this off unless you are debugging pack bitmaps."
+msgid "When true, git will use pack bitmaps (if available) when packing to stdout (e.g., during the server side of a fetch). Defaults to true. You should not generally need to turn this off unless you are debugging pack bitmaps."
msgstr ""
#. type: Labeled list
@@ -7301,15 +5885,7 @@ 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, "
-"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 "
-"consumes 4 bytes per object of disk space, and that JGit's bitmap "
-"implementation does not understand it, causing it to complain if Git and "
-"JGit are used on the same repository. Defaults to false."
+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, 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 consumes 4 bytes per object of disk space, and that JGit's bitmap implementation does not understand it, causing it to complain if Git and JGit are used on the same repository. Defaults to false."
msgstr ""
#. type: Labeled list
@@ -7320,13 +5896,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2411
-msgid ""
-"If the value is boolean, turns on or off pagination of the output of a "
-"particular Git subcommand when writing to a tty. Otherwise, turns on "
-"pagination for the subcommand using the pager specified by the value of "
-"`pager.<cmd>`. If `--paginate` or `--no-pager` is specified on the command "
-"line, it takes precedence over this option. To disable pagination for all "
-"commands, set `core.pager` or `GIT_PAGER` to `cat`."
+msgid "If the value is boolean, turns on or off pagination of the output of a particular Git subcommand when writing to a tty. Otherwise, turns on pagination for the subcommand using the pager specified by the value of `pager.<cmd>`. If `--paginate` or `--no-pager` is specified on the command line, it takes precedence over this option. To disable pagination for all commands, set `core.pager` or `GIT_PAGER` to `cat`."
msgstr ""
#. type: Labeled list
@@ -7337,13 +5907,7 @@ 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 "
-"running `git log \"--pretty=format:* %H %s\"`. Note that an alias with the "
-"same name as a built-in format will be silently ignored."
+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 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 ""
#. type: Labeled list
@@ -7354,13 +5918,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2429
-msgid ""
-"If set, provide a user defined default policy for all protocols which don't "
-"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:"
+msgid "If set, provide a user defined default policy for all protocols which don't 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:"
msgstr ""
#. type: Plain text
@@ -7375,12 +5933,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2441
-msgid ""
-"`user` - protocol is only able to be used when `GIT_PROTOCOL_FROM_USER` is "
-"either unset or has a value of 1. This policy should be used when you want "
-"a protocol to be directly usable by the user but don't want it used by "
-"commands which execute clone/fetch/push commands without user input, e.g. "
-"recursive submodule initialization."
+msgid "`user` - protocol is only able to be used when `GIT_PROTOCOL_FROM_USER` is either unset or has a value of 1. This policy should be used when you want a protocol to be directly usable by the user but don't want it used by commands which execute clone/fetch/push commands without user input, e.g. recursive submodule initialization."
msgstr ""
#. type: Labeled list
@@ -7391,9 +5944,7 @@ 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."
+msgid "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
@@ -7403,15 +5954,12 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2453
-msgid ""
-"`file`: any local file-based path (including `file://` URLs, or local paths)"
+msgid "`file`: any local file-based path (including `file://` URLs, or local paths)"
msgstr ""
#. type: Plain text
#: en/config.txt:2456
-msgid ""
-"`git`: the anonymous git protocol over a direct TCP connection (or proxy, if"
-" configured)"
+msgid "`git`: the anonymous git protocol over a direct TCP connection (or proxy, if configured)"
msgstr ""
#. type: Plain text
@@ -7421,17 +5969,12 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2463
-msgid ""
-"`http`: git over http, both \"smart http\" and \"dumb http\". Note that "
-"this does _not_ include `https`; if you want to configure both, you must do "
-"so individually."
+msgid "`http`: git over http, both \"smart http\" and \"dumb http\". Note that this does _not_ include `https`; if you want to configure both, you must do so individually."
msgstr ""
#. type: Plain text
#: en/config.txt:2466
-msgid ""
-"any external helpers are named by their protocol (e.g., use `hg` to allow "
-"the `git-remote-hg` helper)"
+msgid "any external helpers are named by their protocol (e.g., use `hg` to allow the `git-remote-hg` helper)"
msgstr ""
#. type: Labeled list
@@ -7442,14 +5985,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2477
-msgid ""
-"By default, Git does not create an extra merge commit when merging a commit "
-"that is a descendant of the current commit. Instead, the tip of the current "
-"branch is fast-forwarded. When set to `false`, this variable tells Git to "
-"create an extra merge commit in such a case (equivalent to giving the `--no-"
-"ff` option from the command line). When set to `only`, only such fast-"
-"forward merges are allowed (equivalent to giving the `--ff-only` option from"
-" the command line). This setting overrides `merge.ff` when pulling."
+msgid "By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Instead, the tip of the current branch is fast-forwarded. When set to `false`, this variable tells Git to create an extra merge commit in such a case (equivalent to giving the `--no-ff` option from the command line). When set to `only`, only such fast-forward merges are allowed (equivalent to giving the `--ff-only` option from the command line). This setting overrides `merge.ff` when pulling."
msgstr ""
#. type: Labeled list
@@ -7460,10 +5996,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2483
-msgid ""
-"When true, rebase branches on top of the fetched branch, instead of merging "
-"the default branch from the default remote when \"git pull\" is run. See "
-"\"branch.<name>.rebase\" for setting this on a per-branch basis."
+msgid "When true, rebase branches on top of the fetched branch, instead of merging the default branch from the default remote when \"git pull\" is run. See \"branch.<name>.rebase\" for setting this on a per-branch basis."
msgstr ""
#. type: Labeled list
@@ -7474,8 +6007,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2497
-msgid ""
-"The default merge strategy to use when pulling multiple branches at once."
+msgid "The default merge strategy to use when pulling multiple branches at once."
msgstr ""
#. type: Labeled list
@@ -7491,41 +6023,28 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2501
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "push.default"
msgstr "push.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:"
+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:"
msgstr ""
#. type: Plain text
#: en/config.txt:2513
-msgid ""
-"`nothing` - do not push anything (error out) unless a refspec is explicitly "
-"given. This is primarily meant for people who want to avoid mistakes by "
-"always being explicit."
+msgid "`nothing` - do not push anything (error out) unless a refspec is explicitly given. This is primarily meant for people who want to avoid mistakes by always being explicit."
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."
+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."
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 "
-"would normally pull from (i.e. central workflow)."
+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 would normally pull from (i.e. central workflow)."
msgstr ""
#. type: Plain text
@@ -7535,18 +6054,12 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
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 "
-"beginners."
+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 beginners."
msgstr ""
#. type: Plain text
@@ -7556,84 +6069,50 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2542
-msgid ""
-"`matching` - push all branches having the same name on both ends. This "
-"makes the repository you are pushing to remember the set of branches that "
-"will be pushed out (e.g. if you always push 'maint' and 'master' there and "
-"no other branches, the repository you push to will have these two branches, "
-"and your local 'maint' and 'master' will be pushed there)."
+msgid "`matching` - push all branches having the same name on both ends. This makes the repository you are pushing to remember the set of branches that will be pushed out (e.g. if you always push 'maint' and 'master' there and no other branches, the repository you push to will have these two branches, and your local 'maint' and 'master' will be pushed there)."
msgstr ""
#. type: Plain text
#: en/config.txt:2552
-msgid ""
-"To use this mode effectively, you have to make sure _all_ the branches you "
-"would push out are ready to be pushed out before running 'git push', as the "
-"whole point of this mode is to allow you to push all of the branches in one "
-"go. If you usually finish work on only one branch and push out the result, "
-"while other branches are unfinished, this mode is not for you. Also this "
-"mode is not suitable for pushing into a shared central repository, as other "
-"people may add new branches there, or update the tip of existing branches "
-"outside your control."
+msgid "To use this mode effectively, you have to make sure _all_ the branches you would push out are ready to be pushed out before running 'git push', as the whole point of this mode is to allow you to push all of the branches in one go. If you usually finish work on only one branch and push out the result, while other branches are unfinished, this mode is not for you. Also this mode is not suitable for pushing into a shared central repository, as other people may add new branches there, or update the tip of existing branches outside your control."
msgstr ""
#. type: Plain text
#: en/config.txt:2555
-msgid ""
-"This used to be the default, but not since Git 2.0 (`simple` is the new "
-"default)."
+msgid "This used to be the default, but not since Git 2.0 (`simple` is the new default)."
msgstr ""
#. type: Labeled list
#: en/config.txt:2558
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "push.followTags"
msgstr "push.followTags"
#. type: Plain text
#: en/config.txt:2562
-msgid ""
-"If set to true enable `--follow-tags` option by default. You may override "
-"this configuration at time of push by specifying `--no-follow-tags`."
+msgid "If set to true enable `--follow-tags` option by default. You may override this configuration at time of push by specifying `--no-follow-tags`."
msgstr ""
#. type: Labeled list
#: en/config.txt:2563
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "push.gpgSign"
msgstr "push.gpgSign"
#. 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-"
-"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 "
-"command-line flag always overrides this config option."
+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-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 command-line flag always overrides this config option."
msgstr ""
#. type: Labeled list
#: en/config.txt:2572
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "push.recurseSubmodules"
msgstr "push.recurseSubmodules"
#. type: Plain text
#: 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 "
-"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 "
-"'--recurse-submodules=check|on-demand|no'."
+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 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 '--recurse-submodules=check|on-demand|no'."
msgstr ""
#. type: Labeled list
@@ -7644,9 +6123,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2589 en/git-rebase.txt:209
-msgid ""
-"Whether to show a diffstat of what changed upstream since the last rebase. "
-"False by default."
+msgid "Whether to show a diffstat of what changed upstream since the last rebase. False by default."
msgstr ""
#. type: Labeled list
@@ -7668,12 +6145,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2600
-msgid ""
-"When set to true, 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. Defaults to false."
+msgid "When set to true, 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. Defaults to false."
msgstr ""
#. type: Labeled list
@@ -7684,13 +6156,7 @@ msgstr ""
#. type: Plain text
#: 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, "
-"'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\"."
+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, '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\"."
msgstr ""
#. type: Labeled list
@@ -7701,101 +6167,73 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2616
-msgid ""
-"A format string, as specified in linkgit:git-log[1], to be used for the "
-"instruction list during an interactive rebase. The format will "
-"automatically have the long commit hash prepended to the format."
+msgid "A format string, as specified in linkgit:git-log[1], to be used for the instruction list during an interactive rebase. The format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
#: en/config.txt:2617
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "receive.advertiseAtomic"
msgstr "receive.advertiseAtomic"
#. type: Plain text
#: en/config.txt:2621
-msgid ""
-"By default, git-receive-pack will advertise the atomic push capability to "
-"its clients. If you don't want to advertise this capability, set this "
-"variable to false."
+msgid "By default, git-receive-pack will advertise the atomic push capability to its clients. If you don't want to advertise this capability, set this variable to false."
msgstr ""
#. type: Labeled list
#: en/config.txt:2622
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "receive.advertisePushOptions"
msgstr "receive.advertisePushOptions"
#. type: Plain text
#: en/config.txt:2626
-msgid ""
-"By default, git-receive-pack will advertise the push options capability to "
-"its clients. If you don't want to advertise this capability, set this "
-"variable to false."
+msgid "By default, git-receive-pack will advertise the push options capability to its clients. If you don't want to advertise this capability, set this variable to false."
msgstr ""
#. type: Labeled list
#: en/config.txt:2627
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "receive.autogc"
msgstr "receive.autogc"
#. 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 "
-"to false."
+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 to false."
msgstr ""
#. type: Labeled list
#: en/config.txt:2632
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "receive.certNonceSeed"
msgstr "receive.certNonceSeed"
#. type: Plain text
#: en/config.txt:2637
-msgid ""
-"By setting this variable to a string, `git receive-pack` will accept a `git "
-"push --signed` and verifies it by using a \"nonce\" protected by HMAC using "
-"this string as a secret key."
+msgid "By setting this variable to a string, `git receive-pack` will accept a `git push --signed` and verifies it by using a \"nonce\" protected by HMAC using this string as a secret key."
msgstr ""
#. type: Labeled list
#: en/config.txt:2638
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "receive.certNonceSlop"
msgstr "receive.certNonceSlop"
#. 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 "
-"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`."
+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 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`."
msgstr ""
#. type: Labeled list
#: en/config.txt:2651
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "receive.fsckObjects"
msgstr "receive.fsckObjects"
#. type: Plain text
#: 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 "
-"value of `transfer.fsckObjects` is used instead."
+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 value of `transfer.fsckObjects` is used instead."
msgstr ""
#. type: Labeled list
@@ -7806,209 +6244,149 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2666
-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 "
-"that issue."
+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 that issue."
msgstr ""
#. type: Plain text
#: en/config.txt:2671
-msgid ""
-"This feature is intended to support working with legacy repositories which "
-"would not pass pushing when `receive.fsckObjects = true`, allowing the host "
-"to accept repositories with certain known issues but still catch other "
-"issues."
+msgid "This feature is intended to support working with legacy repositories which would not pass pushing when `receive.fsckObjects = true`, allowing the host to accept repositories with certain known issues but still catch other issues."
msgstr ""
#. type: Labeled list
#: en/config.txt:2672
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "receive.fsck.skipList"
msgstr "receive.fsck.skipList"
#. type: Labeled list
#: en/config.txt:2680
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "receive.keepAlive"
msgstr "receive.keepAlive"
#. type: Plain text
#: en/config.txt:2688
-msgid ""
-"After receiving the pack from the client, `receive-pack` may produce no "
-"output (if `--quiet` was specified) while processing the pack, causing some "
-"networks to drop the TCP connection. With this option set, if `receive-"
-"pack` does not transmit any data in this phase for `receive.keepAlive` "
-"seconds, it will send a short keepalive packet. The default is 5 seconds; "
-"set to 0 to disable keepalives entirely."
+msgid "After receiving the pack from the client, `receive-pack` may produce no output (if `--quiet` was specified) while processing the pack, causing some networks to drop the TCP connection. With this option set, if `receive-pack` does not transmit any data in this phase for `receive.keepAlive` seconds, it will send a short keepalive packet. The default is 5 seconds; set to 0 to disable keepalives entirely."
msgstr ""
#. type: Labeled list
#: en/config.txt:2689
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "receive.unpackLimit"
msgstr "receive.unpackLimit"
#. type: Plain text
#: en/config.txt:2698
-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 "
-"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."
+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 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."
msgstr ""
#. type: Labeled list
#: en/config.txt:2699
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "receive.maxInputSize"
msgstr "receive.maxInputSize"
#. type: Plain text
#: en/config.txt:2704
-msgid ""
-"If the size of the incoming pack stream is larger than this limit, then git-"
-"receive-pack will error out, instead of accepting the pack file. If not set "
-"or set to 0, then the size is unlimited."
+msgid "If the size of the incoming pack stream is larger than this limit, then git-receive-pack will error out, instead of accepting the pack file. If not set or set to 0, then the size is unlimited."
msgstr ""
#. type: Labeled list
#: en/config.txt:2705
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "receive.denyDeletes"
msgstr "receive.denyDeletes"
#. type: Plain text
#: en/config.txt:2708
-msgid ""
-"If set to true, git-receive-pack will deny a ref update that deletes the "
-"ref. Use this to prevent such a ref deletion via a push."
+msgid "If set to true, git-receive-pack will deny a ref update that deletes the ref. Use this to prevent such a ref deletion via a push."
msgstr ""
#. type: Labeled list
#: en/config.txt:2709
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "receive.denyDeleteCurrent"
msgstr "receive.denyDeleteCurrent"
#. type: Plain text
#: en/config.txt:2712
-msgid ""
-"If set to true, git-receive-pack will deny a ref update that deletes the "
-"currently checked out branch of a non-bare repository."
+msgid "If set to true, git-receive-pack will deny a ref update that deletes the currently checked out branch of a non-bare repository."
msgstr ""
#. type: Labeled list
#: en/config.txt:2713
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "receive.denyCurrentBranch"
msgstr "receive.denyCurrentBranch"
#. 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 "
-"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 "
-"such pushes with no message. Defaults to \"refuse\"."
+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 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 such pushes with no message. Defaults to \"refuse\"."
msgstr ""
#. type: Plain text
#: en/config.txt:2728
-msgid ""
-"Another option is \"updateInstead\" which will update the working tree if "
-"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."
+msgid "Another option is \"updateInstead\" which will update the working tree if 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."
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]."
+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]."
msgstr ""
#. type: Labeled list
#: en/config.txt:2733
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "receive.denyNonFastForwards"
msgstr "receive.denyNonFastForwards"
#. type: Plain text
#: 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 "
-"repository."
+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 repository."
msgstr ""
#. type: Labeled list
#: en/config.txt:2739
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "receive.hideRefs"
msgstr "receive.hideRefs"
#. type: Plain text
#: en/config.txt:2744
-msgid ""
-"This variable is the same as `transfer.hideRefs`, but applies only to "
-"`receive-pack` (and so affects pushes, but not fetches). An attempt to "
-"update or delete a hidden ref by `git push` is rejected."
+msgid "This variable is the same as `transfer.hideRefs`, but applies only to `receive-pack` (and so affects pushes, but not fetches). An attempt to update or delete a hidden ref by `git push` is rejected."
msgstr ""
#. type: Labeled list
#: en/config.txt:2745
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "receive.updateServerInfo"
msgstr "receive.updateServerInfo"
#. type: Plain text
#: en/config.txt:2748
-msgid ""
-"If set to true, git-receive-pack will run git-update-server-info after "
-"receiving data from git-push and updating refs."
+msgid "If set to true, git-receive-pack will run git-update-server-info after receiving data from git-push and updating refs."
msgstr ""
#. type: Labeled list
#: en/config.txt:2749
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "receive.shallowUpdate"
msgstr "receive.shallowUpdate"
#. type: Plain text
#: en/config.txt:2752
-msgid ""
-"If set to true, .git/shallow can be updated when new refs require new "
-"shallow roots. Otherwise those refs are rejected."
+msgid "If set to true, .git/shallow can be updated when new refs require new shallow roots. Otherwise those refs are rejected."
msgstr ""
#. type: Labeled list
#: en/config.txt:2753
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "remote.pushDefault"
msgstr "remote.pushDefault"
#. type: Plain text
#: en/config.txt:2757
-msgid ""
-"The remote to push to by default. Overrides `branch.<name>.remote` for all "
-"branches, and is overridden by `branch.<name>.pushRemote` for specific "
-"branches."
+msgid "The remote to push to by default. Overrides `branch.<name>.remote` for all branches, and is overridden by `branch.<name>.pushRemote` for specific branches."
msgstr ""
#. type: Labeled list
@@ -8019,9 +6397,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2761
-msgid ""
-"The URL of a remote repository. See linkgit:git-fetch[1] or linkgit:git-"
-"push[1]."
+msgid "The URL of a remote repository. See linkgit:git-fetch[1] or linkgit:git-push[1]."
msgstr ""
#. type: Labeled list
@@ -8043,10 +6419,7 @@ 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 "
-"remote."
+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 remote."
msgstr ""
#. type: Labeled list
@@ -8057,10 +6430,7 @@ msgstr ""
#. type: Plain text
#: 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`."
+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`."
msgstr ""
#. type: Labeled list
@@ -8071,12 +6441,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2778
-msgid ""
-"The default set of \"refspec\" for linkgit:git-fetch[1]. See linkgit:git-"
-"fetch[1]."
-msgstr ""
-"L'ensemble par d챕faut de \"refspec\" pour linkgit:git-fetch[1]. Voir "
-"linkgit:git-fetch[1]."
+msgid "The default set of \"refspec\" for linkgit:git-fetch[1]. See linkgit:git-fetch[1]."
+msgstr "L'ensemble par d챕faut de \"refspec\" pour linkgit:git-fetch[1]. Voir linkgit:git-fetch[1]."
#. type: Labeled list
#: en/config.txt:2779
@@ -8086,12 +6452,8 @@ msgstr "remote.<nom>.push"
#. type: Plain text
#: en/config.txt:2782
-msgid ""
-"The default set of \"refspec\" for linkgit:git-push[1]. See linkgit:git-"
-"push[1]."
-msgstr ""
-"L'ensemble par d챕faut de \"refspec\" pour linkgit:git-push[1]. Voir "
-"linkgit:git-push[1]."
+msgid "The default set of \"refspec\" for linkgit:git-push[1]. See linkgit:git-push[1]."
+msgstr "L'ensemble par d챕faut de \"refspec\" pour linkgit:git-push[1]. Voir linkgit:git-push[1]."
#. type: Labeled list
#: en/config.txt:2783
@@ -8101,9 +6463,7 @@ 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."
+msgid "If true, pushing to this remote will automatically behave as if the `--mirror` option was given on the command line."
msgstr ""
#. type: Labeled list
@@ -8114,9 +6474,7 @@ 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]."
+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]."
msgstr ""
#. type: Labeled list
@@ -8133,9 +6491,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2800
-msgid ""
-"The default program to execute on the remote side when pushing. See option "
-"--receive-pack of linkgit:git-push[1]."
+msgid "The default program to execute on the remote side when pushing. See option --receive-pack of linkgit:git-push[1]."
msgstr ""
#. type: Labeled list
@@ -8146,9 +6502,7 @@ 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]."
+msgid "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
@@ -8159,12 +6513,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2812
-msgid ""
-"Setting this value to --no-tags disables automatic tag following when "
-"fetching from remote <name>. Setting it to --tags will fetch every tag from "
-"remote <name>, even if they are not reachable from remote branch heads. "
-"Passing these flags directly to linkgit:git-fetch[1] can override this "
-"setting. See options --tags and --no-tags of linkgit:git-fetch[1]."
+msgid "Setting this value to --no-tags disables automatic tag following when fetching from remote <name>. Setting it to --tags will fetch every tag from remote <name>, even if they are not reachable from remote branch heads. Passing these flags directly to linkgit:git-fetch[1] can override this setting. See options --tags and --no-tags of linkgit:git-fetch[1]."
msgstr ""
#. type: Labeled list
@@ -8175,9 +6524,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2816
-msgid ""
-"Setting this to a value <vcs> will cause Git to interact with the remote "
-"with the git-remote-<vcs> helper."
+msgid "Setting this to a value <vcs> will cause Git to interact with the remote with the git-remote-<vcs> helper."
msgstr ""
#. type: Labeled list
@@ -8188,11 +6535,7 @@ msgstr ""
#. type: Plain text
#: 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` "
-"settings, if any."
+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` settings, if any."
msgstr ""
#. type: Labeled list
@@ -8203,56 +6546,40 @@ 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]."
+msgid "The list of remotes which are fetched by \"git remote update <group>\". See linkgit:git-remote[1]."
msgstr ""
#. type: Labeled list
#: en/config.txt:2827
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "repack.useDeltaBaseOffset"
msgstr "repack.useDeltaBaseOffset"
#. type: Plain text
#: en/config.txt:2834
-msgid ""
-"By default, linkgit:git-repack[1] creates packs that use delta-base offset. "
-"If you need to share your repository with Git older than version 1.4.4, "
-"either directly or via a dumb protocol such as http, then you need to set "
-"this option to \"false\" and repack. Access from old Git versions over the "
-"native protocol are unaffected by this option."
+msgid "By default, linkgit:git-repack[1] creates packs that use delta-base offset. If you need to share your repository with Git older than version 1.4.4, either directly or via a dumb protocol such as http, then you need to set this option to \"false\" and repack. Access from old Git versions over the native protocol are unaffected by this option."
msgstr ""
#. type: Labeled list
#: en/config.txt:2835
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "repack.packKeptObjects"
msgstr "repack.packKeptObjects"
#. type: Plain text
#: 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-"
-"index` or `repack.writeBitmaps`)."
+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-index` or `repack.writeBitmaps`)."
msgstr ""
#. type: Labeled list
#: en/config.txt:2842
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "repack.writeBitmaps"
msgstr "repack.writeBitmaps"
#. 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 "
-"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."
+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 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 ""
#. type: Labeled list
@@ -8263,10 +6590,7 @@ 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. "
-"Defaults to false."
+msgid "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 ""
#. type: Labeled list
@@ -8277,40 +6601,29 @@ msgstr ""
#. type: Plain text
#: en/config.txt:2863
-msgid ""
-"Activate recording of resolved conflicts, so that identical conflict hunks "
-"can be resolved automatically, should they be encountered again. By "
-"default, linkgit:git-rerere[1] is enabled if there is an `rr-cache` "
-"directory under the `$GIT_DIR`, e.g. if \"rerere\" was previously used in "
-"the repository."
+msgid "Activate recording of resolved conflicts, so that identical conflict hunks can be resolved automatically, should they be encountered again. By default, linkgit:git-rerere[1] is enabled if there is an `rr-cache` directory under the `$GIT_DIR`, e.g. if \"rerere\" was previously used in the repository."
msgstr ""
#. type: Labeled list
#: en/config.txt:2864
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.identity"
msgstr "sendemail.identity"
#. 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`."
+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`."
msgstr ""
#. type: Labeled list
#: en/config.txt:2870
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.smtpEncryption"
msgstr "sendemail.smtpEncryption"
#. type: Plain text
#: en/config.txt:2873
-msgid ""
-"See linkgit:git-send-email[1] for description. Note that this setting is "
-"not subject to the 'identity' mechanism."
+msgid "See linkgit:git-send-email[1] for description. Note that this setting is not subject to the 'identity' mechanism."
msgstr ""
#. type: Labeled list
@@ -8326,15 +6639,13 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2877
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.smtpsslcertpath"
msgstr "sendemail.smtpsslcertpath"
#. 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."
+msgid "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
@@ -8345,159 +6656,156 @@ msgstr "sendemail.<identit챕>.*"
#. type: Plain text
#: en/config.txt:2886
-msgid ""
-"Identity-specific versions of the 'sendemail.*' parameters found below, "
-"taking precedence over those when the this identity is selected, through "
-"command-line or `sendemail.identity`."
+msgid "Identity-specific versions of the 'sendemail.*' parameters found below, taking precedence over those when the this identity is selected, through command-line or `sendemail.identity`."
msgstr ""
#. type: Labeled list
#: en/config.txt:2887 en/git-send-email.txt:404
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.aliasesFile"
msgstr "sendemail.aliasesFile"
#. type: Labeled list
#: en/config.txt:2888 en/git-send-email.txt:408
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.aliasFileType"
msgstr "sendemail.aliasFileType"
#. type: Labeled list
#: en/config.txt:2889
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.annotate"
msgstr "sendemail.annotate"
#. type: Labeled list
#: en/config.txt:2890
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.bcc"
msgstr "sendemail.bcc"
#. type: Labeled list
#: en/config.txt:2891
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.cc"
msgstr "sendemail.cc"
#. type: Labeled list
#: en/config.txt:2892
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.ccCmd"
msgstr "sendemail.ccCmd"
#. type: Labeled list
#: en/config.txt:2893
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.chainReplyTo"
msgstr "sendemail.chainReplyTo"
#. type: Labeled list
#: en/config.txt:2894 en/git-send-email.txt:435
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.confirm"
msgstr "sendemail.confirm"
#. type: Labeled list
#: en/config.txt:2895
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.envelopeSender"
msgstr "sendemail.envelopeSender"
#. type: Labeled list
#: en/config.txt:2896
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.from"
msgstr "sendemail.from"
#. type: Labeled list
#: en/config.txt:2897 en/git-send-email.txt:429
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.multiEdit"
msgstr "sendemail.multiEdit"
#. type: Labeled list
#: en/config.txt:2898
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.signedoffbycc"
msgstr "sendemail.signedoffbycc"
#. type: Labeled list
#: en/config.txt:2899
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.smtpPass"
msgstr "sendemail.smtpPass"
#. type: Labeled list
#: en/config.txt:2900
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.suppresscc"
msgstr "sendemail.suppresscc"
#. type: Labeled list
#: en/config.txt:2901
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.suppressFrom"
msgstr "sendemail.suppressFrom"
#. type: Labeled list
#: en/config.txt:2902
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.to"
msgstr "sendemail.to"
#. type: Labeled list
#: en/config.txt:2903
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.smtpDomain"
msgstr "sendemail.smtpDomain"
#. type: Labeled list
#: en/config.txt:2904
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.smtpServer"
msgstr "sendemail.smtpServer"
#. type: Labeled list
#: en/config.txt:2905
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.smtpServerPort"
msgstr "sendemail.smtpServerPort"
#. type: Labeled list
#: en/config.txt:2906
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.smtpServerOption"
msgstr "sendemail.smtpServerOption"
#. type: Labeled list
#: en/config.txt:2907
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.smtpUser"
msgstr "sendemail.smtpUser"
#. type: Labeled list
#: en/config.txt:2908
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.thread"
msgstr "sendemail.thread"
#. type: Labeled list
#: en/config.txt:2909
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.transferEncoding"
msgstr "sendemail.transferEncoding"
#. type: Labeled list
#: en/config.txt:2910
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.validate"
msgstr "sendemail.validate"
#. type: Labeled list
#: en/config.txt:2911
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "sendemail.xmailer"
msgstr "sendemail.xmailer"
@@ -8519,127 +6827,90 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2917
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "showbranch.default"
msgstr "showbranch.default"
#. 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]."
-msgstr ""
-"L'ensemble par d챕faut de branches pour linkgit:git-show-branch[1]. Voir "
-"linkgit:git-show-branch[1]."
+msgid "The default set of branches for linkgit:git-show-branch[1]. See linkgit:git-show-branch[1]."
+msgstr "L'ensemble par d챕faut de branches pour linkgit:git-show-branch[1]. Voir linkgit:git-show-branch[1]."
#. type: Labeled list
#: en/config.txt:2921
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "splitIndex.maxPercentChange"
msgstr "splitIndex.maxPercentChange"
#. type: Plain text
#: en/config.txt:2933
-msgid ""
-"When the split index feature is used, this specifies the percent of entries "
-"the split index can contain compared to the total number of entries in both "
-"the split index and the shared index before a new shared index is written. "
-"The value should be between 0 and 100. If the value is 0 then a new shared "
-"index is always written, if it is 100 a new shared index is never written. "
-"By default the value is 20, so a new shared index is written if the number "
-"of entries in the split index would be greater than 20 percent of the total "
-"number of entries. See linkgit:git-update-index[1]."
+msgid "When the split index feature is used, this specifies the percent of entries the split index can contain compared to the total number of entries in both the split index and the shared index before a new shared index is written. The value should be between 0 and 100. If the value is 0 then a new shared index is always written, if it is 100 a new shared index is never written. By default the value is 20, so a new shared index is written if the number of entries in the split index would be greater than 20 percent of the total number of entries. See linkgit:git-update-index[1]."
msgstr ""
#. type: Labeled list
#: en/config.txt:2934
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "splitIndex.sharedIndexExpire"
msgstr "splitIndex.sharedIndexExpire"
#. type: Plain text
#: en/config.txt:2945
-msgid ""
-"When the split index feature is used, shared index files that were not "
-"modified since the time this variable specifies will be removed when a new "
-"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]."
+msgid "When the split index feature is used, shared index files that were not modified since the time this variable specifies will be removed when a new 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]."
msgstr ""
#. type: Labeled list
#: en/config.txt:2946
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "status.relativePaths"
msgstr "status.relativePaths"
#. type: Plain text
#: en/config.txt:2951
-msgid ""
-"By default, linkgit:git-status[1] shows paths relative to the current "
-"directory. Setting this variable to `false` shows paths relative to the "
-"repository root (this was the default for Git prior to v1.5.4)."
+msgid "By default, linkgit:git-status[1] shows paths relative to the current directory. Setting this variable to `false` shows paths relative to the repository root (this was the default for Git prior to v1.5.4)."
msgstr ""
#. type: Labeled list
#: en/config.txt:2952
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "status.short"
msgstr "status.short"
#. type: Plain text
#: en/config.txt:2955
-msgid ""
-"Set to true to enable --short by default in linkgit:git-status[1]. The "
-"option --no-short takes precedence over this variable."
+msgid "Set to true to enable --short by default in linkgit:git-status[1]. The option --no-short takes precedence over this variable."
msgstr ""
#. type: Labeled list
#: en/config.txt:2956
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "status.branch"
msgstr "status.branch"
#. type: Plain text
#: en/config.txt:2959
-msgid ""
-"Set to true to enable --branch by default in linkgit:git-status[1]. The "
-"option --no-branch takes precedence over this variable."
+msgid "Set to true to enable --branch by default in linkgit:git-status[1]. The option --no-branch takes precedence over this variable."
msgstr ""
#. type: Labeled list
#: en/config.txt:2960
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "status.displayCommentPrefix"
msgstr "status.displayCommentPrefix"
#. type: Plain text
#: en/config.txt:2966
-msgid ""
-"If set to true, linkgit:git-status[1] will insert a comment prefix before "
-"each output line (starting with `core.commentChar`, i.e. `#` by default). "
-"This was the behavior of linkgit:git-status[1] in Git 1.8.4 and previous. "
-"Defaults to false."
+msgid "If set to true, linkgit:git-status[1] will insert a comment prefix before each output line (starting with `core.commentChar`, i.e. `#` by default). This was the behavior of linkgit:git-status[1] in Git 1.8.4 and previous. Defaults to false."
msgstr ""
#. type: Labeled list
#: en/config.txt:2967
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "status.showUntrackedFiles"
msgstr "status.showUntrackedFiles"
#. 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 "
-"displays the untracked files. Possible values are:"
+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 displays the untracked files. Possible values are:"
msgstr ""
#. type: Plain text
@@ -8656,65 +6927,44 @@ msgstr "'normal' - Montrer les fichiers et les dossiers non-suivis."
#: en/config.txt:2980
#, fuzzy
msgid "`all` - Show also individual files in untracked directories."
-msgstr ""
-"'all' - Montrer aussi les fichiers individuels dans le dossiers non-suivis."
+msgstr "'all' - Montrer aussi les fichiers individuels dans le dossiers non-suivis."
#. type: Plain text
#: en/config.txt:2985
-msgid ""
-"If this variable is not specified, it defaults to 'normal'. This variable "
-"can be overridden with the -u|--untracked-files option of linkgit:git-"
-"status[1] and linkgit:git-commit[1]."
+msgid "If this variable is not specified, it defaults to 'normal'. This variable can be overridden with the -u|--untracked-files option of linkgit:git-status[1] and linkgit:git-commit[1]."
msgstr ""
#. type: Labeled list
#: en/config.txt:2986
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "status.submoduleSummary"
msgstr "status.submoduleSummary"
#. type: Plain text
#: en/config.txt:3001
-msgid ""
-"Defaults to false. If this is set to a non zero number or true (identical "
-"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 "
-"`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."
+msgid "Defaults to false. If this is set to a non zero number or true (identical 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 `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."
msgstr ""
#. type: Labeled list
#: en/config.txt:3002
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "stash.showPatch"
msgstr "stash.showPatch"
#. type: Plain text
#: 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]."
+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]."
msgstr ""
#. type: Labeled list
#: en/config.txt:3007
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "stash.showStat"
msgstr "stash.showStat"
#. type: Plain text
#: en/config.txt:3011
-msgid ""
-"If this is set to true, the `git stash show` command without an option will "
-"show diffstat of the stash. Defaults to true. See description of 'show' "
-"command in linkgit:git-stash[1]."
+msgid "If this is set to true, the `git stash show` command without an option will show diffstat of the stash. Defaults to true. See description of 'show' command in linkgit:git-stash[1]."
msgstr ""
#. type: Labeled list
@@ -8725,13 +6975,7 @@ msgstr "submodule.<nom>.url"
#. type: Plain text
#: en/config.txt:3019
-msgid ""
-"The URL for a submodule. This variable is copied from the .gitmodules file "
-"to the git config via 'git submodule init'. The user can change the "
-"configured URL before obtaining the submodule via 'git submodule update'. "
-"After obtaining the submodule, the presence of this variable is used as a "
-"sign whether the submodule is of interest to git commands. See linkgit:git-"
-"submodule[1] and linkgit:gitmodules[5] for details."
+msgid "The URL for a submodule. This variable is copied from the .gitmodules file to the git config via 'git submodule init'. The user can change the configured URL before obtaining the submodule via 'git submodule update'. After obtaining the submodule, the presence of this variable is used as a sign whether the submodule is of interest to git commands. See linkgit:git-submodule[1] and linkgit:gitmodules[5] for details."
msgstr ""
#. type: Labeled list
@@ -8742,10 +6986,7 @@ msgstr "submodule.<nom>.update"
#. type: Plain text
#: 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]."
+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]."
msgstr ""
#. type: Labeled list
@@ -8756,10 +6997,7 @@ msgstr "submodule.<nom>.branch"
#. 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."
+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."
msgstr ""
#. type: Labeled list
@@ -8770,11 +7008,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -8785,65 +7019,40 @@ msgstr "submodule.<nom>.ignore"
#. type: Plain text
#: en/config.txt:3054
-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 "
-"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 "
-"affected by this setting."
+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 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 affected by this setting."
msgstr ""
#. type: Labeled list
#: en/config.txt:3055
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "submodule.fetchJobs"
msgstr "submodule.fetchJobs"
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
#: en/config.txt:3061
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "submodule.alternateLocation"
msgstr "submodule.alternateLocation"
#. type: Plain text
#: 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 "
-"submodule to be cloned computes its alternates location relative to the "
-"superprojects alternate."
+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 submodule to be cloned computes its alternates location relative to the superprojects alternate."
msgstr ""
#. type: Labeled list
#: en/config.txt:3068
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "submodule.alternateErrorStrategy"
msgstr "submodule.alternateErrorStrategy"
#. type: Plain text
#: en/config.txt:3072
-msgid ""
-"Specifies how to treat errors with the alternates for a submodule as "
-"computed via `submodule.alternateLocation`. Possible values are `ignore`, "
-"`info`, `die`. Default is `die`."
+msgid "Specifies how to treat errors with the alternates for a submodule as computed via `submodule.alternateLocation`. Possible values are `ignore`, `info`, `die`. Default is `die`."
msgstr ""
#. type: Labeled list
@@ -8854,10 +7063,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:3077
-msgid ""
-"A boolean to specify whether annotated tags created should be GPG signed. "
-"If `--annotate` is specified on the command line, it takes precedence over "
-"this option."
+msgid "A boolean to specify whether annotated tags created should be GPG signed. If `--annotate` is specified on the command line, it takes precedence over this option."
msgstr ""
#. type: Labeled list
@@ -8868,10 +7074,7 @@ 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."
+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."
msgstr ""
#. type: Labeled list
@@ -8882,85 +7085,55 @@ msgstr ""
#. type: Plain text
#: en/config.txt:3089
-msgid ""
-"This variable can be used to restrict the permission bits of tar archive "
-"entries. The default is 0002, which turns off the world write bit. The "
-"special value \"user\" indicates that the archiving user's umask will be "
-"used instead. See umask(2) and linkgit:git-archive[1]."
+msgid "This variable can be used to restrict the permission bits of tar archive entries. The default is 0002, which turns off the world write bit. The special value \"user\" indicates that the archiving user's umask will be used instead. See umask(2) and linkgit:git-archive[1]."
msgstr ""
#. type: Labeled list
#: en/config.txt:3090
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "transfer.fsckObjects"
msgstr "transfer.fsckObjects"
#. type: Plain text
#: en/config.txt:3094
-msgid ""
-"When `fetch.fsckObjects` or `receive.fsckObjects` are not set, the value of "
-"this variable is used instead. Defaults to false."
+msgid "When `fetch.fsckObjects` or `receive.fsckObjects` are not set, the value of this variable is used instead. Defaults to false."
msgstr ""
#. type: Labeled list
#: en/config.txt:3095
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "transfer.hideRefs"
msgstr "transfer.hideRefs"
#. type: Plain text
#: en/config.txt:3103
-msgid ""
-"String(s) `receive-pack` and `upload-pack` use to decide which refs to omit "
-"from their initial advertisements. Use more than one definition to specify "
-"multiple prefix strings. A ref that is under the hierarchies listed in the "
-"value of this variable is excluded, and is hidden when responding to `git "
-"push` or `git fetch`. See `receive.hideRefs` and `uploadpack.hideRefs` for "
-"program-specific versions of this config."
+msgid "String(s) `receive-pack` and `upload-pack` use to decide which refs to omit from their initial advertisements. Use more than one definition to specify multiple prefix strings. A ref that is under the hierarchies listed in the value of this variable is excluded, and is hidden when responding to `git push` or `git fetch`. See `receive.hideRefs` and `uploadpack.hideRefs` for program-specific versions of this config."
msgstr ""
#. type: Plain text
#: en/config.txt:3108
-msgid ""
-"You may also include a `!` in front of the ref name to negate the entry, "
-"explicitly exposing it, even if an earlier entry marked it as hidden. If "
-"you have multiple hideRefs values, later entries override earlier ones (and "
-"entries in more-specific config files override less-specific ones)."
+msgid "You may also include a `!` in front of the ref name to negate the entry, explicitly exposing it, even if an earlier entry marked it as hidden. If you have multiple hideRefs values, later entries override earlier ones (and entries in more-specific config files override less-specific ones)."
msgstr ""
#. type: Plain text
#: en/config.txt:3117
-msgid ""
-"If a namespace is in use, the namespace prefix is stripped from each "
-"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."
+msgid "If a namespace is in use, the namespace prefix is stripped from each 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."
msgstr ""
#. type: Plain text
#: en/config.txt:3122
-msgid ""
-"Even if you hide refs, a client may still be able to steal the target "
-"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."
+msgid "Even if you hide refs, a client may still be able to steal the target 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 ""
#. type: Labeled list
#: en/config.txt:3123
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "transfer.unpackLimit"
msgstr "transfer.unpackLimit"
#. type: Plain text
#: en/config.txt:3127
-msgid ""
-"When `fetch.unpackLimit` or `receive.unpackLimit` are not set, the value of "
-"this variable is used instead. The default value is 100."
+msgid "When `fetch.unpackLimit` or `receive.unpackLimit` are not set, the value of this variable is used instead. The default value is 100."
msgstr ""
#. type: Labeled list
@@ -8971,11 +7144,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:3134
-msgid ""
-"If true, allow clients to use `git archive --remote` to request any tree, "
-"whether reachable from the ref tips or not. See the discussion in the "
-"\"SECURITY\" section of linkgit:git-upload-archive[1] for more details. "
-"Defaults to `false`."
+msgid "If true, allow clients to use `git archive --remote` to request any tree, whether reachable from the ref tips or not. See the discussion in the \"SECURITY\" section of linkgit:git-upload-archive[1] for more details. Defaults to `false`."
msgstr ""
#. type: Labeled list
@@ -8986,11 +7155,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:3140
-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`."
+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`."
msgstr ""
#. type: Labeled list
@@ -9001,13 +7166,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:3149
-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 "
-"described in the \"SECURITY\" section of the linkgit:gitnamespaces[7] man "
-"page; it's best to keep private data in a separate repository."
+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 described in the \"SECURITY\" section of the linkgit:gitnamespaces[7] man page; it's best to keep private data in a separate repository."
msgstr ""
#. type: Labeled list
@@ -9018,13 +7177,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:3158
-msgid ""
-"Allow `upload-pack` to accept a fetch request that asks for an object that "
-"is reachable from any ref tip. However, note that calculating object "
-"reachability is computationally expensive. Defaults to `false`. 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."
+msgid "Allow `upload-pack` to accept a fetch request that asks for an object that is reachable from any ref tip. However, note that calculating object reachability is computationally expensive. Defaults to `false`. 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 ""
#. type: Labeled list
@@ -9035,9 +7188,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:3163
-msgid ""
-"Allow `upload-pack` to accept a fetch request that asks for any object at "
-"all. Defaults to `false`."
+msgid "Allow `upload-pack` to accept a fetch request that asks for any object at all. Defaults to `false`."
msgstr ""
#. type: Labeled list
@@ -9048,15 +7199,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:3174
-msgid ""
-"When `upload-pack` has started `pack-objects`, there may be a quiet period "
-"while `pack-objects` prepares the pack. Normally it would output progress "
-"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."
+msgid "When `upload-pack` has started `pack-objects`, there may be a quiet period while `pack-objects` prepares the pack. Normally it would output progress 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."
msgstr ""
#. type: Labeled list
@@ -9067,22 +7210,12 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/config.txt:3189
-msgid ""
-"Note that this configuration variable is ignored if it is seen in the "
-"repository-level config (this is a safety measure against fetching from "
-"untrusted repositories)."
+msgid "Note that this configuration variable is ignored if it is seen in the repository-level config (this is a safety measure against fetching from untrusted repositories)."
msgstr ""
#. type: Labeled list
@@ -9093,15 +7226,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"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 "
-"longest match is used."
+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 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 longest match is used."
msgstr ""
#. type: Labeled list
@@ -9112,78 +7237,51 @@ msgstr ""
#. type: Plain text
#: en/config.txt:3213
-msgid ""
-"Any URL that starts with this value will not be pushed to; instead, it will "
-"be rewritten to start with <base>, and the resulting URL will be pushed to. "
-"In cases where some site serves a large number of repositories, and serves "
-"them with multiple access methods, some of which do not allow push, this "
-"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."
+msgid "Any URL that starts with this value will not be pushed to; instead, it will be rewritten to start with <base>, and the resulting URL will be pushed to. In cases where some site serves a large number of repositories, and serves them with multiple access methods, some of which do not allow push, this 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."
msgstr ""
#. type: Labeled list
#: en/config.txt:3214
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "user.email"
msgstr "user.email"
#. type: Plain text
#: en/config.txt:3218
-msgid ""
-"Your email address to be recorded in any newly created commits. Can be "
-"overridden by the `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_EMAIL`, and `EMAIL` "
-"environment variables. See linkgit:git-commit-tree[1]."
+msgid "Your email address to be recorded in any newly created commits. Can be overridden by the `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_EMAIL`, and `EMAIL` environment variables. See linkgit:git-commit-tree[1]."
msgstr ""
#. type: Labeled list
#: en/config.txt:3219
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "user.name"
msgstr "user.name"
#. type: Plain text
#: en/config.txt:3223
-msgid ""
-"Your full name to be recorded in any newly created commits. Can be "
-"overridden by the `GIT_AUTHOR_NAME` and `GIT_COMMITTER_NAME` environment "
-"variables. See linkgit:git-commit-tree[1]."
+msgid "Your full name to be recorded in any newly created commits. Can be overridden by the `GIT_AUTHOR_NAME` and `GIT_COMMITTER_NAME` environment variables. See linkgit:git-commit-tree[1]."
msgstr ""
#. type: Labeled list
#: en/config.txt:3224
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "user.useConfigOnly"
msgstr "user.useConfigOnly"
#. 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 "
-"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. "
-"Defaults to `false`."
+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 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. Defaults to `false`."
msgstr ""
#. type: Labeled list
#: en/config.txt:3234
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "user.signingKey"
msgstr "user.signingKey"
#. type: Plain text
#: en/config.txt:3240
-msgid ""
-"If linkgit:git-tag[1] or linkgit:git-commit[1] is not selecting the key you "
-"want it to automatically when creating a signed tag or commit, you can "
-"override the default selection with this variable. This option is passed "
-"unchanged to gpg's --local-user parameter, so you may specify a key using "
-"any method that gpg supports."
+msgid "If linkgit:git-tag[1] or linkgit:git-commit[1] is not selecting the key you want it to automatically when creating a signed tag or commit, you can override the default selection with this variable. This option is passed unchanged to gpg's --local-user parameter, so you may specify a key using any method that gpg supports."
msgstr ""
#. type: Labeled list
@@ -9194,9 +7292,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:3244
-msgid ""
-"Deprecated alias for `versionsort.suffix`. Ignored if `versionsort.suffix` "
-"is set."
+msgid "Deprecated alias for `versionsort.suffix`. Ignored if `versionsort.suffix` is set."
msgstr ""
#. type: Labeled list
@@ -9207,41 +7303,17 @@ 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, "
-"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."
+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, 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."
msgstr ""
#. type: Plain text
#: en/config.txt:3266
-msgid ""
-"By specifying a single suffix in this variable, any tagname containing that "
-"suffix will appear before the corresponding main release. E.g. if the "
-"variable is set to \"-rc\", then all \"1.0-rcX\" tags will appear before "
-"\"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\"."
+msgid "By specifying a single suffix in this variable, any tagname containing that suffix will appear before the corresponding main release. E.g. if the variable is set to \"-rc\", then all \"1.0-rcX\" tags will appear before \"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\"."
msgstr ""
#. type: Plain text
#: en/config.txt:3274
-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 "
-"undefined if they are in multiple config files."
+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 undefined if they are in multiple config files."
msgstr ""
#. type: Labeled list
@@ -9252,9 +7324,7 @@ msgstr ""
#. type: Plain text
#: en/config.txt:3278
-msgid ""
-"Specify a web browser that may be used by some commands. Currently only "
-"linkgit:git-instaweb[1] and linkgit:git-help[1] may use it."
+msgid "Specify a web browser that may be used by some commands. Currently only linkgit:git-instaweb[1] and linkgit:git-help[1] may use it."
msgstr ""
#. type: Title -
@@ -9286,17 +7356,8 @@ 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`."
-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`."
+msgid "It is `<unix timestamp> <time zone offset>`, where `<unix timestamp>` is the number of seconds since the UNIX epoch. `<time zone offset>` is a positive or negative offset from UTC. For example CET (which is 1 hour ahead of UTC) is `+0100`."
+msgstr "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`."
#. type: Labeled list
#: en/date-formats.txt:16
@@ -9306,12 +7367,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`."
-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`."
+msgid "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`."
#. type: Labeled list
#: en/date-formats.txt:20
@@ -9321,117 +7378,78 @@ msgstr "ISO 8601"
#. type: Plain text
#: en/date-formats.txt:24
-msgid ""
-"Time and date specified by the ISO 8601 standard, for example "
-"`2005-04-07T22:13:13`. The parser accepts a space instead of the `T` "
-"character as well."
+msgid "Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the `T` character as well."
msgstr "Les heures et les dates sont sp챕cifi챕es par le standard ISO 8601, par exemple `2005-04-07T22:13:13`. L'analyseur accepte aussi un espace au lieu du caract챔re `T`."
#. 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`."
-msgstr ""
-"De plus, la partie date est accept챕e dans les formats suivants혻: "
-"`AAAA.MM.JJ`, `MM/JJ/AAAA` et `JJ.MM.AAAA`."
+msgid "In addition, the date part is accepted in the following formats: `YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`."
+msgstr "De plus, la partie date est accept챕e dans les formats suivants혻: `AAAA.MM.JJ`, `MM/JJ/AAAA` et `JJ.MM.AAAA`."
#. type: Labeled list
#: en/diff-config.txt:1
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "diff.autoRefreshIndex"
msgstr "diff.autoRefreshIndex"
#. type: Plain text
#: en/diff-config.txt:10
-msgid ""
-"When using 'git diff' to compare with work tree files, do not consider stat-"
-"only change as changed. Instead, silently run `git update-index --refresh` "
-"to update the cached stat information for paths whose contents in the work "
-"tree match the contents in the index. This option defaults to true. Note "
-"that this affects only 'git diff' Porcelain, and not lower level 'diff' "
-"commands such as 'git diff-files'."
+msgid "When using 'git diff' to compare with work tree files, do not consider stat-only change as changed. Instead, silently run `git update-index --refresh` to update the cached stat information for paths whose contents in the work tree match the contents in the index. This option defaults to true. Note that this affects only 'git diff' Porcelain, and not lower level 'diff' commands such as 'git diff-files'."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:11
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "diff.dirstat"
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:"
+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:"
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:20 en/diff-options.txt:137
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`changes`"
msgstr "`changes`"
#. type: Plain text
#: en/diff-config.txt:26 en/diff-options.txt:143
-msgid ""
-"Compute the dirstat numbers by counting the lines that have been removed "
-"from the source, or added to the destination. This ignores the amount of "
-"pure code movements within a file. In other words, rearranging lines in a "
-"file is not counted as much as other changes. This is the default behavior "
-"when no parameter is given."
+msgid "Compute the dirstat numbers by counting the lines that have been removed from the source, or added to the destination. This ignores the amount of pure code movements within a file. In other words, rearranging lines in a file is not counted as much as other changes. This is the default behavior when no parameter is given."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:26 en/diff-options.txt:143
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`lines`"
msgstr "`lines`"
#. type: Plain text
#: en/diff-config.txt:34 en/diff-options.txt:151
-msgid ""
-"Compute the dirstat numbers by doing the regular line-based diff analysis, "
-"and summing the removed/added line counts. (For binary files, count 64-byte "
-"chunks instead, since binary files have no natural concept of lines). This "
-"is a more expensive `--dirstat` behavior than the `changes` behavior, but it"
-" does count rearranged lines within a file as much as other changes. The "
-"resulting output is consistent with what you get from the other `--*stat` "
-"options."
+msgid "Compute the dirstat numbers by doing the regular line-based diff analysis, and summing the removed/added line counts. (For binary files, count 64-byte chunks instead, since binary files have no natural concept of lines). This is a more expensive `--dirstat` behavior than the `changes` behavior, but it does count rearranged lines within a file as much as other changes. The resulting output is consistent with what you get from the other `--*stat` options."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:34 en/diff-options.txt:151
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`files`"
msgstr "`files`"
#. type: Plain text
#: en/diff-config.txt:39 en/diff-options.txt:156
-msgid ""
-"Compute the dirstat numbers by counting the number of files changed. Each "
-"changed file counts equally in the dirstat analysis. This is the "
-"computationally cheapest `--dirstat` behavior, since it does not have to "
-"look at the file contents at all."
+msgid "Compute the dirstat numbers by counting the number of files changed. Each changed file counts equally in the dirstat analysis. This is the computationally cheapest `--dirstat` behavior, since it does not have to look at the file contents at all."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:39 en/diff-options.txt:156
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`cumulative`"
msgstr "`cumulative`"
#. type: Plain text
#: 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 "
-"`noncumulative` parameter."
+msgid "Count changes in a child directory for the parent directory as well. Note that when using `cumulative`, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the `noncumulative` parameter."
msgstr ""
#. type: Labeled list
@@ -9442,108 +7460,78 @@ msgstr ""
#. type: Plain text
#: en/diff-config.txt:48 en/diff-options.txt:165
-msgid ""
-"An integer parameter specifies a cut-off percent (3% by default). "
-"Directories contributing less than this percentage of the changes are not "
-"shown in the output."
+msgid "An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes are not shown in the output."
msgstr ""
#. type: Plain text
#: en/diff-config.txt:54
-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: `files,10,cumulative`."
+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: `files,10,cumulative`."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:55
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "diff.statGraphWidth"
msgstr "diff.statGraphWidth"
#. type: Plain text
#: en/diff-config.txt:58
-msgid ""
-"Limit the width of the graph part in --stat output. If set, applies to all "
-"commands generating --stat output except format-patch."
+msgid "Limit the width of the graph part in --stat output. If set, applies to all commands generating --stat output except format-patch."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:59
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "diff.context"
msgstr "diff.context"
#. type: Plain text
#: en/diff-config.txt:62
-msgid ""
-"Generate diffs with <n> lines of context instead of the default of 3. This "
-"value is overridden by the -U option."
+msgid "Generate diffs with <n> lines of context instead of the default of 3. This value is overridden by the -U option."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:63
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "diff.interHunkContext"
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."
+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."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:69
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "diff.external"
msgstr "diff.external"
#. type: Plain text
#: en/diff-config.txt:77
-msgid ""
-"If this config variable is set, diff generation is not performed using the "
-"internal diff machinery, but using the given command. Can be overridden "
-"with the `GIT_EXTERNAL_DIFF' environment variable. The command is called "
-"with parameters as described under \"git Diffs\" in linkgit:git[1]. Note: "
-"if you want to use an external diff program only on a subset of your files, "
-"you\tmight want to use linkgit:gitattributes[5] instead."
+msgid "If this config variable is set, diff generation is not performed using the internal diff machinery, but using the given command. Can be overridden with the `GIT_EXTERNAL_DIFF' environment variable. The command is called with parameters as described under \"git Diffs\" in linkgit:git[1]. Note: if you want to use an external diff program only on a subset of your files, you\tmight want to use linkgit:gitattributes[5] instead."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:78
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "diff.ignoreSubmodules"
msgstr "diff.ignoreSubmodules"
#. type: Plain text
#: en/diff-config.txt:87
-msgid ""
-"Sets the default value of --ignore-submodules. Note that this affects only "
-"'git diff' Porcelain, and not lower level 'diff' commands such as 'git diff-"
-"files'. 'git checkout' also honors this setting when reporting uncommitted "
-"changes. Setting it to 'all' disables the submodule summary normally shown "
-"by 'git commit' and 'git status' when `status.submoduleSummary` is set "
-"unless it is overridden by using the --ignore-submodules command-line "
-"option. The 'git submodule' commands are not affected by this setting."
+msgid "Sets the default value of --ignore-submodules. Note that this affects only 'git diff' Porcelain, and not lower level 'diff' commands such as 'git diff-files'. 'git checkout' also honors this setting when reporting uncommitted changes. Setting it to 'all' disables the submodule summary normally shown by 'git commit' and 'git status' when `status.submoduleSummary` is set unless it is overridden by using the --ignore-submodules command-line option. The 'git submodule' commands are not affected by this setting."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:88
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "diff.mnemonicPrefix"
msgstr "diff.mnemonicPrefix"
#. type: Plain text
#: en/diff-config.txt:93
-msgid ""
-"If set, 'git diff' uses a prefix pair that is different from the standard "
-"\"a/\" and \"b/\" depending on what is being compared. When this "
-"configuration is in effect, reverse diff output also swaps the order of the "
-"prefixes:"
+msgid "If set, 'git diff' uses a prefix pair that is different from the standard \"a/\" and \"b/\" depending on what is being compared. When this configuration is in effect, reverse diff output also swaps the order of the prefixes:"
msgstr ""
#. type: Labeled list
@@ -9603,7 +7591,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:104
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "diff.noprefix"
msgstr "diff.noprefix"
@@ -9614,90 +7602,68 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:107
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "diff.orderFile"
msgstr "diff.orderFile"
#. type: Plain text
#: en/diff-config.txt:112
-msgid ""
-"File indicating how to order files within a diff. See the '-O' option to "
-"linkgit:git-diff[1] for details. If `diff.orderFile` is a relative "
-"pathname, it is treated as relative to the top of the working tree."
+msgid "File indicating how to order files within a diff. See the '-O' option to linkgit:git-diff[1] for details. If `diff.orderFile` is a relative pathname, it is treated as relative to the top of the working tree."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:113
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "diff.renameLimit"
msgstr "diff.renameLimit"
#. type: Plain text
#: en/diff-config.txt:116
-msgid ""
-"The number of files to consider when performing the copy/rename detection; "
-"equivalent to the 'git diff' option `-l`."
+msgid "The number of files to consider when performing the copy/rename detection; equivalent to the 'git diff' option `-l`."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:117
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "diff.renames"
msgstr "diff.renames"
#. type: Plain text
#: en/diff-config.txt:125
-msgid ""
-"Whether and how Git detects renames. If set to \"false\", rename detection "
-"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]."
+msgid "Whether and how Git detects renames. If set to \"false\", rename detection 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]."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:126
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "diff.suppressBlankEmpty"
msgstr "diff.suppressBlankEmpty"
#. type: Plain text
#: en/diff-config.txt:129
-msgid ""
-"A boolean to inhibit the standard behavior of printing a space before each "
-"empty output line. Defaults to false."
+msgid "A boolean to inhibit the standard behavior of printing a space before each empty output line. Defaults to false."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:130
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "diff.submodule"
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\"."
+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\"."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:138
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "diff.wordRegex"
msgstr "diff.wordRegex"
#. type: Plain text
#: en/diff-config.txt:143
-msgid ""
-"A POSIX Extended Regular Expression used to determine what is a \"word\" "
-"when performing word-by-word difference calculations. Character sequences "
-"that match the regular expression are \"words\", all other characters are "
-"*ignorable* whitespace."
+msgid "A POSIX Extended Regular Expression used to determine what is a \"word\" when performing word-by-word difference calculations. Character sequences that match the regular expression are \"words\", all other characters are *ignorable* whitespace."
msgstr ""
#. type: Labeled list
@@ -9708,8 +7674,7 @@ msgstr ""
#. type: Plain text
#: en/diff-config.txt:147
-msgid ""
-"The custom diff driver command. See linkgit:gitattributes[5] for details."
+msgid "The custom diff driver command. See linkgit:gitattributes[5] for details."
msgstr ""
#. type: Labeled list
@@ -9720,10 +7685,7 @@ 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."
+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."
msgstr ""
#. type: Labeled list
@@ -9734,9 +7696,7 @@ msgstr ""
#. type: Plain text
#: en/diff-config.txt:156
-msgid ""
-"Set this option to true to make the diff driver treat files as binary. See "
-"linkgit:gitattributes[5] for details."
+msgid "Set this option to true to make the diff driver treat files as binary. See linkgit:gitattributes[5] for details."
msgstr ""
#. type: Labeled list
@@ -9747,10 +7707,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -9761,9 +7718,7 @@ msgstr ""
#. type: Plain text
#: en/diff-config.txt:167
-msgid ""
-"The regular expression that the diff driver should use to split words in a "
-"line. See linkgit:gitattributes[5] for details."
+msgid "The regular expression that the diff driver should use to split words in a line. See linkgit:gitattributes[5] for details."
msgstr ""
#. type: Labeled list
@@ -9774,42 +7729,34 @@ msgstr ""
#. type: Plain text
#: en/diff-config.txt:171
-msgid ""
-"Set this option to true to make the diff driver cache the text conversion "
-"outputs. See linkgit:gitattributes[5] for details."
+msgid "Set this option to true to make the diff driver cache the text conversion outputs. See linkgit:gitattributes[5] for details."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:172 en/git-difftool.txt:111
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "diff.tool"
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."
+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."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:181
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "diff.indentHeuristic"
msgstr "diff.indentHeuristic"
#. type: Plain text
#: en/diff-config.txt:184
-msgid ""
-"Set this option to `true` to enable experimental heuristics that shift diff "
-"hunk boundaries to make patches easier to read."
+msgid "Set this option to `true` to enable experimental heuristics that shift diff hunk boundaries to make patches easier to read."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:185
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "diff.algorithm"
msgstr "diff.algorithm"
@@ -9831,7 +7778,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:191 en/diff-options.txt:84
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`minimal`"
msgstr "`minimal`"
@@ -9842,7 +7789,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:194 en/diff-options.txt:87
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`patience`"
msgstr "`patience`"
@@ -9853,29 +7800,24 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:196 en/diff-options.txt:89
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`histogram`"
msgstr "`histogram`"
#. type: Plain text
#: en/diff-config.txt:199 en/diff-options.txt:92
-msgid ""
-"This algorithm extends the patience algorithm to \"support low-occurrence "
-"common elements\"."
+msgid "This algorithm extends the patience algorithm to \"support low-occurrence common elements\"."
msgstr ""
#. type: Labeled list
#: en/diff-config.txt:202
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "diff.wsErrorHighlight"
msgstr "diff.wsErrorHighlight"
#. type: Plain text
#: en/diff-config.txt:206
-msgid ""
-"A comma separated list of `old`, `new`, `context`, that specifies how "
-"whitespace errors on lines are highlighted with `color.diff.whitespace`. "
-"Can be overridden by the command line option `--ws-error-highlight=<kind>`"
+msgid "A comma separated list of `old`, `new`, `context`, that specifies how whitespace errors on lines are highlighted with `color.diff.whitespace`. Can be overridden by the command line option `--ws-error-highlight=<kind>`"
msgstr ""
#. type: Title -
@@ -9886,15 +7828,12 @@ 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."
+msgid "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
#: en/diff-format.txt:9
-msgid ""
-"These commands all compare two sets of things; what is compared differs:"
+msgid "These commands all compare two sets of things; what is compared differs:"
msgstr ""
#. type: Labeled list
@@ -9943,10 +7882,7 @@ 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 "
-"changed file."
+msgid "The \"git-diff-tree\" command begins its output by printing the hash of what is being compared. After that, all the commands print one output line per changed file."
msgstr ""
#. type: Plain text
@@ -10069,8 +8005,7 @@ msgstr ""
#. type: Plain text
#: en/diff-format.txt:65
-msgid ""
-"U: file is unmerged (you must complete the merge before it can be committed)"
+msgid "U: file is unmerged (you must complete the merge before it can be committed)"
msgstr ""
#. type: Plain text
@@ -10080,18 +8015,12 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "Status letters C and R are always followed by a score (denoting the percentage of similarity between the source and target of the move or copy). Status letter M may be followed by a score (denoting the percentage of dissimilarity) for file rewrites."
msgstr ""
#. type: Plain text
#: en/diff-format.txt:74
-msgid ""
-"<sha1> is shown as all 0's if a file is new on the filesystem and it is out "
-"of sync with the index."
+msgid "<sha1> is shown as all 0's if a file is new on the filesystem and it is out of sync with the index."
msgstr ""
#. type: Labeled list
@@ -10109,11 +8038,7 @@ 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-"
-"config[1]). Using `-z` the filename is output verbatim and the line is "
-"terminated by a NUL byte."
+msgid "Without the `-z` option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). Using `-z` the filename is output verbatim and the line is terminated by a NUL byte."
msgstr ""
#. type: Title -
@@ -10124,10 +8049,7 @@ msgstr ""
#. type: Plain text
#: 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:"
+msgid "\"git-diff-tree\", \"git-diff-files\" and \"git-diff --raw\" can take `-c` or `--cc` option to generate diff output also for merge commits. The output differs from the format described above in the following way:"
msgstr ""
#. type: Plain text
@@ -10163,9 +8085,7 @@ msgstr ""
#. type: Plain text
#: en/diff-format.txt:108
-msgid ""
-"Note that 'combined diff' lists only files which were modified from all "
-"parents."
+msgid "Note that 'combined diff' lists only files which were modified from all parents."
msgstr ""
#. type: Title -
@@ -10176,20 +8096,12 @@ msgstr "autres formats de diff"
#. type: Plain text
#: en/diff-format.txt:120
-msgid ""
-"The `--summary` option describes newly added, deleted, renamed and copied "
-"files. The `--stat` option adds diffstat(1) graph to the output. These "
-"options can be combined with other options, such as `-p`, and are meant for "
-"human consumption."
+msgid "The `--summary` option describes newly added, deleted, renamed and copied files. The `--stat` option adds diffstat(1) graph to the output. These options can be combined with other options, such as `-p`, and are meant for human consumption."
msgstr ""
#. type: Plain text
#: 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:"
+msgid "When showing a change that involves a rename or a copy, `--stat` output formats the pathnames compactly by combining common prefix and suffix of the pathnames. For example, a change that moves `arch/i386/Makefile` to `arch/x86/Makefile` while modifying 4 lines will be shown like this:"
msgstr ""
#. type: delimited block -
@@ -10200,10 +8112,7 @@ 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:"
+msgid "The `--numstat` option gives the diffstat(1) information but is designed for easier machine consumption. An entry in `--numstat` output looks like this:"
msgstr ""
#. type: delimited block -
@@ -10247,8 +8156,7 @@ 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 -
@@ -10286,12 +8194,7 @@ 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-"
-"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."
+msgid "The extra `NUL` before the preimage path in renamed case is to allow scripts that read the output to tell if the current record being read is a single-path record or a rename/copy record without reading ahead. After reading added and deleted lines, reading up to `NUL` would yield the pathname, but if that is `NUL`, the record will show two paths."
msgstr ""
#. type: Title -
@@ -10302,20 +8205,12 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:10
-msgid ""
-"When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run "
-"with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" "
-"with the \"-p\" option, they do not produce the output described above; "
-"instead they produce a patch file. You can customize the creation of such "
-"patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment "
-"variables."
+msgid "When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" with the \"-p\" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:13
-msgid ""
-"What the -p option produces is slightly different from the traditional diff "
-"format:"
+msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
@@ -10331,18 +8226,12 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:21
-msgid ""
-"The `a/` and `b/` filenames are the same unless rename/copy is involved. "
-"Especially, even for a creation or a deletion, `/dev/null` is _not_ used in "
-"place of the `a/` or `b/` filenames."
+msgid "The `a/` and `b/` filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, `/dev/null` is _not_ used in place of the `a/` or `b/` filenames."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:25
-msgid ""
-"When rename/copy is involved, `file1` and `file2` show the name of the "
-"source file of the rename/copy and the name of the file that rename/copy "
-"produces, respectively."
+msgid "When rename/copy is involved, `file1` and `file2` show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively."
msgstr ""
#. type: Plain text
@@ -10369,52 +8258,32 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:42
-msgid ""
-"File modes are printed as 6-digit octal numbers including the file type and "
-"file permission bits."
+msgid "File modes are printed as 6-digit octal numbers including the file type and file permission bits."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:44
-msgid ""
-"Path names in extended headers do not include the `a/` and `b/` prefixes."
+msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:51
-msgid ""
-"The similarity index is the percentage of unchanged lines, and the "
-"dissimilarity index is the percentage of changed lines. It is a rounded "
-"down integer, followed by a percent sign. The similarity index value of "
-"100% is thus reserved for two equal files, while 100% dissimilarity means "
-"that no line from the old file made it into the new one."
+msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
msgstr ""
#. 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 "
-"lines indicate the old and the new mode."
+msgid "The index line includes the SHA-1 checksum before and after the change. The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:59
-msgid ""
-"Pathnames with \"unusual\" characters are quoted as explained for the "
-"configuration variable `core.quotePath` (see linkgit:git-config[1])."
-msgstr ""
-"Les noms de chemin avec des caract챔res 짬혻inhabituels혻쨩 sont cit챕s comme "
-"expliqu챕 pour la variable de configuration `core.quotePath` (voir "
-"linkgit:git-config[1])."
+msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
+msgstr "Les noms de chemin avec des caract챔res 짬혻inhabituels혻쨩 sont cit챕s comme expliqu챕 pour la variable de configuration `core.quotePath` (voir linkgit:git-config[1])."
#. type: Plain text
#: en/diff-generate-patch.txt:64
-msgid ""
-"All the `file1` files in the output refer to files before the commit, and "
-"all the `file2` files refer to files after the commit. It is incorrect to "
-"apply each change to each file sequentially. For example, this patch will "
-"swap a and b:"
+msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
msgstr ""
#. type: Plain text
@@ -10437,12 +8306,7 @@ msgstr "format de diff combin챕"
#. type: Plain text
#: en/diff-generate-patch.txt:82
-msgid ""
-"Any diff-generating command can take the `-c` or `--cc` option to produce a "
-"'combined diff' when showing a merge. This is the default format when "
-"showing merges with linkgit:git-diff[1] or linkgit:git-show[1]. Note also "
-"that you can give the `-m` option to any of these commands to force "
-"generation of diffs with individual parents of a merge."
+msgid "Any diff-generating command can take the `-c` or `--cc` option to produce a 'combined diff' when showing a merge. This is the default format when showing merges with linkgit:git-diff[1] or linkgit:git-show[1]. Note also that you can give the `-m` option to any of these commands to force generation of diffs with individual parents of a merge."
msgstr ""
#. type: Plain text
@@ -10495,9 +8359,7 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:117
-msgid ""
-"It is preceded with a \"git diff\" header, that looks like this (when `-c` "
-"option is used):"
+msgid "It is preceded with a \"git diff\" header, that looks like this (when `-c` option is used):"
msgstr ""
#. type: Plain text
@@ -10519,9 +8381,7 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:126
-msgid ""
-"It is followed by one or more extended header lines (this example shows a "
-"merge with two parents):"
+msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
msgstr ""
#. type: Plain text
@@ -10536,11 +8396,7 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:137
-msgid ""
-"The `mode <mode>,<mode>..<mode>` line appears only if at least one of the "
-"<mode> is different from the rest. Extended headers with information about "
-"detected contents movement (renames and copying detection) are designed to "
-"work with diff of two <tree-ish> and are not used by combined diff format."
+msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree-ish> and are not used by combined diff format."
msgstr ""
#. type: Plain text
@@ -10560,18 +8416,12 @@ 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."
+msgid "Similar to two-line header for traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:152
-msgid ""
-"Chunk header format is modified to prevent people from accidentally feeding "
-"it to `patch -p1`. Combined diff format was created for review of merge "
-"commit changes, and was not meant for apply. The change is similar to the "
-"change in the extended 'index' header:"
+msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant for apply. The change is similar to the change in the extended 'index' header:"
msgstr ""
#. type: Plain text
@@ -10582,55 +8432,32 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:157
-msgid ""
-"There are (number of parents + 1) `@` characters in the chunk header for "
-"combined diff format."
+msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
msgstr ""
#. type: Plain text
#: 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) "
-"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."
+msgid "Unlike the traditional 'unified' diff format, which shows two files A and B with a single column that has `-` (minus -- appears in A but removed in B), `+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) prefix, this format compares two or more files file1, file2,... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:172
-msgid ""
-"A `-` character in the column N means that the line appears in fileN but it "
-"does not appear in the result. A `+` character in the column N means that "
-"the line appears in the result, and fileN does not have that line (in other "
-"words, the line was added, from the point of view of that parent)."
+msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:178
-msgid ""
-"In the above example output, the function signature was changed from both "
-"files (hence two `-` removals from both file1 and file2, plus `++` to mean "
-"one line that was added does not appear in either file1 or file2). Also "
-"eight other lines are the same from file1 but do not appear in file2 (hence "
-"prefixed with `+`)."
+msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:184
-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\")."
+msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:17 en/git-rebase.txt:319 en/merge-options.txt:57
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-stat"
msgstr "--no-stat"
@@ -10644,14 +8471,14 @@ msgstr ""
#: en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64
#: en/git-cvsimport.txt:98 en/git-ls-files.txt:69 en/git-mailinfo.txt:52
#: en/git-push.txt:245 en/git-read-tree.txt:44
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-u"
msgstr "-u"
#. type: Labeled list
#: en/diff-options.txt:24 en/git-add.txt:86 en/git-checkout.txt:243
#: en/git-commit.txt:67
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--patch"
msgstr "--patch"
@@ -10673,21 +8500,19 @@ msgstr ""
#: en/git-ls-files.txt:58 en/git-revert.txt:89 en/git-shortlog.txt:34
#: en/git-show-ref.txt:53 en/git-status.txt:27 en/git-stripspace.txt:38
#: en/git-svn.txt:46 en/git-tag.txt:63 en/git-verify-pack.txt:31
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-s"
msgstr "-s"
#. type: Labeled list
#: en/diff-options.txt:31
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-patch"
msgstr "--no-patch"
#. type: Plain text
#: en/diff-options.txt:34
-msgid ""
-"Suppress diff output. Useful for commands like `git show` that show the "
-"patch by default, or to cancel the effect of `--patch`."
+msgid "Suppress diff output. Useful for commands like `git show` that show the patch by default, or to cancel the effect of `--patch`."
msgstr ""
#. type: Labeled list
@@ -10716,7 +8541,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:45 en/git-replace.txt:77 en/git-verify-commit.txt:19
#: en/git-verify-tag.txt:19
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--raw"
msgstr "--raw"
@@ -10739,7 +8564,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:62
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--patch-with-raw"
msgstr "--patch-with-raw"
@@ -10750,13 +8575,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:68
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--minimal"
msgstr "--minimal"
#. type: Labeled list
#: en/diff-options.txt:72
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--patience"
msgstr "--patience"
@@ -10767,7 +8592,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:75
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--histogram"
msgstr "--histogram"
@@ -10789,10 +8614,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:97
-msgid ""
-"For instance, if you configured diff.algorithm variable to a non-default "
-"value and want to use the default one, then you have to use `--diff-"
-"algorithm=default` option."
+msgid "For instance, if you configured diff.algorithm variable to a non-default value and want to use the default one, then you have to use `--diff-algorithm=default` option."
msgstr ""
#. type: Labeled list
@@ -10803,51 +8625,34 @@ 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 "
-"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."
+msgid "Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by `<width>`. The width of the filename part can be limited by giving another width `<name-width>` after a comma. The width of the graph part can be limited by using `--stat-graph-width=<width>` (affects all commands generating a stat graph) or by setting `diff.statGraphWidth=<width>` (does not affect `git format-patch`). By giving a third parameter `<count>`, you can limit the output to the first `<count>` lines, followed by `...` if there are more."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:115
-msgid ""
-"These parameters can also be set individually with `--stat-width=<width>`, "
-"`--stat-name-width=<name-width>` and `--stat-count=<count>`."
+msgid "These parameters can also be set individually with `--stat-width=<width>`, `--stat-name-width=<name-width>` and `--stat-count=<count>`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:116 en/git-apply.txt:45
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--numstat"
msgstr "--numstat"
#. type: Plain text
#: en/diff-options.txt:122
-msgid ""
-"Similar to `--stat`, but shows number of added and deleted lines in decimal "
-"notation and pathname without abbreviation, to make it more machine "
-"friendly. For binary files, outputs two `-` instead of saying `0 0`."
+msgid "Similar to `--stat`, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly. For binary files, outputs two `-` instead of saying `0 0`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:123
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--shortstat"
msgstr "--shortstat"
#. type: Plain text
#: en/diff-options.txt:127
-msgid ""
-"Output only the last line of the `--stat` format containing total number of "
-"modified files, as well as number of added and deleted lines."
+msgid "Output only the last line of the `--stat` format containing total number of modified files, as well as number of added and deleted lines."
msgstr ""
#. type: Labeled list
@@ -10858,40 +8663,29 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:135
-msgid ""
-"Output the distribution of relative amount of changes for each sub-"
-"directory. The behavior of `--dirstat` can be customized by passing it a "
-"comma separated list of parameters. The defaults are controlled by the "
-"`diff.dirstat` configuration variable (see linkgit:git-config[1]). The "
-"following parameters are available:"
+msgid "Output the distribution of relative amount of changes for each sub-directory. The behavior of `--dirstat` can be customized by passing it a comma separated list of parameters. The defaults are controlled by the `diff.dirstat` configuration variable (see linkgit:git-config[1]). The following parameters are available:"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:171
-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`."
+msgid "Example: The following will count changed files, while ignoring directories with less than 10% of the total amount of changed files, and accumulating child directory counts in the parent directories: `--dirstat=files,10,cumulative`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:172 en/git-apply.txt:52 en/git-shortlog.txt:35
#: en/merge-options.txt:98
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--summary"
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."
+msgid "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, ignore-translated
+#, no-wrap
msgid "--patch-with-stat"
msgstr "--patch-with-stat"
@@ -10906,7 +8700,7 @@ msgstr ""
#: en/git-commit.txt:118 en/git-config.txt:183 en/git-grep.txt:196
#: en/git-ls-files.txt:79 en/git-ls-tree.txt:55 en/git-mktree.txt:23
#: en/git-status.txt:100 en/git-update-index.txt:160
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-z"
msgstr "-z"
@@ -10918,9 +8712,7 @@ 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."
+msgid "Also, when `--raw` or `--numstat` has been given, do not munge pathnames and use NULs as output field terminators."
msgstr ""
#. type: Plain text
@@ -10933,16 +8725,13 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:198 en/git-apply.txt:114
-msgid ""
-"Without this option, pathnames with \"unusual\" characters are quoted as "
-"explained for the configuration variable `core.quotePath` (see linkgit:git-"
-"config[1])."
+msgid "Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
#: 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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--name-only"
msgstr "--name-only"
@@ -10953,15 +8742,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:202 en/git-ls-tree.txt:60
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--name-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."
+msgid "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
@@ -10972,16 +8759,7 @@ 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. "
-"This format lists the commits in the range like linkgit:git-submodule[1] "
-"`summary` does. When `--submodule=diff` is specified, the 'diff' format is "
-"used. This format shows an inline diff of the changes in the submodule "
-"contents between the commit range. Defaults to `diff.submodule` or the "
-"'short' format if the config option is unset."
+msgid "Specify how differences in submodules are shown. When specifying `--submodule=short` the 'short' format is used. This format just shows the names of the commits at the beginning and end of the range. When `--submodule` or `--submodule=log` is specified, the 'log' format is used. This format lists the commits in the range like linkgit:git-submodule[1] `summary` does. When `--submodule=diff` is specified, the 'diff' format is used. This format shows an inline diff of the changes in the submodule contents between the commit range. Defaults to `diff.submodule` or the 'short' format if the config option is unset."
msgstr ""
#. type: Labeled list
@@ -10993,9 +8771,7 @@ 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`."
+msgid "Show colored diff. `--color` (i.e. without '=<when>') is the same as `--color=always`. '<when>' can be one of `always`, `never`, or `auto`."
msgstr ""
#. type: Plain text
@@ -11009,7 +8785,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:227 en/git-branch.txt:119 en/git-grep.txt:210
#: en/git-show-branch.txt:124
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-color"
msgstr "--no-color"
@@ -11038,10 +8814,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:239
-msgid ""
-"Show a word diff, using the <mode> to delimit changed words. By default, "
-"words are delimited by whitespace; see `--word-diff-regex` below. The "
-"<mode> defaults to 'plain', and must be one of:"
+msgid "Show a word diff, using the <mode> to delimit changed words. By default, words are delimited by whitespace; see `--word-diff-regex` below. The <mode> defaults to 'plain', and must be one of:"
msgstr ""
#. type: Plain text
@@ -11057,9 +8830,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:247
-msgid ""
-"Show words as `[-removed-]` and `{+added+}`. Makes no attempts to escape "
-"the delimiters if they appear in the input, so the output may be ambiguous."
+msgid "Show words as `[-removed-]` and `{+added+}`. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous."
msgstr ""
#. type: Labeled list
@@ -11070,12 +8841,7 @@ 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, "
-"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."
+msgid "Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the usual unified diff format, starting with a `+`/`-`/` ` character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde `~` on a line of its own."
msgstr ""
#. type: Labeled list
@@ -11091,9 +8857,7 @@ 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."
+msgid "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
@@ -11104,37 +8868,22 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:265
-msgid ""
-"Use <regex> to decide what a word is, instead of considering runs of non-"
-"whitespace to be a word. Also implies `--word-diff` unless it was already "
-"enabled."
+msgid "Use <regex> to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies `--word-diff` unless it was already enabled."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:273
-msgid ""
-"Every non-overlapping match of the <regex> is considered a word. Anything "
-"between these matches is considered whitespace and ignored(!) for the "
-"purposes of finding differences. You may want to append `|[^[:space:]]` to "
-"your regular expression to make sure that it matches all non-whitespace "
-"characters. A match that contains a newline is silently truncated(!) at the"
-" newline."
+msgid "Every non-overlapping match of the <regex> is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append `|[^[:space:]]` to your regular expression to make sure that it matches all non-whitespace characters. A match that contains a newline is silently truncated(!) at the newline."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:276
-msgid ""
-"For example, `--word-diff-regex=.` will treat each character as a word and, "
-"correspondingly, show differences character by character."
+msgid "For example, `--word-diff-regex=.` will treat each character as a word and, correspondingly, show differences character by character."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:281
-msgid ""
-"The regex can also be set via a diff driver or configuration option, see "
-"linkgit:gitattributes[5] or linkgit:git-config[1]. Giving it explicitly "
-"overrides any diff driver or configuration setting. Diff drivers override "
-"configuration settings."
+msgid "The regex can also be set via a diff driver or configuration option, see linkgit:gitattributes[5] or linkgit:git-config[1]. Giving it explicitly overrides any diff driver or configuration setting. Diff drivers override configuration settings."
msgstr ""
#. type: Labeled list
@@ -11145,40 +8894,29 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:285
-msgid ""
-"Equivalent to `--word-diff=color` plus (if a regex was specified) `--word-"
-"diff-regex=<regex>`."
+msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word-diff-regex=<regex>`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:287
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-renames"
msgstr "--no-renames"
#. type: Plain text
#: en/diff-options.txt:290
-msgid ""
-"Turn off rename detection, even when the configuration file gives the "
-"default to do so."
+msgid "Turn off rename detection, even when the configuration file gives the default to do so."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:292 en/git-apply.txt:58
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--check"
msgstr "--check"
#. type: Plain text
#: en/diff-options.txt:301
-msgid ""
-"Warn if changes introduce conflict markers or whitespace errors. What are "
-"considered whitespace errors is controlled by `core.whitespace` "
-"configuration. By default, trailing whitespaces (including lines that "
-"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. Exits with non-zero status if problems are "
-"found. Not compatible with --exit-code."
+msgid "Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by `core.whitespace` configuration. By default, trailing whitespaces (including lines that 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. Exits with non-zero status if problems are found. Not compatible with --exit-code."
msgstr ""
#. type: Labeled list
@@ -11189,41 +8927,29 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:312
-msgid ""
-"Highlight whitespace errors on lines specified by <kind> in the color "
-"specified by `color.diff.whitespace`. <kind> is a comma separated list of "
-"`old`, `new`, `context`. When this option is not given, only whitespace "
-"errors in `new` lines are highlighted. E.g. `--ws-error-highlight=new,old` "
-"highlights whitespace errors on both deleted and added lines. `all` can be "
-"used as a short-hand for `old,new,context`. The `diff.wsErrorHighlight` "
-"configuration variable can be used to specify the default behaviour."
+msgid "Highlight whitespace errors on lines specified by <kind> in the color specified by `color.diff.whitespace`. <kind> is a comma separated list of `old`, `new`, `context`. When this option is not given, only whitespace errors in `new` lines are highlighted. E.g. `--ws-error-highlight=new,old` highlights whitespace errors on both deleted and added lines. `all` can be used as a short-hand for `old,new,context`. The `diff.wsErrorHighlight` configuration variable can be used to specify the default behaviour."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:315
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--full-index"
msgstr "--full-index"
#. type: Plain text
#: en/diff-options.txt:319
-msgid ""
-"Instead of the first handful of characters, show the full pre- and post-"
-"image blob object names on the \"index\" line when generating patch format "
-"output."
+msgid "Instead of the first handful of characters, show the full pre- and post-image blob object names on the \"index\" line when generating patch format output."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:320 en/git-apply.txt:150
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--binary"
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`."
+msgid "In addition to `--full-index`, output a binary diff that can be applied with `git-apply`."
msgstr ""
#. type: Labeled list
@@ -11235,12 +8961,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:331
-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>`."
+msgid "Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show only a partial prefix. This is independent of the `--full-index` option above, which controls the diff-patch output format. Non default number of digits can be specified with `--abbrev=<n>`."
msgstr ""
#. type: Labeled list
@@ -11257,34 +8978,17 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:336
-msgid ""
-"Break complete rewrite changes into pairs of delete and create. This serves "
-"two purposes:"
+msgid "Break complete rewrite changes into pairs of delete and create. This serves two purposes:"
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 "
-"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)."
+msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr ""
#. 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 "
-"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."
+msgid "When used with -M, a totally-rewritten file is also considered as the source of a rename (usually -M only considers a file that disappeared as the source of a rename), and the number `n` controls this aspect of the -B option (defaults to 50%). `-B20%` specifies that a change with addition and deletion compared to 20% or more of the file's size are eligible for being picked up as a possible source of a rename to another file."
msgstr ""
#. type: Labeled list
@@ -11343,25 +9047,18 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:379
-msgid ""
-"Detect copies as well as renames. See also `--find-copies-harder`. If `n` "
-"is specified, it has the same meaning as for `-M<n>`."
+msgid "Detect copies as well as renames. See also `--find-copies-harder`. If `n` is specified, it has the same meaning as for `-M<n>`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:380 en/git-svn.txt:595
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--find-copies-harder"
msgstr "--find-copies-harder"
#. type: Plain text
#: en/diff-options.txt:388
-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."
+msgid "For performance reasons, by default, `-C` option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one `-C` option has the same effect."
msgstr ""
#. type: Labeled list
@@ -11372,26 +9069,18 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:390
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--irreversible-delete"
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 "
-"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."
+msgid "Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and `/dev/null`. The resulting patch is not meant to be applied with `patch` or `git apply`; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lack enough information to apply such a patch in reverse, even manually, hence the name of the option."
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."
+msgid "When used together with `-B`, omit also the preimage in the deletion part of a delete/create pair."
msgstr ""
#. type: Labeled list
@@ -11402,11 +9091,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:408
-msgid ""
-"The `-M` and `-C` options require O(n^2) processing time where n is the "
-"number of potential rename/copy targets. This option prevents rename/copy "
-"detection from running if the number of rename/copy targets exceeds the "
-"specified number."
+msgid "The `-M` and `-C` options require O(n^2) processing time where n is the number of potential rename/copy targets. This option prevents rename/copy detection from running if the number of rename/copy targets exceeds the specified number."
msgstr ""
#. type: Labeled list
@@ -11417,22 +9102,12 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:421
-msgid ""
-"Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), "
-"Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, "
-"submodule, ...) changed (`T`), are Unmerged (`U`), are Unknown (`X`), or "
-"have had their pairing Broken (`B`). Any combination of the filter "
-"characters (including none) can be used. When `*` (All-or-none) is added to"
-" the combination, all paths are selected if there is any file that matches "
-"other criteria in the comparison; if there is no file that matches other "
-"criteria, nothing is selected."
+msgid "Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, submodule, ...) changed (`T`), are Unmerged (`U`), are Unknown (`X`), or have had their pairing Broken (`B`). Any combination of the filter characters (including none) can be used. When `*` (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:424
-msgid ""
-"Also, these upper-case letters can be downcased to exclude. E.g. `--diff-"
-"filter=ad` excludes added and deleted paths."
+msgid "Also, these upper-case letters can be downcased to exclude. E.g. `--diff-filter=ad` excludes added and deleted paths."
msgstr ""
#. type: Labeled list
@@ -11443,19 +9118,12 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:429
-msgid ""
-"Look for differences that change the number of occurrences of the specified "
-"string (i.e. addition/deletion) in a file. Intended for the scripter's use."
+msgid "Look for differences that change the number of occurrences of the specified string (i.e. addition/deletion) in a file. Intended for the scripter's use."
msgstr ""
#. 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: "
-"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."
+msgid "It is useful when you're looking for an exact block of code (like a struct), and want to know the history of that block since it first came into being: use the feature iteratively to feed the interesting block in the preimage back into `-S`, and keep going until you get the very first version of the block."
msgstr ""
#. type: Labeled list
@@ -11466,16 +9134,12 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:439
-msgid ""
-"Look for differences whose patch text contains added/removed lines that "
-"match <regex>."
+msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
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:"
+msgid "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 -
@@ -11489,42 +9153,34 @@ 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 "
-"occurrences of that string did not change)."
+msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
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, ignore-translated
+#, no-wrap
msgid "--pickaxe-all"
msgstr "--pickaxe-all"
#. type: Plain text
#: en/diff-options.txt:461
-msgid ""
-"When `-S` or `-G` finds a change, show all the changes in that changeset, "
-"not just the files that contain the change in <string>."
+msgid "When `-S` or `-G` finds a change, show all the changes in that changeset, not just the files that contain the change in <string>."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:462
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--pickaxe-regex"
msgstr "--pickaxe-regex"
#. type: Plain text
#: en/diff-options.txt:465
-msgid ""
-"Treat the <string> given to `-S` as an extended POSIX regular expression to "
-"match."
+msgid "Treat the <string> given to `-S` as an extended POSIX regular expression to match."
msgstr ""
#. type: Labeled list
@@ -11535,23 +9191,12 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:472
-msgid ""
-"Control the order in which files appear in the output. This overrides the "
-"`diff.orderFile` configuration variable (see linkgit:git-config[1]). To "
-"cancel `diff.orderFile`, use `-O/dev/null`."
+msgid "Control the order in which files appear in the output. This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`."
msgstr ""
#. 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."
+msgid "The output order is determined by the order of glob patterns in <orderfile>. All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on. All files with pathnames that do not match any pattern are output last, as if there was an implicit match-all pattern at the end of the file. If multiple pathnames have the same rank (they match the same pattern but no earlier patterns), their output order relative to each other is the normal order."
msgstr ""
#. type: Plain text
@@ -11561,16 +9206,12 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:490
-msgid ""
-"Blank lines are ignored, so they can be used as separators for readability."
+msgid "Blank lines are ignored, so they can be used as separators for readability."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:494
-msgid ""
-"Lines starting with a hash (\"`#`\") are ignored, so they can be used for "
-"comments. Add a backslash (\"`\\`\") to the beginning of the pattern if it "
-"starts with a hash."
+msgid "Lines starting with a hash (\"`#`\") are ignored, so they can be used for comments. Add a backslash (\"`\\`\") to the beginning of the pattern if it starts with a hash."
msgstr ""
#. type: Plain text
@@ -11580,12 +9221,7 @@ 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 "
-"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`\"."
+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 removing any number of the final pathname components matches the pattern. For example, the pattern \"`foo*bar`\" matches \"`fooasdfbar`\" and \"`foo/bar/baz/asdf`\" but not \"`foobarx`\"."
msgstr ""
#. type: Labeled list
@@ -11596,9 +9232,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:508
-msgid ""
-"Swap two inputs; that is, show differences from index or on-disk file to "
-"tree contents."
+msgid "Swap two inputs; that is, show differences from index or on-disk file to tree contents."
msgstr ""
#. type: Labeled list
@@ -11609,12 +9243,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:516
-msgid ""
-"When run from a subdirectory of the project, it can be told to exclude "
-"changes outside the directory and show pathnames relative to it with this "
-"option. When you are not in a subdirectory (e.g. in a bare repository), you"
-" can name which subdirectory to make the output relative to by giving a "
-"<path> as an argument."
+msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
msgstr ""
#. type: Labeled list
@@ -11624,13 +9253,13 @@ msgstr ""
#: en/git-help.txt:41 en/git-http-fetch.txt:31 en/git-merge-base.txt:71
#: en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47
#: en/git-tag.txt:59
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-a"
msgstr "-a"
#. type: Labeled list
#: en/diff-options.txt:519 en/git-grep.txt:106
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--text"
msgstr "--text"
@@ -11641,7 +9270,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:522
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ignore-space-at-eol"
msgstr "--ignore-space-at-eol"
@@ -11652,41 +9281,36 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:526 en/git-am.txt:102 en/git-apply.txt:172
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Plain text
#: en/diff-options.txt:530
-msgid ""
-"Ignore changes in amount of whitespace. This ignores whitespace at line "
-"end, and considers all other sequences of one or more whitespace characters "
-"to be equivalent."
+msgid "Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:531 en/git-blame.txt:83 en/git-cvsexportcommit.txt:71
#: en/git-grep.txt:131 en/git-hash-object.txt:31 en/git-help.txt:66
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-w"
msgstr "-w"
#. type: Labeled list
#: en/diff-options.txt:532
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ignore-all-space"
msgstr "--ignore-all-space"
#. type: Plain text
#: en/diff-options.txt:536
-msgid ""
-"Ignore whitespace when comparing lines. This ignores differences even if "
-"one line has whitespace where the other line has none."
+msgid "Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:537
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ignore-blank-lines"
msgstr "--ignore-blank-lines"
@@ -11703,10 +9327,7 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other. Defaults to `diff.interHunkContext` or 0 if the config option is unset."
msgstr ""
#. type: Labeled list
@@ -11717,7 +9338,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:547 en/git-grep.txt:247
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--function-context"
msgstr "--function-context"
@@ -11728,15 +9349,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:552 en/git-ls-remote.txt:46
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--exit-code"
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."
+msgid "Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and 0 means no differences."
msgstr ""
#. type: Labeled list
@@ -11752,7 +9371,7 @@ msgstr ""
#: en/git-show-ref.txt:71 en/git-submodule.txt:272 en/git-svn.txt:633
#: en/git-symbolic-ref.txt:40 en/merge-options.txt:105
#: en/rev-list-options.txt:201
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--quiet"
msgstr "--quiet"
@@ -11763,21 +9382,18 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:562
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ext-diff"
msgstr "--ext-diff"
#. type: Plain text
#: en/diff-options.txt:566
-msgid ""
-"Allow an external diff helper to be executed. If you set an external diff "
-"driver with linkgit:gitattributes[5], you need to use this option with "
-"linkgit:git-log[1] and friends."
+msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:567
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-ext-diff"
msgstr "--no-ext-diff"
@@ -11788,26 +9404,19 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:570 en/git-cat-file.txt:59 en/git-grep.txt:109
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
#: en/diff-options.txt:571 en/git-grep.txt:112
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-textconv"
msgstr "--no-textconv"
#. type: Plain text
#: en/diff-options.txt:580
-msgid ""
-"Allow (or disallow) external text conversion filters to be run when "
-"comparing binary files. See linkgit:gitattributes[5] for details. Because "
-"textconv filters are typically a one-way conversion, the resulting diff is "
-"suitable for human consumption, but cannot be applied. For this reason, "
-"textconv filters are enabled by default only for linkgit:git-diff[1] and "
-"linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing"
-" commands."
+msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
msgstr ""
#. type: Labeled list
@@ -11818,18 +9427,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:593
-msgid ""
-"Ignore changes to submodules in the diff generation. <when> can be either "
-"\"none\", \"untracked\", \"dirty\" or \"all\", which is the default. Using "
-"\"none\" will consider the submodule modified when it either contains "
-"untracked or modified files or its HEAD differs from the commit recorded in "
-"the superproject and can be used to override any settings of the 'ignore' "
-"option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\""
-" is used submodules are not considered dirty when they only contain "
-"untracked content (but they are still scanned for modified content). Using "
-"\"dirty\" ignores all changes to the work tree of submodules, only changes "
-"to the commits stored in the superproject are shown (this was the behavior "
-"until 1.7.0). Using \"all\" hides all changes to submodules."
+msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default. Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
msgstr ""
#. type: Labeled list
@@ -11856,7 +9454,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:600
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-prefix"
msgstr "--no-prefix"
@@ -11878,25 +9476,18 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:606
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ita-invisible-in-index"
msgstr "--ita-invisible-in-index"
#. type: Plain text
#: en/diff-options.txt:613
-msgid ""
-"By default entries added by \"git add -N\" appear as an existing empty file "
-"in \"git diff\" and a new file in \"git diff --cached\". This option makes "
-"the entry appear as a new file in \"git diff\" and non-existent in \"git "
-"diff --cached\". This option could be reverted with `--ita-visible-in-"
-"index`. Both options are experimental and could be removed in future."
+msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\". This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:615
-msgid ""
-"For more detailed explanation on these common options, see also "
-"linkgit:gitdiffcore[7]."
+msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
msgstr ""
#. type: Labeled list
@@ -11908,7 +9499,7 @@ msgstr ""
#: en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37
#: en/git-show-branch.txt:48 en/git-submodule.txt:275
#: en/rev-list-options.txt:135
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--all"
msgstr "--all"
@@ -11919,16 +9510,13 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:5
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--append"
msgstr "--append"
#. type: Plain text
#: en/fetch-options.txt:9
-msgid ""
-"Append ref names and object names of fetched refs to the existing contents "
-"of `.git/FETCH_HEAD`. Without this option old data in `.git/FETCH_HEAD` "
-"will be overwritten."
+msgid "Append ref names and object names of fetched refs to the existing contents of `.git/FETCH_HEAD`. Without this option old data in `.git/FETCH_HEAD` will be overwritten."
msgstr ""
#. type: Labeled list
@@ -11939,12 +9527,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"shorten the history to the specified number of commits. Tags for the "
-"deepened commits are not fetched."
+msgid "Limit fetching to the specified number of commits from the tip of each remote branch history. If fetching to a 'shallow' repository created by `git clone` with `--depth=<depth>` option (see linkgit:git-clone[1]), deepen or shorten the history to the specified number of commits. Tags for the deepened commits are not fetched."
msgstr ""
#. type: Labeled list
@@ -11955,10 +9538,7 @@ msgstr ""
#. type: Plain text
#: en/fetch-options.txt:21
-msgid ""
-"Similar to --depth, except it specifies the number of commits from the "
-"current shallow boundary instead of from the tip of each remote branch "
-"history."
+msgid "Similar to --depth, except it specifies the number of commits from the current shallow boundary instead of from the tip of each remote branch history."
msgstr ""
#. type: Labeled list
@@ -11969,9 +9549,7 @@ msgstr ""
#. type: Plain text
#: en/fetch-options.txt:25
-msgid ""
-"Deepen or shorten the history of a shallow repository to include all "
-"reachable commits after <date>."
+msgid "Deepen or shorten the history of a shallow repository to include all reachable commits after <date>."
msgstr ""
#. type: Labeled list
@@ -11982,44 +9560,34 @@ msgstr ""
#. type: Plain text
#: en/fetch-options.txt:30 en/git-fetch-pack.txt:98
-msgid ""
-"Deepen or shorten the history of a shallow repository to exclude commits "
-"reachable from a specified remote branch or tag. This option can be "
-"specified multiple times."
+msgid "Deepen or shorten the history of a shallow repository to exclude commits reachable from a specified remote branch or tag. This option can be specified multiple times."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:31
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--unshallow"
msgstr "--unshallow"
#. type: Plain text
#: en/fetch-options.txt:35
-msgid ""
-"If the source repository is complete, convert a shallow repository to a "
-"complete one, removing all the limitations imposed by shallow repositories."
+msgid "If the source repository is complete, convert a shallow repository to a complete one, removing all the limitations imposed by shallow repositories."
msgstr ""
#. type: Plain text
#: en/fetch-options.txt:38
-msgid ""
-"If the source repository is shallow, fetch as much as possible so that the "
-"current repository has the same history as the source repository."
+msgid "If the source repository is shallow, fetch as much as possible so that the current repository has the same history as the source repository."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:39
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--update-shallow"
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 "
-"accept such refs."
+msgid "By default when fetching from a shallow repository, `git fetch` refuses refs that require updating .git/shallow. This option updates .git/shallow and accept such refs."
msgstr ""
#. type: Labeled list
@@ -12030,7 +9598,7 @@ msgstr ""
#: en/git-read-tree.txt:58 en/git-reflog.txt:115 en/git-rm.txt:44
#: en/git-send-email.txt:362 en/git-send-pack.txt:51 en/git-svn.txt:649
#: en/git-worktree.txt:111
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--dry-run"
msgstr "--dry-run"
@@ -12047,7 +9615,7 @@ msgstr ""
#: en/git-push.txt:221 en/git-rebase.txt:335 en/git-repack.txt:65
#: en/git-replace.txt:59 en/git-rm.txt:39 en/git-submodule.txt:287
#: en/git-tag.txt:71 en/git-update-server-info.txt:26 en/git-worktree.txt:85
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-f"
msgstr "-f"
@@ -12059,31 +9627,28 @@ msgstr "-f"
#: en/git-push.txt:222 en/git-replace.txt:60 en/git-rm.txt:40
#: en/git-send-email.txt:387 en/git-send-pack.txt:54 en/git-submodule.txt:288
#: en/git-tag.txt:72 en/git-update-server-info.txt:27 en/git-worktree.txt:86
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--force"
msgstr "--force"
#. type: Plain text
#: en/fetch-options.txt:57
-msgid ""
-"When 'git fetch' is used with `<rbranch>:<lbranch>` refspec, it refuses to "
-"update the local branch `<lbranch>` unless the remote branch `<rbranch>` it "
-"fetches is a descendant of `<lbranch>`. This option overrides that check."
+msgid "When 'git fetch' is used with `<rbranch>:<lbranch>` refspec, it refuses to update the local branch `<lbranch>` unless the remote branch `<rbranch>` it fetches is a descendant of `<lbranch>`. This option overrides that check."
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
-#, no-wrap, ignore-translated
+#: 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"
#. type: Labeled list
#: en/fetch-options.txt:59 en/git-am.txt:41 en/git-fetch-pack.txt:54
#: en/git-index-pack.txt:54 en/git-reset.txt:82
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--keep"
msgstr "--keep"
@@ -12094,32 +9659,24 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:63
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--multiple"
msgstr "--multiple"
#. type: Plain text
#: en/fetch-options.txt:66
-msgid ""
-"Allow several <repository> and <group> arguments to be specified. No "
-"<refspec>s may be specified."
+msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:68 en/git-push.txt:98
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--prune"
msgstr "--prune"
#. type: Plain text
#: en/fetch-options.txt:77
-msgid ""
-"Before fetching, remove any remote-tracking references that no longer exist "
-"on the remote. Tags are not subject to pruning if they are fetched only "
-"because of the default tag auto-following or due to a --tags option. "
-"However, if tags are fetched due to an explicit refspec (either on the "
-"command line or in the remote configuration, for example if the remote was "
-"cloned with the --mirror option), then they are also subject to pruning."
+msgid "Before fetching, remove any remote-tracking references that no longer exist on the remote. Tags are not subject to pruning if they are fetched only because of the default tag auto-following or due to a --tags option. However, if tags are fetched due to an explicit refspec (either on the command line or in the remote configuration, for example if the remote was cloned with the --mirror option), then they are also subject to pruning."
msgstr ""
#. type: Labeled list
@@ -12132,25 +9689,20 @@ 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
-#, no-wrap, ignore-translated
+#: 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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-tags"
msgstr "--no-tags"
#. type: Plain text
#: en/fetch-options.txt:88
-msgid ""
-"By default, tags that point at objects that are downloaded from the remote "
-"repository are fetched and stored locally. This option disables this "
-"automatic tag following. The default behavior for a remote may be specified "
-"with the remote.<name>.tagOpt setting. See linkgit:git-config[1]."
+msgid "By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following. The default behavior for a remote may be specified with the remote.<name>.tagOpt setting. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
@@ -12161,30 +9713,20 @@ msgstr ""
#. type: Plain text
#: en/fetch-options.txt:97
-msgid ""
-"When fetching refs listed on the command line, use the specified refspec "
-"(can be given more than once) to map the refs to remote-tracking branches, "
-"instead of the values of `remote.*.fetch` configuration variables for the "
-"remote repository. See section on \"Configured Remote-tracking Branches\" "
-"for details."
+msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:99 en/git-describe.txt:42 en/git-fsck.txt:41
#: en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:130
#: en/git-show-ref.txt:40
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--tags"
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 "
-"destination of an explicit refspec; see `--prune`)."
+msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr ""
#. type: Labeled list
@@ -12195,20 +9737,12 @@ msgstr ""
#. type: Plain text
#: en/fetch-options.txt:117
-msgid ""
-"This option controls if and under what conditions new commits of populated "
-"submodules should be fetched too. It can be used as a boolean option to "
-"completely disable recursion when set to 'no' or to unconditionally recurse "
-"into all populated submodules when set to 'yes', which is the default when "
-"this option is used without any value. Use 'on-demand' to only recurse into "
-"a populated submodule when the superproject retrieves a commit that updates "
-"the submodule's reference to a commit that isn't already in the local "
-"submodule clone."
+msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:118
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-j"
msgstr "-j"
@@ -12220,23 +9754,18 @@ msgstr ""
#. type: Plain text
#: en/fetch-options.txt:124
-msgid ""
-"Number of parallel children to be used for fetching submodules. Each will "
-"fetch from different submodules, such that fetching many submodules will be "
-"faster. By default submodules will be fetched one at a time."
+msgid "Number of parallel children to be used for fetching submodules. Each will fetch from different submodules, such that fetching many submodules will be faster. By default submodules will be fetched one at a time."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:125 en/git-push.txt:274
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
#: en/fetch-options.txt:128
-msgid ""
-"Disable recursive fetching of submodules (this has the same effect as using "
-"the `--recurse-submodules=no` option)."
+msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
#. type: Labeled list
@@ -12247,10 +9776,7 @@ msgstr ""
#. type: Plain text
#: en/fetch-options.txt:133
-msgid ""
-"Prepend <path> to paths printed in informative messages such as \"Fetching "
-"submodule foo\". This option is used internally when recursing over "
-"submodules."
+msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
msgstr ""
#. type: Labeled list
@@ -12261,27 +9787,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."
+msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:144
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
#: en/fetch-options.txt:151
-msgid ""
-"By default 'git fetch' refuses to update the head which corresponds to the "
-"current branch. This flag disables the check. This is purely for the "
-"internal use for 'git pull' to communicate with 'git fetch', and unless you "
-"are implementing your own Porcelain you are not supposed to use it."
+msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
#. type: Labeled list
@@ -12292,10 +9809,7 @@ 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."
+msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
@@ -12311,15 +9825,13 @@ msgstr ""
#: en/git-show-ref.txt:70 en/git-submodule.txt:271 en/git-svn.txt:632
#: en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34
#: en/git-update-index.txt:56 en/merge-options.txt:104
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-q"
msgstr "-q"
#. type: Plain text
#: en/fetch-options.txt:164
-msgid ""
-"Pass --quiet to git-fetch-pack and silence any other internally used git "
-"commands. Progress is not reported to the standard error stream."
+msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
@@ -12336,7 +9848,7 @@ msgstr ""
#: en/git-svn.txt:350 en/git-tag.txt:79 en/git-verify-commit.txt:23
#: en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:120
#: en/merge-options.txt:108
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-v"
msgstr "-v"
@@ -12352,7 +9864,7 @@ msgstr "-v"
#: en/git-svn.txt:351 en/git-update-index.txt:145 en/git-verify-commit.txt:24
#: en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:121
#: en/merge-options.txt:109
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--verbose"
msgstr "--verbose"
@@ -12365,28 +9877,25 @@ msgstr "Mode bavard."
#. type: Labeled list
#: en/fetch-options.txt:170 en/git-clone.txt:128 en/git-pack-objects.txt:136
#: en/git-push.txt:268 en/merge-options.txt:112
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--progress"
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."
+msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:176 en/git-push.txt:295
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-4"
msgstr "-4"
#. type: Labeled list
#: en/fetch-options.txt:177 en/git-push.txt:296
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ipv4"
msgstr "--ipv4"
@@ -12397,13 +9906,13 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:180 en/git-push.txt:299
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-6"
msgstr "-6"
#. type: Labeled list
#: en/fetch-options.txt:181 en/git-push.txt:300
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ipv6"
msgstr "--ipv6"
@@ -12420,9 +9929,7 @@ msgstr ""
#. type: Plain text
#: en/fmt-merge-msg-config.txt:5
-msgid ""
-"In addition to branch names, populate the log message with the branch "
-"description text associated with them. Defaults to false."
+msgid "In addition to branch names, populate the log message with the branch description text associated with them. Defaults to false."
msgstr ""
#. type: Labeled list
@@ -12433,15 +9940,12 @@ msgstr ""
#. type: Plain text
#: en/fmt-merge-msg-config.txt:10
-msgid ""
-"In addition to branch names, populate the log message with at most the "
-"specified number of one-line descriptions from the actual commits that are "
-"being merged. Defaults to false, and true is a synonym for 20."
+msgid "In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged. Defaults to false, and true is a synonym for 20."
msgstr ""
#. type: Title =
#: en/git-add.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-add(1)"
msgstr "git-add(1)"
@@ -12450,49 +9954,47 @@ 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
@@ -12514,17 +10016,16 @@ 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
@@ -12628,98 +10129,46 @@ 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 ""
-"This command updates the index using the current content found in the "
-"working tree, to prepare the content staged for the next commit. It "
-"typically adds the current content of existing paths as a whole, but with "
-"some options it can also be used to add content with only part of the "
-"changes made to the working tree files applied, or remove paths that do not "
-"exist in the working tree anymore."
-msgstr ""
-"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."
+msgid "This command updates the index using the current content found in the working tree, to prepare the content staged for the next commit. It typically adds the current content of existing paths as a whole, but with some options it can also be used to add content with only part of the changes made to the working tree files applied, or remove paths that do not exist in the working tree anymore."
+msgstr "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 "
-"command, you must use the `add` command to add any new or modified files to "
-"the index."
-msgstr ""
-"L'짬혻index혻쨩 contient un instantan챕 du contenu de la copie de travail et "
-"c'est cet instantan챕 qui sera utilis챕 comme contenu du prochain commit. "
-"Ainsi, apr챔s avoir r챕alis챕 des modifications dans la copie de travail, et "
-"avant de lancer la commande commit, vous devez utiliser la commande `add` "
-"pour ajouter tout fichier nouveau ou modifi챕 횪 l'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 "L'짬혻index혻쨩 contient un instantan챕 du contenu de la copie de travail et c'est cet instantan챕 qui sera utilis챕 comme contenu du prochain commit. Ainsi, apr챔s avoir r챕alis챕 des modifications dans la copie de travail, et 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 ""
-"This command can be performed multiple times before a commit. It only adds "
-"the content of the specified file(s) at the time the add command is run; if "
-"you want subsequent changes included in the next commit, then you must run "
-"`git add` again to add the new content to the index."
-msgstr ""
-"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."
+msgid "This command can be performed multiple times before a commit. It only adds the content of the specified file(s) at the time the add command is run; if you want subsequent changes included in the next commit, then you must run `git add` again to add the new content to the index."
+msgstr "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."
#. 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."
-msgstr ""
-"La commande `git status` permet d'obtenir un r챕sum챕 des fichiers modifi챕s "
-"qui sont pr챕par챕s pour la prochaine validation."
+msgid "The `git status` command can be used to obtain a summary of which files have changes that are staged for the next commit."
+msgstr "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 "
-"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 "
-"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) "
-"seront ignor챕s silencieusement. La commande `git add` peut tout de m챗me "
-"ajouter des fichiers ignor챕s avec l'option `-f` (force)."
+msgid "The `git add` command will not add ignored files by default. If any ignored files were explicitly specified on the command line, `git add` will fail with a list of ignored files. Ignored files reached by directory recursion or filename globbing performed by Git (quote your globs before the shell) will be silently ignored. The 'git add' command can be used to add ignored files with the `-f` (force) option."
+msgstr "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) 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."
+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."
#. type: Title -
#: en/git-add.txt:51 en/git-am.txt:28 en/git-annotate.txt:24
@@ -12764,8 +10213,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"
@@ -12778,36 +10227,13 @@ msgstr "<sp챕cificateur de chemin>..."
#. type: Plain text
#: 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 "
-"current state of the directory as a whole (e.g. specifying `dir` will "
-"record not just a file `dir/file1` modified in the working tree, a file "
-"`dir/file2` added to the working tree, but also a file `dir/file3` removed "
-"from the working tree). Note that older versions of Git used to ignore "
-"removed files; use `--no-all` option if you want to add modified or new "
-"files but ignore removed ones."
-msgstr ""
-"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."
+msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add all matching files. Also a leading directory name (e.g. `dir` to add `dir/file1` and `dir/file2`) can be given to update the index to match the current state of the directory as a whole (e.g. specifying `dir` will record not just a file `dir/file1` modified in the working tree, a file `dir/file2` added to the working tree, but also a file `dir/file3` removed from the working tree). Note that older versions of Git used to ignore removed files; use `--no-all` option if you want to add modified or new files but ignore removed ones."
+msgstr "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."
#. type: Plain text
#: en/git-add.txt:69
-msgid ""
-"Don't actually add the file(s), just show if they exist and/or will be "
-"ignored."
-msgstr ""
-"Ne pas ajouter r챕ellement les fichiers. Montrer juste ceux qui existent ou "
-"seront ignor챕s."
+msgid "Don't actually add the file(s), just show if they exist and/or will be ignored."
+msgstr "Ne pas ajouter r챕ellement les fichiers. Montrer juste ceux qui existent ou seront ignor챕s."
#. type: Plain text
#: en/git-add.txt:77
@@ -12820,57 +10246,38 @@ msgstr "Permettre l'ajout de fichiers qui sont normalement ignor챕s."
#: en/git-grep.txt:116 en/git-help.txt:51 en/git-ls-files.txt:51
#: en/git-read-tree.txt:48 en/git-rebase.txt:373 en/git-tag.txt:111
#: en/rev-list-options.txt:75
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-i"
msgstr "-i"
#. type: Labeled list
#: en/git-add.txt:79 en/git-am.txt:123 en/git-clean.txt:43
#: en/git-rebase.txt:374 en/git-svn.txt:281
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--interactive"
msgstr "--interactive"
#. type: Plain text
#: en/git-add.txt:84
-msgid ""
-"Add modified contents in the working tree interactively to the index. "
-"Optional path arguments may be supplied to limit operation to a subset of "
-"the working tree. See ``Interactive mode'' for details."
-msgstr ""
-"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 "
-"d챕tails."
+msgid "Add modified contents in the working tree interactively to the index. Optional path arguments may be supplied to limit operation to a subset of the working tree. See ``Interactive mode'' for details."
+msgstr "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 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."
+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."
#. 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."
-msgstr ""
-"Cela lance effectivement `add --interactive` mais court-circuite le menu "
-"initial et saute directement 횪 la sous-commande `patch`. R챕f챕rez-vous 횪 "
-"짬혻Mode interactif혻쨩 pour plus de d챕tails."
+msgid "This effectively runs `add --interactive`, but bypasses the initial command menu and directly jumps to the `patch` subcommand. See ``Interactive mode'' for details."
+msgstr "Cela lance effectivement `add --interactive` mais court-circuite le menu initial et saute directement 횪 la sous-commande `patch`. R챕f챕rez-vous 횪 짬혻Mode interactif혻쨩 pour plus de d챕tails."
#. type: Labeled list
#: en/git-add.txt:96 en/git-blame.txt:77 en/git-cat-file.txt:44
#: en/git-cherry-pick.txt:55 en/git-commit.txt:212 en/git-config.txt:220
#: en/git-grep.txt:260 en/git-revert.txt:43 en/git-shortlog.txt:38
#: en/git-svn.txt:583 en/merge-options.txt:11
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-e"
msgstr "-e"
@@ -12878,59 +10285,35 @@ msgstr "-e"
#: en/git-add.txt:97 en/git-cherry-pick.txt:56 en/git-commit.txt:213
#: en/git-config.txt:221 en/git-revert.txt:44 en/git-svn.txt:584
#: en/merge-options.txt:10
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--edit"
msgstr "--edit"
#. type: Plain text
#: en/git-add.txt:101
-msgid ""
-"Open the diff vs. the index in an editor and let the user edit it. After "
-"the editor was closed, adjust the hunk headers and apply the patch to the "
-"index."
-msgstr ""
-"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."
+msgid "Open the diff vs. the index in an editor and let the user edit it. After the editor was closed, adjust the hunk headers and apply the patch to the index."
+msgstr "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 "
-"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."
+msgid "The intent of this option is to pick and choose lines of the patch to apply, or even to modify the contents of lines to be staged. This can be quicker and more flexible than using the interactive hunk selector. However, it is easy to confuse oneself and create a patch that does not apply to the index. See EDITING PATCHES below."
msgstr "L'objectif de cette option est de permettre de choisir et retenir les lignes de la rustine 횪 appliquer, ou m챗me de modifier le contenu des lignes 횪 indexer. Cela peut 챗tre plus rapide et plus flexible que l'utilisation du s챕lecteur interactif. Cependant, il est plus facile de se tromper et de cr챕er un patch qui ne s'applique pas. R챕f챕rez-vous 횪 횋DITER LES RUSTINES ci-dessous."
#. type: Labeled list
#: en/git-add.txt:109
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--update"
msgstr "--update"
#. type: Plain text
#: en/git-add.txt:113
-msgid ""
-"Update the index just where it already has an entry matching <pathspec>. "
-"This removes as well as modifies index entries to match the working tree, "
-"but adds no new files."
-msgstr ""
-"Mettre 횪 jour l'index sur les seuls fichiers d챕j횪 pr챕sents et correspondant "
-"횪 <chemin>. Cela retire ou modifie les entr챕es d'index pour correspondre 횪 "
-"la copie de travail, mais n'ajoute pas de fichier."
+msgid "Update the index just where it already has an entry matching <pathspec>. This removes as well as modifies index entries to match the working tree, but adds no new files."
+msgstr "Mettre 횪 jour l'index sur les seuls fichiers d챕j횪 pr챕sents et correspondant 횪 <chemin>. Cela retire ou modifie les entr챕es d'index pour correspondre 횪 la copie de travail, mais n'ajoute pas de fichier."
#. 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 "
-"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)."
+msgid "If no <pathspec> is given when `-u` option is used, all tracked files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories)."
+msgstr "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
@@ -12940,68 +10323,41 @@ msgstr "-A"
#. type: Labeled list
#: en/git-add.txt:121
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-ignore-removal"
msgstr "--no-ignore-removal"
#. type: Plain text
#: en/git-add.txt:126
-msgid ""
-"Update the index not only where the working tree has a file matching "
-"<pathspec> but also where the index already has an entry. This adds, "
-"modifies, and removes index entries to match the working tree."
-msgstr ""
-"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 "
-"correspondre 횪 la copie de travail."
+msgid "Update the index not only where the working tree has a file matching <pathspec> but also where the index already has an entry. This adds, modifies, and removes index entries to match the working tree."
+msgstr "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 correspondre 횪 la copie de travail."
#. type: Plain text
#: en/git-add.txt:131
-msgid ""
-"If no <pathspec> is given when `-A` option is used, all files in the entire "
-"working tree are updated (old versions of Git used to limit the update to "
-"the current directory and its subdirectories)."
-msgstr ""
-"Si aucun <chemin> n'est sp챕cifi챕 quand l'option `-A` est utilis챕e, tous les "
-"fichiers de l'arbre de travail sont mis 횪 jour (les versions anciennes de "
-"Git utilisaient le r챕pertoire courant et ses sous-r챕pertoires)."
+msgid "If no <pathspec> is given when `-A` option is used, all files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories)."
+msgstr "Si aucun <chemin> n'est sp챕cifi챕 quand l'option `-A` est utilis챕e, tous les fichiers de l'arbre de travail sont mis 횪 jour (les versions anciennes de Git utilisaient le r챕pertoire courant et ses sous-r챕pertoires)."
#. type: Labeled list
#: en/git-add.txt:132
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-all"
msgstr "--no-all"
#. type: Labeled list
#: en/git-add.txt:133
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ignore-removal"
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 "
-"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 "
-"et les fichiers modifi챕s dans la copie de travail, mais ignore les fichiers "
-"qui ont 챕t챕 effac챕s de la copie de travail. Cette option ne fait rien quand "
-"aucun <chemin> n'est utilis챕."
+msgid "Update the index by adding new files that are unknown to the index and files modified in the working tree, but ignore files that have been removed from the working tree. This option is a no-op when no <pathspec> is used."
+msgstr "Mettre 횪 jour l'index en y ajoutant les nouveaux fichiers qui sont inconnus et les fichiers modifi챕s dans la copie de travail, mais ignore les fichiers qui ont 챕t챕 effac챕s de la copie de travail. Cette option ne fait rien quand aucun <chemin> n'est utilis챕."
#. type: Plain text
#: en/git-add.txt:142
-msgid ""
-"This option is primarily to help users who are used to older versions of "
-"Git, whose \"git add <pathspec>...\" was a synonym for \"git add --no-all "
-"<pathspec>...\", i.e. ignored removed files."
-msgstr ""
-"Cette option sert principalement 횪 aider les utilisateurs de versions "
-"anciennes de Git pour lesquels 짬혻git add <chemin>...혻쨩 챕tait synonyme de "
-"짬혻git add --no-all <chemin>...혻쨩, c'est-횪-dire qui ignorait les fichiers "
-"effac챕s."
+msgid "This option is primarily to help users who are used to older versions of Git, whose \"git add <pathspec>...\" was a synonym for \"git add --no-all <pathspec>...\", i.e. ignored removed files."
+msgstr "Cette option sert principalement 횪 aider les utilisateurs de versions anciennes de Git pour lesquels 짬혻git add <chemin>...혻쨩 챕tait synonyme de 짬혻git add --no-all <chemin>...혻쨩, c'est-횪-dire qui ignorait les fichiers effac챕s."
#. type: Labeled list
#: en/git-add.txt:143 en/git-format-patch.txt:97 en/git-submodule.txt:349
@@ -13011,75 +10367,48 @@ msgstr "-N"
#. type: Labeled list
#: en/git-add.txt:144
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--intent-to-add"
msgstr "--intent-to-add"
#. type: Plain text
#: 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 "
-"committing them with `git commit -a`."
-msgstr ""
-"N'enregistrer que le fait que le chemin sera ajout챕 plus tard. Une entr챕e "
-"pour le chemin est plac챕e en index sans contenu. C'est particuli챔rement "
-"utile pour, entre autres choses, montrer le contenu non index챕 de ces "
-"fichiers avec `git diff` et les valider avec `git commit -a`."
+msgid "Record only the fact that the path will be added later. An entry for the path is placed in the index with no content. This is useful for, among other things, showing the unstaged content of such files with `git diff` and committing them with `git commit -a`."
+msgstr "N'enregistrer que le fait que le chemin sera ajout챕 plus tard. Une entr챕e pour le chemin est plac챕e en index sans contenu. C'est particuli챔rement utile pour, entre autres choses, montrer le contenu non index챕 de ces fichiers avec `git diff` et les valider avec `git commit -a`."
#. type: Labeled list
#: en/git-add.txt:151 en/git-update-index.txt:52
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--refresh"
msgstr "--refresh"
#. type: Plain text
#: en/git-add.txt:154
-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."
+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."
#. type: Labeled list
#: en/git-add.txt:155
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ignore-errors"
msgstr "--ignore-errors"
#. type: Plain text
#: 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` "
-"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."
+msgid "If some files could not be added because of errors indexing them, do not abort the operation, but continue adding the others. The command shall still exit with non-zero status. The configuration variable `add.ignoreErrors` can be set to true to make this the default behaviour."
+msgstr "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."
#. type: Labeled list
#: en/git-add.txt:162 en/git-notes.txt:169 en/git-update-index.txt:70
#: en/rev-list-options.txt:182
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ignore-missing"
msgstr "--ignore-missing"
#. type: Plain text
#: en/git-add.txt:167
-msgid ""
-"This option can only be used together with --dry-run. By using this option "
-"the user can check if any of the given files would be ignored, no matter if "
-"they are already present in the work tree or not."
-msgstr ""
-"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."
+msgid "This option can only be used together with --dry-run. By using this option the user can check if any of the given files would be ignored, no matter if they are already present in the work tree or not."
+msgstr "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
#: en/git-add.txt:168 en/git-update-index.txt:83
@@ -13089,13 +10418,8 @@ msgstr "--chmod=(+|-)x"
#. type: Plain text
#: en/git-add.txt:172
-msgid ""
-"Override the executable bit of the added files. The executable bit is only "
-"changed in the index, the files on disk are left unchanged."
-msgstr ""
-"Forcer le bit ex챕cutable des fichiers ajout챕s. Le bit ex챕cutable n'est "
-"modifi챕 que dans l'index, les fichiers de la copie de travail ne sont pas "
-"modifi챕s."
+msgid "Override the executable bit of the added files. The executable bit is only changed in the index, the files on disk are left unchanged."
+msgstr "Forcer le bit ex챕cutable des fichiers ajout챕s. Le bit ex챕cutable n'est modifi챕 que dans l'index, les fichiers de la copie de travail ne sont pas modifi챕s."
#. type: Labeled list
#: en/git-add.txt:173 en/git-check-attr.txt:39 en/git-checkout-index.txt:71
@@ -13108,13 +10432,8 @@ 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 ""
-"Cette option permet de s챕parer les options de la ligne de commande de la "
-"liste des fichiers (utile si certains noms de fichiers peuvent 챗tre "
-"confondus avec des options)."
+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 "Cette option permet de s챕parer les options de la ligne de commande de la liste des fichiers (utile si certains noms de fichiers peuvent 챗tre confondus avec des options)."
#. type: Title -
#: en/git-add.txt:180 en/git-apply.txt:244 en/git-gc.txt:82
@@ -13125,17 +10444,8 @@ 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]."
-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]."
+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]."
+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]."
#. type: Title -
#: en/git-add.txt:189 en/git-archive.txt:149 en/git-bisect.txt:370
@@ -13147,21 +10457,19 @@ 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 ""
-"Adds content from all `*.txt` files under `Documentation` directory and its "
-"subdirectories:"
+msgid "Adds content from all `*.txt` files under `Documentation` directory and its subdirectories:"
msgstr "Ajouter le contenu de tous les fichiers `*.txt` sous le r챕pertoire `Documentation` et ses sous r챕pertoires혻:"
#. type: delimited block -
@@ -13172,14 +10480,8 @@ 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 ""
-"Remarquez que l'ast챕risque `*` est 챕chapp챕 du shell dans cet exemple혻; cela "
-"permet d'inclure les fichiers dans les sous-r챕pertoires du R챕pertoire "
-"`Documentation/`."
+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 "Remarquez que l'ast챕risque `*` est 챕chapp챕 du shell dans cet exemple혻; cela permet d'inclure les fichiers dans les sous-r챕pertoires du R챕pertoire `Documentation/`."
#. type: Plain text
#: en/git-add.txt:203
@@ -13194,13 +10496,8 @@ msgstr "$ git add git-*.sh\n"
#. type: Plain text
#: en/git-add.txt:211
-msgid ""
-"Because this example lets the shell expand the asterisk (i.e. you are "
-"listing the files explicitly), it does not consider `subdir/git-foo.sh`."
-msgstr ""
-"Comme cet exemple laisse le shell r챕aliser l'expansion de l'ast챕risque "
-"(c'est-횪-dire que vous listez explicitement les fichiers du r챕pertoire), il "
-"ne traite pas `subdir/git-foo.sh`."
+msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not consider `subdir/git-foo.sh`."
+msgstr "Comme cet exemple laisse le shell r챕aliser l'expansion de l'ast챕risque (c'est-횪-dire que vous listez explicitement les fichiers du r챕pertoire), il ne traite pas `subdir/git-foo.sh`."
#. type: Title -
#: en/git-add.txt:213 en/git-clean.txt:75
@@ -13210,24 +10507,13 @@ msgstr "Mode interactif"
#. type: Plain text
#: en/git-add.txt:217
-msgid ""
-"When the command enters the interactive mode, it shows the output of the "
-"'status' subcommand, and then goes into its interactive command loop."
-msgstr ""
-"Quand la commande entre en mode interactif, elle affiche le r챕sultat de la "
-"sous-commande 'status', puis entre en boucle de commande interactive."
+msgid "When the command enters the interactive mode, it shows the output of the 'status' subcommand, and then goes into its interactive command loop."
+msgstr "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:"
-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 "
-"le prompt se termine par un '>' unique, vous ne pouvez choisir qu'une seule "
-"des propositions et appuyer Entr챕e, comme cela :"
+msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
+msgstr "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 le prompt se termine par un '>' unique, vous ne pouvez choisir qu'une seule des propositions et appuyer Entr챕e, comme cela :"
#. type: delimited block -
#: en/git-add.txt:228
@@ -13245,19 +10531,13 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:232
-msgid ""
-"You also could say `s` or `sta` or `status` above as long as the choice is "
-"unique."
-msgstr ""
-"Vous pouvez indiquer `s` ou `sta` ou `status` dans le cas ci-dessus, 횪 "
-"condition que le choix soit univoque."
+msgid "You also could say `s` or `sta` or `status` above as long as the choice is unique."
+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))."
+msgstr "La boucle de commande principale propose 6 sous-commandes (plus help (aide) et quit (quitter))."
#. type: Labeled list
#: en/git-add.txt:235
@@ -13267,17 +10547,8 @@ 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:"
-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 :"
+msgid "This shows the change between HEAD and index (i.e. what will be committed if you say `git commit`), and between index and working tree files (i.e. what you could stage further before `git commit` using `git add`) for each path. A sample output looks like this:"
+msgstr "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 :"
#. type: delimited block -
#: en/git-add.txt:247
@@ -13293,22 +10564,8 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:258
-msgid ""
-"It shows that foo.png has differences from HEAD (but that is binary so line "
-"count cannot be shown) and there is no difference between indexed copy and "
-"the working tree version (if the working tree version were also different, "
-"'binary' would have been shown in place of 'nothing'). The other file, git-"
-"add{litdd}interactive.perl, has 403 lines added and 35 lines deleted if you "
-"commit what is in the index, but working tree file has further modifications"
-" (one addition and one deletion)."
-msgstr ""
-"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 "
-"copie de travail contient d'autres modifications (un ajout et un retrait)."
+msgid "It shows that foo.png has differences from HEAD (but that is binary so line count cannot be shown) and there is no difference between indexed copy and the working tree version (if the working tree version were also different, 'binary' would have been shown in place of 'nothing'). The other file, git-add{litdd}interactive.perl, has 403 lines added and 35 lines deleted if you commit what is in the index, but working tree file has further modifications (one addition and one deletion)."
+msgstr "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 copie de travail contient d'autres modifications (un ajout et un retrait)."
#. type: Labeled list
#: en/git-add.txt:259 en/git-update-ref.txt:94
@@ -13318,21 +10575,8 @@ 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 "
-"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 "
-"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."
+msgid "This shows the status information and issues an \"Update>>\" prompt. When the prompt ends with double '>>', you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining patches are taken. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything."
+msgstr "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 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
@@ -13364,12 +10608,8 @@ 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."
+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."
#. type: Labeled list
#: en/git-add.txt:288
@@ -13379,14 +10619,8 @@ msgstr "revert"
#. type: Plain text
#: en/git-add.txt:293
-msgid ""
-"This has a very similar UI to 'update', and the staged information for "
-"selected paths are reverted to that of the HEAD version. Reverting new "
-"paths makes them untracked."
-msgstr ""
-"Ceci pr챕sente une interface d'utilisation similaire 횪 'update', et le "
-"contenu index챕 des chemins s챕lectionn챕s sont ramen챕s 횪 la version HEAD. "
-"Inverser des chemins nouveaux les rend non-suivis."
+msgid "This has a very similar UI to 'update', and the staged information for selected paths are reverted to that of the HEAD version. Reverting new paths makes them untracked."
+msgstr "Ceci pr챕sente une interface d'utilisation similaire 횪 'update', et le contenu index챕 des chemins s챕lectionn챕s sont ramen챕s 횪 la version HEAD. Inverser des chemins nouveaux les rend non-suivis."
#. type: Labeled list
#: en/git-add.txt:294
@@ -13396,12 +10630,8 @@ 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 ""
-"Ceci pr챕sente une interface d'utilisation tr챔s similaire 횪 'update' et "
-"'revert' et permet d'ajouter des chemins non-suivis 횪 l'index."
+msgid "This has a very similar UI to 'update' and 'revert', and lets you add untracked paths to the index."
+msgstr "Ceci pr챕sente une interface d'utilisation tr챔s similaire 횪 'update' et 'revert' et permet d'ajouter des chemins non-suivis 횪 l'index."
#. type: Labeled list
#: en/git-add.txt:299
@@ -13411,17 +10641,8 @@ msgstr "patch"
#. type: Plain text
#: en/git-add.txt:306
-msgid ""
-"This lets you choose one path out of a 'status' like selection. After "
-"choosing the path, it presents the diff between the index and the working "
-"tree file and asks you if you want to stage the change of each hunk. You "
-"can select one of the following options and type return:"
-msgstr ""
-"Ceci permet de choisir un chemin depuis une s챕lection similaire 횪 'status'. "
-"Apr챔s le choix du chemin, la diff챕rence entre l'index et le fichier dans "
-"l'arbre de travail est pr챕sent챕 et vous demande si vous souhaitez indexer "
-"chaque section de modification. Vous pouvez s챕lectionner une des options "
-"suivantes et taper entr챕e혻:"
+msgid "This lets you choose one path out of a 'status' like selection. After choosing the path, it presents the diff between the index and the working tree file and asks you if you want to stage the change of each hunk. You can select one of the following options and type return:"
+msgstr "Ceci permet de choisir un chemin depuis une s챕lection similaire 횪 'status'. Apr챔s le choix du chemin, la diff챕rence entre l'index et le fichier dans l'arbre de travail est pr챕sent챕 et vous demande si vous souhaitez indexer chaque section de modification. Vous pouvez s챕lectionner une des options suivantes et taper entr챕e혻:"
#. type: Plain text
#: en/git-add.txt:321
@@ -13459,21 +10680,13 @@ msgstr ""
#. 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."
-msgstr ""
-"Apr챔s avoir d챕cid챕 du devenir de chaque section, l'index est mis 횪 jour avec"
-" les sections s챕lectionn챕es."
+msgid "After deciding the fate for all hunks, if there is any hunk that was chosen, the index is updated with the selected hunks."
+msgstr "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 ""
-"You can omit having to type return here, by setting the configuration "
-"variable `interactive.singleKey` to `true`."
-msgstr ""
-"Vous pouvez vous 챕viter de taper entr챕e ici, en mettant la variable de "
-"configuration `interactive.singlekey` 횪 `true`."
+msgid "You can omit having to type return here, by setting the configuration variable `interactive.singleKey` to `true`."
+msgstr "Vous pouvez vous 챕viter de taper entr챕e ici, en mettant la variable de configuration `interactive.singlekey` 횪 `true`."
#. type: Labeled list
#: en/git-add.txt:328
@@ -13483,11 +10696,8 @@ msgstr "diff"
#. type: Plain text
#: en/git-add.txt:332
-msgid ""
-"This lets you review what will be committed (i.e. between HEAD and index)."
-msgstr ""
-"Ceci permet de faire une revue de ce qui sera valid챕 (c'est une diff챕rence "
-"entre HEAD et index)."
+msgid "This lets you review what will be committed (i.e. between HEAD and index)."
+msgstr "Ceci permet de faire une revue de ce qui sera valid챕 (c'est une diff챕rence entre HEAD et index)."
#. type: Title -
#: en/git-add.txt:335
@@ -13497,25 +10707,8 @@ msgstr "횋DITER LES RUSTINES"
#. type: Plain text
#: en/git-add.txt:345
-msgid ""
-"Invoking `git add -e` or selecting `e` from the interactive hunk selector "
-"will open a patch in your editor; after the editor exits, the result is "
-"applied to the index. You are free to make arbitrary changes to the patch, "
-"but note that some changes may have confusing results, or even result in a "
-"patch that cannot be applied. If you want to abort the operation entirely "
-"(i.e., stage nothing new in the index), simply delete all lines of the "
-"patch. The list below describes some common things you may see in a patch, "
-"and which editing operations make sense on them."
-msgstr ""
-"Invoquer `git add -e` ou s챕lectionner `e` depuis le s챕lecteur interactif de "
-"sections ouvre un patch dans votre 챕diteur혻; apr챔s avoir quitt챕 l'챕diteur, "
-"le r챕sultat est appliqu챕 횪 l'index. Vous 챗tes libre de modifier en tout "
-"point le patch, mais notez cependant que certaines modifications provoquent "
-"des r챕sultats inattendus ou m챗me cr챕ent des patchs inapplicables. Si vous "
-"souhaitez abandonner compl챔tement l'op챕ration (c'est-횪-dire ne rien ajouter "
-"횪 l'index), effacez toutes les lignes du patch. La liste ci-dessous d챕crit "
-"des formes habituelles dans les patchs et quelles op챕rations d'챕dition "
-"peuvent 챗tre r챕alis챕es."
+msgid "Invoking `git add -e` or selecting `e` from the interactive hunk selector will open a patch in your editor; after the editor exits, the result is applied to the index. You are free to make arbitrary changes to the patch, but note that some changes may have confusing results, or even result in a patch that cannot be applied. If you want to abort the operation entirely (i.e., stage nothing new in the index), simply delete all lines of the patch. The list below describes some common things you may see in a patch, and which editing operations make sense on them."
+msgstr "Invoquer `git add -e` ou s챕lectionner `e` depuis le s챕lecteur interactif de sections ouvre un patch dans votre 챕diteur혻; apr챔s avoir quitt챕 l'챕diteur, le r챕sultat est appliqu챕 횪 l'index. Vous 챗tes libre de modifier en tout point le patch, mais notez cependant que certaines modifications provoquent des r챕sultats inattendus ou m챗me cr챕ent des patchs inapplicables. Si vous souhaitez abandonner compl챔tement l'op챕ration (c'est-횪-dire ne rien ajouter 횪 l'index), effacez toutes les lignes du patch. La liste ci-dessous d챕crit des formes habituelles dans les patchs et quelles op챕rations d'챕dition peuvent 챗tre r챕alis챕es."
#. type: Labeled list
#: en/git-add.txt:347
@@ -13525,13 +10718,8 @@ msgstr "contenu ajout챕"
#. type: Plain text
#: en/git-add.txt:351
-msgid ""
-"Added content is represented by lines beginning with \"{plus}\". You can "
-"prevent staging any addition lines by deleting them."
-msgstr ""
-"Le contenu ajout챕 est repr챕sent챕 par des lignes commen챌ant par un "
-"\"{plus}\". Vous pouvez emp챗cher l'indexation de lignes ajout챕es en les "
-"supprimant."
+msgid "Added content is represented by lines beginning with \"{plus}\". You can prevent staging any addition lines by deleting them."
+msgstr "Le contenu ajout챕 est repr챕sent챕 par des lignes commen챌ant par un \"{plus}\". Vous pouvez emp챗cher l'indexation de lignes ajout챕es en les supprimant."
#. type: Labeled list
#: en/git-add.txt:352
@@ -13541,13 +10729,8 @@ 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)."
+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)."
#. type: Labeled list
#: en/git-add.txt:357
@@ -13557,43 +10740,18 @@ msgstr "contenu modifi챕"
#. type: Plain text
#: en/git-add.txt:364
-msgid ""
-"Modified content is represented by \"-\" lines (removing the old content) "
-"followed by \"{plus}\" lines (adding the replacement content). You can "
-"prevent staging the modification by converting \"-\" lines to \" \", and "
-"removing \"{plus}\" lines. Beware that modifying only half of the pair is "
-"likely to introduce confusing changes to the index."
-msgstr ""
-"Le contenu modifi챕 est repr챕sent챕 par des lignes \"-\" (supprimant l'ancien "
-"contenu) suivies de lignes \"{plus}\" (ajoutant le nouveau contenu). Vous "
-"pouvez emp챗cher l'indexation de ces modifications en convertissant les "
-"lignes \"-\" en ligne \" \" et en supprimant les lignes \"{plus}\". M챕fiez-"
-"vous혻: ne modifier que la moiti챕 de la paire de lignes a de fortes chances "
-"de cr챕er des modifications inattendues dans l'index."
+msgid "Modified content is represented by \"-\" lines (removing the old content) followed by \"{plus}\" lines (adding the replacement content). You can prevent staging the modification by converting \"-\" lines to \" \", and removing \"{plus}\" lines. Beware that modifying only half of the pair is likely to introduce confusing changes to the index."
+msgstr "Le contenu modifi챕 est repr챕sent챕 par des lignes \"-\" (supprimant l'ancien contenu) suivies de lignes \"{plus}\" (ajoutant le nouveau contenu). Vous pouvez emp챗cher l'indexation de ces modifications en convertissant les lignes \"-\" en ligne \" \" et en supprimant les lignes \"{plus}\". M챕fiez-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 "
-"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."
+msgid "There are also more complex operations that can be performed. But beware that because the patch is applied only to the index and not the working tree, the working tree will appear to \"undo\" the change in the index. For example, introducing a new line into the index that is in neither the HEAD nor the working tree will stage the new line for commit, but the line will appear to be reverted in the working tree."
+msgstr "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."
#. type: Plain text
#: en/git-add.txt:374
msgid "Avoid using these constructs, or do so with extreme caution."
-msgstr ""
-"횋vitez d'utiliser ces constructions, ou faites-le avec une extr챗me "
-"pr챕caution."
+msgstr "횋vitez d'utiliser ces constructions, ou faites-le avec une extr챗me pr챕caution."
#. type: Labeled list
#: en/git-add.txt:376
@@ -13603,17 +10761,8 @@ msgstr "suppression de contenu intact"
#. type: Plain text
#: en/git-add.txt:382
-msgid ""
-"Content which does not differ between the index and working tree may be "
-"shown on context lines, beginning with a \" \" (space). You can stage "
-"context lines for removal by converting the space to a \"-\". The resulting "
-"working tree file will appear to re-add the content."
-msgstr ""
-"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."
+msgid "Content which does not differ between the index and working tree may be shown on context lines, beginning with a \" \" (space). You can stage context lines for removal by converting the space to a \"-\". The resulting working tree file will appear to re-add the content."
+msgstr "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."
#. type: Labeled list
#: en/git-add.txt:383
@@ -13623,19 +10772,8 @@ 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. "
-"Similarly, one can modify \"{plus}\" lines for existing additions or "
-"modifications. In all cases, the new modification will appear reverted in "
-"the working tree."
-msgstr ""
-"On peut aussi modifier le contenu de lignes de contexte en indexant leur "
-"suppression (en convertissant \" \" en \"-\") et en ajoutant dessous une "
-"ligne \"{plus}\" avec le nouveau contenu. On peut modifier des lignes "
-"\"{plus}\" dans des ajouts ou des modifications de contenu. Dans tous les "
-"cas, la nouvelle modification index챕e semblera 챗tre annul챕e dans l'arbre de "
-"travail."
+msgid "One can also modify context lines by staging them for removal (by converting \" \" to \"-\") and adding a \"{plus}\" line with the new content. Similarly, one can modify \"{plus}\" lines for existing additions or modifications. In all cases, the new modification will appear reverted in the working tree."
+msgstr "On peut aussi modifier le contenu de lignes de contexte en indexant leur suppression (en convertissant \" \" en \"-\") et en ajoutant dessous une ligne \"{plus}\" avec le nouveau contenu. On peut modifier des lignes \"{plus}\" dans des ajouts ou des modifications de contenu. Dans tous les cas, la nouvelle modification index챕e semblera 챗tre annul챕e dans l'arbre de travail."
#. type: Labeled list
#: en/git-add.txt:391
@@ -13645,23 +10783,13 @@ msgstr "contenu nouveau"
#. type: Plain text
#: en/git-add.txt:396
-msgid ""
-"You may also add new content that does not exist in the patch; simply add "
-"new lines, each starting with \"{plus}\". The addition will appear reverted "
-"in the working tree."
-msgstr ""
-"Vous pouvez aussi ajouter du contenu nouveau qui n'existe pas dans le "
-"patch혻; ajoutez simplement des nouvelles lignes, chacune commen챌ant par "
-"\"{plus}\". L'ajout semblera annul챕 dans l'arbre de travail."
+msgid "You may also add new content that does not exist in the patch; simply add new lines, each starting with \"{plus}\". The addition will appear reverted in the working tree."
+msgstr "Vous pouvez aussi ajouter du contenu nouveau qui n'existe pas dans le 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 ""
-"There are also several operations which should be avoided entirely, as they "
-"will make the patch impossible to apply:"
-msgstr ""
-"Il existe aussi quelques op챕rations 횪 챕viter compl챔tement car celles-ci "
-"rendent le patch inapplicable혻:"
+msgid "There are also several operations which should be avoided entirely, as they will make the patch impossible to apply:"
+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
@@ -13682,13 +10810,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
@@ -13706,13 +10834,8 @@ msgstr "VOIR AUSSI"
#. type: Plain text
#: en/git-add.txt:413
-#, ignore-translated
-msgid ""
-"linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-"
-"mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
-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-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgstr "linkgit:git-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-add.txt:415 en/git-am.txt:231 en/git-annotate.txt:33
@@ -13736,41 +10859,38 @@ 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"
@@ -13797,47 +10917,44 @@ 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]"
#. type: Title =
#: en/git-am.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-am(1)"
msgstr "git-am(1)"
@@ -13870,12 +10987,8 @@ msgstr ""
#. type: Plain text
#: en/git-am.txt:26
-msgid ""
-"Splits mail messages in a mailbox into commit log message, authorship "
-"information and patches, and applies them to the current branch."
-msgstr ""
-"D챕coupe des messages courriel dans un bo챤te aux lettre en message, auteur, "
-"information et rustine de commit, et les applique sur la branche en cours."
+msgid "Splits mail messages in a mailbox into commit log message, authorship information and patches, and applies them to the current branch."
+msgstr "D챕coupe des messages courriel dans un bo챤te aux lettre en message, auteur, information et rustine de commit, et les applique sur la branche en cours."
#. type: Labeled list
#: en/git-am.txt:29
@@ -13885,33 +10998,20 @@ msgstr "(<mbox>|<Maildir>)..."
#. type: Plain text
#: en/git-am.txt:33
-msgid ""
-"The list of mailbox files to read patches from. If you do not supply this "
-"argument, the command reads from the standard input. If you supply "
-"directories, they will be treated as Maildirs."
-msgstr ""
-"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."
+msgid "The list of mailbox files to read patches from. If you do not supply this argument, the command reads from the standard input. If you supply directories, they will be treated as Maildirs."
+msgstr "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."
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:101 en/git-commit.txt:160
#: en/git-format-patch.txt:114 en/git-revert.txt:90
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--signoff"
msgstr "--signoff"
#. type: Plain text
#: en/git-am.txt:39
-msgid ""
-"Add a `Signed-off-by:` line to the commit message, using the committer "
-"identity of yourself. See the signoff option in linkgit:git-commit[1] for "
-"more information."
-msgstr ""
-"Ajouter une ligne `Signed-off-by:` au message de commit, en utilisant votre "
-"identit챕 pour validateur. R챕f챕rez-vous 횪 l'option signoff dans linkgit:git-"
-"commit[1] pour plus d'information."
+msgid "Add a `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
+msgstr "Ajouter une ligne `Signed-off-by:` au message de commit, en utilisant votre identit챕 pour validateur. R챕f챕rez-vous 횪 l'option signoff dans linkgit:git-commit[1] pour plus d'information."
#. type: Plain text
#: en/git-am.txt:43
@@ -13920,7 +11020,7 @@ msgstr "Passer l'option `-k` 횪 'git mailinfo' (voir linkgit:git-mailinfo[1])."
#. type: Labeled list
#: en/git-am.txt:44
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--keep-non-patch"
msgstr "--keep-non-patch"
@@ -13931,52 +11031,38 @@ msgstr "Passer l'option `-b` 횪 'git mailinfo' (voir linkgit:git-mailinfo[1])."
#. type: Labeled list
#: en/git-am.txt:47
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]keep-cr"
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 "
-"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 "
-"comportement par d챕faut. `--no-keep-cr` permet de surcharger `am.keepcr`."
+msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) with the same option, to prevent it from stripping CR at the end of lines. `am.keepcr` configuration variable can be used to specify the default behaviour. `--no-keep-cr` is useful to override `am.keepcr`."
+msgstr "Avec `--keep-cr`, appeler 'git mailsplit' (voir linkgit:git-mailsplit[1]) avec la m챗me option, pour l'emp챗cher de supprimer les CR en fin de ligne. La variable de configuration `am.keepcr` peut 챗tre utilis챕e pour sp챕cifier le comportement par d챕faut. `--no-keep-cr` permet de surcharger `am.keepcr`."
#. type: Labeled list
#: en/git-am.txt:53 en/git-blame.txt:52 en/git-cvsexportcommit.txt:37
#: en/git-diff-files.txt:37 en/git-diff-tree.txt:91 en/git-grep.txt:201
#: en/git-http-fetch.txt:27 en/git-ls-files.txt:35 en/git-shortlog.txt:50
#: en/git-stripspace.txt:42 en/rev-list-options.txt:866
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-c"
msgstr "-c"
#. type: Labeled list
#: en/git-am.txt:54 en/git-mailinfo.txt:74
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--scissors"
msgstr "--scissors"
#. type: Plain text
#: en/git-am.txt:58
-msgid ""
-"Remove everything in body before a scissors line (see linkgit:git-"
-"mailinfo[1]). Can be activated by default using the `mailinfo.scissors` "
-"configuration variable."
-msgstr ""
-"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`."
+msgid "Remove everything in body before a scissors line (see linkgit:git-mailinfo[1]). Can be activated by default using the `mailinfo.scissors` configuration variable."
+msgstr "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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-scissors"
msgstr "--no-scissors"
@@ -13992,38 +11078,31 @@ msgstr "Ignorer les lignes ciseaux (voir linkgit:git-mailinfo[1])."
#: en/git-instaweb.txt:35 en/git-ls-files.txt:43 en/git-mailinfo.txt:69
#: en/git-read-tree.txt:34 en/git-rebase.txt:270 en/git-svn.txt:292
#: en/git-svn.txt:637 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:879
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-m"
msgstr "-m"
#. type: Labeled list
#: en/git-am.txt:63 en/git-mailinfo.txt:70
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--message-id"
msgstr "--message-id"
#. type: Plain text
#: en/git-am.txt:68
-msgid ""
-"Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]), so that "
-"the Message-ID header is added to the commit message. The `am.messageid` "
-"configuration variable can be used to specify the default behaviour."
+msgid "Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]), so that the Message-ID header is added to the commit message. The `am.messageid` configuration variable can be used to specify the default behaviour."
msgstr ""
#. type: Labeled list
#: en/git-am.txt:69
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-message-id"
msgstr "--no-message-id"
#. type: Plain text
#: en/git-am.txt:72
-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`."
+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`."
#. type: Plain text
#: en/git-am.txt:76
@@ -14032,22 +11111,14 @@ msgstr "N'afficher que les messages d'erreur."
#. type: Labeled list
#: en/git-am.txt:78
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--utf8"
msgstr "--utf8"
#. type: Plain text
#: en/git-am.txt:84
-msgid ""
-"Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]). The "
-"proposed commit log message taken from the e-mail is re-coded into UTF-8 "
-"encoding (configuration variable `i18n.commitencoding` can be used to "
-"specify project's preferred encoding if it is not UTF-8)."
-msgstr ""
-"Passer l'option `-u` 횪 'git mailinfo' (voir linkgit:git-mailinfo[1]). Le "
-"message de validation propos챕 extrait depuis le courriel est re-cod챕 en "
-"UTF-8 (la variable de configuration `i18n.commitencoding` peut sp챕cifier un "
-"codage pr챕f챕r챕 s'il est diff챕rent d'UTF-8)."
+msgid "Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]). The proposed commit log message taken from the e-mail is re-coded into UTF-8 encoding (configuration variable `i18n.commitencoding` can be used to specify project's preferred encoding if it is not UTF-8)."
+msgstr "Passer l'option `-u` 횪 'git mailinfo' (voir linkgit:git-mailinfo[1]). Le message de validation propos챕 extrait depuis le courriel est re-cod챕 en UTF-8 (la variable de configuration `i18n.commitencoding` peut sp챕cifier un codage pr챕f챕r챕 s'il est diff챕rent d'UTF-8)."
#. type: Plain text
#: en/git-am.txt:87
@@ -14061,7 +11132,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:88
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-utf8"
msgstr "--no-utf8"
@@ -14072,41 +11143,30 @@ msgstr "Passer l'option `-n` 횪 'git mailinfo' (voir linkgit:git-mailinfo[1])."
#. type: Labeled list
#: en/git-am.txt:92 en/git-apply.txt:77
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-3"
msgstr "-3"
#. type: Labeled list
#: en/git-am.txt:93 en/git-apply.txt:78
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--3way"
msgstr "--3way"
#. type: Labeled list
#: en/git-am.txt:94
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-3way"
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 "
-"blobs available locally. `--no-3way` can be used to override am.threeWay "
-"configuration variable. For more information, see am.threeWay in "
-"linkgit:git-config[1]."
-msgstr ""
-"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]."
+msgid "When the patch does not apply cleanly, fall back on 3-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs available locally. `--no-3way` can be used to override am.threeWay configuration variable. For more information, see am.threeWay in linkgit:git-config[1]."
+msgstr "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]."
#. type: Labeled list
#: en/git-am.txt:103 en/git-apply.txt:173 en/git-rebase.txt:361
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
@@ -14148,30 +11208,24 @@ msgstr "--include=<chemin>"
#. type: Labeled list
#: en/git-am.txt:110 en/git-apply.txt:100
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--reject"
msgstr "--reject"
#. type: Plain text
#: en/git-am.txt:114
-msgid ""
-"These flags are passed to the 'git apply' (see linkgit:git-apply[1]) "
-"program that applies the patch."
+msgid "These flags are passed to the 'git apply' (see linkgit:git-apply[1]) program that applies the patch."
msgstr ""
#. type: Labeled list
#: en/git-am.txt:115
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--patch-format"
msgstr "--patch-format"
#. type: Plain text
#: en/git-am.txt:121
-msgid ""
-"By default the command will try to detect the patch format automatically. "
-"This option allows the user to bypass the automatic detection and specify "
-"the patch format that the patch(es) should be interpreted as. Valid formats "
-"are mbox, mboxrd, stgit, stgit-series and hg."
+msgid "By default the command will try to detect the patch format automatically. This option allows the user to bypass the automatic detection and specify the patch format that the patch(es) should be interpreted as. Valid formats are mbox, mboxrd, stgit, stgit-series and hg."
msgstr ""
#. type: Plain text
@@ -14181,45 +11235,35 @@ msgstr "Lancer de mani챔re interactive."
#. type: Labeled list
#: en/git-am.txt:126 en/git-rebase.txt:367
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--committer-date-is-author-date"
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."
+msgid "By default the command records the date from the e-mail message as the commit author date, and uses the time of commit creation as the committer date. This allows the user to lie about the committer date by using the same value as the author date."
msgstr ""
#. type: Labeled list
#: en/git-am.txt:133 en/git-rebase.txt:368
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ignore-date"
msgstr "--ignore-date"
#. type: Plain text
#: en/git-am.txt:139
-msgid ""
-"By default the command records the date from the e-mail message as the "
-"commit author date, and uses the time of commit creation as the committer "
-"date. This allows the user to lie about the author date by using the same "
-"value as the committer date."
+msgid "By default the command records the date from the e-mail message as the commit author date, and uses the time of commit creation as the committer date. This allows the user to lie about the author date by using the same value as the committer date."
msgstr ""
#. type: Labeled list
#: en/git-am.txt:140 en/git-rebase.txt:264
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--skip"
msgstr "--skip"
#. type: Plain text
#: en/git-am.txt:143
-msgid ""
-"Skip the current patch. This is only meaningful when restarting an aborted "
-"patch."
+msgid "Skip the current patch. This is only meaningful when restarting an aborted patch."
msgstr ""
#. type: Labeled list
@@ -14241,19 +11285,13 @@ msgstr "--gpg-sign[=<idcl챕>]"
#. type: Plain text
#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62
#: en/git-commit.txt:331 en/git-rebase.txt:305 en/git-revert.txt:88
-msgid ""
-"GPG-sign commits. The `keyid` argument is optional and defaults to the "
-"committer identity; if specified, it must be stuck to the option without a "
-"space."
-msgstr ""
-"Signer les commits avec GPG. L'argument `idcl챕` est optionnel avec par "
-"d챕faut l'identit챕 du validateur혻; si sp챕cifi챕e, elle doit 챗tre coll챕e 횪 "
-"l'option sans aucun espace."
+msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
+msgstr "Signer les commits avec GPG. L'argument `idcl챕` est optionnel avec par d챕faut l'identit챕 du validateur혻; si sp챕cifi챕e, elle doit 챗tre coll챕e 횪 l'option sans aucun espace."
#. type: Labeled list
#: en/git-am.txt:150 en/git-merge.txt:105 en/git-rebase.txt:245
#: en/sequencer.txt:1
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--continue"
msgstr "--continue"
@@ -14262,23 +11300,19 @@ msgstr "--continue"
#: en/git-diff-tree.txt:39 en/git-ls-tree.txt:44 en/git-pull.txt:103
#: en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38
#: en/rev-list-options.txt:887
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-r"
msgstr "-r"
#. type: Labeled list
#: en/git-am.txt:152
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--resolved"
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 "
-"application. Make a commit using the authorship and commit log extracted "
-"from the e-mail message and the current index file, and continue."
+msgid "After a patch failure (e.g. attempting to apply conflicting patch), the user has applied it by hand and the index file stores the result of the application. Make a commit using the authorship and commit log extracted from the e-mail message and the current index file, and continue."
msgstr ""
#. type: Labeled list
@@ -14289,17 +11323,13 @@ msgstr ""
#. type: Plain text
#: 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'."
+msgid "When a patch failure occurs, <msg> will be printed to the screen before exiting. This overrides the standard message informing you to use `--continue` or `--skip` to handle the failure. This is solely for internal use between 'git rebase' and 'git am'."
msgstr ""
#. type: Labeled list
#: en/git-am.txt:167 en/git-merge.txt:93 en/git-notes.txt:201
#: en/git-rebase.txt:248 en/sequencer.txt:11
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--abort"
msgstr "--abort"
@@ -14320,34 +11350,22 @@ 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 "
-"\"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."
+msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
msgstr ""
#. 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."
+msgid "\"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."
+msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
msgstr ""
#. type: Plain text
#: en/git-am.txt:190
-msgid ""
-"The patch is expected to be inline, directly following the message. Any "
-"line that is of the form:"
+msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
msgstr ""
#. type: Plain text
@@ -14367,48 +11385,32 @@ msgstr ""
#. type: Plain text
#: en/git-am.txt:197
-msgid ""
-"is taken as the beginning of a patch, and the commit log message is "
-"terminated before the first occurrence of such a line."
+msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
msgstr ""
#. type: Plain text
#: en/git-am.txt:201
-msgid ""
-"When initially invoking `git am`, you give it the names of the mailboxes to "
-"process. Upon seeing the first patch that does not apply, it aborts in the "
-"middle. You can recover from this in one of two ways:"
+msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
msgstr ""
#. type: Plain text
#: en/git-am.txt:204
-msgid ""
-"skip the current patch by re-running the command with the `--skip` option."
+msgid "skip the current patch by re-running the command with the `--skip` option."
msgstr ""
#. type: Plain text
#: 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."
+msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
#. type: Plain text
#: en/git-am.txt:213
-msgid ""
-"The command refuses to process new mailboxes until the current operation is "
-"finished, so if you decide to start over from scratch, run `git am --abort` "
-"before running the command with mailbox names."
+msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
msgstr ""
#. type: Plain text
#: en/git-am.txt:219
-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)."
+msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
#. type: Title -
@@ -14419,13 +11421,8 @@ msgstr "CROCHETS"
#. type: Plain text
#: en/git-am.txt:225
-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 `applypatch-msg`, `pre-applypatch` "
-"et `post-applypatch`. Voir linkgit:githooks[5] pour de plus amples "
-"informations."
+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 `applypatch-msg`, `pre-applypatch` et `post-applypatch`. Voir linkgit:githooks[5] pour de plus amples informations."
#. type: Plain text
#: en/git-am.txt:229
@@ -14434,7 +11431,7 @@ msgstr "linkgit:git-apply[1]."
#. type: Title =
#: en/git-annotate.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-annotate(1)"
msgstr "git-annotate(1)"
@@ -14451,23 +11448,17 @@ 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."
+msgid "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 "
-"familiar command name for people coming from other SCM systems."
+msgid "The only difference between this command and linkgit:git-blame[1] is that they use slightly different output formats, and this command exists only for backward compatibility to support existing scripts, and provide a more familiar command name for people coming from other SCM systems."
msgstr ""
#. type: Title =
#: en/git-apply.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-apply(1)"
msgstr "git-apply(1)"
@@ -14492,21 +11483,12 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:30
-msgid ""
-"Reads the supplied diff output (i.e. \"a patch\") and applies it to files. "
-"When running from a subdirectory in a repository, patched paths outside the "
-"directory are ignored. With the `--index` option the patch is also applied "
-"to the index, and with the `--cached` option the patch is only applied to "
-"the index. Without these options, the command applies the patch only to "
-"files, and does not require them to be in a Git repository."
+msgid "Reads the supplied diff output (i.e. \"a patch\") and applies it to files. When running from a subdirectory in a repository, patched paths outside the directory are ignored. With the `--index` option the patch is also applied to the index, and with the `--cached` option the patch is only applied to the index. Without these options, the command applies the patch only to files, and does not require them to be in a Git repository."
msgstr ""
#. 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."
+msgid "This command applies the patch but does not create a commit. Use linkgit:git-am[1] to create commits from patches generated by linkgit:git-format-patch[1] and/or received by email."
msgstr ""
#. type: Labeled list
@@ -14517,92 +11499,62 @@ msgstr "<rustine>..."
#. 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."
-msgstr ""
-"Prendre le message de validation depuis le fichier indiqu챕. Utilisez '-' "
-"pour lire le message depuis l'entr챕e standard."
+msgid "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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--stat"
msgstr "--stat"
#. type: Plain text
#: en/git-apply.txt:44
-msgid ""
-"Instead of applying the patch, output diffstat for the input. Turns off "
-"\"apply\"."
+msgid "Instead of applying the patch, output diffstat for the input. Turns off \"apply\"."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:51
-msgid ""
-"Similar to `--stat`, but shows the number of added and deleted lines in "
-"decimal notation and the pathname without abbreviation, to make it more "
-"machine friendly. For binary files, outputs two `-` instead of saying `0 "
-"0`. Turns off \"apply\"."
+msgid "Similar to `--stat`, but shows the number of added and deleted lines in decimal notation and the pathname without abbreviation, to make it more machine friendly. For binary files, outputs two `-` instead of saying `0 0`. Turns off \"apply\"."
msgstr ""
#. type: Plain text
#: 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\"."
+msgid "Instead of applying the patch, output a condensed summary of information obtained from git diff extended headers, such as creations, renames and mode changes. Turns off \"apply\"."
msgstr ""
#. 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\"."
+msgid "Instead of applying the patch, see if the patch is applicable to the current working tree and/or the index file and detects errors. Turns off \"apply\"."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--index"
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 "
-"error. This flag also causes the index file to be updated."
+msgid "When `--check` is in effect, or when applying the patch (which is the default when none of the options that disables it is in effect), make sure the patch is applicable to what the current index file records. If the file to be patched in the working tree is not up-to-date, it is flagged as an error. This flag also causes the index file to be updated."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29
#: en/git-grep.txt:72 en/git-ls-files.txt:36 en/git-rm.txt:58
#: en/git-submodule.txt:300
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--cached"
msgstr "--cached"
#. type: Plain text
#: en/git-apply.txt:76
-msgid ""
-"Apply a patch without touching the working tree. Instead take the cached "
-"data, apply the patch, and store the result in the index without using the "
-"working tree. This implies `--index`."
+msgid "Apply a patch without touching the working tree. Instead take the cached data, apply the patch, and store the result in the index without using the working tree. This implies `--index`."
msgstr ""
#. 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."
+msgid "When the patch does not apply cleanly, fall back on 3-way merge if the patch records the identity of blobs it is supposed to apply to, and we have those blobs available locally, possibly leaving the conflict markers in the files in the working tree for the user to resolve. This option implies the `--index` option, and is incompatible with the `--reject` and the `--cached` options."
msgstr ""
#. type: Labeled list
@@ -14613,23 +11565,17 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:92
-msgid ""
-"Newer 'git diff' output has embedded 'index information' for each blob to "
-"help identify the original version that the patch applies to. When this "
-"flag is given, and if the original versions of the blobs are available "
-"locally, builds a temporary index containing those blobs."
+msgid "Newer 'git diff' output has embedded 'index information' for each blob to help identify the original version that the patch applies to. When this flag is given, and if the original versions of the blobs are available locally, builds a temporary index containing those blobs."
msgstr ""
#. 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."
+msgid "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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--reverse"
msgstr "--reverse"
@@ -14640,97 +11586,71 @@ msgstr "Appliquer la rustine 횪 rebours."
#. type: Plain text
#: en/git-apply.txt:106
-msgid ""
-"For atomicity, 'git apply' by default fails the whole patch and does not "
-"touch the working tree when some of the hunks do not apply. This option "
-"makes it apply the parts of the patch that are applicable, and leave the "
-"rejected hunks in corresponding *.rej files."
+msgid "For atomicity, 'git apply' by default fails the whole patch and does not touch the working tree when some of the hunks do not apply. This option makes it apply the parts of the patch that are applicable, and leave the rejected hunks in corresponding *.rej files."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:110
-msgid ""
-"When `--numstat` has been given, do not munge pathnames, but use a NUL-"
-"terminated machine-readable format."
+msgid "When `--numstat` has been given, do not munge pathnames, but use a NUL-terminated machine-readable format."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:118
-msgid ""
-"Remove <n> leading slashes from traditional diff paths. The default is 1."
+msgid "Remove <n> leading slashes from traditional diff paths. The default is 1."
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."
+msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:125
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--unidiff-zero"
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`."
+msgid "By default, 'git apply' expects that the patch being applied is a unified diff with at least one line of context. This provides good safety measures, but breaks down when applying a diff generated with `--unified=0`. To bypass these checks use `--unidiff-zero`."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:134
-msgid ""
-"Note, for the reasons stated above usage of context-free patches is "
-"discouraged."
+msgid "Note, for the reasons stated above usage of context-free patches is discouraged."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:135
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--apply"
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."
+msgid "If you use any of the options marked \"Turns off 'apply'\" above, 'git apply' reads and outputs the requested information without actually applying the patch. Give this flag after those flags to also apply the patch."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:142
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-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."
+msgid "When applying a patch, ignore additions made by the patch. This can be used to extract the common part between two files by first running 'diff' on them and applying the result with this option, which would apply the deletion part but not the addition part."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:149
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--allow-binary-replacement"
msgstr "--allow-binary-replacement"
#. type: Plain text
#: en/git-apply.txt:155
-msgid ""
-"Historically we did not allow binary patch applied without an explicit "
-"permission from the user, and this flag was the way to do so. Currently we "
-"always allow binary patch application, so this is a no-op."
+msgid "Historically we did not allow binary patch applied without an explicit permission from the user, and this flag was the way to do so. Currently we always allow binary patch application, so this is a no-op."
msgstr ""
#. type: Labeled list
@@ -14741,10 +11661,7 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:160
-msgid ""
-"Don't apply changes to files matching the given path pattern. This can be "
-"useful when importing patchsets, where you want to exclude certain files or "
-"directories."
+msgid "Don't apply changes to files matching the given path pattern. This can be useful when importing patchsets, where you want to exclude certain files or directories."
msgstr ""
#. type: Labeled list
@@ -14755,29 +11672,17 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:165
-msgid ""
-"Apply changes to files matching the given path pattern. This can be useful "
-"when importing patchsets, where you want to include certain files or "
-"directories."
+msgid "Apply changes to files matching the given path pattern. This can be useful when importing patchsets, where you want to include certain files or directories."
msgstr ""
#. 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 "
-"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."
+msgid "When `--exclude` and `--include` patterns are used, they are examined in the order they appear on the command line, and the first match determines if a patch to each path is used. A patch to a path that does not match any include/exclude pattern is used by default if there is no include pattern on the command line, and ignored if there is any include pattern."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:179
-msgid ""
-"When applying a patch, ignore changes in whitespace in context lines if "
-"necessary. Context lines will preserve their whitespace, and they will not "
-"undergo whitespace fixing regardless of the value of the `--whitespace` "
-"option. New lines will still be fixed, though."
+msgid "When applying a patch, ignore changes in whitespace in context lines if necessary. Context lines will preserve their whitespace, and they will not undergo whitespace fixing regardless of the value of the `--whitespace` option. New lines will still be fixed, though."
msgstr ""
#. type: Labeled list
@@ -14788,21 +11693,12 @@ msgstr "--whitespace=<action>"
#. type: Plain text
#: 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."
+msgid "When applying a patch, detect a new or modified line that has whitespace errors. What are considered whitespace errors is controlled by `core.whitespace` configuration. By default, trailing whitespaces (including lines that solely consist of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:192
-msgid ""
-"By default, the command outputs warning messages but applies the patch. "
-"When `git-apply` is used for statistics and not applying a patch, it "
-"defaults to `nowarn`."
+msgid "By default, the command outputs warning messages but applies the patch. When `git-apply` is used for statistics and not applying a patch, it defaults to `nowarn`."
msgstr ""
#. type: Plain text
@@ -14817,25 +11713,17 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:199
-msgid ""
-"`warn` outputs warnings for a few such errors, but applies the patch as-is "
-"(default)."
+msgid "`warn` outputs warnings for a few such errors, but applies the patch as-is (default)."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:203
-msgid ""
-"`fix` outputs warnings for a few such errors, and applies the patch after "
-"fixing them (`strip` is a synonym --- the tool used to consider only "
-"trailing whitespace characters as errors, and the fix involved 'stripping' "
-"them, but modern Gits do more)."
+msgid "`fix` outputs warnings for a few such errors, and applies the patch after fixing them (`strip` is a synonym --- the tool used to consider only trailing whitespace characters as errors, and the fix involved 'stripping' them, but modern Gits do more)."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:205
-msgid ""
-"`error` outputs warnings for a few such errors, and refuses to apply the "
-"patch."
+msgid "`error` outputs warnings for a few such errors, and refuses to apply the patch."
msgstr ""
#. type: Plain text
@@ -14845,39 +11733,29 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:207
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--inaccurate-eof"
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 "
-"such 'diff' programs do not record incomplete lines correctly. This option "
-"adds support for applying such patches by working around this bug."
+msgid "Under certain circumstances, some versions of 'diff' do not correctly detect a missing new-line at the end of the file. As a result, patches created by such 'diff' programs do not record incomplete lines correctly. This option adds support for applying such patches by working around this bug."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:219
-msgid ""
-"Report progress to stderr. By default, only a message about the current "
-"patch being applied will be printed. This option will cause additional "
-"information to be reported."
+msgid "Report progress to stderr. By default, only a message about the current patch being applied will be printed. This option will cause additional information to be reported."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:220
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--recount"
msgstr "--recount"
#. type: Plain text
#: en/git-apply.txt:224
-msgid ""
-"Do not trust the line counts in the hunk headers, but infer them by "
-"inspecting the patch (e.g. after editing the patch without adjusting the "
-"hunk headers appropriately)."
+msgid "Do not trust the line counts in the hunk headers, but infer them by inspecting the patch (e.g. after editing the patch without adjusting the hunk headers appropriately)."
msgstr ""
#. type: Labeled list
@@ -14888,55 +11766,38 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:228
-msgid ""
-"Prepend <root> to all filenames. If a \"-p\" argument was also passed, it "
-"is applied before prepending the new root."
+msgid "Prepend <root> to all filenames. If a \"-p\" argument was also passed, it is applied before prepending the new root."
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`."
+msgid "For example, a patch that talks about updating `a/git-gui.sh` to `b/git-gui.sh` can be applied to the file in the working tree `modules/git-gui/git-gui.sh` by running `git apply --directory=modules/git-gui`."
msgstr ""
#. type: Labeled list
#: en/git-apply.txt:233
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--unsafe-paths"
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 "
-"mischief)."
+msgid "By default, a patch that affects outside the working area (either a Git controlled working tree, or the current working directory when \"git apply\" is used as a replacement of GNU patch) is rejected as a mistake (or a mischief)."
msgstr ""
#. 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 "
-"effect when `--index` or `--cached` is in use."
+msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the `--unsafe-paths` option to override this safety check. This option has no effect when `--index` or `--cached` is in use."
msgstr ""
#. 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."
+msgid "Set to 'change' if you want changes in whitespace to be ignored by default. Set to one of: no, none, never, false if you want changes in whitespace to be significant."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:253
-msgid ""
-"When no `--whitespace` flag is given from the command line, this "
-"configuration item is used as the default."
+msgid "When no `--whitespace` flag is given from the command line, this configuration item is used as the default."
msgstr ""
#. type: Title -
@@ -14947,27 +11808,17 @@ msgstr "Sous-modules"
#. type: Plain text
#: en/git-apply.txt:258
-msgid ""
-"If the patch contains any changes to submodules then 'git apply' treats "
-"these changes as follows."
+msgid "If the patch contains any changes to submodules then 'git apply' treats these changes as follows."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:264
-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."
+msgid "If `--index` is specified (explicitly or implicitly), then the submodule commits must match the index exactly for the patch to apply. If any of the submodules are checked-out, then these check-outs are completely ignored, i.e., they are not required to be up-to-date or clean and they are not updated."
msgstr ""
#. type: Plain text
#: en/git-apply.txt:268
-msgid ""
-"If `--index` is not specified, then the submodule commits in the patch are "
-"ignored and only the absence or presence of the corresponding subdirectory "
-"is checked and (if possible) updated."
+msgid "If `--index` is not specified, then the submodule commits in the patch are ignored and only the absence or presence of the corresponding subdirectory is checked and (if possible) updated."
msgstr ""
#. type: Plain text
@@ -14977,7 +11828,7 @@ msgstr "linkgit:git-am[1]."
#. type: Title =
#: en/git-archimport.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-archimport(1)"
msgstr "git-archimport(1)"
@@ -14996,65 +11847,37 @@ msgstr ""
#. type: Plain text
#: 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)."
+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)."
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."
+msgid "The script expects you to provide the key roots where it can start the import from an 'initial import' or 'tag' type of Arch commit. It will follow and import new branches within the provided roots."
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:31
-msgid ""
-"It expects to be dealing with one project only. If it sees branches that "
-"have different roots, it will refuse to run. In that case, edit your "
-"<archive/branch> parameters to define clearly the scope of the import."
+msgid "It expects to be dealing with one project only. If it sees branches that have different roots, it will refuse to run. In that case, edit your <archive/branch> parameters to define clearly the scope of the import."
msgstr ""
#. 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 "
-"path. `tla` must know about the repositories you pass to 'git archimport'."
+msgid "'git archimport' uses `tla` extensively in the background to access the Arch repository. Make sure you have a recent version of `tla` available in the path. `tla` must know about the repositories you pass to 'git archimport'."
msgstr ""
#. type: Plain text
#: 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 "
-"incremental imports."
+msgid "For the initial import, 'git archimport' expects to find itself in an empty directory. To follow the development of a project that uses Arch, rerun 'git archimport' with the same parameters as the initial import to perform incremental imports."
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:48
-msgid ""
-"While 'git archimport' will try to create sensible branch names for the "
-"archives that it imports, it is also possible to specify Git branch names "
-"manually. To do so, write a Git branch name after each <archive/branch> "
-"parameter, separated by a colon. This way, you can shorten the Arch branch "
-"names and convert Arch jargon to Git jargon, for example mapping a "
-"\"PROJECT{litdd}devo{litdd}VERSION\" branch to \"master\"."
+msgid "While 'git archimport' will try to create sensible branch names for the archives that it imports, it is also possible to specify Git branch names manually. To do so, write a Git branch name after each <archive/branch> parameter, separated by a colon. This way, you can shorten the Arch branch names and convert Arch jargon to Git jargon, for example mapping a \"PROJECT{litdd}devo{litdd}VERSION\" branch to \"master\"."
msgstr ""
#. 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, "
-"after the second branch is created. Still, this is useful to convert Arch "
-"repositories that had been rotated periodically."
+msgid "Associating multiple Arch branches to one Git branch is possible; the result will make the most sense only if no commits are made to the first branch, after the second branch is created. Still, this is useful to convert Arch repositories that had been rotated periodically."
msgstr ""
#. type: Title -
@@ -15065,20 +11888,12 @@ msgstr ""
#. type: Plain text
#: en/git-archimport.txt:62
-msgid ""
-"Patch merge data from Arch is used to mark merges in Git as well. Git does "
-"not care much about tracking patches, and only considers a merge when a "
-"branch incorporates all the commits since the point they forked. The end "
-"result is that Git will have a good idea of how far branches have diverged. "
-"So the import process does lose some patch-trading metadata."
+msgid "Patch merge data from Arch is used to mark merges in Git as well. Git does not care much about tracking patches, and only considers a merge when a branch incorporates all the commits since the point they forked. The end result is that Git will have a good idea of how far branches have diverged. So the import process does lose some patch-trading metadata."
msgstr ""
#. type: Plain text
#: 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."
+msgid "Fortunately, when you try and merge branches imported from Arch, Git will find a good merge base, and it has a good chance of identifying patches that have been traded out-of-sequence between the branches."
msgstr ""
#. type: Plain text
@@ -15099,34 +11914,24 @@ 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."
+msgid "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. "
-"The default strategy is slow and safe."
+msgid "Use the fast patchset import strategy. This can be significantly faster for large trees, but cannot handle directory renames or permissions changes. The default strategy is slow and safe."
msgstr ""
#. type: Labeled list
#: en/git-archimport.txt:85 en/git-commit.txt:260 en/git-ls-files.txt:47
#: en/git-merge-index.txt:29 en/git-push.txt:159
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-o"
msgstr "-o"
#. type: Plain text
#: 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."
+msgid "Use this for compatibility with old-style branch names used by earlier versions of 'git archimport'. Old-style branch names were category{litdd}branch, whereas new-style branch names are archive,category{litdd}branch{litdd}version. In both cases, names given on the command-line will override the automatically-generated ones."
msgstr ""
#. type: Labeled list
@@ -15137,16 +11942,12 @@ msgstr ""
#. type: Plain text
#: en/git-archimport.txt:97
-msgid ""
-"Follow merge ancestry and attempt to import trees that have been merged "
-"from. Specify a depth greater than 1 if patch logs have been pruned."
+msgid "Follow merge ancestry and attempt to import trees that have been merged from. Specify a depth greater than 1 if patch logs have been pruned."
msgstr ""
#. type: Plain text
#: en/git-archimport.txt:101
-msgid ""
-"Attempt to auto-register archives at http://mirrors.sourcecontrol.net This "
-"is particularly useful with the -D option."
+msgid "Attempt to auto-register archives at http://mirrors.sourcecontrol.net This is particularly useful with the -D option."
msgstr ""
#. type: Labeled list
@@ -15173,7 +11974,7 @@ msgstr ""
#. type: Title =
#: en/git-archive.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-archive(1)"
msgstr "git-archive(1)"
@@ -15194,22 +11995,12 @@ 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 "
-"specified it is prepended to the filenames in the archive."
+msgid "Creates an archive of the specified format containing the tree structure for the named tree, and writes it out to the standard output. If <prefix> is specified it is prepended to the filenames in the archive."
msgstr ""
#. type: Plain text
#: en/git-archive.txt:32
-msgid ""
-"'git archive' behaves differently when given a tree ID versus when given a "
-"commit ID or tag ID. In the first case the current time is used as the "
-"modification time of each file in the archive. In the latter case the "
-"commit time as recorded in the referenced commit object is used instead. "
-"Additionally the commit ID is stored in a global extended pax header if the "
-"tar format is used; it can be extracted using 'git get-tar-commit-id'. In "
-"ZIP files it is stored as a file comment."
+msgid "'git archive' behaves differently when given a tree ID versus when given a commit ID or tag ID. In the first case the current time is used as the modification time of each file in the archive. In the latter case the commit time as recorded in the referenced commit object is used instead. Additionally the commit ID is stored in a global extended pax header if the tar format is used; it can be extracted using 'git get-tar-commit-id'. In ZIP files it is stored as a file comment."
msgstr ""
#. type: Labeled list
@@ -15220,17 +12011,13 @@ msgstr "--format=<fmt>"
#. type: Plain text
#: en/git-archive.txt:42
-msgid ""
-"Format of the resulting archive: 'tar' or 'zip'. If this option is not "
-"given, and the output file is specified, the format is inferred from the "
-"filename if possible (e.g. writing to \"foo.zip\" makes the output to be in "
-"the zip format). Otherwise the output format is `tar`."
+msgid "Format of the resulting archive: 'tar' or 'zip'. If this option is not given, and the output file is specified, the format is inferred from the filename if possible (e.g. writing to \"foo.zip\" makes the output to be in the zip format). Otherwise the output format is `tar`."
msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:144 en/git-config.txt:160
#: en/git-show-branch.txt:80
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--list"
msgstr "--list"
@@ -15274,15 +12061,13 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:58
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--worktree-attributes"
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>>)."
+msgid "Look for attributes in .gitattributes files in the working tree as well (see <<ATTRIBUTES>>)."
msgstr ""
#. type: Labeled list
@@ -15293,9 +12078,7 @@ msgstr ""
#. type: Plain text
#: en/git-archive.txt:65
-msgid ""
-"This can be any options that the archiver backend understands. See next "
-"section."
+msgid "This can be any options that the archiver backend understands. See next section."
msgstr ""
#. type: Labeled list
@@ -15306,11 +12089,7 @@ msgstr ""
#. type: Plain text
#: en/git-archive.txt:72
-msgid ""
-"Instead of making a tar archive from the local repository, retrieve a tar "
-"archive from a remote repository. Note that the remote repository may place "
-"restrictions on which sha1 expressions may be allowed in `<tree-ish>`. See "
-"linkgit:git-upload-archive[1] for details."
+msgid "Instead of making a tar archive from the local repository, retrieve a tar archive from a remote repository. Note that the remote repository may place restrictions on which sha1 expressions may be allowed in `<tree-ish>`. See linkgit:git-upload-archive[1] for details."
msgstr ""
#. type: Labeled list
@@ -15321,9 +12100,7 @@ msgstr "--exec=<git-upload-archive>"
#. type: Plain text
#: en/git-archive.txt:76
-msgid ""
-"Used with --remote to specify the path to the 'git-upload-archive' on the "
-"remote side."
+msgid "Used with --remote to specify the path to the 'git-upload-archive' on the remote side."
msgstr ""
#. type: Labeled list
@@ -15346,10 +12123,7 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "Without an optional path parameter, all files and subdirectories of the current working directory are included in the archive. If one or more paths are specified, only these are included."
msgstr ""
#. type: Title -
@@ -15366,7 +12140,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:90 en/git-diff-files.txt:28
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-0"
msgstr "-0"
@@ -15377,15 +12151,13 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:92
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-9"
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."
+msgid "Highest and slowest compression level. You can specify any number from 1 to 9 to adjust compression speed and ratio."
msgstr ""
#. type: Title -
@@ -15401,12 +12173,7 @@ msgstr ""
#. type: Plain text
#: en/git-archive.txt:107
-msgid ""
-"This variable can be used to restrict the permission bits of tar archive "
-"entries. The default is 0002, which turns off the world write bit. The "
-"special value \"user\" indicates that the archiving user's umask will be "
-"used instead. See umask(2) for details. If `--remote` is used then only "
-"the configuration of the remote repository takes effect."
+msgid "This variable can be used to restrict the permission bits of tar archive entries. The default is 0002, which turns off the world write bit. The special value \"user\" indicates that the archiving user's umask will be used instead. See umask(2) for details. If `--remote` is used then only the configuration of the remote repository takes effect."
msgstr ""
#. type: Labeled list
@@ -15417,21 +12184,12 @@ msgstr ""
#. type: Plain text
#: en/git-archive.txt:117
-msgid ""
-"This variable specifies a shell command through which the tar output "
-"generated by `git archive` should be piped. The command is executed using "
-"the shell with the generated tar file on its standard input, and should "
-"produce the final output on its standard output. Any compression-level "
-"options will be passed to the command (e.g., \"-9\"). An output file with "
-"the same extension as `<format>` will be use this format if no other format "
-"is given."
+msgid "This variable specifies a shell command through which the tar output generated by `git archive` should be piped. The command is executed using the shell with the generated tar file on its standard input, and should produce the final output on its standard output. Any compression-level options will be passed to the command (e.g., \"-9\"). An output file with the same extension as `<format>` will be use this format if no other format is given."
msgstr ""
#. type: Plain text
#: en/git-archive.txt:120
-msgid ""
-"The \"tar.gz\" and \"tgz\" formats are defined automatically and default to "
-"`gzip -cn`. You may override them with custom commands."
+msgid "The \"tar.gz\" and \"tgz\" formats are defined automatically and default to `gzip -cn`. You may override them with custom commands."
msgstr ""
#. type: Labeled list
@@ -15442,10 +12200,7 @@ msgstr ""
#. type: Plain text
#: en/git-archive.txt:126
-msgid ""
-"If true, enable `<format>` for use by remote clients via linkgit:git-upload-"
-"archive[1]. Defaults to false for user-defined formats, but true for the "
-"\"tar.gz\" and \"tgz\" formats."
+msgid "If true, enable `<format>` for use by remote clients via linkgit:git-upload-archive[1]. Defaults to false for user-defined formats, but true for the \"tar.gz\" and \"tgz\" formats."
msgstr ""
#. type: Title -
@@ -15462,9 +12217,7 @@ msgstr ""
#. type: Plain text
#: en/git-archive.txt:134
-msgid ""
-"Files and directories with the attribute export-ignore won't be added to "
-"archive files. See linkgit:gitattributes[5] for details."
+msgid "Files and directories with the attribute export-ignore won't be added to archive files. See linkgit:gitattributes[5] for details."
msgstr ""
#. type: Labeled list
@@ -15475,44 +12228,29 @@ 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."
+msgid "If the attribute export-subst is set for a file then Git will expand several placeholders when adding this file to an archive. See linkgit:gitattributes[5] for details."
msgstr ""
#. 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. "
-"Alternatively you can keep necessary attributes that should apply while "
-"archiving any tree in your `$GIT_DIR/info/attributes` file."
+msgid "Note that attributes are by default taken from the `.gitattributes` files in the tree that is being archived. If you want to tweak the way the output is generated after the fact (e.g. you committed without adding an appropriate export-ignore in its `.gitattributes`), adjust the checked out `.gitattributes` file as necessary and use `--worktree-attributes` option. Alternatively you can keep necessary attributes that should apply while archiving any tree in your `$GIT_DIR/info/attributes` file."
msgstr ""
#. 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
#: en/git-archive.txt:155
-msgid ""
-"Create a tar archive that contains the contents of the latest commit on the "
-"current branch, and extract it in the `/var/tmp/junk` directory."
+msgid "Create a tar archive that contains the contents of the latest commit on the current branch, and extract it in the `/var/tmp/junk` directory."
msgstr ""
#. 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
@@ -15523,8 +12261,7 @@ 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
@@ -15546,31 +12283,23 @@ 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
#: en/git-archive.txt:172
-msgid ""
-"Create a compressed tarball for v1.4.0 release, but without a global "
-"extended pax header."
+msgid "Create a compressed tarball for v1.4.0 release, but without a global extended pax header."
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
#: en/git-archive.txt:177
-msgid ""
-"Put everything in the current head's Documentation/ directory into "
-"'git-1.4.0-docs.zip', with the prefix 'git-docs/'."
+msgid "Put everything in the current head's Documentation/ directory into 'git-1.4.0-docs.zip', with the prefix 'git-docs/'."
msgstr ""
#. type: Labeled list
@@ -15581,10 +12310,7 @@ msgstr ""
#. type: Plain text
#: en/git-archive.txt:183
-msgid ""
-"Create a Zip archive that contains the contents of the latest commit on the "
-"current branch. Note that the output format is inferred by the extension of "
-"the output file."
+msgid "Create a Zip archive that contains the contents of the latest commit on the current branch. Note that the output format is inferred by the extension of the output file."
msgstr ""
#. type: Labeled list
@@ -15595,10 +12321,7 @@ msgstr ""
#. type: Plain text
#: en/git-archive.txt:189
-msgid ""
-"Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can "
-"use it specifying `--format=tar.xz`, or by creating an output file like `-o "
-"foo.tar.xz`."
+msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`."
msgstr ""
#. type: Plain text
@@ -15608,14 +12331,13 @@ msgstr "linkgit:gitattributes[5]"
#. type: Title =
#: en/git-bisect.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-bisect(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
@@ -15626,9 +12348,7 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:18 en/git-reflog.txt:18
-msgid ""
-"The command takes various subcommands, and different options depending on "
-"the subcommand:"
+msgid "The command takes various subcommands, and different options depending on the subcommand:"
msgstr ""
#. type: Plain text
@@ -15651,25 +12371,12 @@ msgstr ""
#. type: Plain text
#: 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 "
-"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."
+msgid "This command uses a binary search algorithm to find which commit in your project's history introduced a bug. You use it by first telling it a \"bad\" commit that is known to contain the bug, and a \"good\" commit that is known to be before the bug was introduced. Then `git bisect` picks a commit between those two endpoints and asks you whether the selected commit is \"good\" or \"bad\". It continues narrowing down the range until it finds the exact commit that introduced the change."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:47
-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."
+msgid "In fact, `git bisect` can be used to find the commit that changed *any* property of your project; e.g., the commit that fixed a bug, or the commit that caused a benchmark's performance to improve. To support this more general usage, the terms \"old\" and \"new\" can be used in place of \"good\" and \"bad\", or you can choose your own terms. See section \"Alternate terms\" below for more information."
msgstr ""
#. type: Title ~
@@ -15680,10 +12387,7 @@ msgstr ""
#. type: Plain text
#: 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:"
+msgid "As an example, suppose you are trying to find the commit that broke a feature that was known to work in version `v2.6.13-rc2` of your project. You start a bisect session as follows:"
msgstr ""
#. type: delimited block -
@@ -15697,10 +12401,7 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:64
-msgid ""
-"Once you have specified at least one bad and one good commit, `git bisect` "
-"selects a commit in the middle of that range of history, checks it out, and "
-"outputs something similar to the following:"
+msgid "Once you have specified at least one bad and one good commit, `git bisect` selects a commit in the middle of that range of history, checks it out, and outputs something similar to the following:"
msgstr ""
#. type: delimited block -
@@ -15711,9 +12412,7 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:71
-msgid ""
-"You should now compile the checked-out version and test it. If that version "
-"works correctly, type"
+msgid "You should now compile the checked-out version and test it. If that version works correctly, type"
msgstr ""
#. type: delimited block -
@@ -15746,18 +12445,12 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:91
-msgid ""
-"Keep repeating the process: compile the tree, test it, and depending on "
-"whether it is good or bad run `git bisect good` or `git bisect bad` to ask "
-"for the next commit that needs testing."
+msgid "Keep repeating the process: compile the tree, test it, and depending on whether it is good or bad run `git bisect good` or `git bisect bad` to ask for the next commit that needs testing."
msgstr ""
#. type: Plain text
#: 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."
+msgid "Eventually there will be no more revisions left to inspect, and the command will print out a description of the first bad commit. The reference `refs/bisect/bad` will be left pointing at that commit."
msgstr ""
#. type: Title ~
@@ -15768,9 +12461,7 @@ msgstr "Bisect reset"
#. type: Plain text
#: en/git-bisect.txt:102
-msgid ""
-"After a bisect session, to clean up the bisection state and return to the "
-"original HEAD, issue the following command:"
+msgid "After a bisect session, to clean up the bisection state and return to the original HEAD, issue the following command:"
msgstr ""
#. type: delimited block -
@@ -15781,16 +12472,12 @@ msgstr "$ git bisect reset\n"
#. type: Plain text
#: en/git-bisect.txt:110
-msgid ""
-"By default, this will return your tree to the commit that was checked out "
-"before `git bisect start`. (A new `git bisect start` will also do that, as "
-"it cleans up the old bisection state.)"
+msgid "By default, this will return your tree to the commit that was checked out before `git bisect start`. (A new `git bisect start` will also do that, as it cleans up the old bisection state.)"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:113
-msgid ""
-"With an optional argument, you can return to a different commit instead:"
+msgid "With an optional argument, you can return to a different commit instead:"
msgstr ""
#. type: delimited block -
@@ -15801,10 +12488,7 @@ msgstr "$ git bisect reset <commit>\n"
#. type: Plain text
#: en/git-bisect.txt:121
-msgid ""
-"For example, `git bisect reset bisect/bad` will check out the first bad "
-"revision, while `git bisect reset HEAD` will leave you on the current "
-"bisection commit and avoid switching commits at all."
+msgid "For example, `git bisect reset bisect/bad` will check out the first bad revision, while `git bisect reset HEAD` will leave you on the current bisection commit and avoid switching commits at all."
msgstr ""
#. type: Title ~
@@ -15815,42 +12499,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 "
-"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."
+msgid "Sometimes you are not looking for the commit that introduced a breakage, but rather for a commit that caused a change between some other \"old\" state and \"new\" state. For example, you might be looking for the commit that introduced a particular fix. Or you might be looking for the first commit in which the source-code filenames were finally all converted to your company's naming standard. Or whatever."
msgstr ""
#. 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.)"
+msgid "In such cases it can be very confusing to use the terms \"good\" and \"bad\" to refer to \"the state before the change\" and \"the state after the change\". So instead, you can use the terms \"old\" and \"new\", respectively, in place of \"good\" and \"bad\". (But note that you cannot mix \"good\" and \"bad\" with \"old\" and \"new\" in a single session.)"
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:145
-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 "
-"introduced the property."
+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 introduced the property."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:149
-msgid ""
-"To use \"old\" and \"new\" instead of \"good\" and bad, you must run `git "
-"bisect start` without commits as argument and then run the following "
-"commands to add the commits:"
+msgid "To use \"old\" and \"new\" instead of \"good\" and bad, you must run `git bisect start` without commits as argument and then run the following commands to add the commits:"
msgstr ""
#. type: delimited block -
@@ -15888,17 +12552,12 @@ msgstr "git bisect terms\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`."
+msgid "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 "
-"subcommands like `reset`, `start`, ...) by starting the bisection using"
+msgid "If you would like to use your own terms instead of \"bad\"/\"good\" or \"new\"/\"old\", you can choose any names you like (except existing bisect subcommands like `reset`, `start`, ...) by starting the bisection using"
msgstr ""
#. type: delimited block -
@@ -15909,9 +12568,7 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:182
-msgid ""
-"For example, if you are looking for a commit that introduced a performance "
-"regression, you might use"
+msgid "For example, if you are looking for a commit that introduced a performance regression, you might use"
msgstr ""
#. type: delimited block -
@@ -15933,9 +12590,7 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:195
-msgid ""
-"Then, use `git bisect <term-old>` and `git bisect <term-new>` instead of "
-"`git bisect good` and `git bisect bad` to mark commits."
+msgid "Then, use `git bisect <term-old>` and `git bisect <term-new>` instead of `git bisect good` and `git bisect bad` to mark commits."
msgstr ""
#. type: Title ~
@@ -15946,9 +12601,7 @@ msgstr "Bisect visualize"
#. type: Plain text
#: en/git-bisect.txt:201
-msgid ""
-"To see the currently remaining suspects in 'gitk', issue the following "
-"command during the bisection process:"
+msgid "To see the currently remaining suspects in 'gitk', issue the following command during the bisection process:"
msgstr ""
#. type: delimited block -
@@ -15964,9 +12617,7 @@ 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`."
+msgid "If the `DISPLAY` environment variable is not set, 'git log' is used instead. You can also give command-line options such as `-p` and `--stat`."
msgstr ""
#. type: delimited block -
@@ -15983,9 +12634,7 @@ 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:"
+msgid "After having marked revisions as good or bad, issue the following command to show what has been done so far:"
msgstr ""
#. type: delimited block -
@@ -15996,11 +12645,7 @@ msgstr "$ git bisect log\n"
#. type: Plain text
#: en/git-bisect.txt:230
-msgid ""
-"If you discover that you made a mistake in specifying the status of a "
-"revision, you can save the output of this command to a file, edit it to "
-"remove the incorrect entries, and then issue the following commands to "
-"return to a corrected state:"
+msgid "If you discover that you made a mistake in specifying the status of a revision, you can save the output of this command to a file, edit it to remove the incorrect entries, and then issue the following commands to return to a corrected state:"
msgstr ""
#. type: delimited block -
@@ -16019,11 +12664,7 @@ msgstr "횋viter le test d'un commit"
#. type: Plain text
#: en/git-bisect.txt:244
-msgid ""
-"If, in the middle of a bisect session, you know that the suggested revision "
-"is not a good one to test (e.g. it fails to build and you know that the "
-"failure does not have anything to do with the bug you are chasing), you can "
-"manually select a nearby commit and test that one instead."
+msgid "If, in the middle of a bisect session, you know that the suggested revision is not a good one to test (e.g. it fails to build and you know that the failure does not have anything to do with the bug you are chasing), you can manually select a nearby commit and test that one instead."
msgstr ""
#. type: Plain text
@@ -16044,9 +12685,7 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:257
-msgid ""
-"Then compile and test the chosen revision, and afterwards mark the revision "
-"as good or bad in the usual manner."
+msgid "Then compile and test the chosen revision, and afterwards mark the revision as good or bad in the usual manner."
msgstr ""
#. type: Title ~
@@ -16057,9 +12696,7 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:263
-msgid ""
-"Instead of choosing a nearby commit by yourself, you can ask Git to do it "
-"for you by issuing the command:"
+msgid "Instead of choosing a nearby commit by yourself, you can ask Git to do it for you by issuing the command:"
msgstr ""
#. type: delimited block -
@@ -16070,16 +12707,12 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:271
-msgid ""
-"However, if you skip a commit adjacent to the one you are looking for, Git "
-"will be unable to tell exactly which of those commits was the first bad one."
+msgid "However, if you skip a commit adjacent to the one you are looking for, Git will be unable to tell exactly which of those commits was the first bad one."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:274
-msgid ""
-"You can also skip a range of commits, instead of just one commit, using "
-"range notation. For example:"
+msgid "You can also skip a range of commits, instead of just one commit, using range notation. For example:"
msgstr ""
#. type: delimited block -
@@ -16090,16 +12723,12 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:281
-msgid ""
-"This tells the bisect process that no commit after `v2.5`, up to and "
-"including `v2.6`, should be tested."
+msgid "This tells the bisect process that no commit after `v2.5`, up to and including `v2.6`, should be tested."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:284
-msgid ""
-"Note that if you also want to skip the first commit of the range you would "
-"issue the command:"
+msgid "Note that if you also want to skip the first commit of the range you would issue the command:"
msgstr ""
#. type: delimited block -
@@ -16110,9 +12739,7 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:291
-msgid ""
-"This tells the bisect process that the commits between `v2.5` and `v2.6` "
-"(inclusive) should be skipped."
+msgid "This tells the bisect process that the commits between `v2.5` and `v2.6` (inclusive) should be skipped."
msgstr ""
#. type: Title ~
@@ -16123,10 +12750,7 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:299
-msgid ""
-"You can further cut down the number of trials, if you know what part of the "
-"tree is involved in the problem you are tracking down, by specifying path "
-"parameters when issuing the `bisect start` command:"
+msgid "You can further cut down the number of trials, if you know what part of the tree is involved in the problem you are tracking down, by specifying path parameters when issuing the `bisect start` command:"
msgstr ""
#. type: delimited block -
@@ -16137,10 +12761,7 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:307
-msgid ""
-"If you know beforehand more than one good commit, you can narrow the bisect "
-"space down by specifying all of the good commits immediately after the bad "
-"commit when issuing the `bisect start` command:"
+msgid "If you know beforehand more than one good commit, you can narrow the bisect space down by specifying all of the good commits immediately after the bad commit when issuing the `bisect start` command:"
msgstr ""
#. type: delimited block -
@@ -16160,9 +12781,7 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:319
-msgid ""
-"If you have a script that can tell if the current source code is good or "
-"bad, you can bisect by issuing the command:"
+msgid "If you have a script that can tell if the current source code is good or bad, you can bisect by issuing the command:"
msgstr ""
#. type: delimited block -
@@ -16173,73 +12792,43 @@ msgstr "$ git bisect run mon_script arguments\n"
#. type: Plain text
#: en/git-bisect.txt:328
-msgid ""
-"Note that the script (`my_script` in the above example) should exit with "
-"code 0 if the current source code is good/old, and exit with a code between "
-"1 and 127 (inclusive), except 125, if the current source code is bad/new."
+msgid "Note that the script (`my_script` in the above example) should exit with code 0 if the current source code is good/old, and exit with a code between 1 and 127 (inclusive), except 125, if the current source code is bad/new."
msgstr ""
#. 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) "
-"manual page), as the value is chopped with `& 0377`."
+msgid "Any other exit code will abort the bisect process. It should be noted that a program that terminates via `exit(-1)` leaves $? = 255, (see the exit(3) manual page), as the value is chopped with `& 0377`."
msgstr ""
#. 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 "
-"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)."
+msgid "The special exit code 125 should be used when the current source code cannot be tested. If the script exits with this code, the current revision will be skipped (see `git bisect skip` above). 125 was chosen as the highest sensible value to use for this purpose, because 126 and 127 are used by POSIX shells to signal specific error status (127 is for command not found, 126 is for command found but not executable--these details do not matter, as they are normal errors in the script, as far as `bisect run` is concerned)."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:347
-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."
+msgid "You may often find that during a bisect session you want to have temporary modifications (e.g. s/#define DEBUG 0/#define DEBUG 1/ in a header file, or \"revision that does not have this commit needs this patch applied to work around another problem this bisection is not interested in\") applied to the revision being tested."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:355
-msgid ""
-"To cope with such a situation, after the inner 'git bisect' finds the next "
-"revision to test, the script can apply the patch before compiling, run the "
-"real test, and afterwards decide if the revision (possibly with the needed "
-"patch) passed the test and then rewind the tree to the pristine state. "
-"Finally the script should exit with the status of the real test to let the "
-"`git bisect run` command loop determine the eventual outcome of the bisect "
-"session."
+msgid "To cope with such a situation, after the inner 'git bisect' finds the next revision to test, the script can apply the patch before compiling, run the real test, and afterwards decide if the revision (possibly with the needed patch) passed the test and then rewind the tree to the pristine state. Finally the script should exit with the status of the real test to let the `git bisect run` command loop determine the eventual outcome of the bisect session."
msgstr ""
#. type: Labeled list
#: en/git-bisect.txt:358 en/git-clone.txt:134
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-checkout"
msgstr "--no-checkout"
#. type: Plain text
#: 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."
+msgid "Do not checkout the new working tree at each iteration of the bisection process. Instead just update a special reference named `BISECT_HEAD` to make it point to the commit that should be tested."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:366
-msgid ""
-"This option may be useful when the test you would perform in each step does "
-"not require a checked out tree."
+msgid "This option may be useful when the test you would perform in each step does not require a checked out tree."
msgstr ""
#. type: Plain text
@@ -16295,18 +12884,12 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:404
-msgid ""
-"Here we use a `test.sh` custom script. In this script, if `make` fails, we "
-"skip the current commit. `check_test_case.sh` should `exit 0` if the test "
-"case passes, and `exit 1` otherwise."
+msgid "Here we use a `test.sh` custom script. In this script, if `make` fails, we skip the current commit. `check_test_case.sh` should `exit 0` if the test case passes, and `exit 1` otherwise."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:408
-msgid ""
-"It is safer if both `test.sh` and `check_test_case.sh` are outside the "
-"repository to prevent interactions between the bisect, make and test "
-"processes and the scripts."
+msgid "It is safer if both `test.sh` and `check_test_case.sh` are outside the repository to prevent interactions between the bisect, make and test processes and the scripts."
msgstr ""
#. type: Plain text
@@ -16358,13 +12941,7 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:441
-msgid ""
-"This applies modifications from a hot-fix branch before each test run, e.g. "
-"in case your build or test environment changed so that older revisions may "
-"need a fix which newer ones have already. (Make sure the hot-fix branch is "
-"based off a commit which is contained in all revisions which you are "
-"bisecting, so that the merge does not pull in too much, or use `git cherry-"
-"pick` instead of `git merge`.)"
+msgid "This applies modifications from a hot-fix branch before each test run, e.g. in case your build or test environment changed so that older revisions may need a fix which newer ones have already. (Make sure the hot-fix branch is based off a commit which is contained in all revisions which you are bisecting, so that the merge does not pull in too much, or use `git cherry-pick` instead of `git merge`.)"
msgstr ""
#. type: delimited block -
@@ -16378,9 +12955,7 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:452
-msgid ""
-"This shows that you can do without a run script if you write the test on a "
-"single line."
+msgid "This shows that you can do without a run script if you write the test on a single line."
msgstr ""
#. type: Plain text
@@ -16410,10 +12985,7 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:471
-msgid ""
-"In this case, when 'git bisect run' finishes, bisect/bad will refer to a "
-"commit that has at least one parent whose reachable graph is fully "
-"traversable in the sense required by 'git pack objects'."
+msgid "In this case, when 'git bisect run' finishes, bisect/bad will refer to a commit that has at least one parent whose reachable graph is fully traversable in the sense required by 'git pack objects'."
msgstr ""
#. type: Plain text
@@ -16452,28 +13024,23 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:492
-msgid ""
-"Use `git bisect` to get a short usage description, and `git bisect help` or "
-"`git bisect -h` to get a long usage description."
+msgid "Use `git bisect` to get a short usage description, and `git bisect help` or `git bisect -h` to get a long usage description."
msgstr ""
#. type: Plain text
#: en/git-bisect.txt:497
-msgid ""
-"link:git-bisect-lk2009.html[Fighting regressions with git bisect], "
-"linkgit:git-blame[1]."
+msgid "link:git-bisect-lk2009.html[Fighting regressions with git bisect], linkgit:git-blame[1]."
msgstr ""
#. type: Title =
#: en/git-blame.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-blame(1)"
msgstr "git-blame(1)"
#. type: Plain text
#: en/git-blame.txt:7
-msgid ""
-"git-blame - Show what revision and author last modified each line of a file"
+msgid "git-blame - Show what revision and author last modified each line of a file"
msgstr ""
#. type: Plain text
@@ -16488,45 +13055,27 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:21
-msgid ""
-"Annotates each line in the given file with information from the revision "
-"which last modified the line. Optionally, start annotating from the given "
-"revision."
+msgid "Annotates each line in the given file with information from the revision which last modified the line. Optionally, start annotating from the given revision."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:24
-msgid ""
-"When specified one or more times, `-L` restricts annotation to the requested"
-" lines."
+msgid "When specified one or more times, `-L` restricts annotation to the requested lines."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:30
-msgid ""
-"The origin of lines is automatically followed across whole-file renames "
-"(currently there is no option to turn the rename-following off). To follow "
-"lines moved from one file to another, or to follow lines that were copied "
-"and pasted from another file, etc., see the `-C` and `-M` options."
+msgid "The origin of lines is automatically followed across whole-file renames (currently there is no option to turn the rename-following off). To follow lines moved from one file to another, or to follow lines that were copied and pasted from another file, etc., see the `-C` and `-M` options."
msgstr ""
#. 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\" "
-"interface briefly mentioned in the following paragraph."
+msgid "The report does not tell you anything about lines which have been deleted or replaced; you need to use a tool such as 'git diff' or the \"pickaxe\" interface briefly mentioned in the following paragraph."
msgstr ""
#. type: Plain text
#: 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 "
-"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`:"
+msgid "Apart from supporting file annotation, Git also supports searching the development history for when a code snippet occurred in a change. This makes it possible to track when a code snippet was added to a file, moved or copied between files, and eventually deleted or replaced. It works by searching for a text string in the diff. A small example of the pickaxe interface that searches for `blame_usage`:"
msgstr ""
#. type: delimited block -
@@ -16545,38 +13094,29 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:55
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--score-debug"
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."
+msgid "Include debugging information related to the movement of lines between files (see `-C`) and lines moved within a file (see `-M`). The first number listed is the score. This is the number of alphanumeric characters detected as having been moved between or within files. This must be above a certain threshold for 'git blame' to consider those lines of code to have been moved."
msgstr ""
#. type: Labeled list
#: en/git-blame.txt:65
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--show-name"
msgstr "--show-name"
#. type: Plain text
#: en/git-blame.txt:69
-msgid ""
-"Show the filename in the original commit. By default the filename is shown "
-"if there is any line that came from a file with a different name, due to "
-"rename detection."
+msgid "Show the filename in the original commit. By default the filename is shown if there is any line that came from a file with a different name, due to rename detection."
msgstr ""
#. type: Labeled list
#: en/git-blame.txt:71
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--show-number"
msgstr "--show-number"
@@ -16592,22 +13132,18 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:78
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--show-email"
msgstr "--show-email"
#. type: Plain text
#: en/git-blame.txt:82
-msgid ""
-"Show the author email instead of author name (Default: off). This can also "
-"be controlled via the `blame.showEmail` config option."
+msgid "Show the author email instead of author name (Default: off). This can also be controlled via the `blame.showEmail` config option."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:86
-msgid ""
-"Ignore whitespace when comparing the parent's version and the child's to "
-"find where the lines came from."
+msgid "Ignore whitespace when comparing the parent's version and the child's to find where the lines came from."
msgstr ""
#. type: Labeled list
@@ -16618,10 +13154,7 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:91
-msgid ""
-"Instead of using the default 7+1 hexadecimal digits as the abbreviated "
-"object name, use <n>+1 digits. Note that 1 column is used for a caret to "
-"mark the boundary commit."
+msgid "Instead of using the default 7+1 hexadecimal digits as the abbreviated object name, use <n>+1 digits. Note that 1 column is used for a caret to mark the boundary commit."
msgstr ""
#. type: Title -
@@ -16632,9 +13165,7 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:100
-msgid ""
-"In this format, each line is output after a header; the header at the "
-"minimum has the first line which has:"
+msgid "In this format, each line is output after a header; the header at the minimum has the first line which has:"
msgstr ""
#. type: Plain text
@@ -16654,24 +13185,17 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:107
-msgid ""
-"on a line that starts a group of lines from a different commit than the "
-"previous one, the number of lines in this group. On subsequent lines this "
-"field is absent."
+msgid "on a line that starts a group of lines from a different commit than the previous one, the number of lines in this group. On subsequent lines this field is absent."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:110
-msgid ""
-"This header line is followed by the following information at least once for "
-"each commit:"
+msgid "This header line is followed by the following information at least once for each commit:"
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."
+msgid "the author name (\"author\"), email (\"author-mail\"), time (\"author-time\"), and time zone (\"author-tz\"); similarly for committer."
msgstr ""
#. type: Plain text
@@ -16686,21 +13210,12 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:120
-msgid ""
-"The contents of the actual line is output after the above header, prefixed "
-"by a TAB. This is to allow adding more header elements later."
+msgid "The contents of the actual line is output after the above header, prefixed by a TAB. This is to allow adding more header elements later."
msgstr ""
#. type: Plain text
#: 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:"
+msgid "The porcelain format generally suppresses commit information that has already been seen. For example, two lines that are blamed to the same commit will both be shown, but the details for that commit will be shown only once. This is more efficient, but may require more state be kept by the reader. The `--line-porcelain` option can be used to output full commit information for each line, allowing simpler (but less efficient) usage like:"
msgstr ""
#. type: Plain text
@@ -16721,19 +13236,12 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:142
-msgid ""
-"Unlike 'git blame' and 'git annotate' in older versions of git, the extent "
-"of the annotation can be limited to both line ranges and revision ranges. "
-"The `-L` option, which limits annotation to a range of lines, may be "
-"specified multiple times."
+msgid "Unlike 'git blame' and 'git annotate' in older versions of git, the extent of the annotation can be limited to both line ranges and revision ranges. The `-L` option, which limits annotation to a range of lines, may be specified multiple times."
msgstr ""
#. type: Plain text
#: 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):"
+msgid "When you are interested in finding the origin for lines 40-60 for file `foo`, you can use the `-L` option like so (they mean the same thing -- both ask for 21 lines starting at line 40):"
msgstr ""
#. type: Plain text
@@ -16762,10 +13270,7 @@ msgstr ""
#. type: Plain text
#: 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':"
+msgid "When you are not interested in changes older than version v2.6.18, or changes older than 3 weeks, you can use revision range specifiers similar to 'git rev-list':"
msgstr ""
#. type: Plain text
@@ -16778,20 +13283,12 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:169
-msgid ""
-"When revision range specifiers are used to limit the annotation, lines that "
-"have not changed since the range boundary (either the commit v2.6.18 or the "
-"most recent commit that is more than 3 weeks old in the above example) are "
-"blamed for that range boundary commit."
+msgid "When revision range specifiers are used to limit the annotation, lines that have not changed since the range boundary (either the commit v2.6.18 or the most recent commit that is more than 3 weeks old in the above example) are blamed for that range boundary commit."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:175
-msgid ""
-"A particularly useful way is to see if an added file has lines created by "
-"copy-and-paste from existing files. Sometimes this indicates that the "
-"developer was being sloppy and did not refactor the code properly. You can "
-"first find the commit that introduced the file with:"
+msgid "A particularly useful way is to see if an added file has lines created by copy-and-paste from existing files. Sometimes this indicates that the developer was being sloppy and did not refactor the code properly. You can first find the commit that introduced the file with:"
msgstr ""
#. type: Plain text
@@ -16802,9 +13299,7 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:180
-msgid ""
-"and then annotate the change between the commit and its parents, using "
-"`commit^!` notation:"
+msgid "and then annotate the change between the commit and its parents, using `commit^!` notation:"
msgstr ""
#. type: Plain text
@@ -16821,18 +13316,12 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:192
-msgid ""
-"When called with `--incremental` option, the command outputs the result as "
-"it is built. The output generally will talk about lines touched by more "
-"recent commits first (i.e. the lines will be annotated out of order) and is "
-"meant to be used by interactive viewers."
+msgid "When called with `--incremental` option, the command outputs the result as it is built. The output generally will talk about lines touched by more recent commits first (i.e. the lines will be annotated out of order) and is meant to be used by interactive viewers."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:196
-msgid ""
-"The output format is similar to the Porcelain format, but it does not "
-"contain the actual lines from the file that is being annotated."
+msgid "The output format is similar to the Porcelain format, but it does not contain the actual lines from the file that is being annotated."
msgstr ""
#. type: Plain text
@@ -16853,18 +13342,12 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:207
-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.)."
+msgid "The first time that a commit shows up in the stream, it has various other information about it printed out with a one-word tag at the beginning of each line describing the extra commit information (author, email, committer, dates, summary, etc.)."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:210
-msgid ""
-"Unlike the Porcelain format, the filename information is always given and "
-"terminates the entry:"
+msgid "Unlike the Porcelain format, the filename information is always given and terminates the entry:"
msgstr ""
#. type: Plain text
@@ -16875,20 +13358,12 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:215
-msgid ""
-"and thus it is really quite easy to parse for some line- and word-oriented "
-"parser (which should be quite natural for most scripting languages)."
+msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
msgstr ""
#. type: Plain text
#: en/git-blame.txt:223
-msgid ""
-"For people who do parsing: to make it more robust, just ignore any lines "
-"between the first and last one (\"<sha1>\" and \"filename\" lines) where "
-"you do not recognize the tag words (or care about that particular one) at "
-"the beginning of the \"extended information\" lines. That way, if there is "
-"ever added information (like the commit encoding or extended commit "
-"commentary), a blame viewer will not care."
+msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
msgstr ""
#. type: Title -
@@ -16899,7 +13374,7 @@ msgstr ""
#. type: Title =
#: en/git-branch.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-branch(1)"
msgstr "git-branch(1)"
@@ -16927,81 +13402,42 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:35
-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."
+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."
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 "
-"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. If the <commit> argument is missing it 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 will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
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."
+msgid "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 ""
-"Note that this will create the new branch, but it will not switch the "
-"working tree to it; use \"git checkout <newbranch>\" to switch to the new "
-"branch."
+msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git checkout <newbranch>\" to switch to the new branch."
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` "
-"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`."
+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 ""
#. type: Plain text
#: en/git-branch.txt:64
-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."
+msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. 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 "
-"then the reflog will also be deleted."
+msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:74
-msgid ""
-"Use `-r` together with `-d` to delete remote-tracking branches. Note, that "
-"it only makes sense to delete remote-tracking branches if they no longer "
-"exist in the remote repository or if 'git fetch' was configured not to fetch"
-" them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a "
-"way to clean up all obsolete remote-tracking branches."
+msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
@@ -17010,22 +13446,20 @@ msgstr ""
#: en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-repack.txt:55
#: en/git-replace.txt:64 en/git-show-ref.txt:47 en/git-symbolic-ref.txt:35
#: en/git-tag.txt:75
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-d"
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, ignore-translated
+#, no-wrap
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:83
-msgid ""
-"Delete a branch. The branch must be fully merged in its upstream branch, or "
-"in `HEAD` if no upstream was set with `--track` or `--set-upstream`."
+msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream`."
msgstr ""
#. type: Plain text
@@ -17035,35 +13469,23 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:88 en/git-tag.txt:152
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--create-reflog"
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`."
+msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logallrefupdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logallrefupdates`."
msgstr ""
#. 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 "
-"status. In combination with `-m` (or `--move`), allow renaming the branch "
-"even if the new branch name already exists."
+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 status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:108
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--move"
msgstr "--move"
@@ -17085,22 +13507,18 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:118
-msgid ""
-"Color branches to highlight current, local, and remote-tracking branches. "
-"The value must be always (the default), never, or auto."
+msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:123
-msgid ""
-"Turn off branch colors, even when the configuration file gives the default "
-"to color output. Same as `--color=never`."
+msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -17117,16 +13535,13 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-status.txt:105 en/git-tag.txt:116
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-column"
msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:133
-msgid ""
-"Display branch listing in columns. See configuration variable column.branch "
-"for option syntax.`--column` and `--no-column` without options are "
-"equivalent to 'always' and 'never' respectively."
+msgid "Display branch listing in columns. See configuration variable column.branch for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
@@ -17136,7 +13551,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:137 en/git-show-branch.txt:44
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--remotes"
msgstr "--remotes"
@@ -17152,30 +13567,23 @@ 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."
+msgid "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, ignore-translated
+#, no-wrap
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:156
-msgid ""
-"When in list mode, show sha1 and commit subject line for each head, along "
-"with relationship to upstream branch (if any). If given twice, print the "
-"name of the upstream branch, as well (see also `git remote show <remote>`)."
+msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the name of the upstream branch, as well (see also `git remote show <remote>`)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:161
-msgid ""
-"Be more quiet when creating or deleting a branch, suppressing non-error "
-"messages."
+msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Labeled list
@@ -17186,78 +13594,56 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:166
-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."
+msgid "Alter the sha1's minimum display length in the output listing. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:167
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:169
-msgid ""
-"Display the full sha1s in the output listing rather than abbreviating them."
+msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:171 en/git-checkout.txt:156
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--track"
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."
+msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:185
-msgid ""
-"This behavior is the default when the start point is a remote-tracking "
-"branch. Set the branch.autoSetupMerge configuration variable to `false` if "
-"you want `git checkout` and `git branch` to always behave as if `--no-track`"
-" were given. Set it to `always` if you want this behavior when the start-"
-"point is either a local or remote-tracking branch."
+msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:186 en/git-checkout.txt:170
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:189 en/git-checkout.txt:173
-msgid ""
-"Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge "
-"configuration variable is true."
-msgstr ""
-"Ne pas renseigner la configuration 짬혻amont혻쨩, m챗me si la configuration "
-"branch.autoSetupMerge est true."
+msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
+msgstr "Ne pas renseigner la configuration 짬혻amont혻쨩, m챗me si la configuration branch.autoSetupMerge est true."
#. type: Labeled list
#: en/git-branch.txt:190 en/git-push.txt:246
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--set-upstream"
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."
+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."
msgstr ""
#. type: Labeled list
@@ -17274,37 +13660,29 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:201
-msgid ""
-"Set up <branchname>'s tracking information so <upstream> is considered "
-"<branchname>'s upstream branch. If no <branchname> is specified, then it "
-"defaults to the current branch."
+msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:202
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:205
-msgid ""
-"Remove the upstream information for <branchname>. If no branch is specified "
-"it defaults to the current branch."
+msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:206
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:211
-msgid ""
-"Open an editor and edit the text to explain what the branch is for, to be "
-"used by various other commands (e.g. `format-patch`, `request-pull`, and "
-"`merge` (if enabled)). Multi-line explanations may be used."
+msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
@@ -17315,9 +13693,7 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:215
-msgid ""
-"Only list branches which contain the specified commit (HEAD if not "
-"specified). Implies `--list`."
+msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
@@ -17328,9 +13704,7 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:219
-msgid ""
-"Only list branches whose tips are reachable from the specified commit (HEAD "
-"if not specified). Implies `--list`."
+msgid "Only list branches whose tips are reachable from the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
@@ -17341,9 +13715,7 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:223
-msgid ""
-"Only list branches whose tips are not reachable from the specified commit "
-"(HEAD if not specified). Implies `--list`."
+msgid "Only list branches whose tips are not reachable from the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
@@ -17354,10 +13726,7 @@ msgstr ""
#. 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."
+msgid "The name of the branch to create or delete. The new branch name must pass all checks defined by linkgit:git-check-ref-format[1]. Some of these checks may restrict the characters allowed in a branch name."
msgstr ""
#. type: Labeled list
@@ -17368,10 +13737,7 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:234
-msgid ""
-"The new branch head will point to this commit. It may be given as a branch "
-"name, a commit-id, or a tag. If this option is omitted, the current HEAD "
-"will be used instead."
+msgid "The new branch head will point to this commit. It may be given as a branch name, a commit-id, or a tag. If this option is omitted, the current HEAD will be used instead."
msgstr ""
#. type: Labeled list
@@ -17393,9 +13759,7 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:241
-msgid ""
-"The new name for an existing branch. The same restrictions as for "
-"<branchname> apply."
+msgid "The new name for an existing branch. The same restrictions as for <branchname> apply."
msgstr ""
#. type: Labeled list
@@ -17406,13 +13770,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"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."
+msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key. The keys supported are the same as those in `git for-each-ref`. Sort order defaults to sorting based on the full refname (including `refs/...` prefix). This lists detached HEAD (if present) first, then local branches and finally remote-tracking branches."
msgstr ""
#. type: Labeled list
@@ -17434,10 +13792,7 @@ msgstr "--format <format>"
#. type: Plain text
#: en/git-branch.txt:260
-msgid ""
-"A string that interpolates `%(fieldname)` from the object pointed at by a "
-"ref being shown. The format is the same as that of linkgit:git-for-each-"
-"ref[1]."
+msgid "A string that interpolates `%(fieldname)` from the object pointed at by a ref being shown. The format is the same as that of linkgit:git-for-each-ref[1]."
msgstr ""
#. type: Title -
@@ -17467,9 +13822,7 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:275
-msgid ""
-"This step and the next one could be combined into a single step with "
-"\"checkout -b my2.6.14 v2.6.14\"."
+msgid "This step and the next one could be combined into a single step with \"checkout -b my2.6.14 v2.6.14\"."
msgstr ""
#. type: Labeled list
@@ -17490,18 +13843,12 @@ 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]."
+msgid "Delete the remote-tracking branches \"todo\", \"html\" and \"man\". The next 'fetch' or 'pull' will create them again unless you configure them not to. See linkgit:git-fetch[1]."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:290
-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."
+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 ""
#. type: Title -
@@ -17513,52 +13860,37 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:298
-msgid ""
-"If you are creating a branch that you want to checkout immediately, it is "
-"easier to use the git checkout command with its `-b` option to create a "
-"branch and check it out with a single command."
+msgid "If you are creating a branch that you want to checkout immediately, it is easier to use the git checkout command with its `-b` option to create a branch and check it out with a single command."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:301
-msgid ""
-"The options `--contains`, `--merged` and `--no-merged` serve three related "
-"but different purposes:"
+msgid "The options `--contains`, `--merged` and `--no-merged` serve three related but different purposes:"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:305
-msgid ""
-"`--contains <commit>` is used to find all branches which will need special "
-"attention if <commit> were to be rebased or amended, since those branches "
-"contain the specified <commit>."
+msgid "`--contains <commit>` is used to find all branches which will need special attention if <commit> were to be rebased or amended, since those branches contain the specified <commit>."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:308
-msgid ""
-"`--merged` is used to find all branches which can be safely deleted, since "
-"those branches are fully contained by HEAD."
+msgid "`--merged` is used to find all branches which can be safely deleted, since those branches are fully contained by HEAD."
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."
+msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:319
-msgid ""
-"linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-"
-"remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: "
-"What is a branch?''] in the Git User's Manual."
+msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
#. type: Title =
#: en/git-bundle.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-bundle(1)"
msgstr "git-bundle(1)"
@@ -17579,18 +13911,7 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:32
-msgid ""
-"Some workflows require that one or more branches of development on one "
-"machine be replicated on another machine, but the two machines cannot be "
-"directly connected, and therefore the interactive Git protocols (git, ssh, "
-"http) cannot be used. This command provides support for 'git fetch' and "
-"'git pull' to operate by packaging objects and references in an archive at "
-"the originating machine, then importing those into another repository using "
-"'git fetch' and 'git pull' after moving the archive by some means (e.g., by "
-"sneakernet). As no direct connection between the repositories exists, the "
-"user must specify a basis for the bundle that is held by the destination "
-"repository: the bundle assumes that all objects in the basis are already in "
-"the destination repository."
+msgid "Some workflows require that one or more branches of development on one machine be replicated on another machine, but the two machines cannot be directly connected, and therefore the interactive Git protocols (git, ssh, http) cannot be used. This command provides support for 'git fetch' and 'git pull' to operate by packaging objects and references in an archive at the originating machine, then importing those into another repository using 'git fetch' and 'git pull' after moving the archive by some means (e.g., by sneakernet). As no direct connection between the repositories exists, the user must specify a basis for the bundle that is held by the destination repository: the bundle assumes that all objects in the basis are already in the destination repository."
msgstr ""
#. type: Labeled list
@@ -17601,9 +13922,7 @@ 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."
+msgid "Used to create a bundle named 'file'. This requires the 'git-rev-list-args' arguments to define the bundle contents."
msgstr ""
#. type: Labeled list
@@ -17614,12 +13933,7 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:47
-msgid ""
-"Used to check that a bundle file is valid and will apply cleanly to the "
-"current repository. This includes checks on the bundle format itself as "
-"well as checking that the prerequisite commits exist and are fully linked in"
-" the current repository. 'git bundle' prints a list of missing commits, if "
-"any, and exits with a non-zero status."
+msgid "Used to check that a bundle file is valid and will apply cleanly to the current repository. This includes checks on the bundle format itself as well as checking that the prerequisite commits exist and are fully linked in the current repository. 'git bundle' prints a list of missing commits, if any, and exits with a non-zero status."
msgstr ""
#. type: Labeled list
@@ -17630,9 +13944,7 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:52
-msgid ""
-"Lists the references defined in the bundle. If followed by a list of "
-"references, only references matching those given are printed out."
+msgid "Lists the references defined in the bundle. If followed by a list of references, only references matching those given are printed out."
msgstr ""
#. type: Labeled list
@@ -17643,11 +13955,7 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:59
-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'."
+msgid "Passes the objects in the bundle to 'git index-pack' for storage in the repository, then prints the names of all defined references. If a list of references is given, only references matching those in the list are printed. This command is really plumbing, intended to be called only by 'git fetch'."
msgstr ""
#. type: Labeled list
@@ -17658,13 +13966,7 @@ msgstr "<git-rev-list-args>"
#. type: Plain text
#: 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."
+msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list' (and containing a named ref, see SPECIFYING REFERENCES below), that specifies the specific objects and references to transport. For example, `master~10..master` causes the current master reference to be packaged along with all objects added since its 10th ancestor commit. There is no explicit limit to the number of references and objects that may be packaged."
msgstr ""
#. type: Labeled list
@@ -17675,11 +13977,7 @@ msgstr "[<nom-de-r챕f>...]"
#. type: Plain text
#: en/git-bundle.txt:77
-msgid ""
-"A list of references used to limit the references reported as available. "
-"This is principally of use to 'git fetch', which expects to receive only "
-"those references asked for and not necessarily everything in the pack (in "
-"this case, 'git bundle' acts like 'git fetch-pack')."
+msgid "A list of references used to limit the references reported as available. This is principally of use to 'git fetch', which expects to receive only those references asked for and not necessarily everything in the pack (in this case, 'git bundle' acts like 'git fetch-pack')."
msgstr ""
#. type: Title -
@@ -17690,23 +13988,12 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:89
-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`)."
+msgid "'git bundle' will only package references that are shown by 'git show-ref': this includes heads, tags, and remote heads. References such as `master~1` cannot be packaged, but are perfectly suitable for defining the basis. More than one reference may be packaged, and more than one basis can be specified. The objects packaged are those not contained in the union of the given bases. Each basis can be specified explicitly (e.g. `^master~10`), or implicitly (e.g. `master~10..master`, `--since=10.days.ago master`)."
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:94
-msgid ""
-"It is very important that the basis used be held by the destination. It is "
-"okay to err on the side of caution, causing the bundle file to contain "
-"objects already in the destination, as these are ignored when unpacking at "
-"the destination."
+msgid "It is very important that the basis used be held by the destination. It is okay to err on the side of caution, causing the bundle file to contain objects already in the destination, as these are ignored when unpacking at the destination."
msgstr ""
#. type: Plain text
@@ -17720,21 +14007,12 @@ msgstr "EXEMPLE"
#. 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 "
-"mechanism (CD, email, etc.). We want to update R2 with development made on "
-"the branch master in R1."
+msgid "Assume you want to transfer the history from a repository R1 on machine A to another repository R2 on machine B. For whatever reason, direct connection between A and B is not allowed, but we can move data from A to B via some mechanism (CD, email, etc.). We want to update R2 with development made on the branch master in R1."
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:108
-msgid ""
-"To bootstrap the process, you can first create a bundle that does not have "
-"any basis. You can use a tag to remember up to what commit you last "
-"processed, in order to make it easy to later update the other repository "
-"with an incremental bundle:"
+msgid "To bootstrap the process, you can first create a bundle that does not have any basis. You can use a tag to remember up to what commit you last processed, in order to make it easy to later update the other repository with an incremental bundle:"
msgstr ""
#. type: delimited block -
@@ -17748,10 +14026,7 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:118
-msgid ""
-"Then you transfer file.bundle to the target machine B. Because this bundle "
-"does not require any existing object to be extracted, you can create a new "
-"repository on machine B by cloning from it:"
+msgid "Then you transfer file.bundle to the target machine B. Because this bundle does not require any existing object to be extracted, you can create a new repository on machine B by cloning from it:"
msgstr ""
#. type: delimited block -
@@ -17762,10 +14037,7 @@ 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:"
+msgid "This will define a remote called \"origin\" in the resulting repository that lets you fetch and pull from the bundle. The $GIT_DIR/config file in R2 will have an entry like this:"
msgstr ""
#. type: delimited block -
@@ -17779,17 +14051,12 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:136
-msgid ""
-"To update the resulting mine.git repository, you can fetch or pull after "
-"replacing the bundle stored at /home/me/tmp/file.bundle with incremental "
-"updates."
+msgid "To update the resulting mine.git repository, you can fetch or pull after replacing the bundle stored at /home/me/tmp/file.bundle with incremental updates."
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:139
-msgid ""
-"After working some more in the original repository, you can create an "
-"incremental bundle to update the other repository:"
+msgid "After working some more in the original repository, you can create an incremental bundle to update the other repository:"
msgstr ""
#. type: delimited block -
@@ -17803,9 +14070,7 @@ 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."
+msgid "You then transfer the bundle to the other machine to replace /home/me/tmp/file.bundle, and pull from it."
msgstr ""
#. type: delimited block -
@@ -17818,13 +14083,7 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:160
-msgid ""
-"If you know up to what commit the intended recipient repository should have "
-"the necessary objects, you can use that knowledge to specify the basis, "
-"giving a cut-off point to limit the revisions and objects that go in the "
-"resulting bundle. The previous example used the lastR2bundle tag for this "
-"purpose, but you can use any other options that you would give to the "
-"linkgit:git-log[1] command. Here are more examples:"
+msgid "If you know up to what commit the intended recipient repository should have the necessary objects, you can use that knowledge to specify the basis, giving a cut-off point to limit the revisions and objects that go in the resulting bundle. The previous example used the lastR2bundle tag for this purpose, but you can use any other options that you would give to the linkgit:git-log[1] command. Here are more examples:"
msgstr ""
#. type: Plain text
@@ -17862,9 +14121,7 @@ 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:"
+msgid "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 -
@@ -17875,17 +14132,12 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:188
-msgid ""
-"This will list what commits you must have in order to extract from the "
-"bundle and will error out if you do not have them."
+msgid "This will list what commits you must have in order to extract from the bundle and will error out if you do not have them."
msgstr ""
#. type: Plain text
#: en/git-bundle.txt:192
-msgid ""
-"A bundle from a recipient repository's point of view is just like a regular "
-"repository which it fetches or pulls from. You can, for example, map "
-"references when fetching:"
+msgid "A bundle from a recipient repository's point of view is just like a regular repository which it fetches or pulls from. You can, for example, map references when fetching:"
msgstr ""
#. type: delimited block -
@@ -17907,15 +14159,13 @@ msgstr ""
#. type: Title =
#: en/git-cat-file.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-cat-file(1)"
msgstr "git-cat-file(1)"
#. type: Plain text
#: en/git-cat-file.txt:7
-msgid ""
-"git-cat-file - Provide content or type and size information for repository "
-"objects"
+msgid "git-cat-file - Provide content or type and size information for repository objects"
msgstr ""
#. type: Plain text
@@ -17928,22 +14178,12 @@ 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\")."
+msgid "In its first form, the command provides the content or the type of an object in the repository. The type is required unless `-t` or `-p` is used to find the object type, or `-s` is used to find the object size, or `--textconv` or `--filters` is used (which imply type \"blob\")."
msgstr ""
#. 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 "
-"to list the object names followed by the path name, separated by a single "
-"white space, so that the appropriate drivers can be determined."
+msgid "In the second form, a list of objects (separated by linefeeds) is provided on stdin, and the SHA-1, type, and size of each object is printed on stdout. The output format can be overridden using the optional `<format>` argument. If either `--textconv` or `--filters` was specified, the input is expected to list the object names followed by the path name, separated by a single white space, so that the appropriate drivers can be determined."
msgstr ""
#. type: Labeled list
@@ -17954,10 +14194,7 @@ msgstr ""
#. type: Plain text
#: 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]."
+msgid "The name of the object to show. For a more complete list of ways to spell object names, see the \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Plain text
@@ -17972,9 +14209,7 @@ 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."
+msgid "Suppress all output; instead exit with zero status if <object> exists and is a valid object."
msgstr ""
#. type: Plain text
@@ -17990,35 +14225,23 @@ msgstr ""
#. type: Plain text
#: 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 "
-"contains it, or to ask for a \"blob\" with <object> being a tag object that "
-"points at it."
+msgid "Typically this matches the real type of <object> but asking for a type that can trivially be dereferenced from the given <object> is also permitted. An example is to ask for a \"tree\" with <object> being a commit object that contains it, or to ask for a \"blob\" with <object> being a tag object that points at it."
msgstr ""
#. 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 "
-"filter to the content recorded in the index at <path>."
+msgid "Show the content as transformed by a textconv filter. In this case, <object> has to be of the form <tree-ish>:<path>, or :<path> in order to apply the filter to the content recorded in the index at <path>."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:65
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--filters"
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>."
+msgid "Show the content as converted by the filters configured in the current working tree for the given <path> (i.e. smudge filters, end-of-line conversion, etc). In this case, <object> has to be of the form <tree-ish>:<path>, or :<path>."
msgstr ""
#. type: Labeled list
@@ -18029,15 +14252,12 @@ msgstr "--path=<chemin>"
#. 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."
+msgid "For use with --textconv or --filters, to allow specifying an object name and a path separately, e.g. when it is difficult to figure out the revision from which the blob came."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:76 en/git-mktree.txt:32
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--batch"
msgstr "--batch"
@@ -18049,17 +14269,12 @@ msgstr "--batch=<format>"
#. type: Plain text
#: en/git-cat-file.txt:83
-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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:84
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--batch-check"
msgstr "--batch-check"
@@ -18071,47 +14286,34 @@ msgstr ""
#. type: Plain text
#: 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, "
-"separated by white space. See the section `BATCH OUTPUT` below for details."
+msgid "Print object information for each object provided on stdin. May not be combined with any other options or arguments except `--textconv` or `--filters`, in which case the input lines also need to specify the path, separated by white space. See the section `BATCH OUTPUT` below for details."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:92
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--batch-all-objects"
msgstr "--batch-all-objects"
#. type: Plain text
#: en/git-cat-file.txt:98
-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."
+msgid "Instead of reading a list of objects on stdin, perform the requested batch operation on all objects in the repository and any alternate object stores (not just reachable objects). Requires `--batch` or `--batch-check` be specified. Note that the objects are visited in order sorted by their hashes."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:99
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--buffer"
msgstr "--buffer"
#. type: Plain text
#: en/git-cat-file.txt:105
-msgid ""
-"Normally batch output is flushed after each object is output, so that a "
-"process can interactively read and write from `cat-file`. With this option, "
-"the output uses normal stdio buffering; this is much more efficient when "
-"invoking `--batch-check` on a large number of objects."
+msgid "Normally batch output is flushed after each object is output, so that a process can interactively read and write from `cat-file`. With this option, the output uses normal stdio buffering; this is much more efficient when invoking `--batch-check` on a large number of objects."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:106
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--allow-unknown-type"
msgstr "--allow-unknown-type"
@@ -18122,34 +14324,23 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:109
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--follow-symlinks"
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."
+msgid "With --batch or --batch-check, follow symlinks inside the repository when requesting objects with extended SHA-1 expressions of the form tree-ish:path-in-tree. Instead of providing output about the link itself, provide output about the linked-to object. If a symlink points outside the tree-ish (e.g. a link to /foo or a root-level link to ../foo), the portion of the link which is outside the tree will be printed."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:122
-msgid ""
-"This option does not (currently) work correctly when an object in the index "
-"is specified (e.g. `:link` instead of `HEAD:link`) rather than one in the "
-"tree."
+msgid "This option does not (currently) work correctly when an object in the index is specified (e.g. `:link` instead of `HEAD:link`) rather than one in the tree."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:125
-msgid ""
-"This option cannot (currently) be used unless `--batch` or `--batch-check` "
-"is used."
+msgid "This option cannot (currently) be used unless `--batch` or `--batch-check` is used."
msgstr ""
#. type: Plain text
@@ -18170,8 +14361,7 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:137
-msgid ""
-"For a regular file `f`, `echo HEAD:f | git cat-file --batch` would print"
+msgid "For a regular file `f`, `echo HEAD:f | git cat-file --batch` would print"
msgstr ""
#. type: Plain text
@@ -18182,16 +14372,12 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:145
-msgid ""
-"And `echo HEAD:link | git cat-file --batch --follow-symlinks` would print "
-"the same thing, as would `HEAD:dir/link`, as they both point at `HEAD:f`."
+msgid "And `echo HEAD:link | git cat-file --batch --follow-symlinks` would print the same thing, as would `HEAD:dir/link`, as they both point at `HEAD:f`."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:148
-msgid ""
-"Without `--follow-symlinks`, these would print data about the symlink "
-"itself. In the case of `HEAD:link`, you would see"
+msgid "Without `--follow-symlinks`, these would print data about the symlink itself. In the case of `HEAD:link`, you would see"
msgstr ""
#. type: Plain text
@@ -18202,9 +14388,7 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:155
-msgid ""
-"Both `plink` and `alink` point outside the tree, so they would respectively "
-"print:"
+msgid "Both `plink` and `alink` point outside the tree, so they would respectively print:"
msgstr ""
#. type: Plain text
@@ -18254,9 +14438,7 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:177
-msgid ""
-"If <type> is specified, the raw (though uncompressed) contents of the "
-"<object> will be returned."
+msgid "If <type> is specified, the raw (though uncompressed) contents of the <object> will be returned."
msgstr ""
#. type: Title -
@@ -18267,25 +14449,17 @@ msgstr "SORTIE DE LOT"
#. type: Plain text
#: 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-"
-"parse[1]."
+msgid "If `--batch` or `--batch-check` is given, `cat-file` will read objects from stdin, one per line, and print information about them. By default, the whole line is considered as an object, as if it were fed to linkgit:git-rev-parse[1]."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:190
-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:"
+msgid "You can specify the information shown for each object by using a custom `<format>`. The `<format>` is copied literally to stdout for each object, with placeholders of the form `%(atom)` expanded, followed by a newline. The available atoms are:"
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:191
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`objectname`"
msgstr "`objectname`"
@@ -18296,7 +14470,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:194
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`objecttype`"
msgstr "`objecttype`"
@@ -18307,7 +14481,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:197
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`objectsize`"
msgstr "`objectsize`"
@@ -18324,53 +14498,39 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:204
-msgid ""
-"The size, in bytes, that the object takes up on disk. See the note about on-"
-"disk sizes in the `CAVEATS` section below."
+msgid "The size, in bytes, that the object takes up on disk. See the note about on-disk sizes in the `CAVEATS` section below."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:205
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`deltabase`"
msgstr "`deltabase`"
#. type: Plain text
#: en/git-cat-file.txt:209
-msgid ""
-"If the object is stored as a delta on-disk, this expands to the 40-hex sha1 "
-"of the delta base object. Otherwise, expands to the null sha1 (40 zeroes). "
-"See `CAVEATS` below."
+msgid "If the object is stored as a delta on-disk, this expands to the 40-hex sha1 of the delta base object. Otherwise, expands to the null sha1 (40 zeroes). See `CAVEATS` below."
msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:210
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`rest`"
msgstr "`rest`"
#. type: Plain text
#: en/git-cat-file.txt:216
-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."
+msgid "If this atom is used in the output string, input lines are split at the first whitespace boundary. All characters before that whitespace are considered to be the object name; characters after that first run of whitespace (i.e., the \"rest\" of the line) are output in place of the `%(rest)` atom."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:219
-msgid ""
-"If no format is specified, the default format is `%(objectname) "
-"%(objecttype) %(objectsize)`."
+msgid "If no format is specified, the default format is `%(objectname) %(objecttype) %(objectsize)`."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:223
-msgid ""
-"If `--batch` is specified, the object information is followed by the object "
-"contents (consisting of `%(objectsize)` bytes), followed by a newline."
+msgid "If `--batch` is specified, the object information is followed by the object contents (consisting of `%(objectsize)` bytes), followed by a newline."
msgstr ""
#. type: Plain text
@@ -18399,9 +14559,7 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:239
-msgid ""
-"If a name is specified on stdin that cannot be resolved to an object in the "
-"repository, then `cat-file` will ignore any custom format and print:"
+msgid "If a name is specified on stdin that cannot be resolved to an object in the repository, then `cat-file` will ignore any custom format and print:"
msgstr ""
#. type: delimited block -
@@ -18412,9 +14570,7 @@ 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:"
+msgid "If --follow-symlinks is used, and a symlink in the repository points outside the repository, then `cat-file` will ignore any custom format and print:"
msgstr ""
#. type: delimited block -
@@ -18427,17 +14583,12 @@ 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> "
-"will be ../foo. <size> is the size of the symlink in bytes."
+msgid "The symlink will either be absolute (beginning with a /), or relative to the tree root. For instance, if dir/link points to ../../foo, then <symlink> will be ../foo. <size> is the size of the symlink in bytes."
msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:259
-msgid ""
-"If --follow-symlinks is used, the following error messages will be "
-"displayed:"
+msgid "If --follow-symlinks is used, the following error messages will be displayed:"
msgstr ""
#. type: Plain text
@@ -18455,9 +14606,7 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:271
-msgid ""
-"is printed when the initial symlink exists, but something that it "
-"(transitive-of) points to does not."
+msgid "is printed when the initial symlink exists, but something that it (transitive-of) points to does not."
msgstr ""
#. type: delimited block -
@@ -18470,9 +14619,7 @@ 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)."
+msgid "is printed for symlink loops (or any symlinks that require more than 40 link resolutions to resolve)."
msgstr ""
#. type: delimited block -
@@ -18485,9 +14632,7 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:285
-msgid ""
-"is printed when, during symlink resolution, a file is used as a directory "
-"name."
+msgid "is printed when, during symlink resolution, a file is used as a directory name."
msgstr ""
#. type: Title -
@@ -18498,26 +14643,17 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:295
-msgid ""
-"Note that the sizes of objects on disk are reported accurately, but care "
-"should be taken in drawing conclusions about which refs or objects are "
-"responsible for disk usage. The size of a packed non-delta object may be "
-"much larger than the size of objects which delta against it, but the choice "
-"of which object is the base and which is the delta is arbitrary and is "
-"subject to change during a repack."
+msgid "Note that the sizes of objects on disk are reported accurately, but care should be taken in drawing conclusions about which refs or objects are responsible for disk usage. The size of a packed non-delta object may be much larger than the size of objects which delta against it, but the choice of which object is the base and which is the delta is arbitrary and is subject to change during a repack."
msgstr ""
#. type: Plain text
#: 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."
+msgid "Note also that multiple copies of an object may be present in the object database; in this case, it is undefined which copy's size or delta base will be reported."
msgstr ""
#. type: Title =
#: en/git-check-attr.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-check-attr(1)"
msgstr "git-check-attr(1)"
@@ -18536,9 +14672,7 @@ msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:19
-msgid ""
-"For every pathname, this command will list if each attribute is "
-"'unspecified', 'set', or 'unset' as a gitattribute on that pathname."
+msgid "For every pathname, this command will list if each attribute is 'unspecified', 'set', or 'unset' as a gitattribute on that pathname."
msgstr ""
#. type: Labeled list
@@ -18549,23 +14683,15 @@ msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:26
-msgid ""
-"List all attributes that are associated with the specified paths. If this "
-"option is used, then 'unspecified' attributes will not be included in the "
-"output."
+msgid "List all attributes that are associated with the specified paths. If this option is used, then 'unspecified' attributes will not be included in the output."
msgstr ""
#. type: Plain text
#: 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."
-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',"
+#| 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."
+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',"
#. type: Labeled list
#: en/git-check-attr.txt:30 en/git-check-ignore.txt:37
@@ -18574,57 +14700,43 @@ msgstr ""
#: en/git-http-fetch.txt:40 en/git-index-pack.txt:38 en/git-name-rev.txt:45
#: en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:564
#: en/git-update-index.txt:140 en/rev-list-options.txt:194
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--stdin"
msgstr "--stdin"
#. type: Plain text
#: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
-msgid ""
-"Read pathnames from the standard input, one per line, instead of from the "
-"command-line."
+msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
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."
+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."
msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:42
-msgid ""
-"Interpret all preceding arguments as attributes and all following arguments "
-"as path names."
+msgid "Interpret all preceding arguments as attributes and all following arguments as path names."
msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:46
-msgid ""
-"If none of `--stdin`, `--all`, or `--` is used, the first argument will be "
-"treated as an attribute and the rest of the arguments as pathnames."
+msgid "If none of `--stdin`, `--all`, or `--` is used, the first argument will be treated as an attribute and the rest of the arguments as pathnames."
msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:52
-msgid ""
-"The output is of the form: <path> COLON SP <attribute> COLON SP <info> LF"
+msgid "The output is of the form: <path> COLON SP <attribute> COLON SP <info> LF"
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"
+msgid "unless `-z` is in effect, in which case NUL is used as delimiter: <path> NUL <attribute> NUL <info> NUL"
msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:59
-msgid ""
-"<path> is the path of a file being queried, <attribute> is an attribute "
-"being queried and <info> can be either:"
+msgid "<path> is the path of a file being queried, <attribute> is an attribute being queried and <info> can be either:"
msgstr ""
#. type: Labeled list
@@ -18673,10 +14785,7 @@ 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 "
-"overfilling an input buffer or reading from an empty output buffer."
+msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
msgstr ""
#. type: Plain text
@@ -18769,7 +14878,7 @@ msgstr "linkgit:gitattributes[5]."
#. type: Title =
#: en/git-check-ignore.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-check-ignore(1)"
msgstr "git-check-ignore(1)"
@@ -18788,17 +14897,12 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:22
-msgid ""
-"For each pathname given via the command-line or from a file via `--stdin`, "
-"check whether the file is excluded by .gitignore (or other input files to "
-"the exclude mechanism) and output the path if it is excluded."
+msgid "For each pathname given via the command-line or from a file via `--stdin`, check whether the file is excluded by .gitignore (or other input files to the exclude mechanism) and output the path if it is excluded."
msgstr ""
#. 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'."
+msgid "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
@@ -18809,9 +14913,7 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:31
-msgid ""
-"Don't output anything, just set exit status. This is only valid with a "
-"single pathname."
+msgid "Don't output anything, just set exit status. This is only valid with a single pathname."
msgstr ""
#. type: Labeled list
@@ -18822,18 +14924,12 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:36
-msgid ""
-"Also output details about the matching pattern (if any) for each given "
-"pathname. For precedence rules within and between exclude sources, see "
-"linkgit:gitignore[5]."
+msgid "Also output details about the matching pattern (if any) for each given pathname. For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
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."
+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."
msgstr ""
#. type: Labeled list
@@ -18844,39 +14940,28 @@ 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 "
-"between paths which match a pattern and those which don't."
+msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
msgstr ""
#. type: Labeled list
#: en/git-check-ignore.txt:52 en/git-grep.txt:76
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-index"
msgstr "--no-index"
#. type: Plain text
#: en/git-check-ignore.txt:58
-msgid ""
-"Don't look in the index when undertaking the checks. This can be used to "
-"debug why a path became tracked by e.g. `git add .` and was not ignored by "
-"the rules as expected by the user or when developing patterns including "
-"negation to match a path previously added with `git add -f`."
+msgid "Don't look in the index when undertaking the checks. This can be used to debug why a path became tracked by e.g. `git add .` and was not ignored by the rules as expected by the user or when developing patterns including negation to match a path previously added with `git add -f`."
msgstr ""
#. 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 "
-"output for that path; this means that path will not be ignored."
+msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line. If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:68
-msgid ""
-"If `--verbose` is specified, the output is a series of lines of the form:"
+msgid "If `--verbose` is specified, the output is a series of lines of the form:"
msgstr ""
#. type: Plain text
@@ -18886,22 +14971,12 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:78
-msgid ""
-"<pathname> is the path of a file being queried, <pattern> is the matching "
-"pattern, <source> is the pattern's source file, and <linenum> is the line "
-"number of the pattern within that source. If the pattern contained a `!` "
-"prefix or `/` suffix, it will be preserved in the output. <source> will be "
-"an absolute path when referring to the file configured by "
-"`core.excludesFile`, or relative to the repository root when referring to "
-"`.git/info/exclude` or a per-directory exclude file."
+msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:82
-msgid ""
-"If `-z` is specified, the pathnames in the output are delimited by the null "
-"character; if `--verbose` is also specified then null characters are also "
-"used instead of colons and hard tabs:"
+msgid "If `-z` is specified, the pathnames in the output are delimited by the null character; if `--verbose` is also specified then null characters are also used instead of colons and hard tabs:"
msgstr ""
#. type: Plain text
@@ -18911,16 +14986,7 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:94
-msgid ""
-"If `-n` or `--non-matching` are specified, non-matching pathnames will also "
-"be output, in which case all fields in each output record except for "
-"<pathname> will be empty. This can be useful when running non-"
-"interactively, so that files can be incrementally streamed to STDIN of a "
-"long-running check-ignore process, and for each of these files, STDOUT will "
-"indicate whether that file matched a pattern or not. (Without this option, "
-"it would be impossible to tell whether the absence of output for a given "
-"file meant that it didn't match any pattern, or that the output hadn't been "
-"generated yet.)"
+msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
msgstr ""
#. type: Title -
@@ -18969,14 +15035,13 @@ msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
#. type: Title =
#: en/git-check-mailmap.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-check-mailmap(1)"
msgstr "git-check-mailmap(1)"
#. type: Plain text
#: en/git-check-mailmap.txt:7
-msgid ""
-"git-check-mailmap - Show canonical names and email addresses of contacts"
+msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
msgstr ""
#. type: Plain text
@@ -18987,31 +15052,22 @@ msgstr ""
#. type: Plain text
#: en/git-check-mailmap.txt:22
-msgid ""
-"For each ``Name $$<user@host>$$'' or ``$$<user@host>$$'' from the command-"
-"line or standard input (when using `--stdin`), look up the person's "
-"canonical name and email address (see \"Mapping Authors\" below). If found, "
-"print them; otherwise print the input as-is."
+msgid "For each ``Name $$<user@host>$$'' or ``$$<user@host>$$'' from the command-line or standard input (when using `--stdin`), look up the person's canonical name and email address (see \"Mapping Authors\" below). If found, print them; otherwise print the input as-is."
msgstr ""
#. type: Plain text
#: en/git-check-mailmap.txt:29
-msgid ""
-"Read contacts, one per line, from the standard input after exhausting "
-"contacts provided on the command-line."
+msgid "Read contacts, one per line, from the standard input after exhausting contacts provided on the command-line."
msgstr ""
#. type: Plain text
#: en/git-check-mailmap.txt:37
-msgid ""
-"For each contact, a single line is output, terminated by a newline. If the "
-"name is provided or known to the 'mailmap', ``Name $$<user@host>$$'' is "
-"printed; otherwise only ``$$<user@host>$$'' is printed."
+msgid "For each contact, a single line is output, terminated by a newline. If the name is provided or known to the 'mailmap', ``Name $$<user@host>$$'' is printed; otherwise only ``$$<user@host>$$'' is printed."
msgstr ""
#. type: Title =
#: en/git-checkout-index.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-checkout-index(1)"
msgstr "git-checkout-index(1)"
@@ -19036,15 +15092,9 @@ msgstr ""
#. type: Plain text
#: 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;"
-msgid ""
-"Will copy all files listed from the index to the working directory (not "
-"overwriting existing files)."
-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',"
+#| msgid "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)."
+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',"
#. type: Plain text
#: en/git-checkout-index.txt:29
@@ -19073,14 +15123,12 @@ msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:42
-msgid ""
-"checks out all files in the index. Cannot be used together with explicit "
-"filenames."
+msgid "checks out all files in the index. Cannot be used together with explicit filenames."
msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:44
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-create"
msgstr "--no-create"
@@ -19097,9 +15145,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:51
-msgid ""
-"When creating files, prepend <string> (usually a directory including a "
-"trailing /)"
+msgid "When creating files, prepend <string> (usually a directory including a trailing /)"
msgstr ""
#. type: Labeled list
@@ -19110,38 +15156,28 @@ msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:56
-msgid ""
-"Instead of checking out unmerged entries, copy out the files from named "
-"stage. <number> must be between 1 and 3. Note: --stage=all automatically "
-"implies --temp."
+msgid "Instead of checking out unmerged entries, copy out the files from named stage. <number> must be between 1 and 3. Note: --stage=all automatically implies --temp."
msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:57
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--temp"
msgstr "--temp"
#. type: Plain text
#: en/git-checkout-index.txt:61
-msgid ""
-"Instead of copying the files to the working directory write the content to "
-"temporary files. The temporary name associations will be written to stdout."
+msgid "Instead of copying the files to the working directory write the content to temporary files. The temporary name associations will be written to stdout."
msgstr ""
#. type: Plain text
#: 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."
+msgid "Instead of taking list of paths from the command line, read list of paths from the standard input. Paths are separated by LF (i.e. one path per line) by default."
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:70
-msgid ""
-"Only meaningful with `--stdin`; paths are separated with NUL character "
-"instead of LF."
+msgid "Only meaningful with `--stdin`; paths are separated with NUL character instead of LF."
msgstr ""
#. type: Plain text
@@ -19158,18 +15194,12 @@ msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:79
-msgid ""
-"Just doing `git checkout-index` does nothing. You probably meant `git "
-"checkout-index -a`. And if you want to force it, you want `git checkout-"
-"index -f -a`."
+msgid "Just doing `git checkout-index` does nothing. You probably meant `git checkout-index -a`. And if you want to force it, you want `git checkout-index -f -a`."
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:83
-msgid ""
-"Intuitiveness is not the goal here. Repeatability is. The reason for the "
-"\"no arguments means no work\" behavior is that from scripts you are "
-"supposed to be able to do:"
+msgid "Intuitiveness is not the goal here. Repeatability is. The reason for the \"no arguments means no work\" behavior is that from scripts you are supposed to be able to do:"
msgstr ""
#. type: delimited block -
@@ -19180,11 +15210,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:92
-msgid ""
-"which will force all existing `*.h` files to be replaced with their cached "
-"copies. If an empty command line implied \"all\", then this would force-"
-"refresh everything in the index, which was not the point. But since 'git "
-"checkout-index' accepts --stdin it would be faster to use:"
+msgid "which will force all existing `*.h` files to be replaced with their cached copies. If an empty command line implied \"all\", then this would force-refresh everything in the index, which was not the point. But since 'git checkout-index' accepts --stdin it would be faster to use:"
msgstr ""
#. type: delimited block -
@@ -19195,10 +15221,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:100
-msgid ""
-"The `--` is just a good idea when you know the rest will be filenames; it "
-"will prevent problems with a filename of, for example, `-a`. Using `--` is "
-"probably a good policy in scripts."
+msgid "The `--` is just a good idea when you know the rest will be filenames; it will prevent problems with a filename of, for example, `-a`. Using `--` is probably a good policy in scripts."
msgstr ""
#. type: Title -
@@ -19209,19 +15232,12 @@ msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:110
-msgid ""
-"When `--temp` is used (or implied by `--stage=all`) 'git checkout-index' "
-"will create a temporary file for each index entry being checked out. The "
-"index will not be updated with stat information. These options can be "
-"useful if the caller needs all stages of all unmerged entries so that the "
-"unmerged files can be processed by an external merge tool."
+msgid "When `--temp` is used (or implied by `--stage=all`) 'git checkout-index' will create a temporary file for each index entry being checked out. The index will not be updated with stat information. These options can be useful if the caller needs all stages of all unmerged entries so that the unmerged files can be processed by an external merge tool."
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:114
-msgid ""
-"A listing will be written to stdout providing the association of temporary "
-"file names to tracked path names. The listing format has two variations:"
+msgid "A listing will be written to stdout providing the association of temporary file names to tracked path names. The listing format has two variations:"
msgstr ""
#. type: Plain text
@@ -19231,11 +15247,7 @@ 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."
+msgid "The first format is what gets used when `--stage` is omitted or is not `--stage=all`. The field tempname is the temporary file name holding the file content and path is the tracked path name in the index. Only the requested entries are output."
msgstr ""
#. type: Plain text
@@ -19245,31 +15257,17 @@ msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:129
-msgid ""
-"The second format is what gets used when `--stage=all`. The three stage "
-"temporary fields (stage1temp, stage2temp, stage3temp) list the name of the "
-"temporary file if there is a stage entry in the index or `.` if there is no "
-"stage entry. Paths which only have a stage 0 entry will always be omitted "
-"from the output."
+msgid "The second format is what gets used when `--stage=all`. The three stage temporary fields (stage1temp, stage2temp, stage3temp) list the name of the temporary file if there is a stage entry in the index or `.` if there is no stage entry. Paths which only have a stage 0 entry will always be omitted from the output."
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:136
-msgid ""
-"In both formats RS (the record separator) is newline by default but will be "
-"the null byte if -z was passed on the command line. The temporary file "
-"names are always safe strings; they will never contain directory separators "
-"or whitespace characters. The path field is always relative to the current "
-"directory and the temporary file names are always relative to the top level "
-"directory."
+msgid "In both formats RS (the record separator) is newline by default but will be the null byte if -z was passed on the command line. The temporary file names are always safe strings; they will never contain directory separators or whitespace characters. The path field is always relative to the current directory and the temporary file names are always relative to the top level directory."
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:140
-msgid ""
-"If the object being copied out to a temporary file is a symbolic link the "
-"content of the link will be written to a normal file. It is up to the end-"
-"user or the Porcelain to make use of this information."
+msgid "If the object being copied out to a temporary file is a symbolic link the content of the link will be written to a normal file. It is up to the end-user or the Porcelain to make use of this information."
msgstr ""
#. type: Labeled list
@@ -19281,9 +15279,7 @@ 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
@@ -19294,10 +15290,7 @@ 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:"
+msgid "The prefix ability basically makes it trivial to use 'git checkout-index' as an \"export as tree\" function. Just read the desired tree into the index, and do:"
msgstr ""
#. type: delimited block -
@@ -19308,15 +15301,12 @@ msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:161
-msgid ""
-"`git checkout-index` will \"export\" the index into the specified directory."
+msgid "`git checkout-index` will \"export\" the index into the specified directory."
msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:165
-msgid ""
-"The final \"/\" is important. The exported name is literally just prefixed "
-"with the specified string. Contrast this with the following example."
+msgid "The final \"/\" is important. The exported name is literally just prefixed with the specified string. Contrast this with the following example."
msgstr ""
#. type: Labeled list
@@ -19333,23 +15323,19 @@ 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`."
+msgid "This will check out the currently cached copy of `Makefile` into the file `.merged-Makefile`."
msgstr ""
#. type: Title =
#: en/git-checkout.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-checkout(1)"
msgstr "git-checkout(1)"
#. type: Plain text
#: en/git-checkout.txt:7
msgid "git-checkout - Switch branches or restore working tree files"
-msgstr ""
-"git-checkout - Bascule de branches ou restaure des fichiers de l'arbre de "
-"travail"
+msgstr "git-checkout - Bascule de branches ou restaure des fichiers de l'arbre de travail"
#. type: Plain text
#: en/git-checkout.txt:17
@@ -19371,15 +15357,8 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:24
-msgid ""
-"Updates files in the working tree to match the version in the index or the "
-"specified tree. If no paths are given, 'git checkout' will also update "
-"`HEAD` to set the specified branch as the current branch."
-msgstr ""
-"Met 횪 jour les fichiers dans l'arbre de travail pour correspondre 횪 la "
-"version dans l'index ou dans l'arbre sp챕cifi챕. Si aucun chemin n'est fourni,"
-" 'git checkout' met aussi 횪 jour `HEAD`pour positionner la branche specifi챕e"
-" comme la branche actuelle."
+msgid "Updates files in the working tree to match the version in the index or the specified tree. If no paths are given, 'git checkout' will also update `HEAD` to set the specified branch as the current branch."
+msgstr "Met 횪 jour les fichiers dans l'arbre de travail pour correspondre 횪 la version dans l'index ou dans l'arbre sp챕cifi챕. Si aucun chemin n'est fourni, 'git checkout' met aussi 횪 jour `HEAD`pour positionner la branche specifi챕e comme la branche actuelle."
#. type: Labeled list
#: en/git-checkout.txt:25
@@ -19389,27 +15368,13 @@ msgstr "'git checkout' <branche>"
#. type: Plain text
#: en/git-checkout.txt:31
-msgid ""
-"To prepare for working on <branch>, switch to it by updating the index and "
-"the files in the working tree, and by pointing HEAD at the branch. Local "
-"modifications to the files in the working tree are kept, so that they can be"
-" committed to the <branch>."
-msgstr ""
-"Pour se pr챕parer 횪 travailler sur <branche>, basculer dessus en mettant "
-"l'index et les fichiers de l'arbre de travail 횪 jour, et en pointant HEAD "
-"sur cette branche. Les modifications locales aux fichiers de l'arbre de "
-"travail sont conserv챕es, de sorte qu'elles peuvent 챗tre valid챕es sur la "
-"<branche>."
+msgid "To prepare for working on <branch>, switch to it by updating the index and the files in the working tree, and by pointing HEAD at the branch. Local modifications to the files in the working tree are kept, so that they can be committed to the <branch>."
+msgstr "Pour se pr챕parer 횪 travailler sur <branche>, basculer dessus en mettant l'index et les fichiers de l'arbre de travail 횪 jour, et en pointant HEAD sur cette branche. Les modifications locales aux fichiers de l'arbre de travail sont conserv챕es, de sorte qu'elles peuvent 챗tre valid챕es sur la <branche>."
#. type: Plain text
#: en/git-checkout.txt:35
-msgid ""
-"If <branch> is not found but there does exist a tracking branch in exactly "
-"one remote (call it <remote>) with a matching name, treat as equivalent to"
-msgstr ""
-"Si la <branche> a 챕t챕 trouv챕e mais qu'il n'existe pas de branche de suivi "
-"pour un d챕p척t distant unique (appel챕 <distant>) avec un nom identique, le "
-"traiter comme 챕quivalent 횪"
+msgid "If <branch> is not found but there does exist a tracking branch in exactly one remote (call it <remote>) with a matching name, treat as equivalent to"
+msgstr "Si la <branche> a 챕t챕 trouv챕e mais qu'il n'existe pas de branche de suivi pour un d챕p척t distant unique (appel챕 <distant>) avec un nom identique, le traiter comme 챕quivalent 횪"
#. type: delimited block -
#: en/git-checkout.txt:38
@@ -19419,16 +15384,8 @@ msgstr "$ git checkout -b <branche> --track <distant>/<branche>\n"
#. type: Plain text
#: 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 "
-"current branch."
-msgstr ""
-"Vous pourriez omettre <branche>, auquel cas le commande a une forme "
-"d챕g챕n챕r챕e 짬 extraire la branche actuelle혻쨩, qui est une op챕ration nulle de "
-"luxe avec un effet de bord plut척t cher de ne montrer que l'information de "
-"suivi, si elle existe, pour la branche actuelle."
+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 current branch."
+msgstr "Vous pourriez omettre <branche>, auquel cas le commande a une forme d챕g챕n챕r챕e 짬 extraire la branche actuelle혻쨩, qui est une op챕ration nulle de luxe avec un effet de bord plut척t cher de ne montrer que l'information de suivi, si elle existe, pour la branche actuelle."
#. type: Labeled list
#: en/git-checkout.txt:45
@@ -19438,27 +15395,13 @@ msgstr "'git checkout' -b|-B <nouvelle_branche> [<point_de_d챕part>]"
#. type: Plain text
#: 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 "
-"description of `--track` below."
-msgstr ""
-"Sp챕cifier `-b` provoque la cr챕ation d'une nouvelle branche comme si "
-"linkgit:git-branch[1] 챕tait lanc챕 puis la branche extraite. Dans ce cas, "
-"vous pouvez utiliser les options `--track` ou `--no-track`, qui seront "
-"pass챕es 횪 'git branch'. Pour plus de confort, `--track` sans `-b` implique "
-"la cr챕ation d'une branche혻; voir la description de `--track` ci-dessous."
+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 description of `--track` below."
+msgstr "Sp챕cifier `-b` provoque la cr챕ation d'une nouvelle branche comme si linkgit:git-branch[1] 챕tait lanc챕 puis la branche extraite. Dans ce cas, vous pouvez utiliser les options `--track` ou `--no-track`, qui seront pass챕es 횪 'git branch'. Pour plus de confort, `--track` sans `-b` implique la cr챕ation d'une branche혻; voir la description de `--track` ci-dessous."
#. 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"
-msgstr ""
-"Si `-B` est fourni, <nouvelle_branche> est cr챕챕e si elle n'existe pas혻; "
-"sinon, elle est r챕initialis챕e. C'est l'챕quivalent transactionnel de"
+msgid "If `-B` is given, <new_branch> is created if it doesn't exist; otherwise, it is reset. This is the transactional equivalent of"
+msgstr "Si `-B` est fourni, <nouvelle_branche> est cr챕챕e si elle n'existe pas혻; sinon, elle est r챕initialis챕e. C'est l'챕quivalent transactionnel de"
#. type: delimited block -
#: en/git-checkout.txt:60
@@ -19472,12 +15415,8 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:64
-msgid ""
-"that is to say, the branch is not reset/created unless \"git checkout\" is "
-"successful."
-msgstr ""
-"Ce qui veut dire que la branche n'est pas cr챕챕e ou r챕initialis챕e 횪 moins que"
-" 짬혻git checkout혻쨩 soit r챕ussie."
+msgid "that is to say, the branch is not reset/created unless \"git checkout\" is successful."
+msgstr "Ce qui veut dire que la branche n'est pas cr챕챕e ou r챕initialis챕e 횪 moins que 짬혻git checkout혻쨩 soit r챕ussie."
#. type: Labeled list
#: en/git-checkout.txt:65
@@ -19493,29 +15432,13 @@ msgstr "'git checkout' [--detach] <commit>"
#. type: Plain text
#: en/git-checkout.txt:74
-msgid ""
-"Prepare to work on top of <commit>, by detaching HEAD at it (see \"DETACHED "
-"HEAD\" section), and updating the index and the files in the working tree. "
-"Local modifications to the files in the working tree are kept, so that the "
-"resulting working tree will be the state recorded in the commit plus the "
-"local modifications."
-msgstr ""
-"Pr챕pare 횪 travailler par-dessus <commit>, en d챕tachant HEAD dessus (voir la "
-"section 짬혻HEAD D횋TACH횋E혻쨩), et en mettant l'index et les fichiers de l'arbre"
-" de travail 횪 jour. Les modifications locales des fichiers dans l'arbre de "
-"travail sont conserv챕es, de sorte que l'arbre de travail sera le r챕sultat du"
-" commit plus les modifications locales."
+msgid "Prepare to work on top of <commit>, by detaching HEAD at it (see \"DETACHED HEAD\" section), and updating the index and the files in the working tree. Local modifications to the files in the working tree are kept, so that the resulting working tree will be the state recorded in the commit plus the local modifications."
+msgstr "Pr챕pare 횪 travailler par-dessus <commit>, en d챕tachant HEAD dessus (voir la section 짬혻HEAD D횋TACH횋E혻쨩), et en mettant l'index et les fichiers de l'arbre de travail 횪 jour. Les modifications locales des fichiers dans l'arbre de travail sont conserv챕es, de sorte que l'arbre de travail sera le r챕sultat du commit plus les modifications locales."
#. type: Plain text
#: en/git-checkout.txt:78
-msgid ""
-"When the <commit> argument is a branch name, the `--detach` option can be "
-"used to detach HEAD at the tip of the branch (`git checkout <branch>` would "
-"check out that branch without detaching HEAD)."
-msgstr ""
-"Quand l'argument <commit> est un nom de branche, l'option `--detach` peut "
-"챗tre utilis챕e pour d챕tacher HEAD au sommet de la branche (`git checkout "
-"<branche>` extrairait cette branche sans d챕tacher HEAD)."
+msgid "When the <commit> argument is a branch name, the `--detach` option can be used to detach HEAD at the tip of the branch (`git checkout <branch>` would check out that branch without detaching HEAD)."
+msgstr "Quand l'argument <commit> est un nom de branche, l'option `--detach` peut 챗tre utilis챕e pour d챕tacher HEAD au sommet de la branche (`git checkout <branche>` extrairait cette branche sans d챕tacher HEAD)."
#. type: Plain text
#: en/git-checkout.txt:80
@@ -19530,55 +15453,18 @@ msgstr "'git checkout' [-p|--patch] [<arbre-esque>] [--] <sp챕c. de chemin>..."
#. type: Plain text
#: en/git-checkout.txt:91
-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."
-msgstr ""
-"Quand <sp챕c. de chemin> ou `--patch` sont fournis 'git checkout' ne bascule "
-"*pas* de branche. Elle met 횪 jour 횪 jour les chemins nomm챕s dans l'arbre de "
-"travail depuis le fichier d'index ou depuis l'<arbre-esque> nomm챕 (le plus "
-"souvent un <commit>. Dans ce cas, les options `-b` et `--track` ne "
-"signifient rien et les fournir provoque une erreur. L'argument <arbre-esque>"
-" peut servir 횪 sp챕cifier un arbre-esque particulier (c'est-횪-dire un commit,"
-" une 챕tiquette ou un arbre) pour mettre 횪 jour l'index pour les chemins "
-"fournis avant de mettre 횪 jour l'arbre de travail."
+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."
+msgstr "Quand <sp챕c. de chemin> ou `--patch` sont fournis 'git checkout' ne bascule *pas* de branche. Elle met 횪 jour 횪 jour les chemins nomm챕s dans l'arbre de travail depuis le fichier d'index ou depuis l'<arbre-esque> nomm챕 (le plus souvent un <commit>. Dans ce cas, les options `-b` et `--track` ne signifient rien et les fournir provoque une erreur. L'argument <arbre-esque> peut servir 횪 sp챕cifier un arbre-esque particulier (c'est-횪-dire un commit, une 챕tiquette ou un arbre) pour mettre 횪 jour l'index pour les chemins fournis avant de mettre 횪 jour l'arbre de travail."
#. type: Plain text
#: en/git-checkout.txt:95
-msgid ""
-"'git checkout' with <paths> or `--patch` is used to restore modified or "
-"deleted paths to their original contents from the index or replace paths "
-"with the contents from a named <tree-ish> (most often a commit-ish)."
-msgstr ""
-"'git checkout' avec <chemins> ou `--patch` est utilis챕 pour restaurer des "
-"chemins modifi챕s ou supprim챕s 횪 leur contenu d'origine depuis l'index ou "
-"pour remplacer les chemins avec le contenu issu d'un <arbre-esque> nomm챕 (le"
-" plus souvent un <commit-esque>)."
+msgid "'git checkout' with <paths> or `--patch` is used to restore modified or deleted paths to their original contents from the index or replace paths with the contents from a named <tree-ish> (most often a commit-ish)."
+msgstr "'git checkout' avec <chemins> ou `--patch` est utilis챕 pour restaurer des chemins modifi챕s ou supprim챕s 횪 leur contenu d'origine depuis l'index ou pour remplacer les chemins avec le contenu issu d'un <arbre-esque> nomm챕 (le plus souvent un <commit-esque>)."
#. type: Plain text
#: en/git-checkout.txt:103
-msgid ""
-"The index may contain unmerged entries because of a previous failed merge. "
-"By default, if you try to check out such an entry from the index, the "
-"checkout operation will fail and nothing will be checked out. Using `-f` "
-"will ignore these unmerged entries. The contents from a specific side of "
-"the merge can be checked out of the index by using `--ours` or `--theirs`. "
-"With `-m`, changes made to the working tree file can be discarded to re-"
-"create the original conflicted merge result."
-msgstr ""
-"L'index peut contenir des entr챕es non fusionn챕es 횪 cause d'un 챕chec "
-"pr챕c챕dent de fusion. Par d챕faut, si vous essayez d'extraire une telle entr챕e"
-" depuis l'index, l'op챕ration d'extraction 챕chouera et rien ne sera extrait. "
-"L'utilisation de `-f` forcera 횪 ignorer des entr챕es non fusionn챕es. Le "
-"contenu depuis un c척t챕 donn챕 de la fusion peut 챗tre extrait de l'index en "
-"utilisant `--ours` (notre c척t챕) ou `--theirs` (l'autre c척t챕). Avec `-m`, les"
-" modifications op챕r챕es sur le fichier de l'arbre de travail peuvent 챗tre "
-"jet챕es pour r챕cr챕er le r챕sultat originel de conflit de fusion."
+msgid "The index may contain unmerged entries because of a previous failed merge. By default, if you try to check out such an entry from the index, the checkout operation will fail and nothing will be checked out. Using `-f` will ignore these unmerged entries. The contents from a specific side of the merge can be checked out of the index by using `--ours` or `--theirs`. With `-m`, changes made to the working tree file can be discarded to re-create the original conflicted merge result."
+msgstr "L'index peut contenir des entr챕es non fusionn챕es 횪 cause d'un 챕chec pr챕c챕dent de fusion. Par d챕faut, si vous essayez d'extraire une telle entr챕e depuis l'index, l'op챕ration d'extraction 챕chouera et rien ne sera extrait. L'utilisation de `-f` forcera 횪 ignorer des entr챕es non fusionn챕es. Le contenu depuis un c척t챕 donn챕 de la fusion peut 챗tre extrait de l'index en utilisant `--ours` (notre c척t챕) ou `--theirs` (l'autre c척t챕). Avec `-m`, les modifications op챕r챕es sur le fichier de l'arbre de travail peuvent 챗tre jet챕es pour r챕cr챕er le r챕sultat originel de conflit de fusion."
#. type: Plain text
#: en/git-checkout.txt:109
@@ -19587,92 +15473,45 @@ msgstr "Silencieux, supprimer les messages d'챕tat."
#. type: Plain text
#: en/git-checkout.txt:115
-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`."
-msgstr ""
-"L'챕tat d'avancement est affich챕 sur la sortie standard d'erreur par d챕faut "
-"quand elle est attach챕e 횪 un terminal, 횪 moins que `--quiet` ne soit "
-"sp챕cifi챕. Cette bascule active l'챕tat d'avancement m챗me sans 챗tre attach챕 횪 "
-"un terminal, ind챕pendamment de `--quiet`."
+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`."
+msgstr "L'챕tat d'avancement est affich챕 sur la sortie standard d'erreur par d챕faut quand elle est attach챕e 횪 un terminal, 횪 moins que `--quiet` ne soit sp챕cifi챕. Cette bascule active l'챕tat d'avancement m챗me sans 챗tre attach챕 횪 un terminal, ind챕pendamment de `--quiet`."
#. type: Plain text
#: en/git-checkout.txt:121
-msgid ""
-"When switching branches, proceed even if the index or the working tree "
-"differs from HEAD. This is used to throw away local changes."
-msgstr ""
-"Lors du basculement de branche, continuer m챗me si l'index ou l'arbre de "
-"travail sont diff챕rents de HEAD. Ceci peut servir 횪 챕liminer des "
-"modifications locales."
+msgid "When switching branches, proceed even if the index or the working tree differs from HEAD. This is used to throw away local changes."
+msgstr "Lors du basculement de branche, continuer m챗me si l'index ou l'arbre de travail sont diff챕rents de HEAD. Ceci peut servir 횪 챕liminer des modifications locales."
#. type: Plain text
#: en/git-checkout.txt:124
-msgid ""
-"When checking out paths from the index, do not fail upon unmerged entries; "
-"instead, unmerged entries are ignored."
-msgstr ""
-"Lors de l'extraction de chemins depuis l'index, ne pas 챕chouer sur des "
-"entr챕es non fusionn챕es혻; 횪 la place, les entr챕es non fusionn챕es sont "
-"ignor챕es."
+msgid "When checking out paths from the index, do not fail upon unmerged entries; instead, unmerged entries are ignored."
+msgstr "Lors de l'extraction de chemins depuis l'index, ne pas 챕chouer sur des entr챕es non fusionn챕es혻; 횪 la place, les entr챕es non fusionn챕es sont ignor챕es."
#. type: Labeled list
#: en/git-checkout.txt:125 en/git-merge-file.txt:73
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:126 en/git-merge-file.txt:74
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--theirs"
msgstr "--theirs"
#. type: Plain text
#: en/git-checkout.txt:129
-msgid ""
-"When checking out paths from the index, check out stage #2 ('ours') or #3 "
-"('theirs') for unmerged paths."
-msgstr ""
-"Lors de l'extraction de chemins depuis l'index, extraire l'챕tat #2 ('ours', "
-"le n척tre) ou #3 ('theirs', le leur) pour les chemins non fusionn챕s."
+msgid "When checking out paths from the index, check out stage #2 ('ours') or #3 ('theirs') for unmerged paths."
+msgstr "Lors de l'extraction de chemins depuis l'index, extraire l'챕tat #2 ('ours', le n척tre) ou #3 ('theirs', le leur) pour les chemins non fusionn챕s."
#. type: Plain text
#: en/git-checkout.txt:134
-msgid ""
-"Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' "
-"may appear swapped; `--ours` gives the version from the branch the changes "
-"are rebased onto, while `--theirs` gives the version from the branch that "
-"holds your work that is being rebased."
-msgstr ""
-"Veuillez noter que pendant `git rebase` et `git pull --rebase`, `ours` et "
-"`theirs` peuvent sembler 챕chang챕s혻; `--ours` fournit la version depuis la "
-"branche sur laquelle les modifications sont rebas챕es, tandis que `--theirs` "
-"fournit la version de la branche qui contient le travail rebas챕."
+msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped; `--ours` gives the version from the branch the changes are rebased onto, while `--theirs` gives the version from the branch that holds your work that is being rebased."
+msgstr "Veuillez noter que pendant `git rebase` et `git pull --rebase`, `ours` et `theirs` peuvent sembler 챕chang챕s혻; `--ours` fournit la version depuis la branche sur laquelle les modifications sont rebas챕es, tandis que `--theirs` fournit la version de la branche qui contient le travail rebas챕."
#. type: Plain text
#: en/git-checkout.txt:144
-msgid ""
-"This is because `rebase` is used in a workflow that treats the history at "
-"the remote as the shared canonical one, and treats the work done on the "
-"branch you are rebasing as the third-party work to be integrated, and you "
-"are temporarily assuming the role of the keeper of the canonical history "
-"during the rebase. As the keeper of the canonical history, you need to view"
-" the history from the remote as `ours` (i.e. \"our shared canonical "
-"history\"), while what you did on your side branch as `theirs` (i.e. \"one "
-"contributor's work on top of it\")."
-msgstr ""
-"C'est parce que `rebase` est utilis챕 dans une approche qui traite "
-"l'historique distant comme la r챕f챕rence canonique partag챕e, et traite le "
-"travail sur la branche que vous rebasez comme un travail tiers 횪 int챕grer, "
-"et vous assumez temporairement le r척le du gardien de l'historique canonique "
-"quand vous rebasez. En tant que gardien de l'historique canonique, vous "
-"devez voir l'historique distant comme le v척tre ('ours', c'est-횪-dire 짬혻notre"
-" historique partag챕 canonique혻쨩), tandis que votre travail sur l'autre "
-"branche devient le tiers ('theirs', c'est-횪-dire 짬혻le travail d'un "
-"contributeur sur le canonique혻쨩)."
+msgid "This is because `rebase` is used in a workflow that treats the history at the remote as the shared canonical one, and treats the work done on the branch you are rebasing as the third-party work to be integrated, and you are temporarily assuming the role of the keeper of the canonical history during the rebase. As the keeper of the canonical history, you need to view the history from the remote as `ours` (i.e. \"our shared canonical history\"), while what you did on your side branch as `theirs` (i.e. \"one contributor's work on top of it\")."
+msgstr "C'est parce que `rebase` est utilis챕 dans une approche qui traite l'historique distant comme la r챕f챕rence canonique partag챕e, et traite le travail sur la branche que vous rebasez comme un travail tiers 횪 int챕grer, et vous assumez temporairement le r척le du gardien de l'historique canonique quand vous rebasez. En tant que gardien de l'historique canonique, vous devez voir l'historique distant comme le v척tre ('ours', c'est-횪-dire 짬혻notre historique partag챕 canonique혻쨩), tandis que votre travail sur l'autre branche devient le tiers ('theirs', c'est-횪-dire 짬혻le travail d'un contributeur sur le canonique혻쨩)."
#. type: Labeled list
#: en/git-checkout.txt:145
@@ -19682,12 +15521,8 @@ msgstr "-b <nouvelle_branche>"
#. type: Plain text
#: en/git-checkout.txt:148
-msgid ""
-"Create a new branch named <new_branch> and start it at <start_point>; see "
-"linkgit:git-branch[1] for details."
-msgstr ""
-"Cr챕er une nouvelle branche nomm챕e <nouvelle_branche> et la commencer 횪 "
-"<point_de_d챕part>혻; voir linkgit:git-branch[1] pour plus de d챕tails."
+msgid "Create a new branch named <new_branch> and start it at <start_point>; see linkgit:git-branch[1] for details."
+msgstr "Cr챕er une nouvelle branche nomm챕e <nouvelle_branche> et la commencer 횪 <point_de_d챕part>혻; voir linkgit:git-branch[1] pour plus de d챕tails."
#. type: Labeled list
#: en/git-checkout.txt:149
@@ -19697,70 +15532,34 @@ msgstr "-B <nouvelle_branche>"
#. 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."
-msgstr ""
-"Cr챕er la branche <nouvelle_branche> et la commencer 횪 <point_de_d챕part>혻; si"
-" elle existe d챕j횪, alors la r챕initialise 횪 <point_de_d챕part>. C'est "
-"챕quivalent 횪 lancer 'git branch' avec `-f`혻; voir linkgit:git-branch[1] pour"
-" plus de d챕tails."
+msgid "Creates the branch <new_branch> and start it at <start_point>; if it already exists, then reset it to <start_point>. This is equivalent to running \"git branch\" with \"-f\"; see linkgit:git-branch[1] for details."
+msgstr "Cr챕er la branche <nouvelle_branche> et la commencer 횪 <point_de_d챕part>혻; si elle existe d챕j횪, alors la r챕initialise 횪 <point_de_d챕part>. C'est 챕quivalent 횪 lancer 'git branch' avec `-f`혻; voir linkgit:git-branch[1] pour plus de d챕tails."
#. 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."
+msgid "When creating a new branch, set up \"upstream\" configuration. See \"--track\" in linkgit:git-branch[1] for details."
msgstr "� la cr챕ation d'une nouvelle branche, positionner la configuration 'upstream' (branche amont). Voir `--track` dans linkgit:git-branch[1] pour plus de d챕tails."
#. type: Plain text
#: en/git-checkout.txt:169
-msgid ""
-"If no `-b` option is given, the name of the new branch will be derived from "
-"the remote-tracking branch, by looking at the local part of the refspec "
-"configured for the corresponding remote, and then stripping the initial part"
-" up to the \"*\". This would tell us to use \"hack\" as the local branch "
-"when branching off of \"origin/hack\" (or \"remotes/origin/hack\", or even "
-"\"refs/remotes/origin/hack\"). If the given name has no slash, or the above"
-" guessing results in an empty name, the guessing is aborted. You can "
-"explicitly give a name with `-b` in such a case."
-msgstr ""
-"Si aucune option `-b` n'est fournie, le nom de la nouvelle branche sera "
-"d챕riv챕 depuis la branche de suivi 횪 distance, en regardant la partie locale "
-"de la sp챕cification de r챕f챕rence configur챕e pour le distant correspondant et"
-" en 챕lidant la partie initiale jusqu'au \"*\". Cela indiquerait d'utiliser "
-"le nom 짬혻hack혻쨩 comme branche locale cr챕챕e 횪 partir 짬혻origin/hack혻쨩 (ou "
-"짬혻remotes/origin/hack혻쨩, ou m챗me 짬혻refs/remotes/origin/hack혻쨩). Si le nom "
-"fournit ne contient pas de barre oblique, ou si le r챕sultat de la d챕rivation"
-" est un nom vide, la d챕rivation 챕choue. Vous pouvez sp챕cifier explicitement "
-"un nom avec `-b` dans ce cas."
+msgid "If no `-b` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the \"*\". This would tell us to use \"hack\" as the local branch when branching off of \"origin/hack\" (or \"remotes/origin/hack\", or even \"refs/remotes/origin/hack\"). If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted. You can explicitly give a name with `-b` in such a case."
+msgstr "Si aucune option `-b` n'est fournie, le nom de la nouvelle branche sera d챕riv챕 depuis la branche de suivi 횪 distance, en regardant la partie locale de la sp챕cification de r챕f챕rence configur챕e pour le distant correspondant et en 챕lidant la partie initiale jusqu'au \"*\". Cela indiquerait d'utiliser le nom 짬혻hack혻쨩 comme branche locale cr챕챕e 횪 partir 짬혻origin/hack혻쨩 (ou 짬혻remotes/origin/hack혻쨩, ou m챗me 짬혻refs/remotes/origin/hack혻쨩). Si le nom fournit ne contient pas de barre oblique, ou si le r챕sultat de la d챕rivation est un nom vide, la d챕rivation 챕choue. Vous pouvez sp챕cifier explicitement un nom avec `-b` dans ce cas."
#. type: Plain text
#: en/git-checkout.txt:177
msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
-msgstr ""
-"Cr챕er le reflog de la nouvelle branche혻; voir linkgit:git-branch[1] pour "
-"plus de d챕tails."
+msgstr "Cr챕er le reflog de la nouvelle branche혻; voir linkgit:git-branch[1] pour plus de d챕tails."
#. type: Labeled list
#: en/git-checkout.txt:178 en/git-daemon.txt:134 en/git-worktree.txt:100
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--detach"
msgstr "--detach"
#. type: Plain text
#: en/git-checkout.txt:184
-msgid ""
-"Rather than checking out a branch to work on it, check out a commit for "
-"inspection and discardable experiments. This is the default behavior of "
-"\"git checkout <commit>\" when <commit> is not a branch name. See the "
-"\"DETACHED HEAD\" section below for details."
-msgstr ""
-"Plut척t que d'extraire une branche pour travailler dessus, extraire un commit"
-" pour l'inspecter et faire des exp챕riences jetables. C'est le comportement "
-"par d챕faut de 짬혻git checkout <commit>혻쨩 quand <commit> n'est pas un nom de "
-"branche. Voir la section 짬혻HEAD D횋TACH횋E혻쨩 plus bas pour plus de d챕tails."
+msgid "Rather than checking out a branch to work on it, check out a commit for inspection and discardable experiments. This is the default behavior of \"git checkout <commit>\" when <commit> is not a branch name. See the \"DETACHED HEAD\" section below for details."
+msgstr "Plut척t que d'extraire une branche pour travailler dessus, extraire un commit pour l'inspecter et faire des exp챕riences jetables. C'est le comportement par d챕faut de 짬혻git checkout <commit>혻쨩 quand <commit> n'est pas un nom de branche. Voir la section 짬혻HEAD D횋TACH횋E혻쨩 plus bas pour plus de d챕tails."
#. type: Labeled list
#: en/git-checkout.txt:185
@@ -19770,123 +15569,56 @@ msgstr "--orphan <nouvelle_branche>"
#. 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 "
-"parents and it will be the root of a new history totally disconnected from "
-"all the other branches and commits."
-msgstr ""
-"Cr챕er une nouvelle branche 짬혻orpheline혻쨩, nomm챕e <nouvelle_branche>, "
-"commen챌ant depuis <point_de_d챕part> et basculer dessus. Le premier commit "
-"r챕alis챕 sur cette branche n'aura pas de parent et il sera la racine du "
-"nouvel historique totalement d챕connect챕 de toutes les autres branches et des"
-" autres commits."
+msgid "Create a new 'orphan' branch, named <new_branch>, started from <start_point> and switch to it. The first commit made on this new branch will have no parents and it will be the root of a new history totally disconnected from all the other branches and commits."
+msgstr "Cr챕er une nouvelle branche 짬혻orpheline혻쨩, nomm챕e <nouvelle_branche>, commen챌ant depuis <point_de_d챕part> et basculer dessus. Le premier commit r챕alis챕 sur cette branche n'aura pas de parent et il sera la racine du nouvel historique totalement d챕connect챕 de toutes les autres branches et des autres commits."
#. type: Plain text
#: 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 "
-"commit -a\" to make the root commit."
+msgid "The index and the working tree are adjusted as if you had previously run \"git checkout <start_point>\". This allows you to start a new history that records a set of paths similar to <start_point> by easily running \"git commit -a\" to make the root commit."
msgstr "L'index et l'arbre de travail sont ajust챕s comme si vous aviez d챕j횪 lanc챕 짬혻git혻checkout혻<point_de_d챕part>혻쨩. Cela vous permet de d챕marrer un nouvel historique qui enregistre un ensemble de chemins similaires 횪 <point_de_d챕part> en lan챌ant simplement 짬혻git혻commit혻-a혻쨩 pour cr챕er une commit racine."
#. type: Plain text
#: en/git-checkout.txt:202
-msgid ""
-"This can be useful when you want to publish the tree from a commit without "
-"exposing its full history. You might want to do this to publish an open "
-"source branch of a project whose current tree is \"clean\", but whose full "
-"history contains proprietary or otherwise encumbered bits of code."
-msgstr ""
-"Ceci peut 챗tre utile quand vous souhaitez publier un arbre depuis un commit "
-"sans exposer tout son historique. Vous pourriez souhaiter le faire pour "
-"publier un branche open source d'un projet dont l'arbre pr챕sent est "
-"짬혻propre혻쨩, mais dont l'historique complet contient des morceaux de code "
-"propri챕taires ou autrement non publiables."
+msgid "This can be useful when you want to publish the tree from a commit without exposing its full history. You might want to do this to publish an open source branch of a project whose current tree is \"clean\", but whose full history contains proprietary or otherwise encumbered bits of code."
+msgstr "Ceci peut 챗tre utile quand vous souhaitez publier un arbre depuis un commit sans exposer tout son historique. Vous pourriez souhaiter le faire pour publier un branche open source d'un projet dont l'arbre pr챕sent est 짬혻propre혻쨩, mais dont l'historique complet contient des morceaux de code propri챕taires ou autrement non publiables."
#. 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 "
-"the index and the working tree right after creating the orphan branch by "
-"running \"git rm -rf .\" from the top level of the working tree. Afterwards"
-" you will be ready to prepare your new files, repopulating the working tree,"
-" by copying them from elsewhere, extracting a tarball, etc."
-msgstr ""
-"Si vous voulez d챕marrer un historique d챕connect챕 qui enregistre un ensemble "
-"de chemins qui sont totalement diff챕rents de celui de <point_de_d챕part>, "
-"vous devriez effacer l'index et l'arbre de travail juste apr챔s avoir cr챕챕 la"
-" branche orpheline en lan챌ant 짬혻git혻rm혻-rf혻.혻쨩 depuis la racine de l'arbre "
-"de travail. Apr챔s, vous pourrez pr챕parer vos nouveaux fichiers, pour "
-"repeupler l'arbre de travail, en les copiant depuis un autre endroit, en les"
-" extrayant depuis une archive, etc."
+msgid "If you want to start a disconnected history that records a set of paths that is totally different from the one of <start_point>, then you should clear the index and the working tree right after creating the orphan branch by running \"git rm -rf .\" from the top level of the working tree. Afterwards you will be ready to prepare your new files, repopulating the working tree, by copying them from elsewhere, extracting a tarball, etc."
+msgstr "Si vous voulez d챕marrer un historique d챕connect챕 qui enregistre un ensemble de chemins qui sont totalement diff챕rents de celui de <point_de_d챕part>, vous devriez effacer l'index et l'arbre de travail juste apr챔s avoir cr챕챕 la branche orpheline en lan챌ant 짬혻git혻rm혻-rf혻.혻쨩 depuis la racine de l'arbre de travail. Apr챔s, vous pourrez pr챕parer vos nouveaux fichiers, pour repeupler l'arbre de travail, en les copiant depuis un autre endroit, en les extrayant depuis une archive, etc."
#. type: Labeled list
#: en/git-checkout.txt:210
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ignore-skip-worktree-bits"
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. "
-"This option ignores the sparse patterns and adds back any files in <paths>."
-msgstr ""
-"En mode d'extraction clairsem챕, `git혻checkout혻--혻<chemins>` mettrait "
-"seulement 횪 jour les entr챕es correspondant 횪 <chemins> et aux motifs "
-"clairsem챕s dans $GIT_DIR/info/sparse-checkout. Cette option ignore les "
-"motifs clairsem챕s et r챕-ajoute tous les fichiers de <chemins>."
+msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entries matched by <paths> and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and adds back any files in <paths>."
+msgstr "En mode d'extraction clairsem챕, `git혻checkout혻--혻<chemins>` mettrait seulement 횪 jour les entr챕es correspondant 횪 <chemins> et aux motifs clairsem챕s dans $GIT_DIR/info/sparse-checkout. Cette option ignore les motifs clairsem챕s et r챕-ajoute tous les fichiers de <chemins>."
#. 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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--merge"
msgstr "--merge"
#. type: Plain text
#: en/git-checkout.txt:226
-msgid ""
-"When switching branches, if you have local modifications to one or more "
-"files that are different between the current branch and the branch to which "
-"you are switching, the command refuses to switch branches in order to "
-"preserve your modifications in context. However, with this option, a three-"
-"way merge between the current branch, your working tree contents, and the "
-"new branch is done, and you will be on the new branch."
-msgstr ""
-"Lors d'un basculement de branche, si vous avez des modifications locales sur"
-" un fichier ou plus qui sont diff챕rentes entre la branche actuelle et celle "
-"sur laquelle vous basculez, la commande refuse le basculement pour pr챕server"
-" vos modifications dans leur contexte. Cependant, avec cette option, une "
-"fusion 횪 trois points entre la branche actuelle, le contenu de votre arbre "
-"de travail et la nouvelle branche est op챕r챕e et vous serez sur la nouvelle "
-"branche."
+msgid "When switching branches, if you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context. However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch."
+msgstr "Lors d'un basculement de branche, si vous avez des modifications locales sur un fichier ou plus qui sont diff챕rentes entre la branche actuelle et celle sur laquelle vous basculez, la commande refuse le basculement pour pr챕server vos modifications dans leur contexte. Cependant, avec cette option, une fusion 횪 trois points entre la branche actuelle, le contenu de votre arbre de travail et la nouvelle branche est op챕r챕e et vous serez sur la nouvelle branche."
#. type: Plain text
#: en/git-checkout.txt:231
-msgid ""
-"When a merge conflict happens, the index entries for conflicting paths are "
-"left unmerged, and you need to resolve the conflicts and mark the resolved "
-"paths with `git add` (or `git rm` if the merge should result in deletion of "
-"the path)."
-msgstr ""
-"Quand un conflit de fusion appara챤t, les entr챕es d'index pour les chemins en"
-" conflit sont laiss챕es non-fusionn챕es et vous devez r챕soudre les conflits et"
-" les marquer r챕solus pour les chemins concern챕s avec `git add` (ou `git rm` "
-"si la suppression r챕sulte de la fusion du chemin)."
+msgid "When a merge conflict happens, the index entries for conflicting paths are left unmerged, and you need to resolve the conflicts and mark the resolved paths with `git add` (or `git rm` if the merge should result in deletion of the path)."
+msgstr "Quand un conflit de fusion appara챤t, les entr챕es d'index pour les chemins en conflit sont laiss챕es non-fusionn챕es et vous devez r챕soudre les conflits et les marquer r챕solus pour les chemins concern챕s avec `git add` (ou `git rm` si la suppression r챕sulte de la fusion du chemin)."
#. type: Plain text
#: en/git-checkout.txt:234
-msgid ""
-"When checking out paths from the index, this option lets you recreate the "
-"conflicted merge in the specified paths."
-msgstr ""
-"Lors de l'extraction de chemins depuis l'index, cette option vous permet de "
-"r챕cr챕er la fusion en conflit dans les chemins sp챕cifi챕s."
+msgid "When checking out paths from the index, this option lets you recreate the conflicted merge in the specified paths."
+msgstr "Lors de l'extraction de chemins depuis l'index, cette option vous permet de r챕cr챕er la fusion en conflit dans les chemins sp챕cifi챕s."
#. type: Labeled list
#: en/git-checkout.txt:235
@@ -19896,59 +15628,29 @@ msgstr "--conflict=<style>"
#. type: Plain text
#: en/git-checkout.txt:241
-msgid ""
-"The same as --merge option above, but changes the way the conflicting hunks "
-"are presented, overriding the merge.conflictStyle configuration variable. "
-"Possible values are \"merge\" (default) and \"diff3\" (in addition to what "
-"is shown by \"merge\" style, shows the original contents)."
-msgstr ""
-"Identique 횪 l'option `--merge` ci-dessus, mais la mani챔re dont les sections "
-"en conflits sont pr챕sent챕es est modifi챕e, en surchargeant la variable de "
-"configuration merge.conflictStyle. Les valeurs possibles sont `merge` "
-"(fusion, par d챕faut) et `diff3` (en plus de ce qui est affich챕 avec le style"
-" `merge`, affiche aussi le contenu d'origine)."
+msgid "The same as --merge option above, but changes the way the conflicting hunks are presented, overriding the merge.conflictStyle configuration variable. Possible values are \"merge\" (default) and \"diff3\" (in addition to what is shown by \"merge\" style, shows the original contents)."
+msgstr "Identique 횪 l'option `--merge` ci-dessus, mais la mani챔re dont les sections en conflits sont pr챕sent챕es est modifi챕e, en surchargeant la variable de configuration merge.conflictStyle. Les valeurs possibles sont `merge` (fusion, par d챕faut) et `diff3` (en plus de ce qui est affich챕 avec le style `merge`, affiche aussi le contenu d'origine)."
#. type: Plain text
#: en/git-checkout.txt:248
-msgid ""
-"Interactively select hunks in the difference between the <tree-ish> (or the "
-"index, if unspecified) and the working tree. The chosen hunks are then "
-"applied in reverse to the working tree (and if a <tree-ish> was specified, "
-"the index)."
-msgstr ""
-"S챕lectionner interactivement les sections dans la diff챕rence entre l'<arbre-"
-"esque> (ou l'index, si non sp챕cifi챕) et l'arbre de travail. Les sections "
-"choisies sont ensuite appliqu챕es en ordre invers챕 횪 l'arbre de travail (et "
-"si un <arbre-esque> a 챕t챕 sp챕cifi챕, 횪 l'index)."
+msgid "Interactively select hunks in the difference between the <tree-ish> (or the index, if unspecified) and the working tree. The chosen hunks are then applied in reverse to the working tree (and if a <tree-ish> was specified, the index)."
+msgstr "S챕lectionner interactivement les sections dans la diff챕rence entre l'<arbre-esque> (ou l'index, si non sp챕cifi챕) et l'arbre de travail. Les sections choisies sont ensuite appliqu챕es en ordre invers챕 횪 l'arbre de travail (et si un <arbre-esque> a 챕t챕 sp챕cifi챕, 횪 l'index)."
#. type: Plain text
#: en/git-checkout.txt:252
-msgid ""
-"This means that you can use `git checkout -p` to selectively discard edits "
-"from your current working tree. See the ``Interactive Mode'' section of "
-"linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-"Ceci signifie que vous pouvez utiliser `git checkout -p` pour supprimer "
-"s챕lectivement les 챕ditions depuis votre arbre de travail actuel. Voir la "
-"section 짬혻Mode Interactif혻쨩 de linkgit:git-add[1] pour apprendre 횪 utiliser "
-"le mode `--patch`."
+msgid "This means that you can use `git checkout -p` to selectively discard edits from your current working tree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr "Ceci signifie que vous pouvez utiliser `git checkout -p` pour supprimer s챕lectivement les 챕ditions depuis votre arbre de travail actuel. Voir la section 짬혻Mode Interactif혻쨩 de linkgit:git-add[1] pour apprendre 횪 utiliser le mode `--patch`."
#. type: Labeled list
#: en/git-checkout.txt:253
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ignore-other-worktrees"
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."
-msgstr ""
-"`git checkout` 챕choue quand la r챕f챕rence voulue est d챕j횪 extraite dans un "
-"autre arbre de travail. Cette option force l'extraction. En d'autres termes,"
-" la r챕f peut 챗tre tenue par plus d'un arbre de travail."
+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."
+msgstr "`git checkout` 챕choue quand la r챕f챕rence voulue est d챕j횪 extraite dans un autre arbre de travail. Cette option force l'extraction. En d'autres termes, la r챕f peut 챗tre tenue par plus d'un arbre de travail."
#. type: Labeled list
#: en/git-checkout.txt:259 en/git-rebase.txt:242
@@ -19958,40 +15660,18 @@ msgstr "<branche>"
#. type: Plain text
#: 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)."
-msgstr ""
-"Branche 횪 extraire혻; si c'est une r챕f챕rence 횪 une branche (c'est-횪-dire un "
-"nom qui, pr챕fix챕 par 짬혻refs/heads/혻쨩 est une r챕f챕rence valide), alors cette "
-"branche est extraite. Sinon, si c'est une r챕f챕rence 횪 un commit valide, "
-"votre HEAD devient 짬혻d챕tache챕혻쨩 et vous n'챗tes plus sur aucune branche (voir"
-" plus bas pour plus de d챕tails)."
+msgid "Branch to checkout; if it refers to a branch (i.e., a name that, when prepended with \"refs/heads/\", is a valid ref), then that branch is checked out. Otherwise, if it refers to a valid commit, your HEAD becomes \"detached\" and you are no longer on any branch (see below for details)."
+msgstr "Branche 횪 extraire혻; si c'est une r챕f챕rence 횪 une branche (c'est-횪-dire un nom qui, pr챕fix챕 par 짬혻refs/heads/혻쨩 est une r챕f챕rence valide), alors cette branche est extraite. Sinon, si c'est une r챕f챕rence 횪 un commit valide, votre HEAD devient 짬혻d챕tache챕혻쨩 et vous n'챗tes plus sur aucune branche (voir plus bas pour plus de d챕tails)."
#. type: Plain text
#: en/git-checkout.txt:269
-msgid ""
-"As a special case, the `\"@{-N}\"` syntax for the N-th last branch/commit "
-"checks out branches (instead of detaching). You may also specify `-` which "
-"is synonymous with `\"@{-1}\"`."
-msgstr ""
-"Cas sp챕cial, la syntaxe `\"@{-N}\"` pour la N-i챔me derni챔re branche ou "
-"commit extrait les branches (au lieu de les d챕tacher). Vous pouvez aussi "
-"sp챕cifier `-` qui est synonyme de `\"@{-1}\"`."
+msgid "As a special case, the `\"@{-N}\"` syntax for the N-th last branch/commit checks out branches (instead of detaching). You may also specify `-` which is synonymous with `\"@{-1}\"`."
+msgstr "Cas sp챕cial, la syntaxe `\"@{-N}\"` pour la N-i챔me derni챔re branche ou commit extrait les branches (au lieu de les d챕tacher). Vous pouvez aussi sp챕cifier `-` qui est synonyme de `\"@{-1}\"`."
#. type: Plain text
#: en/git-checkout.txt:273
-msgid ""
-"As a further special case, you may use `\"A...B\"` as a shortcut for the "
-"merge base of `A` and `B` if there is exactly one merge base. You can leave "
-"out at most one of `A` and `B`, in which case it defaults to `HEAD`."
-msgstr ""
-"Autre cas sp챕cial, vous pouvez utiliser 짬혻A...B혻쨩 comme raccourci pour la "
-"base de fusion de `A` et `B` s'il y a exactement une seule base de fusion. "
-"Vous pouvez ne pas sp챕cifier `A` ou `B`, auquel cas ce sera `HEAD` par "
-"d챕faut."
+msgid "As a further special case, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
+msgstr "Autre cas sp챕cial, vous pouvez utiliser 짬혻A...B혻쨩 comme raccourci pour la base de fusion de `A` et `B` s'il y a exactement une seule base de fusion. Vous pouvez ne pas sp챕cifier `A` ou `B`, auquel cas ce sera `HEAD` par d챕faut."
#. type: Labeled list
#: en/git-checkout.txt:274
@@ -20012,21 +15692,13 @@ msgstr "<point_de_d챕part>"
#. type: Plain text
#: en/git-checkout.txt:280
-msgid ""
-"The name of a commit at which to start the new branch; see linkgit:git-"
-"branch[1] for details. Defaults to HEAD."
-msgstr ""
-"Le nom du commit auquel d챕marrer la nouvelle branche혻; voir linkgit:git-"
-"branch[1] pour plus de d챕tails. HEAD par d챕faut."
+msgid "The name of a commit at which to start the new branch; see linkgit:git-branch[1] for details. Defaults to HEAD."
+msgstr "Le nom du commit auquel d챕marrer la nouvelle branche혻; voir linkgit:git-branch[1] pour plus de d챕tails. HEAD par d챕faut."
#. type: Plain text
#: en/git-checkout.txt:284
-msgid ""
-"Tree to checkout from (when paths are given). If not specified, the index "
-"will be used."
-msgstr ""
-"Arbre depuis lequel extraire (quand des chemins sont indiqu챕s). Si non "
-"sp챕cifi챕, l'index est utilis챕."
+msgid "Tree to checkout from (when paths are given). If not specified, the index will be used."
+msgstr "Arbre depuis lequel extraire (quand des chemins sont indiqu챕s). Si non sp챕cifi챕, l'index est utilis챕."
#. type: Title -
#: en/git-checkout.txt:288
@@ -20036,15 +15708,8 @@ msgstr "HEAD D횋TACH횋E"
#. type: Plain text
#: 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:"
-msgstr ""
-"HEAD fait normalement r챕f챕rence 횪 une branche nomm챕e (par exemple, "
-"'master'). Dans le m챗me temps, chaque branche pointe sur un commit "
-"sp챕cifique. Regardons un d챕p척t avec trois commits, tous 챕tiquet챕s et avec "
-"une branche extraite혻:"
+msgid "HEAD normally refers to a named branch (e.g. 'master'). Meanwhile, each branch refers to a specific commit. Let's look at a repo with three commits, one of them tagged, and with branch 'master' checked out:"
+msgstr "HEAD fait normalement r챕f챕rence 횪 une branche nomm챕e (par exemple, 'master'). Dans le m챗me temps, chaque branche pointe sur un commit sp챕cifique. Regardons un d챕p척t avec trois commits, tous 챕tiquet챕s et avec une branche extraite혻:"
#. type: delimited block -
#: en/git-checkout.txt:301
@@ -20068,19 +15733,8 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:308
-msgid ""
-"When a commit is created in this state, the branch is updated to refer to "
-"the new commit. Specifically, 'git commit' creates a new commit 'd', whose "
-"parent is commit 'c', and then updates branch 'master' to refer to new "
-"commit 'd'. HEAD still refers to branch 'master' and so indirectly now "
-"refers to commit 'd':"
-msgstr ""
-"Quand un commit est cr챕챕 dans cet 챕tat, la branche est mise 횪 jour pour "
-"faire r챕f챕rence 횪 un nouveau commit. Sp챕cifiquement, 'git commit' cr챕e un "
-"nouveau commit 'd', dont le parent est le commit 'c', et ainsi elle met 횪 "
-"jour la branche 'master' pour faire r챕f챕rence au nouveau commit 'd'. HEAD "
-"fait toujours r챕f챕rence 횪 la branche 'master' et donc indirectement "
-"maintenant fait r챕f챕rence au commit 'd'혻:"
+msgid "When a commit is created in this state, the branch is updated to refer to the new commit. Specifically, 'git commit' creates a new commit 'd', whose parent is commit 'c', and then updates branch 'master' to refer to new commit 'd'. HEAD still refers to branch 'master' and so indirectly now refers to commit 'd':"
+msgstr "Quand un commit est cr챕챕 dans cet 챕tat, la branche est mise 횪 jour pour faire r챕f챕rence 횪 un nouveau commit. Sp챕cifiquement, 'git commit' cr챕e un nouveau commit 'd', dont le parent est le commit 'c', et ainsi elle met 횪 jour la branche 'master' pour faire r챕f챕rence au nouveau commit 'd'. HEAD fait toujours r챕f챕rence 횪 la branche 'master' et donc indirectement maintenant fait r챕f챕rence au commit 'd'혻:"
#. type: delimited block -
#: en/git-checkout.txt:311 en/git-checkout.txt:346 en/git-checkout.txt:363
@@ -20110,16 +15764,8 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:325
-msgid ""
-"It is sometimes useful to be able to checkout a commit that is not at the "
-"tip of any named branch, or even to create a new commit that is not "
-"referenced by a named branch. Let's look at what happens when we checkout "
-"commit 'b' (here we show two ways this may be done):"
-msgstr ""
-"Il est utile quelquefois de permettre d'extraire un commit qui n'est sommet "
-"d'aucune branche ou m챗me de cr챕er un nouveau commit qui n'est pas r챕f챕renc챕 "
-"par une branche nomm챕e. Regardons ce qui arrive quand on extrait le commit "
-"'b' (ici, deux mani챔res sont montr챕es)혻:"
+msgid "It is sometimes useful to be able to checkout a commit that is not at the tip of any named branch, or even to create a new commit that is not referenced by a named branch. Let's look at what happens when we checkout commit 'b' (here we show two ways this may be done):"
+msgstr "Il est utile quelquefois de permettre d'extraire un commit qui n'est sommet d'aucune branche ou m챗me de cr챕er un nouveau commit qui n'est pas r챕f챕renc챕 par une branche nomm챕e. Regardons ce qui arrive quand on extrait le commit 'b' (ici, deux mani챔res sont montr챕es)혻:"
#. type: delimited block -
#: en/git-checkout.txt:329
@@ -20153,17 +15799,8 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:343
-msgid ""
-"Notice that regardless of which checkout command we use, HEAD now refers "
-"directly to commit 'b'. This is known as being in detached HEAD state. It "
-"means simply that HEAD refers to a specific commit, as opposed to referring "
-"to a named branch. Let's see what happens when we create a commit:"
-msgstr ""
-"Veuillez noter que quelle que soit la commande d'extraction utilis챕e, HEAD "
-"pointe maintenant directement sur le commit 'b'. C'est connu comme un 챕tat "
-"de HEAD d챕tach챕e. Ceci signifie simplement que HEAD fait r챕f챕rence 횪 un "
-"commit sp챕cifique, par opposition 횪 une r챕f챕rence 횪 une branche nomm챕e. "
-"Voyons ce qui arrive quand un commit est cr챕챕혻:"
+msgid "Notice that regardless of which checkout command we use, HEAD now refers directly to commit 'b'. This is known as being in detached HEAD state. It means simply that HEAD refers to a specific commit, as opposed to referring to a named branch. Let's see what happens when we create a commit:"
+msgstr "Veuillez noter que quelle que soit la commande d'extraction utilis챕e, HEAD pointe maintenant directement sur le commit 'b'. C'est connu comme un 챕tat de HEAD d챕tach챕e. Ceci signifie simplement que HEAD fait r챕f챕rence 횪 un commit sp챕cifique, par opposition 횪 une r챕f챕rence 횪 une branche nomm챕e. Voyons ce qui arrive quand un commit est cr챕챕혻:"
#. type: delimited block -
#: en/git-checkout.txt:356
@@ -20191,12 +15828,8 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:360
-msgid ""
-"There is now a new commit 'e', but it is referenced only by HEAD. We can of "
-"course add yet another commit in this state:"
-msgstr ""
-"Il y a maintenant un nouveau commit 'e' mais il est r챕f챕renc챕 seulement par "
-"HEAD. Un autre commit peut bien sur 챗tre ajout챕 dans cet 챕tat혻:"
+msgid "There is now a new commit 'e', but it is referenced only by HEAD. We can of course add yet another commit in this state:"
+msgstr "Il y a maintenant un nouveau commit 'e' mais il est r챕f챕renc챕 seulement par HEAD. Un autre commit peut bien sur 챗tre ajout챕 dans cet 챕tat혻:"
#. type: delimited block -
#: en/git-checkout.txt:373
@@ -20224,12 +15857,8 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:377
-msgid ""
-"In fact, we can perform all the normal Git operations. But, let's look at "
-"what happens when we then checkout master:"
-msgstr ""
-"En fait, toutes les op챕rations normales de Git peuvent 챗tre ex챕cut챕es. Mais,"
-" regardons ce qui arrive quand master est extraite :"
+msgid "In fact, we can perform all the normal Git operations. But, let's look at what happens when we then checkout master:"
+msgstr "En fait, toutes les op챕rations normales de Git peuvent 챗tre ex챕cut챕es. Mais, regardons ce qui arrive quand master est extraite :"
#. type: delimited block -
#: en/git-checkout.txt:380
@@ -20259,19 +15888,8 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:395
-msgid ""
-"It is important to realize that at this point nothing refers to commit 'f'. "
-"Eventually commit 'f' (and by extension commit 'e') will be deleted by the "
-"routine Git garbage collection process, unless we create a reference before "
-"that happens. If we have not yet moved away from commit 'f', any of these "
-"will create a reference to it:"
-msgstr ""
-"Il est important de r챕aliser qu'횪 ce moment, rien ne fait r챕f챕rence au "
-"commit 'f'. � un moment ult챕rieur, le commit 'f' (et par extension le commit"
-" 'e') sera supprim챕 par le processus de ramasse-miette r챕gulier de Git, 횪 "
-"moins de cr챕er une r챕f챕rence avant que cela n'arrive. Si vous n'avez pas "
-"encore quitt챕 le commit 'f', une des commandes suivantes permet de cr챕er une"
-" r챕f챕rence sur lui혻:"
+msgid "It is important to realize that at this point nothing refers to commit 'f'. Eventually commit 'f' (and by extension commit 'e') will be deleted by the routine Git garbage collection process, unless we create a reference before that happens. If we have not yet moved away from commit 'f', any of these will create a reference to it:"
+msgstr "Il est important de r챕aliser qu'횪 ce moment, rien ne fait r챕f챕rence au commit 'f'. � un moment ult챕rieur, le commit 'f' (et par extension le commit 'e') sera supprim챕 par le processus de ramasse-miette r챕gulier de Git, 횪 moins de cr챕er une r챕f챕rence avant que cela n'arrive. Si vous n'avez pas encore quitt챕 le commit 'f', une des commandes suivantes permet de cr챕er une r챕f챕rence sur lui혻:"
#. type: delimited block -
#: en/git-checkout.txt:400
@@ -20287,45 +15905,23 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:405
-msgid ""
-"creates a new branch 'foo', which refers to commit 'f', and then updates "
-"HEAD to refer to branch 'foo'. In other words, we'll no longer be in "
-"detached HEAD state after this command."
-msgstr ""
-"cr챕e une nouvelle branche 'foo' qui fait r챕f챕rence au commit 'f', puis met 횪"
-" jour HEAD pour faire r챕f챕rence 횪 la branche 'foo'. En d'autres termes, "
-"l'챕tat ne sera plus en HEAD d챕tach챕e apr챔s cette commande."
+msgid "creates a new branch 'foo', which refers to commit 'f', and then updates HEAD to refer to branch 'foo'. In other words, we'll no longer be in detached HEAD state after this command."
+msgstr "cr챕e une nouvelle branche 'foo' qui fait r챕f챕rence au commit 'f', puis met 횪 jour HEAD pour faire r챕f챕rence 횪 la branche 'foo'. En d'autres termes, l'챕tat ne sera plus en HEAD d챕tach챕e apr챔s cette commande."
#. type: Plain text
#: en/git-checkout.txt:408
-msgid ""
-"similarly creates a new branch 'foo', which refers to commit 'f', but leaves"
-" HEAD detached."
-msgstr ""
-"cr챕e aussi une nouvelle branche 'foo' qui fait r챕f챕rence au commit 'f' mais "
-"laisse la t챗te d챕tach챕e."
+msgid "similarly creates a new branch 'foo', which refers to commit 'f', but leaves HEAD detached."
+msgstr "cr챕e aussi une nouvelle branche 'foo' qui fait r챕f챕rence au commit 'f' mais laisse la t챗te d챕tach챕e."
#. type: Plain text
#: en/git-checkout.txt:411
-msgid ""
-"creates a new tag 'foo', which refers to commit 'f', leaving HEAD detached."
-msgstr ""
-"Cr챕e une nouvelle 챕tiquette 'foo' qui fait r챕f챕rence au commit 'f', en "
-"laissant HEAD d챕tach챕e."
+msgid "creates a new tag 'foo', which refers to commit 'f', leaving HEAD detached."
+msgstr "Cr챕e une nouvelle 챕tiquette 'foo' qui fait r챕f챕rence au commit 'f', en laissant HEAD d챕tach챕e."
#. 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:"
-msgstr ""
-"Si nous ne sommes plus sur 'f', alors nous devons d챕j횪 retrouver son nom "
-"d'objet (typiquement en utilisant git reflog), puis nous pouvons cr챕er une "
-"r챕f챕rence dessus. Par exemple, pour voir les deux derniers commits sur "
-"lesquels HEAD pointait, nous pouvons utiliser une des deux commandes "
-"suivantes혻:"
+msgid "If we have moved away from commit 'f', then we must first recover its object name (typically by using git reflog), and then we can create a reference to it. For example, to see the last two commits to which HEAD referred, we can use either of these commands:"
+msgstr "Si nous ne sommes plus sur 'f', alors nous devons d챕j횪 retrouver son nom d'objet (typiquement en utilisant git reflog), puis nous pouvons cr챕er une r챕f챕rence dessus. Par exemple, pour voir les deux derniers commits sur lesquels HEAD pointait, nous pouvons utiliser une des deux commandes suivantes혻:"
#. type: delimited block -
#: en/git-checkout.txt:420
@@ -20345,33 +15941,12 @@ msgstr "D횋SAMBIGU횕SATION D'ARGUMENT"
#. type: Plain text
#: en/git-checkout.txt:433
-msgid ""
-"When there is only one argument given and it is not `--` (e.g. \"git "
-"checkout abc\"), and when the argument is both a valid `<tree-ish>` (e.g. a "
-"branch \"abc\" exists) and a valid `<pathspec>` (e.g. a file or a directory "
-"whose name is \"abc\" exists), Git would usually ask you to disambiguate. "
-"Because checking out a branch is so common an operation, however, \"git "
-"checkout abc\" takes \"abc\" as a `<tree-ish>` in such a situation. Use "
-"`git checkout -- <pathspec>` if you want to checkout these paths out of the "
-"index."
-msgstr ""
-"Quand il n'y a qu'un argument et qu'il n'est pas `--` (par exemple 짬혻git "
-"checkout abc혻쨩) et quand l'argument fourni est 횪 la fois un `<arbre-esque>` "
-"valide (par exemple une branche 짬혻abc혻쨩 existe) et un "
-"<sp챕cificateur_de_chemin> valide (par exemple un fichier ou un r챕pertoire du"
-" nom de 짬혻abc혻쨩 existe), Git vous demandera g챕n챕ralement de lever "
-"l'ambig체it챕. Du fait qu'extraire une branche est une op챕ration tr챔s commune,"
-" cependant, 짬혻git checkout abc혻쨩 consid챔re 짬혻abc혻쨩 comme un <arbre-esque> "
-"dans une telle situation. Utilisez `git checkout -- "
-"<sp챕cificateur_de_chemin>` si vous voulez extraire ces chemins depuis "
-"l'index."
+msgid "When there is only one argument given and it is not `--` (e.g. \"git checkout abc\"), and when the argument is both a valid `<tree-ish>` (e.g. a branch \"abc\" exists) and a valid `<pathspec>` (e.g. a file or a directory whose name is \"abc\" exists), Git would usually ask you to disambiguate. Because checking out a branch is so common an operation, however, \"git checkout abc\" takes \"abc\" as a `<tree-ish>` in such a situation. Use `git checkout -- <pathspec>` if you want to checkout these paths out of the index."
+msgstr "Quand il n'y a qu'un argument et qu'il n'est pas `--` (par exemple 짬혻git checkout abc혻쨩) et quand l'argument fourni est 횪 la fois un `<arbre-esque>` valide (par exemple une branche 짬혻abc혻쨩 existe) et un <sp챕cificateur_de_chemin> valide (par exemple un fichier ou un r챕pertoire du nom de 짬혻abc혻쨩 existe), Git vous demandera g챕n챕ralement de lever l'ambig체it챕. Du fait qu'extraire une branche est une op챕ration tr챔s commune, cependant, 짬혻git checkout abc혻쨩 consid챔re 짬혻abc혻쨩 comme un <arbre-esque> dans une telle situation. Utilisez `git checkout -- <sp챕cificateur_de_chemin>` si vous voulez extraire ces chemins depuis l'index."
#. type: Plain text
#: en/git-checkout.txt:440
-msgid ""
-"The following sequence checks out the `master` branch, reverts the "
-"`Makefile` to two revisions back, deletes hello.c by mistake, and gets it "
-"back from the index."
+msgid "The following sequence checks out the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr "La s챕quence suivante extrait la branche `master`, ram챔ne le fichier `Makefile` 횪 deux r챕visions en arri챔re, supprime hello.c par erreur et le r챕cup챔re de l'index."
#. type: delimited block -
@@ -20405,11 +15980,8 @@ msgstr "restaure hello.c depuis l'index"
#. type: Plain text
#: en/git-checkout.txt:454
-msgid ""
-"If you want to check out _all_ C source files out of the index, you can say"
-msgstr ""
-"Si vous souhaitez extraire _tous_ les fichiers source C de l'index, vous "
-"pouvez lancer"
+msgid "If you want to check out _all_ C source files out of the index, you can say"
+msgstr "Si vous souhaitez extraire _tous_ les fichiers source C de l'index, vous pouvez lancer"
#. type: delimited block -
#: en/git-checkout.txt:457
@@ -20419,27 +15991,13 @@ msgstr "$ git checkout -- '*.c'\n"
#. type: Plain text
#: en/git-checkout.txt:463
-msgid ""
-"Note the quotes around `*.c`. The file `hello.c` will also be checked out, "
-"even though it is no longer in the working tree, because the file globbing "
-"is used to match entries in the index (not in the working tree by the "
-"shell)."
-msgstr ""
-"Notez les guillemets autour de `*.c`. Le fichier `hello.c` sera aussi "
-"extrait, m챗me s'il n'est plus dans l'arbre de travail, parce que le patron "
-"de fichier est utilis챕 pour trouver les entr챕es dans l'index (et non dans "
-"l'arbre de travail par le shell)."
+msgid "Note the quotes around `*.c`. The file `hello.c` will also be checked out, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
+msgstr "Notez les guillemets autour de `*.c`. Le fichier `hello.c` sera aussi extrait, m챗me s'il n'est plus dans l'arbre de travail, parce que le patron de fichier est utilis챕 pour trouver les entr챕es dans l'index (et non dans l'arbre de travail par le shell)."
#. type: Plain text
#: en/git-checkout.txt:467
-msgid ""
-"If you have an unfortunate branch that is named `hello.c`, this step would "
-"be confused as an instruction to switch to that branch. You should instead "
-"write:"
-msgstr ""
-"Si vous avez une branche qui s'appelle malheureusement `hello.c`, cette "
-"챕tape pourrait 챗tre confondue avec une instruction de basculer sur cette "
-"branche. Vous devriez alors plut척t 챕crire혻:"
+msgid "If you have an unfortunate branch that is named `hello.c`, this step would be confused as an instruction to switch to that branch. You should instead write:"
+msgstr "Si vous avez une branche qui s'appelle malheureusement `hello.c`, cette 챕tape pourrait 챗tre confondue avec une instruction de basculer sur cette branche. Vous devriez alors plut척t 챕crire혻:"
#. type: delimited block -
#: en/git-checkout.txt:470
@@ -20449,12 +16007,8 @@ msgstr "$ git checkout -- hello.c\n"
#. type: Plain text
#: en/git-checkout.txt:474
-msgid ""
-"After working in the wrong branch, switching to the correct branch would be "
-"done using:"
-msgstr ""
-"Apr챔s avoir travaill챕 dans la mauvaise branche, basculer sur la branche "
-"correcte serait r챕alis챕 par혻:"
+msgid "After working in the wrong branch, switching to the correct branch would be done using:"
+msgstr "Apr챔s avoir travaill챕 dans la mauvaise branche, basculer sur la branche correcte serait r챕alis챕 par혻:"
#. type: delimited block -
#: en/git-checkout.txt:477
@@ -20464,14 +16018,8 @@ msgstr "$ git checkout monsujet\n"
#. type: Plain text
#: 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:"
-msgstr ""
-"Cependant, votre branche 짬혻fausse혻쨩 et votre branche correcte 짬혻monsujet혻쨩 "
-"peuvent 챗tre diff챕rentes par les fichiers que vous avez modifi챕s localement,"
-" auquel cas l'extraction ci-dessus 챕chouerait comme ceci혻:"
+msgid "However, your \"wrong\" branch and correct \"mytopic\" branch may differ in files that you have modified locally, in which case the above checkout would fail like this:"
+msgstr "Cependant, votre branche 짬혻fausse혻쨩 et votre branche correcte 짬혻monsujet혻쨩 peuvent 챗tre diff챕rentes par les fichiers que vous avez modifi챕s localement, auquel cas l'extraction ci-dessus 챕chouerait comme ceci혻:"
#. type: delimited block -
#: en/git-checkout.txt:486
@@ -20485,12 +16033,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:"
-msgstr ""
-"Vous pouvez fournir l'option `-m` 횪 la commande, ce qui essaierait une "
-"fusion 횪 trois points혻:"
+msgid "You can give the `-m` flag to the command, which would try a three-way merge:"
+msgstr "Vous pouvez fournir l'option `-m` 횪 la commande, ce qui essaierait une fusion 횪 trois points혻:"
#. type: delimited block -
#: en/git-checkout.txt:494
@@ -20504,23 +16048,13 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:499
-msgid ""
-"After this three-way merge, the local modifications are _not_ registered in "
-"your index file, so `git diff` would show you what changes you made since "
-"the tip of the new branch."
-msgstr ""
-"Apr챔s cette fusion 횪 trois points, les modifications locales ne sont _pas_ "
-"enregistr챕es dans votre index, donc `git diff` vous montrerait ce qui a "
-"chang챕 depuis le sommet de la nouvelle branche."
+msgid "After this three-way merge, the local modifications are _not_ registered in your index file, so `git diff` would show you what changes you made since the tip of the new branch."
+msgstr "Apr챔s cette fusion 횪 trois points, les modifications locales ne sont _pas_ enregistr챕es dans votre index, donc `git diff` vous montrerait ce qui a chang챕 depuis le sommet de la nouvelle branche."
#. type: Plain text
#: en/git-checkout.txt:502
-msgid ""
-"When a merge conflict happens during switching branches with the `-m` "
-"option, you would see something like this:"
-msgstr ""
-"Quand un conflit de fusion arrive pendant une basculement de branche avec "
-"l'option `-m`, vous devriez voir quelque chose comme혻:"
+msgid "When a merge conflict happens during switching branches with the `-m` option, you would see something like this:"
+msgstr "Quand un conflit de fusion arrive pendant une basculement de branche avec l'option `-m`, vous devriez voir quelque chose comme혻:"
#. type: delimited block -
#: en/git-checkout.txt:508
@@ -20538,15 +16072,8 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:514
-msgid ""
-"At this point, `git diff` shows the changes cleanly merged as in the "
-"previous example, as well as the changes in the conflicted files. Edit and "
-"resolve the conflict and mark it resolved with `git add` as usual:"
-msgstr ""
-"� ce niveau, `git diff` affiche les modifications proprement fusionn챕es "
-"comme dans l'exemple pr챕c챕dent, ainsi que les modifications en conflit. "
-"횋ditez et r챕solvez le conflit et marquez-le r챕solu avec `git add` comme "
-"d'habitude혻:"
+msgid "At this point, `git diff` shows the changes cleanly merged as in the previous example, as well as the changes in the conflicted files. Edit and resolve the conflict and mark it resolved with `git add` as usual:"
+msgstr "� ce niveau, `git diff` affiche les modifications proprement fusionn챕es comme dans l'exemple pr챕c챕dent, ainsi que les modifications en conflit. 횋ditez et r챕solvez le conflit et marquez-le r챕solu avec `git add` comme d'habitude혻:"
#. type: delimited block -
#: en/git-checkout.txt:518
@@ -20560,7 +16087,7 @@ msgstr ""
#. type: Title =
#: en/git-check-ref-format.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-check-ref-format(1)"
msgstr "git-check-ref-format(1)"
@@ -20581,19 +16108,12 @@ msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:20
-msgid ""
-"Checks if a given 'refname' is acceptable, and exits with a non-zero status "
-"if it is not."
+msgid "Checks if a given 'refname' is acceptable, and exits with a non-zero status if it is not."
msgstr ""
#. type: Plain text
#: 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`)."
+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`)."
msgstr ""
#. type: Plain text
@@ -20603,18 +16123,12 @@ msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:33
-msgid ""
-"They can include slash `/` for hierarchical (directory) grouping, but no "
-"slash-separated component can begin with a dot `.` or end with the sequence "
-"`.lock`."
+msgid "They can include slash `/` for hierarchical (directory) grouping, but no slash-separated component can begin with a dot `.` or end with the sequence `.lock`."
msgstr ""
#. 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."
+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."
msgstr ""
#. type: Plain text
@@ -20624,25 +16138,17 @@ 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 `:` "
-"anywhere."
+msgid "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 ""
#. type: Plain text
#: 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."
+msgid "They cannot have question-mark `?`, asterisk `*`, or open bracket `[` anywhere. See the `--refspec-pattern` option below for an exception to this rule."
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:52
-msgid ""
-"They cannot begin or end with a slash `/` or contain multiple consecutive "
-"slashes (see the `--normalize` option below for an exception to this rule)"
+msgid "They cannot begin or end with a slash `/` or contain multiple consecutive slashes (see the `--normalize` option below for an exception to this rule)"
msgstr ""
#. type: Plain text
@@ -20667,34 +16173,22 @@ msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:65
-msgid ""
-"These rules make it easy for shell script based tools to parse reference "
-"names, pathname expansion by the shell when a reference name is used "
-"unquoted (by mistake), and also avoid ambiguities in certain reference name "
-"expressions (see linkgit:gitrevisions[7]):"
+msgid "These rules make it easy for shell script based tools to parse reference names, pathname expansion by the shell when a reference name is used unquoted (by mistake), and also avoid ambiguities in certain reference name expressions (see linkgit:gitrevisions[7]):"
msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:69
-msgid ""
-"A double-dot `..` is often used as in `ref1..ref2`, and in some contexts "
-"this notation means `^ref1 ref2` (i.e. not in `ref1` and in `ref2`)."
+msgid "A double-dot `..` is often used as in `ref1..ref2`, and in some contexts this notation means `^ref1 ref2` (i.e. not in `ref1` and in `ref2`)."
msgstr ""
#. 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."
+msgid "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 "
-"select a specific object such as with 'git cat-file': \"git cat-file blob "
-"v1.3.3:refs.c\"."
+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 select a specific object such as with 'git cat-file': \"git cat-file blob v1.3.3:refs.c\"."
msgstr ""
#. type: Plain text
@@ -20704,56 +16198,40 @@ 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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:88
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]allow-onelevel"
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-"
-"onelevel`."
+msgid "Controls whether one-level refnames are accepted (i.e., refnames that do not contain multiple `/`-separated components). The default is `--no-allow-onelevel`."
msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:93
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--refspec-pattern"
msgstr "--refspec-pattern"
#. type: Plain text
#: en/git-check-ref-format.txt:99
-msgid ""
-"Interpret <refname> as a reference name pattern for a refspec (as used with "
-"remote repositories). If this option is enabled, <refname> is allowed to "
-"contain a single `*` in the refspec (e.g., `foo/bar*/baz` or `foo/bar*baz/` "
-"but not `foo/bar*/baz*`)."
+msgid "Interpret <refname> as a reference name pattern for a refspec (as used with remote repositories). If this option is enabled, <refname> is allowed to contain a single `*` in the refspec (e.g., `foo/bar*/baz` or `foo/bar*baz/` but not `foo/bar*/baz*`)."
msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:100
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--normalize"
msgstr "--normalize"
#. type: Plain text
#: en/git-check-ref-format.txt:107
-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`.)"
+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`.)"
msgstr ""
#. type: Plain text
@@ -20782,14 +16260,13 @@ msgstr ""
#. type: Title =
#: en/git-cherry-pick.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-cherry-pick(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
@@ -20805,10 +16282,7 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:23
-msgid ""
-"Given one or more existing commits, apply the change each one introduces, "
-"recording a new commit for each. This requires your working tree to be "
-"clean (no modifications from the HEAD commit)."
+msgid "Given one or more existing commits, apply the change each one introduces, recording a new commit for each. This requires your working tree to be clean (no modifications from the HEAD commit)."
msgstr ""
#. type: Plain text
@@ -20818,32 +16292,22 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:29
-msgid ""
-"The current branch and `HEAD` pointer stay at the last commit successfully "
-"made."
+msgid "The current branch and `HEAD` pointer stay at the last commit successfully made."
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."
+msgid "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."
+msgid "Paths in which the change applied cleanly are updated both in the index file and in your working tree."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:38
-msgid ""
-"For conflicting paths, the index file records up to three versions, as "
-"described in the \"TRUE MERGE\" section of linkgit:git-merge[1]. The "
-"working tree files will include a description of the conflict bracketed by "
-"the usual conflict markers `<<<<<<<` and `>>>>>>>`."
+msgid "For conflicting paths, the index file records up to three versions, as described in the \"TRUE MERGE\" section of linkgit:git-merge[1]. The working tree files will include a description of the conflict bracketed by the usual conflict markers `<<<<<<<` and `>>>>>>>`."
msgstr ""
#. type: Plain text
@@ -20865,48 +16329,28 @@ msgstr "<commit>..."
#. type: Plain text
#: 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')."
+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')."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:59
-msgid ""
-"With this option, 'git cherry-pick' will let you edit the commit message "
-"prior to committing."
+msgid "With this option, 'git cherry-pick' will let you edit the commit message prior to committing."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:60 en/git-clean.txt:62
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-x"
msgstr "-x"
#. type: Plain text
#: en/git-cherry-pick.txt:73
-msgid ""
-"When recording the commit, append a line that says \"(cherry picked from "
-"commit ...)\" to the original commit message in order to indicate which "
-"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 "
-"older release from a development branch), adding this information can be "
-"useful."
+msgid "When recording the commit, append a line that says \"(cherry picked from commit ...)\" to the original commit message in order to indicate which 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 older release from a development branch), adding this information can be useful."
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."
+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."
msgstr ""
#. type: Labeled list
@@ -20923,104 +16367,72 @@ 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 "
-"parent number (starting from 1) of the mainline and allows cherry-pick to "
-"replay the change relative to the specified parent."
+msgid "Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified parent."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:88 en/git-revert.txt:70 en/merge-options.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-commit"
msgstr "--no-commit"
#. type: Plain text
#: en/git-cherry-pick.txt:96
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:99
-msgid ""
-"This is useful when cherry-picking more than one commits' effect to your "
-"index in a row."
+msgid "This is useful when cherry-picking more than one commits' effect to your index in a row."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:104 en/git-revert.txt:93
-msgid ""
-"Add Signed-off-by line at the end of the commit message. See the signoff "
-"option in linkgit:git-commit[1] for more information."
+msgid "Add Signed-off-by line at the end of the commit message. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:111 en/merge-options.txt:30
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ff"
msgstr "--ff"
#. type: Plain text
#: en/git-cherry-pick.txt:115
-msgid ""
-"If the current HEAD is the same as the parent of the cherry-pick'ed commit, "
-"then a fast forward to this commit will be performed."
+msgid "If the current HEAD is the same as the parent of the cherry-pick'ed commit, then a fast forward to this commit will be performed."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:116 en/git-commit.txt:173 en/git-notes.txt:158
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--allow-empty"
msgstr "--allow-empty"
#. type: Plain text
#: en/git-cherry-pick.txt:128
-msgid ""
-"By default, cherry-picking an empty commit will fail, indicating that an "
-"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`."
+msgid "By default, cherry-picking an empty commit will fail, indicating that an 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`."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:129 en/git-commit.txt:179
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
#. type: Plain text
#: en/git-cherry-pick.txt:133
-msgid ""
-"By default, cherry-picking a commit with an empty message will fail. This "
-"option overrides that behavior, allowing commits with empty messages to be "
-"cherry picked."
+msgid "By default, cherry-picking a commit with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be cherry picked."
msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:134
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--keep-redundant-commits"
msgstr "--keep-redundant-commits"
#. type: Plain text
#: en/git-cherry-pick.txt:140
-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`."
+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`."
msgstr ""
#. type: Labeled list
@@ -21032,9 +16444,7 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:145 en/git-revert.txt:98
-msgid ""
-"Use the given merge strategy. Should only be used once. See the MERGE "
-"STRATEGIES section in linkgit:git-merge[1] for details."
+msgid "Use the given merge strategy. Should only be used once. See the MERGE STRATEGIES section in linkgit:git-merge[1] for details."
msgstr ""
#. type: Labeled list
@@ -21052,9 +16462,7 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:150 en/git-revert.txt:103
-msgid ""
-"Pass the merge strategy-specific option through to the merge strategy. See "
-"linkgit:git-merge[1] for details."
+msgid "Pass the merge strategy-specific option through to the merge strategy. See linkgit:git-merge[1] for details."
msgstr ""
#. type: Title -
@@ -21071,9 +16479,7 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:161
-msgid ""
-"Apply the change introduced by the commit at the tip of the master branch "
-"and create a new commit with this change."
+msgid "Apply the change introduced by the commit at the tip of the master branch and create a new commit with this change."
msgstr ""
#. type: Labeled list
@@ -21090,9 +16496,7 @@ 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."
+msgid "Apply the changes introduced by all commits that are ancestors of master but not of HEAD to produce new commits."
msgstr ""
#. type: Labeled list
@@ -21109,11 +16513,7 @@ msgstr ""
#. type: Plain text
#: 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, "
-"`maint` will not be used if it is included in `master`."
+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, `maint` will not be used if it is included in `master`."
msgstr ""
#. type: Labeled list
@@ -21124,9 +16524,7 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:182
-msgid ""
-"Apply the changes introduced by the fifth and third last commits pointed to "
-"by master and create 2 new commits with these changes."
+msgid "Apply the changes introduced by the fifth and third last commits pointed to by master and create 2 new commits with these changes."
msgstr ""
#. type: Labeled list
@@ -21137,10 +16535,7 @@ 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."
+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."
msgstr ""
#. type: Labeled list
@@ -21151,11 +16546,7 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:197
-msgid ""
-"If history is linear and HEAD is an ancestor of next, update the working "
-"tree and advance the HEAD pointer to match next. Otherwise, apply the "
-"changes introduced by those commits that are in next but not HEAD to the "
-"current branch, creating a new commit for each new change."
+msgid "If history is linear and HEAD is an ancestor of next, update the working tree and advance the HEAD pointer to match next. Otherwise, apply the changes introduced by those commits that are in next but not HEAD to the current branch, creating a new commit for each new change."
msgstr ""
#. type: Labeled list
@@ -21166,18 +16557,12 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:208
-msgid ""
-"The following sequence attempts to backport a patch, bails out because the "
-"code the patch applies to has changed too much, and then tries again, this "
-"time exercising more care about matching up context lines."
+msgid "The following sequence attempts to backport a patch, bails out because the code the patch applies to has changed too much, and then tries again, this time exercising more care about matching up context lines."
msgstr ""
#. type: delimited block -
@@ -21192,10 +16577,7 @@ 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 "
-"written to the index and working tree and no new commit results."
+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 written to the index and working tree and no new commit results."
msgstr ""
#. type: Plain text
@@ -21205,21 +16587,17 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:223
-msgid ""
-"cancel the cherry-pick. In other words, return to the pre-cherry-pick "
-"state, preserving any local modifications you had in the working tree."
+msgid "cancel the cherry-pick. In other words, return to the pre-cherry-pick state, preserving any local modifications you had in the working tree."
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."
+msgid "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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-cherry(1)"
msgstr "git-cherry(1)"
@@ -21236,26 +16614,17 @@ msgstr ""
#. type: Plain text
#: en/git-cherry.txt:17
-msgid ""
-"Determine whether there are commits in `<head>..<upstream>` that are "
-"equivalent to those in the range `<limit>..<head>`."
+msgid "Determine whether there are commits in `<head>..<upstream>` that are equivalent to those in the range `<limit>..<head>`."
msgstr ""
#. type: Plain text
#: 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]."
+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]."
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 "
-"not."
+msgid "Outputs the SHA1 of every commit in `<limit>..<head>`, prefixed with `-` for commits that have an equivalent in <upstream>, and `+` for commits that do not."
msgstr ""
#. type: Plain text
@@ -21271,9 +16640,7 @@ msgstr ""
#. type: Plain text
#: en/git-cherry.txt:35
-msgid ""
-"Upstream branch to search for equivalent commits. Defaults to the upstream "
-"branch of HEAD."
+msgid "Upstream branch to search for equivalent commits. Defaults to the upstream branch of HEAD."
msgstr ""
#. type: Labeled list
@@ -21300,11 +16667,7 @@ 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:"
+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:"
msgstr ""
#. type: delimited block -
@@ -21319,9 +16682,7 @@ msgstr ""
#. type: Plain text
#: en/git-cherry.txt:62
-msgid ""
-"Later, you can see whether your changes have been applied by saying (still "
-"on `topic`):"
+msgid "Later, you can see whether your changes have been applied by saying (still on `topic`):"
msgstr ""
#. type: delimited block -
@@ -21340,9 +16701,7 @@ msgstr ""
#. type: Plain text
#: en/git-cherry.txt:73
-msgid ""
-"In a situation where topic consisted of three commits, and the maintainer "
-"applied two of them, the situation might look like:"
+msgid "In a situation where topic consisted of three commits, and the maintainer applied two of them, the situation might look like:"
msgstr ""
#. type: delimited block -
@@ -21364,9 +16723,7 @@ msgstr ""
#. type: Plain text
#: en/git-cherry.txt:90
-msgid ""
-"In such cases, git-cherry shows a concise summary of what has yet to be "
-"applied:"
+msgid "In such cases, git-cherry shows a concise summary of what has yet to be applied:"
msgstr ""
#. type: delimited block -
@@ -21381,11 +16738,7 @@ msgstr ""
#. type: Plain text
#: en/git-cherry.txt:102
-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`."
+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`."
msgstr ""
#. type: Title ~
@@ -21396,10 +16749,7 @@ msgstr ""
#. type: Plain text
#: 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:"
+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:"
msgstr ""
#. type: delimited block -
@@ -21424,9 +16774,7 @@ msgstr ""
#. type: Plain text
#: en/git-cherry.txt:130
-msgid ""
-"By specifying `base` as the limit, you can avoid listing commits between "
-"`base` and `topic`:"
+msgid "By specifying `base` as the limit, you can avoid listing commits between `base` and `topic`:"
msgstr ""
#. type: delimited block -
@@ -21441,7 +16789,7 @@ msgstr ""
#. type: Title =
#: en/git-citool.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-citool(1)"
msgstr "git-citool(1)"
@@ -21458,90 +16806,61 @@ 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."
+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."
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."
+msgid "'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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-clean(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;"
+#| msgid "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 "
-"de l'index, encore une fois, avant d'utiliser la commande 'commit',"
+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',"
#. 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
#: en/git-clean.txt:18
-msgid ""
-"Cleans the working tree by recursively removing files that are not under "
-"version control, starting from the current directory."
+msgid "Cleans the working tree by recursively removing files that are not under version control, starting from the current directory."
msgstr ""
#. type: Plain text
#: en/git-clean.txt:22
-msgid ""
-"Normally, only files unknown to Git are removed, but if the `-x` option is "
-"specified, ignored files are also removed. This can, for example, be useful "
-"to remove all build products."
+msgid "Normally, only files unknown to Git are removed, but if the `-x` option is specified, ignored files are also removed. This can, for example, be useful to remove all build products."
msgstr ""
#. type: Plain text
#: en/git-clean.txt:25
-msgid ""
-"If any optional `<path>...` arguments are given, only those paths are "
-"affected."
+msgid "If any optional `<path>...` arguments are given, only those paths are affected."
msgstr ""
#. type: Plain text
#: en/git-clean.txt:33
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-clean.txt:41
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-clean.txt:46
-msgid ""
-"Show what would be done and clean files interactively. See ``Interactive "
-"mode'' for details."
+msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details."
msgstr ""
#. type: Plain text
@@ -21561,9 +16880,7 @@ msgstr ""
#. type: Plain text
#: en/git-clean.txt:55
-msgid ""
-"Be quiet, only report errors, but not the files that are successfully "
-"removed."
+msgid "Be quiet, only report errors, but not the files that are successfully removed."
msgstr ""
#. type: Labeled list
@@ -21580,20 +16897,12 @@ 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."
+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."
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` "
-"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."
+msgid "Don't use the standard ignore rules read from .gitignore (per directory) and $GIT_DIR/info/exclude, but do still use the ignore rules given with `-e` options. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git reset') to create a pristine working directory to test a clean build."
msgstr ""
#. type: Labeled list
@@ -21604,23 +16913,15 @@ msgstr ""
#. type: Plain text
#: en/git-clean.txt:73
-msgid ""
-"Remove only files ignored by Git. This may be useful to rebuild everything "
-"from scratch, but keep manually created files."
+msgid "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files."
msgstr ""
#. type: Plain text
#: en/git-clean.txt:79
#, fuzzy
-#| msgid ""
-#| "When the command enters the interactive mode, it shows the output of the "
-#| "'status' subcommand, and then goes into its interactive command loop."
-msgid ""
-"When the command enters the interactive mode, it shows the files and "
-"directories to be cleaned, and goes into its interactive command loop."
-msgstr ""
-"Quand la commande entre en mode interactif, elle affiche le r챕sultat de la "
-"sous-commande 'status', puis entre en boucle de commande interactive."
+#| msgid "When the command enters the interactive mode, it shows the output of the 'status' subcommand, and then goes into its interactive command loop."
+msgid "When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop."
+msgstr "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: delimited block -
#: en/git-clean.txt:90
@@ -21644,23 +16945,16 @@ msgstr ""
#. 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."
-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."
+#| msgid "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))."
+msgstr "La boucle de commande principale propose 6 sous-commandes (plus help (aide) et quit (quitter))."
#. type: Labeled list
#: en/git-clean.txt:96
@@ -21681,12 +16975,7 @@ msgstr ""
#. type: Plain text
#: en/git-clean.txt:108
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -21698,30 +16987,9 @@ 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."
-msgid ""
-"This shows the files and directories to be deleted and issues an \"Select "
-"items to delete>>\" prompt. When the prompt ends with double '>>' like this,"
-" you can make more than one selection, concatenated with whitespace or "
-"comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 "
-"from the list. If the second number in a range is omitted, all remaining "
-"items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say"
-" '*' to choose everything. Also when you are satisfied with the filtered "
-"result, press ENTER (empty) back to the main menu."
-msgstr ""
-"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 "
-"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."
+#| 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."
+msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
+msgstr "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 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: Labeled list
#: en/git-clean.txt:121
@@ -21731,10 +16999,7 @@ 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 "
-"actions."
+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 actions."
msgstr ""
#. type: Labeled list
@@ -21766,7 +17031,7 @@ msgstr ""
#. type: Title =
#: en/git-clone.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-clone(1)"
msgstr "git-clone(1)"
@@ -21790,91 +17055,58 @@ msgstr ""
#. type: Plain text
#: 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 "
-"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 cloned repository's currently active branch."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:34
-msgid ""
-"After the clone, a plain `git fetch` without arguments will update all the "
-"remote-tracking branches, and a `git pull` without arguments will in "
-"addition merge the remote master branch into the current master branch, if "
-"any (this is untrue when \"--single-branch\" is given; see below)."
+msgid "After the clone, a plain `git fetch` without arguments will update all the remote-tracking branches, and a `git pull` without arguments will in addition merge the remote master branch into the current master branch, if any (this is untrue when \"--single-branch\" is given; see below)."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:39
#, fuzzy
-#| msgid ""
-#| "The default can be changed by the `commit.cleanup` configuration variable "
-#| "(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."
-msgstr ""
-"La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration "
-"`commit.cleanup` (voir linkgit:git-config[1])."
+#| msgid "The default can be changed by the `commit.cleanup` configuration variable (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."
+msgstr "La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration `commit.cleanup` (voir linkgit:git-config[1])."
#. type: Labeled list
#: en/git-clone.txt:43 en/git-config.txt:127 en/git-instaweb.txt:24
#: en/git-pack-objects.txt:127 en/git-svn.txt:229
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--local"
msgstr "--local"
#. type: Plain text
#: en/git-clone.txt:51
-msgid ""
-"When the repository to clone from is on a local machine, this flag bypasses "
-"the normal \"Git aware\" transport mechanism and clones the repository by "
-"making a copy of HEAD and everything under objects and refs directories. "
-"The files under `.git/objects/` directory are hardlinked to save space when "
-"possible."
+msgid "When the repository to clone from is on a local machine, this flag bypasses the normal \"Git aware\" transport mechanism and clones the repository by making a copy of HEAD and everything under objects and refs directories. The files under `.git/objects/` directory are hardlinked to save space when possible."
msgstr ""
#. 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 "
-"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."
+msgid "If the repository is specified as a local path (e.g., `/path/to/repo`), this is the default, and --local is essentially a no-op. If the repository is specified as a URL, then this flag is ignored (and we never use the local optimizations). Specifying `--no-local` will override the default when `/path/to/repo` is given, using the regular Git transport instead."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:59
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-hardlinks"
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."
+msgid "Force the cloning process from a repository on a local filesystem to copy the files under the `.git/objects` directory instead of using hardlinks. This may be desirable if you are trying to make a back-up of your repository."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:65
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--shared"
msgstr "--shared"
#. type: Plain text
#: en/git-clone.txt:72
-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."
+msgid "When the repository to clone is on the local machine, instead of using hard links, automatically setup `.git/objects/info/alternates` to share the objects with the source repository. The resulting repository starts out without any object of its own."
msgstr ""
#. type: Plain text
@@ -21894,19 +17126,12 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:92
-msgid ""
-"If you want to break the dependency of a repository cloned with `-s` on its "
-"source repository, you can simply run `git repack -a` to copy all objects "
-"from the source repository into a pack in the cloned repository."
+msgid "If you want to break the dependency of a repository cloned with `-s` on its source repository, you can simply run `git repack -a` to copy all objects from the source repository into a pack in the cloned repository."
msgstr ""
#. type: Labeled list
@@ -21917,14 +17142,7 @@ 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 "
-"repository. Using an already existing repository as an alternate will "
-"require fewer objects to be copied from the repository being cloned, "
-"reducing network and local storage costs. When using the `--reference-if-"
-"able`, a non existing directory is skipped with a warning instead of "
-"aborting the clone."
+msgid "If the reference repository is on the local machine, automatically setup `.git/objects/info/alternates` to obtain objects from the reference repository. Using an already existing repository as an alternate will require fewer objects to be copied from the repository being cloned, reducing network and local storage costs. When using the `--reference-if-able`, a non existing directory is skipped with a warning instead of aborting the clone."
msgstr ""
#. type: Plain text
@@ -21937,33 +17155,23 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:107
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--dissociate"
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 "
-"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."
+msgid "Borrow the objects from reference repositories specified with the `--reference` options only to reduce network transfer, and stop borrowing from them after a clone is made by making necessary local copies of borrowed objects. This option can also be used when cloning locally from a repository that already borrows objects from another repository--the new repository will borrow objects from the same repository, and this option can be used to stop the borrowing."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:122
-msgid ""
-"Operate quietly. Progress is not reported to the standard error stream."
+msgid "Operate quietly. Progress is not reported to the standard error stream."
msgstr ""
#. type: Plain text
#: en/git-clone.txt:127
-msgid ""
-"Run verbosely. Does not affect the reporting of progress status to the "
-"standard error stream."
+msgid "Run verbosely. Does not affect the reporting of progress status to the standard error stream."
msgstr ""
#. type: Plain text
@@ -21973,38 +17181,24 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:138 en/git-init.txt:48 en/git-p4.txt:268 en/git.txt:624
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--bare"
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 "
-"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 the remote are copied directly to corresponding local branch heads, without mapping them to `refs/remotes/origin/`. When this option is used, neither remote-tracking branches nor the related configuration variables are created."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:150 en/git-push.txt:106
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--mirror"
msgstr "--mirror"
#. type: Plain text
#: en/git-clone.txt:157
-msgid ""
-"Set up a mirror of the source repository. This implies `--bare`. Compared "
-"to `--bare`, `--mirror` not only maps local branches of the source to local "
-"branches of the target, it maps all refs (including remote-tracking "
-"branches, notes etc.) and sets up a refspec configuration such that all "
-"these refs are overwritten by a `git remote update` in the target "
-"repository."
+msgid "Set up a mirror of the source repository. This implies `--bare`. Compared to `--bare`, `--mirror` not only maps local branches of the source to local branches of the target, it maps all refs (including remote-tracking branches, notes etc.) and sets up a refspec configuration such that all these refs are overwritten by a `git remote update` in the target repository."
msgstr ""
#. type: Labeled list
@@ -22021,9 +17215,7 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:162
-msgid ""
-"Instead of using the remote name `origin` to keep track of the upstream "
-"repository, use `<name>`."
+msgid "Instead of using the remote name `origin` to keep track of the upstream repository, use `<name>`."
msgstr ""
#. type: Labeled list
@@ -22041,12 +17233,7 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:171
-msgid ""
-"Instead of pointing the newly created HEAD to the branch pointed to by the "
-"cloned repository's HEAD, point to `<name>` branch instead. In a non-bare "
-"repository, this is the branch that will be checked out. `--branch` can "
-"also take tags and detaches the HEAD at that commit in the resulting "
-"repository."
+msgid "Instead of pointing the newly created HEAD to the branch pointed to by the cloned repository's HEAD, point to `<name>` branch instead. In a non-bare repository, this is the branch that will be checked out. `--branch` can also take tags and detaches the HEAD at that commit in the resulting repository."
msgstr ""
#. type: Labeled list
@@ -22058,9 +17245,7 @@ msgstr "git-add(1)"
#. type: Plain text
#: en/git-clone.txt:177
-msgid ""
-"When given, and the repository to clone from is accessed via ssh, this "
-"specifies a non-default path for the command run on the other end."
+msgid "When given, and the repository to clone from is accessed via ssh, this specifies a non-default path for the command run on the other end."
msgstr ""
#. type: Labeled list
@@ -22071,9 +17256,7 @@ 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].)"
+msgid "Specify the directory from which templates will be used; (See the \"TEMPLATE DIRECTORY\" section of linkgit:git-init[1].)"
msgstr ""
#. type: Labeled list
@@ -22090,14 +17273,7 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:192
-msgid ""
-"Set a configuration variable in the newly-created repository; this takes "
-"effect immediately after the repository is initialized, but before the "
-"remote history is fetched or any files checked out. The key is in the same "
-"format as expected by linkgit:git-config[1] (e.g., `core.eol=true`). If "
-"multiple values are given for the same key, each value will be written to "
-"the config file. This makes it safe, for example, to add additional fetch "
-"refspecs to the origin remote."
+msgid "Set a configuration variable in the newly-created repository; this takes effect immediately after the repository is initialized, but before the remote history is fetched or any files checked out. The key is in the same format as expected by linkgit:git-config[1] (e.g., `core.eol=true`). If multiple values are given for the same key, each value will be written to the config file. This makes it safe, for example, to add additional fetch refspecs to the origin remote."
msgstr ""
#. type: Labeled list
@@ -22108,11 +17284,7 @@ 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 "
-"fetch the histories near the tips of all branches. If you want to clone "
-"submodules shallowly, also pass `--shallow-submodules`."
+msgid "Create a 'shallow' clone with a history truncated to the specified number of commits. Implies `--single-branch` unless `--no-single-branch` is given to fetch the histories near the tips of all branches. If you want to clone submodules shallowly, also pass `--shallow-submodules`."
msgstr ""
#. type: Plain text
@@ -22122,54 +17294,40 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "Create a shallow clone with a history, excluding commits reachable from a specified remote branch or tag. This option can be specified multiple times."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:208
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
#. type: Plain text
#: en/git-clone.txt:217
-msgid ""
-"Clone only the history leading to the tip of a single branch, either "
-"specified by the `--branch` option or the primary branch remote's `HEAD` "
-"points at. Further fetches into the resulting repository will only update "
-"the remote-tracking branch for the branch this option was used for the "
-"initial cloning. If the HEAD at the remote did not point at any branch when"
-" `--single-branch` clone was made, no remote-tracking branch is created."
+msgid "Clone only the history leading to the tip of a single branch, either specified by the `--branch` option or the primary branch remote's `HEAD` points at. Further fetches into the resulting repository will only update the remote-tracking branch for the branch this option was used for the initial cloning. If the HEAD at the remote did not point at any branch when `--single-branch` clone was made, no remote-tracking branch is created."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:218 en/git-submodule.txt:400
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--recursive"
msgstr "--recursive"
#. type: Labeled list
#: en/git-clone.txt:219 en/git-grep.txt:92 en/git-ls-files.txt:142
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--recurse-submodules"
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)"
+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)"
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:227
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]shallow-submodules"
msgstr "--[no-]shallow-submodules"
@@ -22186,11 +17344,7 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:236
-msgid ""
-"Instead of placing the cloned repository where it is supposed to be, place "
-"the cloned repository at the specified directory, then make a filesystem-"
-"agnostic Git symbolic link to there. The result is Git repository can be "
-"separated from working tree."
+msgid "Instead of placing the cloned repository where it is supposed to be, place the cloned repository at the specified directory, then make a filesystem-agnostic Git symbolic link to there. The result is Git repository can be separated from working tree."
msgstr ""
#. type: Labeled list
@@ -22207,9 +17361,7 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:241
-msgid ""
-"The number of submodules fetched at the same time. Defaults to the "
-"`submodule.fetchJobs` option."
+msgid "The number of submodules fetched at the same time. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. type: Labeled list
@@ -22221,9 +17373,7 @@ msgstr ""
#. 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."
+msgid "The (possibly remote) repository to clone from. See the <<URLS,URLS>> section below for more information on specifying repositories."
msgstr ""
#. type: Labeled list
@@ -22236,11 +17386,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"existing directory is only allowed if the directory is empty."
+msgid "The name of a new directory to clone into. The \"humanish\" part of the source repository is used if no directory is explicitly given (`repo` for `/path/to/repo.git` and `foo` for `host.xz:foo/.git`). Cloning into an existing directory is only allowed if the directory is empty."
msgstr ""
#. type: Plain text
@@ -22259,9 +17405,7 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:270
-msgid ""
-"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:"
msgstr ""
#. type: delimited block -
@@ -22301,7 +17445,7 @@ msgstr ""
#. type: Title =
#: en/git-column.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-column(1)"
msgstr "git-column(1)"
@@ -22331,9 +17475,7 @@ msgstr ""
#. type: Plain text
#: en/git-column.txt:23
-msgid ""
-"Look up layout mode using configuration variable column.<name> and "
-"column.ui."
+msgid "Look up layout mode using configuration variable column.<name> and column.ui."
msgstr ""
#. type: Labeled list
@@ -22344,8 +17486,7 @@ msgstr ""
#. type: Plain text
#: en/git-column.txt:27
-msgid ""
-"Specify layout mode. See configuration variable column.ui for option syntax."
+msgid "Specify layout mode. See configuration variable column.ui for option syntax."
msgstr ""
#. type: Labeled list
@@ -22356,9 +17497,7 @@ msgstr ""
#. type: Plain text
#: en/git-column.txt:31
-msgid ""
-"Same as --mode but take mode encoded as a number. This is mainly used by "
-"other commands that have already parsed layout mode."
+msgid "Same as --mode but take mode encoded as a number. This is mainly used by other commands that have already parsed layout mode."
msgstr ""
#. type: Labeled list
@@ -22369,9 +17508,7 @@ 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."
+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."
msgstr ""
#. type: Labeled list
@@ -22393,8 +17530,7 @@ msgstr ""
#. type: Plain text
#: en/git-column.txt:42
-msgid ""
-"String to be printed at the end of each line, including newline character."
+msgid "String to be printed at the end of each line, including newline character."
msgstr ""
#. type: Labeled list
@@ -22410,7 +17546,7 @@ msgstr ""
#. type: Title =
#: en/git-commit-tree.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-commit-tree(1)"
msgstr "git-commit-tree(1)"
@@ -22432,41 +17568,27 @@ 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."
+msgid "This is usually not what an end user wants to run directly. See linkgit:git-commit[1] instead."
msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:25
-msgid ""
-"Creates a new commit object based on the provided tree object and emits the "
-"new commit object id on stdout. The log message is read from the standard "
-"input, unless `-m` or `-F` options are given."
+msgid "Creates a new commit object based on the provided tree object and emits the new commit object id on stdout. The log message is read from the standard input, unless `-m` or `-F` options are given."
msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:30
-msgid ""
-"A commit object may have any number of parents. With exactly one parent, it "
-"is an ordinary commit. Having more than one parent makes the commit a merge "
-"between several lines of history. Initial (root) commits have no parents."
+msgid "A commit object may have any number of parents. With exactly one parent, it is an ordinary commit. Having more than one parent makes the commit a merge between several lines of history. Initial (root) commits have no parents."
msgstr ""
#. 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."
+msgid "While a tree represents a particular directory state of a working directory, a commit represents that state in \"time\", and explains how to get there."
msgstr ""
#. 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 "
-"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."
+msgid "Normally a commit would identify a new \"HEAD\" state, and while Git doesn't care where you save the note about that state, in practice we tend to just write the result to the file that is pointed at by `.git/HEAD`, so that we can always see what the last committed state was."
msgstr ""
#. type: Labeled list
@@ -22499,9 +17621,7 @@ msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:52
-msgid ""
-"A paragraph in the commit log message. This can be given more than once and "
-"each <message> becomes its own paragraph."
+msgid "A paragraph in the commit log message. This can be given more than once and each <message> becomes its own paragraph."
msgstr ""
#. type: Labeled list
@@ -22519,9 +17639,7 @@ msgstr "-F <fichier>"
#| "--file=<file>::\n"
#| "\tTake the commit message from the given file. Use '-' to\n"
#| "\tread the message from the standard input.\n"
-msgid ""
-"Read the commit log message from the given file. Use `-` to read from the "
-"standard input."
+msgid "Read the commit log message from the given file. Use `-` to read from the standard input."
msgstr ""
"-F <fichier>::\n"
"--file=<fichier>::\n"
@@ -22530,15 +17648,13 @@ msgstr ""
#. type: Labeled list
#: en/git-commit-tree.txt:63 en/git-commit.txt:332
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
#. type: Plain text
#: en/git-commit-tree.txt:66
-msgid ""
-"Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlier "
-"on the command line."
+msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlier on the command line."
msgstr ""
#. type: Title -
@@ -22570,10 +17686,7 @@ msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:80
-msgid ""
-"While parent object ids are provided on the command line, author and "
-"committer information is taken from the following environment variables, if "
-"set:"
+msgid "While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, if set:"
msgstr ""
#. type: Plain text
@@ -22595,21 +17708,12 @@ msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:96
-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)."
+msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:100
-msgid ""
-"A commit comment is read from stdin. If a changelog entry is not provided "
-"via \"<\" redirection, 'git commit-tree' will just wait for one to be "
-"entered and terminated with ^D."
+msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
#. type: Title -
@@ -22633,7 +17737,7 @@ msgstr ""
#. type: Title =
#: en/git-commit.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-commit(1)"
msgstr "git-commit(1)"
@@ -22662,12 +17766,8 @@ msgstr ""
#. type: Plain text
#: en/git-commit.txt:22
-msgid ""
-"Stores the current contents of the index in a new commit along with a log "
-"message from the user describing the changes."
-msgstr ""
-"Enregistre les contenus actuels de l'index dans un nouveau commit avec un "
-"message de journal de l'utilisateur d챕crivant les modifications."
+msgid "Stores the current contents of the index in a new commit along with a log message from the user describing the changes."
+msgstr "Enregistre les contenus actuels de l'index dans un nouveau commit avec un message de journal de l'utilisateur d챕crivant les modifications."
#. type: Plain text
#: en/git-commit.txt:24
@@ -22676,91 +17776,49 @@ msgstr "Le contenu 횪 ajouter peut 챗tre sp챕cifi챕 de diff챕rentes mani챔res혻:
#. type: Plain text
#: en/git-commit.txt:28
-msgid ""
-"by using 'git add' to incrementally \"add\" changes to the index before "
-"using the 'commit' command (Note: even modified files must be \"added\");"
+msgid "by using 'git add' to incrementally \"add\" changes to the index before using the 'commit' command (Note: even modified files must be \"added\");"
msgstr "en utilisant 'git add' pour 짬혻ajouter혻쨩 de mani챔re incr챕mentale des modifications 횪 l'index avant d'utiliser la commande 'commit' (Note혻: les fichiers doivent 챗tre 짬혻ajout챕s혻쨩 pour faire partie du commit, m챗me s'ils ont 챕t챕 modifi챕s);"
#. 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;"
+msgid "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';"
#. 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);"
+msgid "by listing files as arguments to the 'commit' command (without --interactive or --patch switch), in which case the commit will ignore changes staged in the index, and instead record the current content of the listed files (which must already be known to Git);"
msgstr "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);"
#. 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;"
+msgid "by using the -a switch with the 'commit' command to automatically \"add\" changes from all known files (i.e. all files that are already listed in the index) and to automatically \"rm\" files in the index that have been removed from the working tree, and then perform the actual commit;"
msgstr "en utilisant l'option -a avec la commande 'commit' pour 짬혻ajouter혻쨩 automatiquement les modifications de tous les fichiers connus (c'est-횪-dire les fichiers list챕s dans l'index) et supprimer ('rm') automatiquement les fichiers de l'index qui ont 챕t챕 supprim챕s dans l'arbre de travail, puis d'effectuer la validation;"
#. type: Plain text
#: en/git-commit.txt:49
-msgid ""
-"by using the --interactive or --patch switches with the 'commit' command to "
-"decide one by one which files or hunks should be part of the commit in "
-"addition to contents in the index, before finalizing the operation. See the "
-"``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate "
-"these modes."
-msgstr ""
-"en utilisant les options --interactive ou --patch avec la commande 'commit' "
-"pour choisir quels fichiers ou sections de fichier doivent 챗tre inclus dans "
-"le commit en plus de l'index, avant finalisation de l'op챕ration. R챕f챕rez-"
-"vous 횪 la section 짬혻Mode interactif혻쨩 de linkgit:git-add[1] pour la "
-"description de ces modes."
+msgid "by using the --interactive or --patch switches with the 'commit' command to decide one by one which files or hunks should be part of the commit in addition to contents in the index, before finalizing the operation. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate these modes."
+msgstr "en utilisant les options --interactive ou --patch avec la commande 'commit' pour choisir quels fichiers ou sections de fichier doivent 챗tre inclus dans le commit en plus de l'index, avant finalisation de l'op챕ration. R챕f챕rez-vous 횪 la section 짬혻Mode interactif혻쨩 de linkgit:git-add[1] pour la description de ces modes."
#. type: Plain text
#: en/git-commit.txt:53
#, 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)."
-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 "
-"fournissant le jeu de param챔tres (options et chemins)."
+msgid "The `--dry-run` option can be used to obtain a summary of what is included by any of the above for the next commit by giving the same set of parameters (options and paths)."
+msgstr "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 fournissant le jeu de param챔tres (options et chemins)."
#. 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'."
-msgstr ""
-"Si vous validez et trouvez une erreur imm챕diatement apr챔s, vous pouvez "
-"annuler la validation avec 'git reset'."
+msgid "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'."
#. type: Plain text
#: en/git-commit.txt:65
-msgid ""
-"Tell the command to automatically stage files that have been modified and "
-"deleted, but new files you have not told Git about are not affected."
-msgstr ""
-"Indiquer 횪 la commande d'indexer automatiquement les fichiers qui ont 챕t챕 "
-"modifi챕s ou supprim챕s, mais les nouveaux fichiers dont vous n'avez pas "
-"signal챕 la pr챕sence 횪 Git ne sont pas affect챕s."
+msgid "Tell the command to automatically stage files that have been modified and deleted, but new files you have not told Git about are not affected."
+msgstr "Indiquer 횪 la commande d'indexer automatiquement les fichiers qui ont 챕t챕 modifi챕s ou supprim챕s, mais les nouveaux fichiers dont vous n'avez pas signal챕 la pr챕sence 횪 Git ne sont pas affect챕s."
#. type: Plain text
#: en/git-commit.txt:71
-msgid ""
-"Use the interactive patch selection interface to chose which changes to "
-"commit. See linkgit:git-add[1] for details."
-msgstr ""
-"Utiliser la s챕lection interactive de rustine pour choisir quelles "
-"modifications valider. R챕f챕rez-vous 횪 linkgit:git-add[1] pour plus de "
-"d챕tails."
+msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
+msgstr "Utiliser la s챕lection interactive de rustine pour choisir quelles modifications valider. R챕f챕rez-vous 횪 linkgit:git-add[1] pour plus de d챕tails."
#. type: Labeled list
#: en/git-commit.txt:72
@@ -22776,13 +17834,8 @@ 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."
-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."
+msgid "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."
#. type: Labeled list
#: en/git-commit.txt:78
@@ -22799,12 +17852,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."
-msgstr ""
-"Comme '-C', mais avec '-c', l'챕diteur est appel챕 pour permettre 횪 "
-"l'utilisateur de modifier le message de validation."
+msgid "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."
#. type: Labeled list
#: en/git-commit.txt:83
@@ -22815,15 +17864,8 @@ msgstr "--fixup=<commit>"
#. type: Plain text
#: en/git-commit.txt:88
#, fuzzy
-msgid ""
-"Construct a commit message for use with `rebase --autosquash`. The commit "
-"message will be the subject line from the specified commit with a prefix of "
-"\"fixup! \". See linkgit:git-rebase[1] for details."
-msgstr ""
-"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."
+msgid "Construct a commit message for use with `rebase --autosquash`. The commit message will be the subject line from the specified commit with a prefix of \"fixup! \". See linkgit:git-rebase[1] for details."
+msgstr "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."
#. type: Labeled list
#: en/git-commit.txt:89
@@ -22833,100 +17875,69 @@ msgstr "--squash=<commit>"
#. type: Plain text
#: en/git-commit.txt:95
-msgid ""
-"Construct a commit message for use with `rebase --autosquash`. The commit "
-"message subject line is taken from the specified commit with a prefix of "
-"\"squash! \". Can be used with additional commit message options "
-"(`-m`/`-c`/`-C`/`-F`). See linkgit:git-rebase[1] for details."
-msgstr ""
-"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."
+msgid "Construct a commit message for use with `rebase --autosquash`. The commit message subject line is taken from the specified commit with a prefix of \"squash! \". Can be used with additional commit message options (`-m`/`-c`/`-C`/`-F`). See linkgit:git-rebase[1] for details."
+msgstr "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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--reset-author"
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."
-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 "
-"appartient 횪 pr챕sent au validateur avec un horodatage mis 횪 jour."
+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."
+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 appartient 횪 pr챕sent au validateur avec un horodatage mis 횪 jour."
#. 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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--short"
msgstr "--short"
#. type: Plain text
#: en/git-commit.txt:105
-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."
+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."
#. type: Labeled list
#: en/git-commit.txt:106 en/git-status.txt:32 en/git-submodule.txt:280
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--branch"
msgstr "--branch"
#. type: Plain text
#: en/git-commit.txt:108 en/git-status.txt:34
msgid "Show the branch and tracking info even in short-format."
-msgstr ""
-"Montrer la branche et l'information de suivi, y compris en format court."
+msgstr "Montrer la branche et l'information de suivi, y compris en format court."
#. type: Plain text
#: en/git-commit.txt:113
-msgid ""
-"When doing a dry-run, give the output in a porcelain-ready format. See "
-"linkgit:git-status[1] for details. Implies `--dry-run`."
-msgstr ""
-"Seulement avec '--dry-run', donner la sortie en format compatible "
-"porcelaine. Voir linkgit:git-status[1] pour plus de d챕tails."
+msgid "When doing a dry-run, give the output in a porcelain-ready format. See linkgit:git-status[1] for details. Implies `--dry-run`."
+msgstr "Seulement avec '--dry-run', donner la sortie en format compatible porcelaine. Voir linkgit:git-status[1] pour plus de d챕tails."
#. type: Labeled list
#: en/git-commit.txt:114 en/git-describe.txt:74 en/git-ls-tree.txt:52
#: en/git-status.txt:44
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--long"
msgstr "--long"
#. type: Plain text
#: en/git-commit.txt:117
-msgid ""
-"When doing a dry-run, give the output in a the long-format. Implies `--dry-"
-"run`."
+msgid "When doing a dry-run, give the output in a the long-format. Implies `--dry-run`."
msgstr "Seulement avec '--dry-run', donner la sortie en format long."
#. type: Labeled list
#: en/git-commit.txt:119 en/git-config.txt:184 en/git-grep.txt:197
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--null"
msgstr "--null"
#. type: Plain text
#: 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, "
-"filenames with \"unusual\" characters are quoted as explained for the "
-"configuration variable `core.quotePath` (see linkgit:git-config[1])."
+msgid "When showing `short` or `porcelain` status output, print the filename verbatim and terminate the entries with NUL, instead of LF. If no format is given, implies the `--porcelain` output format. Without the `-z` option, filenames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr "Avec les sorties de status `short` ou `porcelain`, afficher le nom du fichier verbatim et terminer par NUL, au lieu de LF. Si aucun format n'est sp챕cifi챕, implique `--porcelain`. Sans l'option `-z`, les noms de fichier contenant des caract챔res 짬혻inusuels혻쨩 sont cit챕s selon la variable de configuration `core.quotePath` (voir linkgit:git-config[1])."
#. type: Labeled list
@@ -22937,12 +17948,8 @@ msgstr "--file=<fichier>"
#. 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 ""
-"Prendre le message de validation depuis le fichier indiqu챕. Utilisez '-' "
-"pour lire le message depuis l'entr챕e standard."
+msgid "Take the commit message from the given file. Use '-' to read the message 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-commit.txt:132
@@ -22952,18 +17959,8 @@ 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 "
-"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챕."
+msgid "Override the commit author. Specify an explicit author using the standard `A U Thor <author@example.com>` format. Otherwise <author> is assumed to be a pattern and is used to search for an existing commit by that author (i.e. rev-list --all -i --author=<author>); the commit author is then copied from the first such commit found."
+msgstr "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챕."
#. type: Labeled list
#: en/git-commit.txt:139
@@ -22991,13 +17988,8 @@ msgstr "--message=<msg>"
#. type: Plain text
#: en/git-commit.txt:147
-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."
+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."
#. type: Labeled list
#: en/git-commit.txt:148
@@ -23013,73 +18005,34 @@ msgstr "--template=<fichier>"
#. type: Plain text
#: en/git-commit.txt:158
-msgid ""
-"When editing the commit message, start the editor with the contents in the "
-"given file. The `commit.template` configuration variable is often used to "
-"give this option implicitly to the command. This mechanism can be used by "
-"projects that want to guide participants with some hints on what to write in"
-" the message in what order. If the user exits the editor without editing "
-"the message, the commit is aborted. This has no effect when a message is "
-"given by other means, e.g. with the `-m` or `-F` options."
-msgstr ""
-"� 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 "
-"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 "
-"moyen, par exemple par les options `-m` ou `-F`."
+msgid "When editing the commit message, start the editor with the contents in the given file. The `commit.template` configuration variable is often used to give this option implicitly to the command. This mechanism can be used by projects that want to guide participants with some hints on what to write in the message in what order. If the user exits the editor without editing the message, the commit is aborted. This has no effect when a message is given by other means, e.g. with the `-m` or `-F` options."
+msgstr "� 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 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 moyen, par exemple par les options `-m` ou `-F`."
#. type: Plain text
#: en/git-commit.txt:167
-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)."
+msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)."
msgstr "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)."
#. type: Labeled list
#: en/git-commit.txt:169 en/git-rebase.txt:322
-#, no-wrap, ignore-translated
+#, no-wrap
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]."
-msgstr ""
-"Cette option court-circuite les crochets pre-commit et commit-msg. Voir "
-"aussi linkgit:githooks[5]."
+msgid "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]."
#. type: Plain text
#: 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."
-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 "
-"commit. Cette option court-circuite cette s챕curit챕 et sert principalement "
-"dans les scripts d'interface avec d'autres SCM."
+msgid "Usually recording a commit that has the exact same tree as its sole parent commit is a mistake, and the command prevents you from making such a commit. This option bypasses the safety, and is primarily for use by foreign SCM interface scripts."
+msgstr "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 commit. Cette option court-circuite cette s챕curit챕 et sert principalement dans les scripts d'interface avec d'autres SCM."
#. type: Plain text
#: en/git-commit.txt:184
-msgid ""
-"Like --allow-empty this command is primarily for use by foreign SCM "
-"interface scripts. It allows you to create a commit with an empty commit "
-"message without using plumbing commands like linkgit:git-commit-tree[1]."
-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]."
+msgid "Like --allow-empty this command is primarily for use by foreign SCM interface scripts. It allows you to create a commit with an empty commit message without using plumbing commands like linkgit:git-commit-tree[1]."
+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]."
#. type: Labeled list
#: en/git-commit.txt:185 en/git-tag.txt:145
@@ -23089,14 +18042,8 @@ msgstr "--cleanup=<mode>"
#. type: Plain text
#: en/git-commit.txt:189
-msgid ""
-"This option determines how the supplied commit message should be cleaned up "
-"before committing. The '<mode>' can be `strip`, `whitespace`, `verbatim`, "
-"`scissors` or `default`."
-msgstr ""
-"Cette option d챕termine comment le message fourni doit 챗tre nettoy챕 avant la "
-"validation. Le '<mode>' peut 챗tre `strip`, `whitespace`, `verbatim`, "
-"`scissors` ou `default`."
+msgid "This option determines how the supplied commit message should be cleaned up before committing. The '<mode>' can be `strip`, `whitespace`, `verbatim`, `scissors` or `default`."
+msgstr "Cette option d챕termine comment le message fourni doit 챗tre nettoy챕 avant la validation. Le '<mode>' peut 챗tre `strip`, `whitespace`, `verbatim`, `scissors` ou `default`."
#. type: Labeled list
#: en/git-commit.txt:191
@@ -23106,12 +18053,8 @@ msgstr "strip"
#. type: Plain text
#: en/git-commit.txt:194
-msgid ""
-"Strip leading and trailing empty lines, trailing whitespace, commentary and "
-"collapse consecutive empty lines."
-msgstr ""
-"Retirer les lignes vides en d챕but et fin du message, les espaces de fin de "
-"ligne, les commentaires et d챕dupliquer les lignes vides cons챕cutives."
+msgid "Strip leading and trailing empty lines, trailing whitespace, commentary and collapse consecutive empty lines."
+msgstr "Retirer les lignes vides en d챕but et fin du message, les espaces de fin de ligne, les commentaires et d챕dupliquer les lignes vides cons챕cutives."
#. type: Labeled list
#: en/git-commit.txt:194
@@ -23144,21 +18087,9 @@ msgstr "scissors"
#. type: Plain text
#: 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 "
-#| "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."
-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."
+#| 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."
+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."
+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."
#. type: Labeled list
#: en/git-commit.txt:204
@@ -23168,77 +18099,41 @@ msgstr "default"
#. type: Plain text
#: en/git-commit.txt:207
-msgid ""
-"Same as `strip` if the message is to be edited. Otherwise `whitespace`."
-msgstr ""
-"Identique 횪 `strip` si le messages est 챕dit챕. Sinon identique 횪 "
-"`whitespace`."
+msgid "Same as `strip` if the message is to be edited. Otherwise `whitespace`."
+msgstr "Identique 횪 `strip` si le messages est 챕dit챕. Sinon identique 횪 `whitespace`."
#. type: Plain text
#: en/git-commit.txt:211
-msgid ""
-"The default can be changed by the `commit.cleanup` configuration variable "
-"(see linkgit:git-config[1])."
-msgstr ""
-"La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration "
-"`commit.cleanup` (voir linkgit:git-config[1])."
+msgid "The default can be changed by the `commit.cleanup` configuration variable (see linkgit:git-config[1])."
+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-commit.txt:218
-msgid ""
-"The message taken from file with `-F`, command line with `-m`, and from "
-"commit object with `-C` are usually used as the commit log message "
-"unmodified. This option lets you further edit the message taken from these "
-"sources."
-msgstr ""
-"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."
+msgid "The message taken from file with `-F`, command line with `-m`, and from commit object with `-C` are usually used as the commit log message unmodified. This option lets you further edit the message taken from these sources."
+msgstr "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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-edit"
msgstr "--no-edit"
#. type: Plain text
#: en/git-commit.txt:223
-msgid ""
-"Use the selected commit message without launching an editor. For example, "
-"`git commit --amend --no-edit` amends a commit without changing its commit "
-"message."
-msgstr ""
-"Utiliser le message de validation s챕lectionn챕 sans lancer d'챕diteur. Par "
-"exemple, `git commit --amend --no-edit` corrige un commit sans changer son "
-"message de validation."
+msgid "Use the selected commit message without launching an editor. For example, `git commit --amend --no-edit` amends a commit without changing its commit message."
+msgstr "Utiliser le message de validation s챕lectionn챕 sans lancer d'챕diteur. Par exemple, `git commit --amend --no-edit` corrige un commit sans changer son message de validation."
#. type: Labeled list
#: en/git-commit.txt:224
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--amend"
msgstr "--amend"
#. type: Plain text
#: 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)."
-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)."
+msgid "Replace the tip of the current branch by creating a new commit. The recorded tree is prepared as usual (including the effect of the `-i` and `-o` options and explicit pathspec), and the message from the original commit is used as the starting point, instead of an empty message, when no other message is specified from the command line via options such as `-m`, `-F`, `-c`, etc. The new commit has the same parents and author as the current one (the `--reset-author` option can countermand this)."
+msgstr "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)."
#. type: Plain text
#: en/git-commit.txt:237
@@ -23264,15 +18159,12 @@ msgstr "mais peut 챗tre utilis챕 pour corriger un commit de fusion."
#. type: Plain text
#: 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].)"
+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].)"
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].)"
#. type: Labeled list
#: en/git-commit.txt:250
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-post-rewrite"
msgstr "--no-post-rewrite"
@@ -23283,50 +18175,25 @@ msgstr "Court-circuiter le crochet post-rewrite."
#. type: Labeled list
#: en/git-commit.txt:254
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--include"
msgstr "--include"
#. type: Plain text
#: en/git-commit.txt:259
-msgid ""
-"Before making a commit out of staged contents so far, stage the contents of "
-"paths given on the command line as well. This is usually not what you want "
-"unless you are concluding a conflicted merge."
-msgstr ""
-"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."
+msgid "Before making a commit out of staged contents so far, stage the contents of paths given on the command line as well. This is usually not what you want unless you are concluding a conflicted merge."
+msgstr "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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--only"
msgstr "--only"
#. type: Plain text
#: en/git-commit.txt:273
-msgid ""
-"Make a commit by taking the updated working tree contents of the paths "
-"specified on the command line, disregarding any contents that have been "
-"staged for other paths. This is the default mode of operation of 'git "
-"commit' if any paths are given on the command line, in which case this "
-"option can be omitted. If this option is specified together with `--amend`,"
-" then no paths need to be specified, which can be used to amend the last "
-"commit without committing changes that have already been staged. If used "
-"together with `--allow-empty` paths are also not required, and an empty "
-"commit will be created."
-msgstr ""
-"R챕aliser une validation en prenant le contenu de l'arbre de travail des "
-"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챕챕."
+msgid "Make a commit by taking the updated working tree contents of the paths specified on the command line, disregarding any contents that have been staged for other paths. This is the default mode of operation of 'git commit' if any paths are given on the command line, in which case this option can be omitted. If this option is specified together with `--amend`, then no paths need to be specified, which can be used to amend the last commit without committing changes that have already been staged. If used together with `--allow-empty` paths are also not required, and an empty commit will be created."
+msgstr "R챕aliser une validation en prenant le contenu de l'arbre de travail des 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챕챕."
#. type: Labeled list
#: en/git-commit.txt:274 en/git-status.txt:55
@@ -23347,15 +18214,8 @@ msgstr "Montrer les fichiers non-suivis."
#. type: Plain text
#: en/git-commit.txt:281
-msgid ""
-"The mode parameter is optional (defaults to 'all'), and is used to specify "
-"the handling of untracked files; when -u is not used, the default is "
-"'normal', i.e. show untracked files and directories."
-msgstr ""
-"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."
+msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
+msgstr "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."
#. type: Plain text
#: en/git-commit.txt:283 en/git-status.txt:64
@@ -23378,40 +18238,22 @@ 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]."
-msgstr ""
-"La valeur par d챕faut est contenue dans la variable de configuration "
-"status.showUntrackedFiles document챕e dans linkgit:git-config[1]."
+msgid "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]."
#. 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 "
-"by reminding what changes the commit has. Note that this diff output "
-"doesn't have its lines prefixed with '#'. This diff will not be a part of "
-"the commit message. See the `commit.verbose` configuration variable in "
-"linkgit:git-config[1]."
+msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]."
msgstr "Afficher en bas du mod챔le de message de validation un diff unifi챕 entre le commit HEAD et ce qui serait valid챕 pour aider l'utilisateur 횪 d챕crire le commit en lui rappelant les modifications qui seront valid챕es. Veuillez noter que cette sortie de diff n'est pas pr챕fix챕e par des '#'. Elle ne fera pas pour autant partie du message de validation. R챕f챕rez-vous 횪 la variable de configuration `commit.verbose` dans linkgit:git-config[1]."
#. type: Plain text
#: 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."
-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 "
-"non-index챕es des fichiers suivis."
+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."
+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 non-index챕es des fichiers suivis."
#. type: Plain text
#: en/git-commit.txt:309
@@ -23420,57 +18262,35 @@ msgstr "Supprimer le message de r챕sum챕 de commit."
#. type: Plain text
#: en/git-commit.txt:314
-msgid ""
-"Do not create a commit, but show a list of paths that are to be committed, "
-"paths with local changes that will be left uncommitted and paths that are "
-"untracked."
-msgstr ""
-"Ne pas cr챕er de commit, mais montrer une liste des chemins qui seront "
-"valid챕s, une de ceux contenant des modifications locales et qui ne seront "
-"pas valid챕s, et une de ceux non-suivis."
+msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
+msgstr "Ne pas cr챕er de commit, mais montrer une liste des chemins qui seront valid챕s, une de ceux contenant des modifications locales et qui ne seront pas valid챕s, et une de ceux non-suivis."
#. type: Labeled list
#: en/git-commit.txt:315
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--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."
-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 "
-"validation. Activ챕 par d챕faut, mais peut surcharger la variable de "
-"configuration commit.status."
+msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status."
+msgstr "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. Activ챕 par d챕faut, mais peut surcharger la variable de configuration commit.status."
#. type: Labeled list
#: en/git-commit.txt:321
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-status"
msgstr "--no-status"
#. type: Plain text
#: en/git-commit.txt:325
-msgid ""
-"Do not include the output of linkgit:git-status[1] in the commit message "
-"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."
+msgid "Do not include the output of linkgit:git-status[1] in the commit message 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."
#. type: Plain text
#: en/git-commit.txt:335
-msgid ""
-"Countermand `commit.gpgSign` configuration variable that is set to force "
-"each and every commit to be signed."
-msgstr ""
-"Annuler la variable de configuration `commit.gpgSign` qui force tous les "
-"commits 횪 챗tre sign챕s."
+msgid "Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed."
+msgstr "Annuler la variable de configuration `commit.gpgSign` qui force tous les commits 횪 챗tre sign챕s."
#. type: Labeled list
#: en/git-commit.txt:339 en/git-rm.txt:29
@@ -23480,41 +18300,13 @@ msgstr "<fichier>..."
#. type: Plain text
#: en/git-commit.txt:345
-msgid ""
-"When files are given on the command line, the command commits the contents "
-"of the named files, without recording the changes already staged. The "
-"contents of these files are also staged for the next commit on top of what "
-"have been staged before."
-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."
+msgid "When files are given on the command line, the command commits the contents of the named files, without recording the changes already staged. The contents of these files are also staged for the next commit on top of what have been staged before."
+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."
#. 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:"
-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 "
-"qui a 챕t챕 pr챕par챕 jusqu'ici. C'est la forme la plus simple de la commande. "
-"Par exemple혻:"
+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 "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 qui a 챕t챕 pr챕par챕 jusqu'ici. C'est la forme la plus simple de la commande. Par exemple혻:"
#. type: delimited block -
#: en/git-commit.txt:368
@@ -23532,19 +18324,8 @@ msgstr ""
#. 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 "
-"change in your working tree:"
-msgstr ""
-"Au lieu d'indexer les fichiers apr챔s chaque modification individuelle, vous "
-"pouvez ordonner 횪 `git commit` d'observer les modifications aux fichiers "
-"dans le contenu est d챕j횪 suivi dans votre arbre de travail et de r챕aliser "
-"les `git add` et `git rm` correspondant pour vous. De fait, l'exemple "
-"suivant fait la m챗me chose que l'exemple pr챕c챕dent si aucune autre "
-"modification n'a eu lieu dans votre arbre de travail혻:"
+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 change in your working tree:"
+msgstr "Au lieu d'indexer les fichiers apr챔s chaque modification individuelle, vous pouvez ordonner 횪 `git commit` d'observer les modifications aux fichiers dans le contenu est d챕j횪 suivi dans votre arbre de travail et de r챕aliser les `git add` et `git rm` correspondant pour vous. De fait, l'exemple suivant fait la m챗me chose que l'exemple pr챕c챕dent si aucune autre modification n'a eu lieu dans votre arbre de travail혻:"
#. type: delimited block -
#: en/git-commit.txt:381
@@ -23560,22 +18341,12 @@ msgstr ""
#. 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."
-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` "
-"et `git rm` n챕cessaires pour vous."
+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."
+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` et `git rm` n챕cessaires pour vous."
#. 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:"
+msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
msgstr "Apr챔s l'indexation des modifications de nombreux fichiers, vous pouvez modifier l'ordre dans lequel les modifications sont enregistr챕es, en fournissant des chemins 횪 `git commit`. Quand ces chemins sont fournis, la commande cr챕e un commit qui n'enregistre que les modifications aux chemins indiqu챕s혻:"
#. type: delimited block -
@@ -23594,17 +18365,8 @@ msgstr ""
#. 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 "
-"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 -- "
-"elles sont toujours index챕es et simplement suspendues. Apr챔s la s챕quence ci-"
-"dessus, si vous faites혻:"
+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 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 -- elles sont toujours index챕es et simplement suspendues. Apr챔s la s챕quence ci-dessus, si vous faites혻:"
#. type: delimited block -
#: en/git-commit.txt:407 en/git-commit.txt:433
@@ -23614,29 +18376,13 @@ msgstr "$ git commit\n"
#. type: Plain text
#: en/git-commit.txt:411
-msgid ""
-"this second commit would record the changes to `hello.c` and `hello.h` as "
-"expected."
-msgstr ""
-"cette seconde validation enregistrerait les modifications de `hello.c` et "
-"`hello.h` comme attendu."
+msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
+msgstr "cette seconde validation enregistrerait les modifications de `hello.c` et `hello.h` comme attendu."
#. type: Plain text
#: en/git-commit.txt:419
-msgid ""
-"After a merge (initiated by 'git merge' or 'git pull') stops because of "
-"conflicts, cleanly merged paths are already staged to be committed for you, "
-"and paths that conflicted are left in unmerged state. You would have to "
-"first check which paths are conflicting with 'git status' and after fixing "
-"them manually in your working tree, you would stage the result as usual with"
-" 'git add':"
-msgstr ""
-"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 "
-"vous, et les chemins en conflit sont laiss챕 dans un 챕tat non-fusionn챕. Vous "
-"auriez 횪 chercher d'abord les chemins en conflit avec `git status` et apr챔s "
-"les avoir corrig챕s manuellement dans votre copie de travail, vous les "
-"indexeriez comme d'habitude avec `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':"
+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 vous, et les chemins en conflit sont laiss챕 dans un 챕tat non-fusionn챕. Vous auriez 횪 chercher d'abord les chemins en conflit avec `git status` et apr챔s les avoir corrig챕s manuellement dans votre copie de travail, vous les indexeriez comme d'habitude avec `git add`혻:"
#. type: delimited block -
#: en/git-commit.txt:425
@@ -23654,42 +18400,17 @@ msgstr ""
#. 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:"
-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챕, "
-"lancez `git commit` pour finaliser la validation de la fusion혻:"
+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:"
+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챕, lancez `git commit` pour finaliser la validation de la fusion혻:"
#. 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 "
-"`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 "
-"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. "
-"En fait, la commande refuse d'챗tre lanc챕e avec des noms de chemin (voir par "
-"contre l'option `-i`)."
+msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
+msgstr "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. En fait, la commande refuse d'챗tre lanc챕e avec des noms de chemin (voir par contre l'option `-i`)."
#. type: Plain text
#: en/git-commit.txt:453
-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."
+msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
msgstr "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) pour r챕sumer la modification, suivie d'une ligne blanche, suivie d'un description plus pr챕cise. Le texte jusqu'횪 la ligne vide du message de validation est trait챕 comme le titre du commit, et ce titre est utilis챕 extensivement dans Git. Par exemple, linkgit:git-format-patch[1] transforme un commit en courriel et utilise le titre comme sujet et le reste du texte comme corps."
#. type: Title -
@@ -23700,23 +18421,13 @@ msgstr "ENVIRONNEMENT ET VARIABLES DE CONFIGURATION"
#. type: Plain text
#: en/git-commit.txt:462
-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."
+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 "L'챕diteur utilis챕 pour 챕diter le message de validation sera choisi dans l'ordre de recherche depuis la variable d'environnement `GIT_EDITOR`, puis depuis la variable de configuration `core.editor`, puis depuis la variable d'environnement `VISUAL` ou la variable d'environnement `EDITOR`. Voir linkgit:git-var[1] pour plus de d챕tails."
#. 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 "
-"information."
-msgstr ""
-"Cette commande peut lancer les crochets `commit-msg`, `prepare-commit-msg`, "
-"`pre-commit`, `post-commit` et `post-rewrite`. Voir linkgit:githooks[5] "
-"pour de plus amples informations."
+msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
+msgstr "Cette commande peut lancer les crochets `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` et `post-rewrite`. Voir linkgit:githooks[5] pour de plus amples informations."
#. type: Labeled list
#: en/git-commit.txt:472
@@ -23726,31 +18437,17 @@ msgstr "`$GIT_DIR/COMMIT_EDITMSG`"
#. type: Plain text
#: en/git-commit.txt:478
-msgid ""
-"This file contains the commit message of a commit in progress. If `git "
-"commit` exits due to an error before creating a commit, any commit message "
-"that has been provided by the user (e.g., in an editor session) will be "
-"available in this file, but will be overwritten by the next invocation of "
-"`git commit`."
-msgstr ""
-"Ce fichier contient le message de validation en cours. Si `git commit` sort "
-"횪 cause d'une erreur avant de cr챕er un commit, tout message de validation "
-"fourni par l'utilisateur (par exemple dans une session d'챕diteur) sera "
-"disponible dans ce fichier, mais sera 챕cras챕 par l'invocation suivante de "
-"`git commit`."
+msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
+msgstr "Ce fichier contient le message de validation en cours. Si `git commit` sort 횪 cause d'une erreur avant de cr챕er un commit, tout message de validation fourni par l'utilisateur (par exemple dans une session d'챕diteur) sera disponible dans ce fichier, mais sera 챕cras챕 par l'invocation suivante de `git commit`."
#. type: Plain text
#: en/git-commit.txt:486
-msgid ""
-"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-"merge[1], linkgit:git-commit-tree[1]"
-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-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[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-config.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-config(1)"
msgstr "git-config(1)"
@@ -23784,57 +18481,32 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:33
-msgid ""
-"You can query/set/replace/unset options with this command. The name is "
-"actually the section and the key separated by a dot, and the value will be "
-"escaped."
+msgid "You can query/set/replace/unset options with this command. The name is actually the section and the key separated by a dot, and the value will be escaped."
msgstr ""
#. type: Plain text
#: en/git-config.txt:40
-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>>)."
+msgid "Multiple lines can be added to an option by using the `--add` option. If you want to update or unset an option which can occur on multiple lines, a POSIX regexp `value_regex` needs to be given. Only the existing values that match the regexp are updated or unset. If you want to handle the lines that do *not* match the regex, just prepend a single exclamation mark in front (see also <<EXAMPLES>>)."
msgstr ""
#. type: Plain text
#: en/git-config.txt:47
-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 "
-"the canonical form (simple decimal number for int, a \"true\" or \"false\" "
-"string for bool), or `--path`, which does some path expansion (see `--path` "
-"below). 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 the canonical form (simple decimal number for int, a \"true\" or \"false\" string for bool), or `--path`, which does some path expansion (see `--path` below). If no type specifier is passed, no checks or transformations are performed on the value."
msgstr ""
#. type: Plain text
#: 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>>)."
+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>>)."
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)."
+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)."
msgstr ""
#. type: Plain text
#: en/git-config.txt:60
-msgid ""
-"This command will fail with non-zero status upon error. Some exit codes "
-"are:"
+msgid "This command will fail with non-zero status upon error. Some exit codes are:"
msgstr ""
#. type: Plain text
@@ -23864,8 +18536,7 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:67
-msgid ""
-"you try to unset/set an option for which multiple lines match (ret=5), or"
+msgid "you try to unset/set an option for which multiple lines match (ret=5), or"
msgstr ""
#. type: Plain text
@@ -23880,47 +18551,40 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:74
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--replace-all"
msgstr "--replace-all"
#. type: Plain text
#: en/git-config.txt:77
-msgid ""
-"Default behavior is to replace at most one line. This replaces all lines "
-"matching the key (and optionally the value_regex)."
+msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the value_regex)."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:78 en/git-update-index.txt:42
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--add"
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`."
+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`."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:83
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--get"
msgstr "--get"
#. type: Plain text
#: en/git-config.txt:87
-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 "
-"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 multiple key values were found."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:88
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--get-all"
msgstr "--get-all"
@@ -23931,17 +18595,13 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:91
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--get-regexp"
msgstr "--get-regexp"
#. type: Plain text
#: en/git-config.txt:97
-msgid ""
-"Like --get-all, but interprets the name as a regular expression and writes "
-"out the key names. Regular expression matching is currently case-sensitive "
-"and done against a canonicalized version of the key in which section and "
-"variable names are lowercased, but subsection names are not."
+msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names. Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
msgstr ""
#. type: Labeled list
@@ -23952,33 +18612,23 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:105
-msgid ""
-"When given a two-part name section.key, the value for section.<url>.key "
-"whose <url> part matches the best to the given URL is returned (if no such "
-"key exists, the value for section.key is used as a fallback). When given "
-"just the section as name, do so for all the keys in the section and list "
-"them. Returns error code 1 if no value is found."
+msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback). When given just the section as name, do so for all the keys in the section and list them. Returns error code 1 if no value is found."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:106
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--global"
msgstr "--global"
#. type: Plain text
#: en/git-config.txt:111
-msgid ""
-"For writing options: write to global `~/.gitconfig` file rather than the "
-"repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if "
-"this file exists and the `~/.gitconfig` file doesn't."
+msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
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."
+msgid "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
@@ -23989,36 +18639,28 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:117
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--system"
msgstr "--system"
#. type: Plain text
#: en/git-config.txt:121
-msgid ""
-"For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather "
-"than the repository `.git/config`."
+msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
msgstr ""
#. type: Plain text
#: en/git-config.txt:124
-msgid ""
-"For reading options: read only from system-wide `$(prefix)/etc/gitconfig` "
-"rather than from all available files."
+msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
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."
+msgid "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."
+msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
msgstr ""
#. type: Labeled list
@@ -24046,34 +18688,25 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:146
-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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:147
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--remove-section"
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;"
+#| msgid "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 "
-"de l'index, encore une fois, avant d'utiliser la commande 'commit',"
+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',"
#. type: Labeled list
#: en/git-config.txt:150
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--rename-section"
msgstr "--rename-section"
@@ -24084,7 +18717,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:153
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--unset"
msgstr "--unset"
@@ -24095,7 +18728,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:156
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--unset-all"
msgstr "--unset-all"
@@ -24111,7 +18744,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:163
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--bool"
msgstr "--bool"
@@ -24122,73 +18755,56 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:166
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--int"
msgstr "--int"
#. type: Plain text
#: en/git-config.txt:171
-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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:172
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--bool-or-int"
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."
+msgid "'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, ignore-translated
+#, no-wrap
msgid "--path"
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)."
+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)."
msgstr ""
#. type: Plain text
#: en/git-config.txt:191
-msgid ""
-"For all options that output values and/or keys, always end values with the "
-"null character (instead of a newline). Use newline instead as a delimiter "
-"between key and value. This allows for secure parsing of the output without "
-"getting confused e.g. by values that contain line breaks."
+msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
msgstr ""
#. type: Plain text
#: en/git-config.txt:195
-msgid ""
-"Output only the names of config variables for `--list` or `--get-regexp`."
+msgid "Output only the names of config variables for `--list` or `--get-regexp`."
msgstr ""
#. type: Labeled list
#: en/git-config.txt:196
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--show-origin"
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)."
+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)."
msgstr ""
#. type: Labeled list
@@ -24199,14 +18815,7 @@ 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 "
-"taken into account when configuration says \"auto\". If `stdout-is-tty` is "
-"missing, then checks the standard output of the command itself, and exits "
-"with status 0 if color is to be used, or exits with status 1 otherwise. "
-"When the color setting for `name` is undefined, the command uses `color.ui` "
-"as fallback."
+msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
msgstr ""
#. type: Labeled list
@@ -24217,39 +18826,28 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:219
-msgid ""
-"Find the color configured for `name` (e.g. `color.diff.new`) and output it "
-"as the ANSI color escape sequence to the standard output. The optional "
-"`default` parameter is used instead, if there is no color configured for "
-"`name`."
+msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
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)."
+msgid "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, ignore-translated
+#, no-wrap
msgid "--[no-]includes"
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."
+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."
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:"
+msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
msgstr ""
#. type: Labeled list
@@ -24271,12 +18869,7 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:248
-msgid ""
-"Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or "
-"empty, `$HOME/.config/git/config` will be used. Any single-valued variable "
-"set in this file will be overwritten by whatever is in `~/.gitconfig`. It "
-"is a good idea not to create this file if you sometimes use older versions "
-"of Git, as support for this file was added fairly recently."
+msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`. It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
msgstr ""
#. type: Labeled list
@@ -24288,8 +18881,7 @@ msgstr "git-commit(1)"
#. type: Plain text
#: en/git-config.txt:252
-msgid ""
-"User-specific configuration file. Also called \"global\" configuration file."
+msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
@@ -24301,55 +18893,33 @@ msgstr ""
#. type: Plain text
#: 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;"
+#| msgid "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 "
-"de l'index, encore une fois, avant d'utiliser la commande 'commit',"
+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',"
#. type: Plain text
#: en/git-config.txt:261
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-config.txt:265
-msgid ""
-"The files are read in the order given above, with last value found taking "
-"precedence over values read earlier. When multiple values are taken then "
-"all values of a key from all files will be used."
+msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used."
msgstr ""
#. type: Plain text
#: en/git-config.txt:268
-msgid ""
-"You may override individual configuration parameters when running any git "
-"command by using the `-c` option. See linkgit:git[1] for details."
+msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
#: 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*."
+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*."
msgstr ""
#. type: Plain text
#: en/git-config.txt:277
-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."
+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."
msgstr ""
#. type: Title -
@@ -24367,10 +18937,7 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:286
-msgid ""
-"Take the configuration from the given file instead of .git/config. Using "
-"the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" "
-"option forces this to $(prefix)/etc/gitconfig."
+msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
msgstr ""
#. type: Labeled list
@@ -24381,9 +18948,7 @@ 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."
+msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
#. type: Plain text
@@ -24457,10 +19022,7 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:337
-msgid ""
-"The hypothetical proxy command entries actually have a postfix to discern "
-"what URL they apply to. Here is how to change the entry for kernel.org to "
-"\"ssh\"."
+msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
#. type: delimited block -
@@ -24471,8 +19033,7 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:343
-msgid ""
-"This makes sure that only the key/value pair for kernel.org is replaced."
+msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
@@ -24488,9 +19049,7 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:352
-msgid ""
-"If you want to delete an entry for a multivar (like core.gitproxy above), "
-"you have to provide a regex matching the value of exactly one line."
+msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
#. type: Plain text
@@ -24539,9 +19098,7 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:379
-msgid ""
-"If you like to live dangerously, 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"
msgstr ""
#. type: delimited block -
@@ -24552,9 +19109,7 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:386
-msgid ""
-"However, if you really only want to replace the line for the default proxy, "
-"i.e. the one without a \"for ...\" postfix, do something like this:"
+msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
#. type: delimited block -
@@ -24587,8 +19142,7 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:405
-msgid ""
-"An example to use customized color from the configuration in your script:"
+msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
@@ -24603,9 +19157,7 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:415
-msgid ""
-"For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, "
-"while it is set to `true` for all others:"
+msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
#. type: delimited block -
@@ -24623,15 +19175,13 @@ msgstr ""
#. type: Title =
#: en/git-count-objects.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-count-objects(1)"
msgstr "git-count-objects(1)"
#. type: Plain text
#: en/git-count-objects.txt:7
-msgid ""
-"git-count-objects - Count unpacked number of objects and their disk "
-"consumption"
+msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
msgstr ""
#. type: Plain text
@@ -24642,9 +19192,7 @@ msgstr ""
#. type: Plain text
#: en/git-count-objects.txt:17
-msgid ""
-"This counts the number of unpacked object files and disk space consumed by "
-"them, to help you decide when it is a good time to repack."
+msgid "This counts the number of unpacked object files and disk space consumed by them, to help you decide when it is a good time to repack."
msgstr ""
#. type: Plain text
@@ -24661,8 +19209,7 @@ msgstr "mais peut 챗tre utilis챕 pour corriger un commit de fusion."
#. type: Plain text
#: en/git-count-objects.txt:28
-msgid ""
-"size: disk space consumed by loose objects, in KiB (unless -H is specified)"
+msgid "size: disk space consumed by loose objects, in KiB (unless -H is specified)"
msgstr ""
#. type: Plain text
@@ -24672,38 +19219,27 @@ msgstr ""
#. type: Plain text
#: en/git-count-objects.txt:32
-msgid ""
-"size-pack: disk space consumed by the packs, in KiB (unless -H is specified)"
+msgid "size-pack: disk space consumed by the packs, in KiB (unless -H is specified)"
msgstr ""
#. type: Plain text
#: en/git-count-objects.txt:35
-msgid ""
-"prune-packable: the number of loose objects that are also present in the "
-"packs. These objects could be pruned using `git prune-packed`."
+msgid "prune-packable: the number of loose objects that are also present in the packs. These objects could be pruned using `git prune-packed`."
msgstr ""
#. 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"
+msgid "garbage: the number of files in object database that are neither valid loose objects nor valid packs"
msgstr ""
#. type: Plain text
#: en/git-count-objects.txt:41
-msgid ""
-"size-garbage: disk space consumed by garbage files, in KiB (unless -H is "
-"specified)"
+msgid "size-garbage: disk space consumed by garbage files, in KiB (unless -H is specified)"
msgstr ""
#. type: Plain text
#: en/git-count-objects.txt:46
-msgid ""
-"alternate: absolute path of alternate object databases; may appear multiple "
-"times, one line per path. Note that if the path contains non-printable "
-"characters, it may be surrounded by double-quotes and contain C-style "
-"backslashed escape sequences."
+msgid "alternate: absolute path of alternate object databases; may appear multiple times, one line per path. Note that if the path contains non-printable characters, it may be surrounded by double-quotes and contain C-style backslashed escape sequences."
msgstr ""
#. type: Labeled list
@@ -24714,7 +19250,7 @@ msgstr ""
#. type: Labeled list
#: en/git-count-objects.txt:48
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--human-readable"
msgstr "--human-readable"
@@ -24725,14 +19261,13 @@ msgstr ""
#. type: Title =
#: en/git-credential-cache--daemon.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-credential-cache--daemon(1)"
msgstr "git-credential-cache--daemon(1)"
#. type: Plain text
#: en/git-credential-cache--daemon.txt:7
-msgid ""
-"git-credential-cache--daemon - Temporarily store user credentials in memory"
+msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
msgstr ""
#. type: Plain text
@@ -24743,31 +19278,22 @@ msgstr ""
#. type: Plain text
#: en/git-credential-cache--daemon.txt:18
-msgid ""
-"You probably don't want to invoke this command yourself; it is started "
-"automatically when you use linkgit:git-credential-cache[1]."
+msgid "You probably don't want to invoke this command yourself; it is started automatically when you use linkgit:git-credential-cache[1]."
msgstr ""
#. type: Plain text
#: en/git-credential-cache--daemon.txt:23
-msgid ""
-"This command listens on the Unix domain socket specified by `<socket>` for "
-"`git-credential-cache` clients. Clients may store and retrieve credentials. "
-"Each credential is held for a timeout specified by the client; once no "
-"credentials are held, the daemon exits."
+msgid "This command listens on the Unix domain socket specified by `<socket>` for `git-credential-cache` clients. Clients may store and retrieve credentials. Each credential is held for a timeout specified by the client; once no credentials are held, the daemon exits."
msgstr ""
#. type: Plain text
#: en/git-credential-cache--daemon.txt:27
-msgid ""
-"If the `--debug` option is specified, the daemon does not close its stderr "
-"stream, and may output extra diagnostics to it even after it has begun "
-"listening for clients."
+msgid "If the `--debug` option is specified, the daemon does not close its stderr stream, and may output extra diagnostics to it even after it has begun listening for clients."
msgstr ""
#. type: Title =
#: en/git-credential-cache.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-credential-cache(1)"
msgstr "git-credential-cache(1)"
@@ -24784,19 +19310,12 @@ msgstr ""
#. type: Plain text
#: en/git-credential-cache.txt:21
-msgid ""
-"This command caches credentials in memory for use by future Git programs. "
-"The stored credentials never touch the disk, and are forgotten after a "
-"configurable timeout. The cache is accessible over a Unix domain socket, "
-"restricted to the current user by filesystem permissions."
+msgid "This command caches credentials in memory for use by future Git programs. The stored credentials never touch the disk, and are forgotten after a configurable timeout. The cache is accessible over a Unix domain socket, restricted to the current user by filesystem permissions."
msgstr ""
#. type: Plain text
#: 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."
+msgid "You probably don't want to invoke this command directly; it is meant to be used as a credential helper by other parts of Git. See linkgit:gitcredentials[7] or `EXAMPLES` below."
msgstr ""
#. type: Labeled list
@@ -24818,11 +19337,7 @@ msgstr ""
#. type: Plain text
#: en/git-credential-cache.txt:40
-msgid ""
-"Use `<path>` to contact a running cache daemon (or start a new cache daemon "
-"if one is not started). Defaults to `~/.git-credential-cache/socket`. If "
-"your home directory is on a network-mounted filesystem, you may need to "
-"change this to a local filesystem. You must specify an absolute path."
+msgid "Use `<path>` to contact a running cache daemon (or start a new cache daemon if one is not started). Defaults to `~/.git-credential-cache/socket`. If your home directory is on a network-mounted filesystem, you may need to change this to a local filesystem. You must specify an absolute path."
msgstr ""
#. type: Title -
@@ -24833,9 +19348,7 @@ msgstr ""
#. type: Plain text
#: en/git-credential-cache.txt:46
-msgid ""
-"If you would like the daemon to exit early, forgetting all cached "
-"credentials before their timeout, you can issue an `exit` action:"
+msgid "If you would like the daemon to exit early, forgetting all cached credentials before their timeout, you can issue an `exit` action:"
msgstr ""
#. type: delimited block -
@@ -24847,9 +19360,7 @@ 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:"
+msgid "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 -
@@ -24873,9 +19384,7 @@ msgstr ""
#. type: Plain text
#: en/git-credential-cache.txt:70
-msgid ""
-"You can provide options via the credential.helper configuration variable "
-"(this example drops the cache time to 5 minutes):"
+msgid "You can provide options via the credential.helper configuration variable (this example drops the cache time to 5 minutes):"
msgstr ""
#. type: delimited block -
@@ -24886,7 +19395,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-store.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-credential-store(1)"
msgstr "git-credential-store(1)"
@@ -24903,26 +19412,17 @@ msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:21
-msgid ""
-"Using this helper will store your passwords unencrypted on disk, protected "
-"only by filesystem permissions. If this is not an acceptable security "
-"tradeoff, try linkgit:git-credential-cache[1], or find a helper that "
-"integrates with secure storage provided by your operating system."
+msgid "Using this helper will store your passwords unencrypted on disk, protected only by filesystem permissions. If this is not an acceptable security tradeoff, try linkgit:git-credential-cache[1], or find a helper that integrates with secure storage provided by your operating system."
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:24
-msgid ""
-"This command stores credentials indefinitely on disk for use by future Git "
-"programs."
+msgid "This command stores credentials indefinitely on disk for use by future Git programs."
msgstr ""
#. type: Plain text
#: 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."
+msgid "You probably don't want to invoke this command directly; it is meant to be used as a credential helper by other parts of git. See linkgit:gitcredentials[7] or `EXAMPLES` below."
msgstr ""
#. type: Labeled list
@@ -24934,21 +19434,12 @@ msgstr "patch"
#. type: Plain text
#: 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>>."
+msgid "Use `<path>` to lookup and store credentials. The file will have its filesystem permissions set to prevent other users on the system from reading it, but will not be encrypted or otherwise protected. If not specified, credentials will be searched for from `~/.git-credentials` and `$XDG_CONFIG_HOME/git/credentials`, and credentials will be written to `~/.git-credentials` if it exists, or `$XDG_CONFIG_HOME/git/credentials` if it exists and the former does not. See also <<FILES>>."
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:49
-msgid ""
-"If not set explicitly with `--file`, there are two files where git-"
-"credential-store will search for credentials in order of precedence:"
+msgid "If not set explicitly with `--file`, there are two files where git-credential-store will search for credentials in order of precedence:"
msgstr ""
#. type: Labeled list
@@ -24971,35 +19462,22 @@ msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:59
-msgid ""
-"Second user-specific credentials file. If '$XDG_CONFIG_HOME' is not set or "
-"empty, `$HOME/.config/git/credentials` will be used. Any credentials stored "
-"in this file will not be used if `~/.git-credentials` has a matching "
-"credential as well. It is a good idea not to create this file if you "
-"sometimes use older versions of Git that do not support it."
+msgid "Second user-specific credentials file. If '$XDG_CONFIG_HOME' is not set or empty, `$HOME/.config/git/credentials` will be used. Any credentials stored in this file will not be used if `~/.git-credentials` has a matching credential as well. It is a good idea not to create this file if you sometimes use older versions of Git that do not support it."
msgstr ""
#. type: Plain text
#: 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."
+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."
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."
+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."
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:69
-msgid ""
-"When erasing credentials, matching credentials will be erased from all "
-"files."
+msgid "When erasing credentials, matching credentials will be erased from all files."
msgstr ""
#. type: delimited block -
@@ -25030,9 +19508,7 @@ msgstr "FORMATS DE DATE"
#. type: Plain text
#: en/git-credential-store.txt:92
-msgid ""
-"The `.git-credentials` file is stored in plaintext. Each credential is "
-"stored on its own line as a URL like:"
+msgid "The `.git-credentials` file is stored in plaintext. Each credential is stored on its own line as a URL like:"
msgstr ""
#. type: delimited block -
@@ -25043,17 +19519,12 @@ 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 "
-"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."
+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 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."
msgstr ""
#. type: Title =
#: en/git-credential.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-credential(1)"
msgstr "git-credential(1)"
@@ -25070,47 +19541,27 @@ msgstr ""
#. type: Plain text
#: en/git-credential.txt:25
-msgid ""
-"Git has an internal interface for storing and retrieving credentials from "
-"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 "
-"more background on the concepts."
+msgid "Git has an internal interface for storing and retrieving credentials from 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 more background on the concepts."
msgstr ""
#. type: Plain text
#: en/git-credential.txt:29
-msgid ""
-"git-credential takes an \"action\" option on the command-line (one of "
-"`fill`, `approve`, or `reject`) and reads a credential description on stdin "
-"(see <<IOFMT,INPUT/OUTPUT FORMAT>>)."
+msgid "git-credential takes an \"action\" option on the command-line (one of `fill`, `approve`, or `reject`) and reads a credential description on stdin (see <<IOFMT,INPUT/OUTPUT FORMAT>>)."
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 "
-"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."
+msgid "If the action is `fill`, git-credential will attempt to add \"username\" and \"password\" attributes to the description by reading config files, by contacting any configured credential helpers, or by prompting the user. The username and password attributes of the credential description are then printed to stdout together with the attributes already provided."
msgstr ""
#. type: Plain text
#: en/git-credential.txt:40
-msgid ""
-"If the action is `approve`, git-credential will send the description to any "
-"configured credential helpers, which may store the credential for later use."
+msgid "If the action is `approve`, git-credential will send the description to any configured credential helpers, which may store the credential for later use."
msgstr ""
#. type: Plain text
#: en/git-credential.txt:44
-msgid ""
-"If the action is `reject`, git-credential will send the description to any "
-"configured credential helpers, which may erase any stored credential "
-"matching the description."
+msgid "If the action is `reject`, git-credential will send the description to any configured credential helpers, which may erase any stored credential matching the description."
msgstr ""
#. type: Plain text
@@ -25126,9 +19577,7 @@ msgstr ""
#. type: Plain text
#: en/git-credential.txt:52
-msgid ""
-"An application using git-credential will typically use `git credential` "
-"following these steps:"
+msgid "An application using git-credential will typically use `git credential` following these steps:"
msgstr ""
#. type: Plain text
@@ -25138,11 +19587,7 @@ msgstr ""
#. type: Plain text
#: en/git-credential.txt:60
-msgid ""
-"For example, if we want a password for `https://example.com/foo.git`, we "
-"might generate the following credential description (don't forget the blank "
-"line at the end; it tells `git credential` that the application finished "
-"feeding all the information it has):"
+msgid "For example, if we want a password for `https://example.com/foo.git`, we might generate the following credential description (don't forget the blank line at the end; it tells `git credential` that the application finished feeding all the information it has):"
msgstr ""
#. type: Plain text
@@ -25156,12 +19601,7 @@ msgstr ""
#. type: Plain text
#: en/git-credential.txt:70
-msgid ""
-"Ask git-credential to give us a username and password for this description. "
-"This is done by running `git credential fill`, feeding the description from "
-"step (1) to its standard input. The complete credential description "
-"(including the credential per se, i.e. the login and password) will be "
-"produced on standard output, like:"
+msgid "Ask git-credential to give us a username and password for this description. This is done by running `git credential fill`, feeding the description from step (1) to its standard input. The complete credential description (including the credential per se, i.e. the login and password) will be produced on standard output, like:"
msgstr ""
#. type: Plain text
@@ -25176,40 +19616,22 @@ 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 "
-"example by removing the `path` attribute when the protocol is HTTP(s) and "
-"`credential.useHttpPath` is false."
+msgid "In most cases, this means the attributes given in the input will be repeated in the output, but Git may also modify the credential description, for example by removing the `path` attribute when the protocol is HTTP(s) and `credential.useHttpPath` is false."
msgstr ""
#. type: Plain text
#: en/git-credential.txt:86
-msgid ""
-"If the `git credential` knew about the password, this step may not have "
-"involved the user actually typing this password (the user may have typed a "
-"password to unlock the keychain instead, or no user interaction was done if "
-"the keychain was already unlocked) before it returned `password=secr3t`."
+msgid "If the `git credential` knew about the password, this step may not have involved the user actually typing this password (the user may have typed a password to unlock the keychain instead, or no user interaction was done if the keychain was already unlocked) before it returned `password=secr3t`."
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."
+msgid "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
#: en/git-credential.txt:99
-msgid ""
-"Report on the success or failure of the password. If the credential allowed "
-"the operation to complete successfully, then it can be marked with an "
-"\"approve\" action to tell `git credential` to reuse it in its next "
-"invocation. If the credential was rejected during the operation, use the "
-"\"reject\" action so that `git credential` will ask for a new password in "
-"its next invocation. In either case, `git credential` should be fed with the"
-" credential description obtained from step (2) (which also contain the ones "
-"provided in step (1))."
+msgid "Report on the success or failure of the password. If the credential allowed the operation to complete successfully, then it can be marked with an \"approve\" action to tell `git credential` to reuse it in its next invocation. If the credential was rejected during the operation, use the \"reject\" action so that `git credential` will ask for a new password in its next invocation. In either case, `git credential` should be fed with the credential description obtained from step (2) (which also contain the ones provided in step (1))."
msgstr ""
#. type: Title -
@@ -25220,30 +19642,17 @@ msgstr ""
#. type: Plain text
#: en/git-credential.txt:109
-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 "
-"credential data to be obtained (login/password)."
+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 credential data to be obtained (login/password)."
msgstr ""
#. type: Plain text
#: en/git-credential.txt:119
-msgid ""
-"The credential is split into a set of named attributes, with one attribute "
-"per line. Each attribute is specified by a key-value pair, separated by an "
-"`=` (equals) sign, followed by a newline. The key may contain any bytes "
-"except `=`, newline, or NUL. The value may contain any bytes except newline "
-"or NUL. In both cases, all bytes are treated as-is (i.e., there is no "
-"quoting, and one cannot transmit a value with newline or NUL in it). The "
-"list of attributes is terminated by a blank line or end-of-file. Git "
-"understands the following attributes:"
+msgid "The credential is split into a set of named attributes, with one attribute per line. Each attribute is specified by a key-value pair, separated by an `=` (equals) sign, followed by a newline. The key may contain any bytes except `=`, newline, or NUL. The value may contain any bytes except newline or NUL. In both cases, all bytes are treated as-is (i.e., there is no quoting, and one cannot transmit a value with newline or NUL in it). The list of attributes is terminated by a blank line or end-of-file. Git understands the following attributes:"
msgstr ""
#. type: Labeled list
#: en/git-credential.txt:120
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`protocol`"
msgstr "`protocol`"
@@ -25254,7 +19663,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:125
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`host`"
msgstr "`host`"
@@ -25265,33 +19674,29 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:129
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`path`"
msgstr "`path`"
#. type: Plain text
#: en/git-credential.txt:134
-msgid ""
-"The path with which the credential will be used. E.g., for accessing a "
-"remote https repository, this will be the repository's path on the server."
+msgid "The path with which the credential will be used. E.g., for accessing a remote https repository, this will be the repository's path on the server."
msgstr ""
#. type: Labeled list
#: en/git-credential.txt:135
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`username`"
msgstr "`username`"
#. type: Plain text
#: en/git-credential.txt:139
-msgid ""
-"The credential's username, if we already have one (e.g., from a URL, from "
-"the user, or from a previously run helper)."
+msgid "The credential's username, if we already have one (e.g., from a URL, from the user, or from a previously run helper)."
msgstr ""
#. type: Labeled list
#: en/git-credential.txt:140
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`password`"
msgstr "`password`"
@@ -25302,26 +19707,18 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:144
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`url`"
msgstr "`url`"
#. 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., "
-"`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 "
-"attribute first, followed by any overrides."
+msgid "When this special attribute is read by `git credential`, the value is parsed as a URL and treated as if its constituent parts were read (e.g., `url=https://example.com` would behave as if `protocol=https` and `host=example.com` had been provided). This can help callers avoid parsing URLs themselves. 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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-cvsexportcommit(1)"
msgstr "git-cvsexportcommit(1)"
@@ -25340,66 +19737,47 @@ msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:20
-msgid ""
-"Exports a commit from Git to a CVS checkout, making it easier to merge "
-"patches from a Git repository into a CVS repository."
+msgid "Exports a commit from Git to a CVS checkout, making it easier to merge patches from a Git repository into a CVS repository."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:24
-msgid ""
-"Specify the name of a CVS checkout using the -w switch or execute it from "
-"the root of the CVS working copy. In the latter case GIT_DIR must be "
-"defined. See examples below."
+msgid "Specify the name of a CVS checkout using the -w switch or execute it from the root of the CVS working copy. In the latter case GIT_DIR must be defined. See examples below."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:28
-msgid ""
-"It does its best to do the safe thing, it will check that the files are "
-"unchanged and up to date in the CVS checkout, and it will not autocommit by "
-"default."
+msgid "It does its best to do the safe thing, it will check that the files are unchanged and up to date in the CVS checkout, and it will not autocommit by default."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:30
-msgid ""
-"Supports file additions, removals, and commits that affect binary files."
+msgid "Supports file additions, removals, and commits that affect binary files."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:33
-msgid ""
-"If the commit is a merge commit, you must tell 'git cvsexportcommit' what "
-"parent the changeset should be done against."
+msgid "If the commit is a merge commit, you must tell 'git cvsexportcommit' what parent the changeset should be done against."
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."
+msgid "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
#: en/git-cvsexportcommit.txt:44
-msgid ""
-"Be pedantic (paranoid) when applying patches. Invokes patch with --fuzz=0"
+msgid "Be pedantic (paranoid) when applying patches. Invokes patch with --fuzz=0"
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:48
-msgid ""
-"Add authorship information. Adds Author line, and Committer (if different "
-"from Author) to the message."
+msgid "Add authorship information. Adds Author line, and Committer (if different from Author) to the message."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:53
-msgid ""
-"Set an alternative CVSROOT to use. This corresponds to the CVS -d "
-"parameter. Usually users will not want to set this, except if using CVS in "
-"an asymmetric fashion."
+msgid "Set an alternative CVSROOT to use. This corresponds to the CVS -d parameter. Usually users will not want to set this, except if using CVS in an asymmetric fashion."
msgstr ""
#. type: Plain text
@@ -25420,9 +19798,7 @@ msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:63
-msgid ""
-"Prepend the commit message with the provided prefix. Useful for patch "
-"series and the like."
+msgid "Prepend the commit message with the provided prefix. Useful for patch series and the like."
msgstr ""
#. type: Plain text
@@ -25432,26 +19808,17 @@ msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:70
-msgid ""
-"Reverse CVS keyword expansion (e.g. $Revision: 1.2.3.4$ becomes $Revision$) "
-"in working CVS checkout before applying patch."
+msgid "Reverse CVS keyword expansion (e.g. $Revision: 1.2.3.4$ becomes $Revision$) in working CVS checkout before applying patch."
msgstr ""
#. type: Plain text
#: 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'."
+msgid "Specify the location of the CVS checkout to use for the export. This option does not require GIT_DIR to be set before execution if the current directory is within a Git repository. The default is the value of 'cvsexportcommit.cvsdir'."
msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:81
-msgid ""
-"Tell cvsexportcommit that the current working directory is not only a Git "
-"checkout, but also the CVS checkout. Therefore, Git will reset the working "
-"directory to the parent commit before proceeding."
+msgid "Tell cvsexportcommit that the current working directory is not only a Git checkout, but also the CVS checkout. Therefore, Git will reset the working directory to the parent commit before proceeding."
msgstr ""
#. type: Plain text
@@ -25490,9 +19857,7 @@ 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 -
@@ -25504,9 +19869,7 @@ 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 -
@@ -25520,14 +19883,13 @@ msgstr ""
#. type: Title =
#: en/git-cvsimport.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-cvsimport(1)"
msgstr "git-cvsimport(1)"
#. type: Plain text
#: en/git-cvsimport.txt:7
-msgid ""
-"git-cvsimport - Salvage your data out of another SCM people love to hate"
+msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
msgstr ""
#. type: Plain text
@@ -25554,16 +19916,12 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:29
-msgid ""
-"Imports a CVS repository into Git. It will either create a new repository, "
-"or incrementally import into an existing one."
+msgid "Imports a CVS repository into Git. It will either create a new repository, or incrementally import into an existing one."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:32
-msgid ""
-"Splitting the CVS log into patch sets is done by 'cvsps'. At least version "
-"2.1 is required."
+msgid "Splitting the CVS log into patch sets is done by 'cvsps'. At least version 2.1 is required."
msgstr ""
#. type: Plain text
@@ -25576,22 +19934,12 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:42
-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."
+msgid "You should *never* do any work of your own on the branches that are created by 'git cvsimport'. By default initial import will create and populate a \"master\" branch from the CVS repository's main branch which you're free to work with; after that, you need to 'git merge' incremental imports, or any CVS branches, yourself. It is advisable to specify a named remote via -r to separate and protect the incoming branches."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:48
-msgid ""
-"If you intend to set up a shared public repository that all developers can "
-"read/write, or if you want to use linkgit:git-cvsserver[1], then you "
-"probably want to make a bare clone of the imported repository, and use the "
-"clone as the shared repository. See linkgit:gitcvs-migration[7]."
+msgid "If you intend to set up a shared public repository that all developers can read/write, or if you want to use linkgit:git-cvsserver[1], then you probably want to make a bare clone of the imported repository, and use the clone as the shared repository. See linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Plain text
@@ -25607,12 +19955,7 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:61
-msgid ""
-"The root of the CVS archive. May be local (a simple path) or remote; "
-"currently, only the :local:, :ext: and :pserver: access methods are "
-"supported. If not given, 'git cvsimport' will try to read it from "
-"`CVS/Root`. If no such file exists, it checks for the `CVSROOT` environment "
-"variable."
+msgid "The root of the CVS archive. May be local (a simple path) or remote; currently, only the :local:, :ext: and :pserver: access methods are supported. If not given, 'git cvsimport' will try to read it from `CVS/Root`. If no such file exists, it checks for the `CVSROOT` environment variable."
msgstr ""
#. type: Labeled list
@@ -25624,9 +19967,7 @@ msgstr "git-add(1)"
#. type: Plain text
#: en/git-cvsimport.txt:66
-msgid ""
-"The CVS module you want to import. Relative to <CVSROOT>. If not given, "
-"'git cvsimport' tries to read it from `CVS/Repository`."
+msgid "The CVS module you want to import. Relative to <CVSROOT>. If not given, 'git cvsimport' tries to read it from `CVS/Repository`."
msgstr ""
#. type: Labeled list
@@ -25654,10 +19995,7 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:75
-msgid ""
-"The Git remote to import this CVS repository into. Moves all CVS branches "
-"into remotes/<remote>/<branch> akin to the way 'git clone' uses 'origin' by "
-"default."
+msgid "The Git remote to import this CVS repository into. Moves all CVS branches into remotes/<remote>/<branch> akin to the way 'git clone' uses 'origin' by default."
msgstr ""
#. type: Labeled list
@@ -25668,35 +20006,22 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:84
-msgid ""
-"When no remote is specified (via -r) the `HEAD` branch from CVS is imported "
-"to the 'origin' branch within the Git repository, as `HEAD` already has a "
-"special meaning for Git. When a remote is specified the `HEAD` branch is "
-"named remotes/<remote>/master mirroring 'git clone' behaviour. Use this "
-"option if you want to import into a different branch."
+msgid "When no remote is specified (via -r) the `HEAD` branch from CVS is imported to the 'origin' branch within the Git repository, as `HEAD` already has a special meaning for Git. When a remote is specified the `HEAD` branch is named remotes/<remote>/master mirroring 'git clone' behaviour. Use this option if you want to import into a different branch."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:87
-msgid ""
-"Use '-o master' for continuing an import that was initially done by the old "
-"cvs2git tool."
+msgid "Use '-o master' for continuing an import that was initially done by the old cvs2git tool."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:97
-msgid ""
-"Kill keywords: will extract files with '-kk' from the CVS archive to avoid "
-"noisy changesets. Highly recommended, but off by default to preserve "
-"compatibility with early imported trees."
+msgid "Kill keywords: will extract files with '-kk' from the CVS archive to avoid noisy changesets. Highly recommended, but off by default to preserve compatibility with early imported trees."
msgstr ""
#. type: Plain text
@@ -25723,9 +20048,7 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:107
-msgid ""
-"Additional options for cvsps. The options `-u` and '-A' are implicit and "
-"should not be used here."
+msgid "Additional options for cvsps. The options `-u` and '-A' are implicit and should not be used here."
msgstr ""
#. type: Plain text
@@ -25741,9 +20064,7 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:113
-msgid ""
-"Pass the timestamp fuzz factor to cvsps, in seconds. If unset, cvsps "
-"defaults to 300s."
+msgid "Pass the timestamp fuzz factor to cvsps, in seconds. If unset, cvsps defaults to 300s."
msgstr ""
#. type: Labeled list
@@ -25754,17 +20075,12 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:117
-msgid ""
-"Instead of calling cvsps, read the provided cvsps output file. Useful for "
-"debugging or when cvsps is being handled outside cvsimport."
+msgid "Instead of calling cvsps, read the provided cvsps output file. Useful for debugging or when cvsps is being handled outside cvsimport."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:122
-msgid ""
-"Attempt to detect merges based on the commit message. This option will "
-"enable default regexes that try to capture the source branch name from the "
-"commit message."
+msgid "Attempt to detect merges based on the commit message. This option will enable default regexes that try to capture the source branch name from the commit message."
msgstr ""
#. type: Labeled list
@@ -25775,10 +20091,7 @@ 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."
+msgid "Attempt to detect merges based on the commit message with a custom regex. It can be used with `-m` to enable the default regexes as well. You must escape forward slashes."
msgstr ""
#. type: Plain text
@@ -25788,8 +20101,7 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:131
-msgid ""
-"This option can be used several times to provide several detection regexes."
+msgid "This option can be used several times to provide several detection regexes."
msgstr ""
#. type: Labeled list
@@ -25805,9 +20117,7 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:138
-msgid ""
-"Import all commits, including recent ones. cvsimport by default skips "
-"commits that have a timestamp less than 10 minutes ago."
+msgid "Import all commits, including recent ones. cvsimport by default skips commits that have a timestamp less than 10 minutes ago."
msgstr ""
#. type: Labeled list
@@ -25818,9 +20128,7 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:142
-msgid ""
-"Limit the number of commits imported. Workaround for cases where cvsimport "
-"leaks memory."
+msgid "Limit the number of commits imported. Workaround for cases where cvsimport leaks memory."
msgstr ""
#. type: Labeled list
@@ -25831,10 +20139,7 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:148
-msgid ""
-"CVS by default uses the Unix username when writing its commit logs. Using "
-"this option and an author-conv-file maps the name recorded in CVS to author "
-"name, e-mail and optional time zone:"
+msgid "CVS by default uses the Unix username when writing its commit logs. Using this option and an author-conv-file maps the name recorded in CVS to author name, e-mail and optional time zone:"
msgstr ""
#. type: delimited block -
@@ -25847,34 +20152,22 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "'git cvsimport' will make it appear as those authors had their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly all along. If a time zone is specified, GIT_AUTHOR_DATE will have the corresponding offset applied."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:163
-msgid ""
-"For convenience, this data is saved to `$GIT_DIR/cvs-authors` each time the "
-"'-A' option is provided and read from that same file each time 'git "
-"cvsimport' is run."
+msgid "For convenience, this data is saved to `$GIT_DIR/cvs-authors` each time the '-A' option is provided and read from that same file each time 'git cvsimport' is run."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:167
-msgid ""
-"It is not recommended to use this feature if you intend to export changes "
-"back to CVS again later with 'git cvsexportcommit'."
+msgid "It is not recommended to use this feature if you intend to export changes back to CVS again later with 'git cvsexportcommit'."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:173
-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"
+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"
msgstr ""
#. type: delimited block -
@@ -25885,16 +20178,12 @@ 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."
+msgid "The revision data is appended to the file if it already exists, for use when doing incremental imports."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:183
-msgid ""
-"This option may be useful if you have CVS revision numbers stored in commit "
-"messages, bug-tracking systems, email archives, and the like."
+msgid "This option may be useful if you have CVS revision numbers stored in commit messages, bug-tracking systems, email archives, and the like."
msgstr ""
#. type: Plain text
@@ -25909,9 +20198,7 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:193
-msgid ""
-"Otherwise, success is indicated the Unix way, i.e. by simply exiting with a "
-"zero exit status."
+msgid "Otherwise, success is indicated the Unix way, i.e. by simply exiting with a zero exit status."
msgstr ""
#. type: Title -
@@ -25927,23 +20214,17 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:202
-msgid ""
-"If timestamps of commits in the CVS repository are not stable enough to be "
-"used for ordering commits changes may show up in the wrong order."
+msgid "If timestamps of commits in the CVS repository are not stable enough to be used for ordering commits changes may show up in the wrong order."
msgstr ""
#. 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:207
-msgid ""
-"If the timestamp order of different files cross the revision order within "
-"the commit matching time window the order of commits may be wrong."
+msgid "If the timestamp order of different files cross the revision order within the commit matching time window the order of commits may be wrong."
msgstr ""
#. type: Plain text
@@ -25958,17 +20239,12 @@ 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."
+msgid "All files from the branching point are added to a branch even if never added in CVS."
msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:216
-msgid ""
-"This applies to files added to the source branch *after* a daughter branch "
-"was created: if previously no commit was made on the daughter branch they "
-"will erroneously be added to the daughter branch in git."
+msgid "This applies to files added to the source branch *after* a daughter branch was created: if previously no commit was made on the daughter branch they will erroneously be added to the daughter branch in git."
msgstr ""
#. type: Plain text
@@ -25983,9 +20259,7 @@ 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:"
+msgid "If you suspect that any of these issues may apply to the repository you want to import, consider using cvs2git:"
msgstr ""
#. type: Plain text
@@ -25995,7 +20269,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsserver.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-cvsserver(1)"
msgstr "git-cvsserver(1)"
@@ -26025,9 +20299,7 @@ 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
@@ -26043,10 +20315,7 @@ 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."
+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."
msgstr ""
#. type: Labeled list
@@ -26062,7 +20331,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:37 en/git-daemon.txt:48
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--strict-paths"
msgstr "--strict-paths"
@@ -26073,15 +20342,13 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:40 en/git-daemon.txt:77
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--export-all"
msgstr "--export-all"
#. type: Plain text
#: en/git-cvsserver.txt:43
-msgid ""
-"Don't check for `gitcvs.enabled` in config. You also have to specify a list "
-"of allowed directories (see below) if you want to use this option."
+msgid "Don't check for `gitcvs.enabled` in config. You also have to specify a list of allowed directories (see below) if you want to use this option."
msgstr ""
#. type: Labeled list
@@ -26092,7 +20359,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:45 en/git.txt:534
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--version"
msgstr "--version"
@@ -26103,7 +20370,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:50 en/git.txt:537
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--help"
msgstr "--help"
@@ -26114,11 +20381,7 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:58
-msgid ""
-"You can specify a list of allowed directories. If no directories are given, "
-"all are allowed. This is an additional restriction, gitcvs access still "
-"needs to be enabled by the `gitcvs.enabled` config option unless `--export-"
-"all` was given, too."
+msgid "You can specify a list of allowed directories. If no directories are given, all are allowed. This is an additional restriction, gitcvs access still needs to be enabled by the `gitcvs.enabled` config option unless `--export-all` was given, too."
msgstr ""
#. type: Plain text
@@ -26128,16 +20391,12 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:68
-msgid ""
-"It is highly functional. However, not all methods are implemented, and for "
-"those methods that are implemented, not all switches are implemented."
+msgid "It is highly functional. However, not all methods are implemented, and for those methods that are implemented, not all switches are implemented."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:71
-msgid ""
-"Testing has been done using both the CLI CVS client, and the Eclipse CVS "
-"plugin. Most functionality works fine with both of these clients."
+msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS plugin. Most functionality works fine with both of these clients."
msgstr ""
#. type: Title -
@@ -26153,10 +20412,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Title -
@@ -26167,9 +20423,7 @@ 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"
+msgid "If you are going to offer CVS access via pserver, add a line in /etc/inetd.conf like"
msgstr ""
#. type: delimited block -
@@ -26180,28 +20434,18 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:96
-msgid ""
-"Note: Some inetd servers let you specify the name of the executable "
-"independently of the value of argv[0] (i.e. the name the program assumes it "
-"was executed with). In this case the correct line in /etc/inetd.conf looks "
-"like"
+msgid "Note: Some inetd servers let you specify the name of the executable independently of the value of argv[0] (i.e. the name the program assumes it was executed with). In this case the correct line in /etc/inetd.conf looks like"
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
#: en/git-cvsserver.txt:106
-msgid ""
-"Only anonymous access is provided by pserve by default. To commit you will "
-"have to create pserver accounts, simply add a gitcvs.authdb setting in the "
-"config file of the repositories you want the cvsserver to allow writes to, "
-"for example:"
+msgid "Only anonymous access is provided by pserve by default. To commit you will have to create pserver accounts, simply add a gitcvs.authdb setting in the config file of the repositories you want the cvsserver to allow writes to, for example:"
msgstr ""
#. type: delimited block -
@@ -26214,9 +20458,7 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:115
-msgid ""
-"The format of these files is username followed by the encrypted password, "
-"for example:"
+msgid "The format of these files is username followed by the encrypted password, for example:"
msgstr ""
#. type: delimited block -
@@ -26229,24 +20471,18 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:123
-msgid ""
-"You can use the 'htpasswd' facility that comes with Apache to make these "
-"files, but Apache's MD5 crypt method differs from the one used by most C "
-"library's crypt() function, so don't use the -m option."
+msgid "You can use the 'htpasswd' facility that comes with Apache to make these files, but Apache's MD5 crypt method differs from the one used by most C library's crypt() function, so don't use the -m option."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:125
-msgid ""
-"Alternatively you can produce the password with perl's crypt() operator:"
+msgid "Alternatively you can produce the password with perl's crypt() operator:"
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
@@ -26257,50 +20493,33 @@ 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
#: en/git-cvsserver.txt:136
-msgid ""
-"No special setup is needed for SSH access, other than having Git tools in "
-"the PATH. If you have clients that do not accept the CVS_SERVER environment "
-"variable, you can rename 'git-cvsserver' to `cvs`."
+msgid "No special setup is needed for SSH access, other than having Git tools in the PATH. If you have clients that do not accept the CVS_SERVER environment variable, you can rename 'git-cvsserver' to `cvs`."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:139
-msgid ""
-"Note: Newer CVS versions (>= 1.12.11) also support specifying CVS_SERVER "
-"directly in CVSROOT like"
+msgid "Note: Newer CVS versions (>= 1.12.11) also support specifying CVS_SERVER directly in CVSROOT like"
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
#: en/git-cvsserver.txt:148
-msgid ""
-"This has the advantage that it will be saved in your 'CVS/Root' files and "
-"you don't need to worry about always setting the correct environment "
-"variable. SSH users restricted to 'git-shell' don't need to override the "
-"default with CVS_SERVER (and shouldn't) as 'git-shell' understands `cvs` to "
-"mean 'git-cvsserver' and pretends that the other end runs the real 'cvs' "
-"better."
+msgid "This has the advantage that it will be saved in your 'CVS/Root' files and you don't need to worry about always setting the correct environment variable. SSH users restricted to 'git-shell' don't need to override the default with CVS_SERVER (and shouldn't) as 'git-shell' understands `cvs` to mean 'git-cvsserver' and pretends that the other end runs the real 'cvs' better."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:151
-msgid ""
-"For each repo that you want accessible from CVS you need to edit config in "
-"the repo and add the following section."
+msgid "For each repo that you want accessible from CVS you need to edit config in the repo and add the following section."
msgstr ""
#. type: delimited block -
@@ -26315,27 +20534,17 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:167
-msgid ""
-"You also need to ensure that each repository is \"bare\" (without a Git "
-"index file) for `cvs commit` to work. See linkgit:gitcvs-migration[7]."
+msgid "You also need to ensure that each repository is \"bare\" (without a Git index file) for `cvs commit` to work. See linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Plain text
#: 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 "
-"allowing access over SSH."
+msgid "All configuration variables can also be overridden for a specific method of access. Valid method names are \"ext\" (for SSH access) and \"pserver\". The following example configuration would disable pserver access while still allowing access over SSH."
msgstr ""
#. type: delimited block -
@@ -26356,13 +20565,7 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:186
-msgid ""
-"If you didn't specify the CVSROOT/CVS_SERVER directly in the checkout "
-"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'."
+msgid "If you didn't specify the CVSROOT/CVS_SERVER directly in the checkout 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'."
msgstr ""
#. type: delimited block -
@@ -26375,22 +20578,12 @@ 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, "
-"GIT_COMMITTER_NAME, and GIT_COMMITTER_EMAIL. For SSH clients whose login "
-"shell is bash, .bashrc may be a reasonable alternative."
+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, GIT_COMMITTER_NAME, and GIT_COMMITTER_EMAIL. For SSH clients whose login shell is bash, .bashrc may be a reasonable alternative."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:204
-msgid ""
-"Clients should now be able to check out the project. Use the CVS 'module' "
-"name to indicate what Git 'head' you want to check out. This also sets the "
-"name of your newly checked-out directory, unless you tell it otherwise with "
-"`-d <dir_name>`. For example, this checks out 'master' branch to the "
-"`project-master` directory:"
+msgid "Clients should now be able to check out the project. Use the CVS 'module' name to indicate what Git 'head' you want to check out. This also sets the name of your newly checked-out directory, unless you tell it otherwise with `-d <dir_name>`. For example, this checks out 'master' branch to the `project-master` directory:"
msgstr ""
#. type: delimited block -
@@ -26407,59 +20600,32 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:217
-msgid ""
-"'git-cvsserver' uses one database per Git head (i.e. CVS module) to store "
-"information about the repository to maintain consistent CVS revision "
-"numbers. The database needs to be updated (i.e. written to) after every "
-"commit."
+msgid "'git-cvsserver' uses one database per Git head (i.e. CVS module) to store information about the repository to maintain consistent CVS revision numbers. The database needs to be updated (i.e. written to) after every commit."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:222
-msgid ""
-"If the commit is done directly by using `git` (as opposed to using 'git-"
-"cvsserver') the update will need to happen on the next repository access by "
-"'git-cvsserver', independent of access method and requested operation."
+msgid "If the commit is done directly by using `git` (as opposed to using 'git-cvsserver') the update will need to happen on the next repository access by 'git-cvsserver', independent of access method and requested operation."
msgstr ""
#. type: Plain text
#: 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-"
-"date any time 'git-cvsserver' is executed)."
+msgid "That means that even if you offer only read access (e.g. by using the pserver method), 'git-cvsserver' should have write access to the database to work reliably (otherwise you need to make sure that the database is up-to-date any time 'git-cvsserver' is executed)."
msgstr ""
#. 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:246
-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-"
-"existing CVS sandboxes."
+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-existing CVS sandboxes."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:249
-msgid ""
-"You can configure the database backend with the following configuration "
-"variables:"
+msgid "You can configure the database backend with the following configuration variables:"
msgstr ""
#. type: Title ~
@@ -26470,27 +20636,17 @@ 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()`."
+msgid "'git-cvsserver' uses the Perl DBI module. Please also read its documentation if changing these variables, especially about `DBI->connect()`."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:263
-msgid ""
-"Database name. The exact meaning depends on the selected database driver, "
-"for SQLite this is a filename. Supports variable substitution (see below). "
-"May not contain semicolons (`;`). Default: '%Ggitcvs.%m.sqlite'"
+msgid "Database name. The exact meaning depends on the selected database driver, for SQLite this is a filename. Supports variable substitution (see below). May not contain semicolons (`;`). Default: '%Ggitcvs.%m.sqlite'"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:272
-msgid ""
-"Used DBI driver. You can specify any available driver for this here, but it "
-"might not work. cvsserver is tested with 'DBD::SQLite', reported to work "
-"with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Please regard"
-" this as an experimental feature. May not contain colons (`:`). Default: "
-"'SQLite'"
+msgid "Used DBI driver. You can specify any available driver for this here, but it might not work. cvsserver is tested with 'DBD::SQLite', reported to work with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Please regard this as an experimental feature. May not contain colons (`:`). Default: 'SQLite'"
msgstr ""
#. type: Labeled list
@@ -26501,9 +20657,7 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:277
-msgid ""
-"Database user. Only useful if setting `dbDriver`, since SQLite has no "
-"concept of database users. Supports variable substitution (see below)."
+msgid "Database user. Only useful if setting `dbDriver`, since SQLite has no concept of database users. Supports variable substitution (see below)."
msgstr ""
#. type: Labeled list
@@ -26514,23 +20668,17 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:281
-msgid ""
-"Database password. Only useful if setting `dbDriver`, since SQLite has no "
-"concept of database passwords."
+msgid "Database password. Only useful if setting `dbDriver`, since SQLite has no concept of database passwords."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:286
-msgid ""
-"Database table name prefix. Supports variable substitution (see below). "
-"Any non-alphabetic characters will be replaced with underscores."
+msgid "Database table name prefix. Supports variable substitution (see below). Any non-alphabetic characters will be replaced with underscores."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:288
-msgid ""
-"All variables can also be set per access method, see "
-"<<configaccessmethod,above>>."
+msgid "All variables can also be set per access method, see <<configaccessmethod,above>>."
msgstr ""
#. type: Title ^
@@ -26563,10 +20711,7 @@ 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 "
-"directory name in a filename if wanted)"
+msgid "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 ""
#. type: Labeled list
@@ -26599,37 +20744,27 @@ 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."
+msgid "Name of the user running 'git-cvsserver'. If no name can be determined, the numeric uid is used."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:314
-msgid ""
-"These variables obviate the need for command-line options in some "
-"circumstances, allowing easier restricted usage through git-shell."
+msgid "These variables obviate the need for command-line options in some circumstances, allowing easier restricted usage through git-shell."
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."
+msgid "GIT_CVSSERVER_ROOT specifies a single-directory whitelist. The repository must still be configured to allow access through git-cvsserver, as described above."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:323
-msgid ""
-"When these environment variables are set, the corresponding command-line "
-"arguments may not be used."
+msgid "When these environment variables are set, the corresponding command-line arguments may not be used."
msgstr ""
#. type: Title -
@@ -26650,43 +20785,27 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:332
-msgid ""
-"Create a new location. See the notes below for details on how to choose the "
-"right protocol."
+msgid "Create a new location. See the notes below for details on how to choose the right protocol."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:335
-msgid ""
-"Browse the 'modules' available. It will give you a list of the heads in the "
-"repository. You will not be able to browse the tree from there. Only the "
-"heads."
+msgid "Browse the 'modules' available. It will give you a list of the heads in the repository. You will not be able to browse the tree from there. Only the heads."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:337
-msgid ""
-"Pick `HEAD` when it asks what branch/tag to check out. Untick the \"launch "
-"commit wizard\" to avoid committing the .project file."
+msgid "Pick `HEAD` when it asks what branch/tag to check out. Untick the \"launch commit wizard\" to avoid committing the .project file."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:343
-msgid ""
-"Protocol notes: If you are using anonymous access via pserver, just select "
-"that. Those using SSH access should choose the 'ext' protocol, and "
-"configure 'ext' access on the Preferences->Team->CVS->ExtConnection pane. "
-"Set CVS_SERVER to \"`git cvsserver`\". Note that password support is not "
-"good when using 'ext', you will definitely want to have SSH keys setup."
+msgid "Protocol notes: If you are using anonymous access via pserver, just select that. Those using SSH access should choose the 'ext' protocol, and configure 'ext' access on the Preferences->Team->CVS->ExtConnection pane. Set CVS_SERVER to \"`git cvsserver`\". Note that password support is not good when using 'ext', you will definitely want to have SSH keys setup."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:348
-msgid ""
-"Alternatively, you can just use the non-standard extssh protocol that "
-"Eclipse offer. In that case CVS_SERVER is ignored, and you will have to "
-"replace the cvs utility on the server with 'git-cvsserver' or manipulate "
-"your `.bashrc` so that calling 'cvs' effectively calls 'git-cvsserver'."
+msgid "Alternatively, you can just use the non-standard extssh protocol that Eclipse offer. In that case CVS_SERVER is ignored, and you will have to replace the cvs utility on the server with 'git-cvsserver' or manipulate your `.bashrc` so that calling 'cvs' effectively calls 'git-cvsserver'."
msgstr ""
#. type: Title -
@@ -26723,61 +20842,27 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:362
-msgid ""
-"All the operations required for normal use are supported, including "
-"checkout, diff, status, update, log, add, remove, commit."
+msgid "All the operations required for normal use are supported, including checkout, diff, status, update, log, add, remove, commit."
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). "
-"However, CVS revision numbers for non-default branches are not well "
-"emulated, and cvs log does not show tags or branches at all. (Non-main-"
-"branch CVS revision numbers superficially resemble CVS revision numbers, but"
-" they actually encode a git commit ID directly, rather than represent the "
-"number of revisions since the branch point.)"
+msgid "Most CVS command arguments that read CVS tags or revision numbers (typically -r) work, and also support any git refspec (tag, branch, commit ID, etc). However, CVS revision numbers for non-default branches are not well emulated, and cvs log does not show tags or branches at all. (Non-main-branch CVS revision numbers superficially resemble CVS revision numbers, but they actually encode a git commit ID directly, rather than represent the number of revisions since the branch point.)"
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:385
-msgid ""
-"Note that there are two ways to checkout a particular branch. As described "
-"elsewhere on this page, the \"module\" parameter of cvs checkout is "
-"interpreted as a branch name, and it becomes the main branch. It remains "
-"the main branch for a given sandbox even if you temporarily make another "
-"branch sticky with cvs update -r. Alternatively, the -r argument can "
-"indicate some other branch to actually checkout, even though the module is "
-"still the \"main\" branch. Tradeoffs (as currently implemented): Each new "
-"\"module\" creates a new database on disk with a history for the given "
-"module, and after the database is created, operations against that main "
-"branch are fast. Or alternatively, -r doesn't take any extra disk space, "
-"but may be significantly slower for many operations, like cvs update."
+msgid "Note that there are two ways to checkout a particular branch. As described elsewhere on this page, the \"module\" parameter of cvs checkout is interpreted as a branch name, and it becomes the main branch. It remains the main branch for a given sandbox even if you temporarily make another branch sticky with cvs update -r. Alternatively, the -r argument can indicate some other branch to actually checkout, even though the module is still the \"main\" branch. Tradeoffs (as currently implemented): Each new \"module\" creates a new database on disk with a history for the given module, and after the database is created, operations against that main branch are fast. Or alternatively, -r doesn't take any extra disk space, but may be significantly slower for many operations, like cvs update."
msgstr ""
#. type: Plain text
#: 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 "
-"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 "
-"the form (underscore (`\"_\"`), dash (`\"-\"`), one or two characters, and "
-"dash (`\"-\"`)) can encode various characters based on the one or two "
-"letters: `\"s\"` for slash (`\"/\"`), `\"p\"` for period (`\".\"`), `\"u\"` "
-"for underscore (`\"_\"`), or two hexadecimal digits for any byte value at "
-"all (typically an ASCII number, or perhaps a part of a UTF-8 encoded "
-"character)."
+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 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 the form (underscore (`\"_\"`), dash (`\"-\"`), one or two characters, and dash (`\"-\"`)) can encode various characters based on the one or two letters: `\"s\"` for slash (`\"/\"`), `\"p\"` for period (`\".\"`), `\"u\"` for underscore (`\"_\"`), or two hexadecimal digits for any byte value at all (typically an ASCII number, or perhaps a part of a UTF-8 encoded character)."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:401
-msgid ""
-"Legacy monitoring operations are not supported (edit, watch and related). "
-"Exports and tagging (tags and branches) are not supported at this stage."
+msgid "Legacy monitoring operations are not supported (edit, watch and related). Exports and tagging (tags and branches) are not supported at this stage."
msgstr ""
#. type: Title ~
@@ -26788,39 +20873,22 @@ 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 "
-"conversion on some platforms."
+msgid "By default the server leaves the `-k` mode blank for all files, which causes the CVS client to treat them as a text files, subject to end-of-line conversion on some platforms."
msgstr ""
#. 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. "
-"See linkgit:gitattributes[5] for more information about end-of-line "
-"conversion."
+msgid "You can make the server use the end-of-line conversion attributes to set the `-k` modes for files by setting the `gitcvs.usecrlfattr` config variable. See linkgit:gitattributes[5] for more information about end-of-line conversion."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:422
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:426
-msgid ""
-"For best consistency with 'cvs', it is probably best to override the "
-"defaults by setting `gitcvs.usecrlfattr` to true, and `gitcvs.allBinary` to "
-"\"guess\"."
+msgid "For best consistency with 'cvs', it is probably best to override the defaults by setting `gitcvs.usecrlfattr` to true, and `gitcvs.allBinary` to \"guess\"."
msgstr ""
#. type: Title -
@@ -26836,7 +20904,7 @@ msgstr ""
#. type: Title =
#: en/git-daemon.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-daemon(1)"
msgstr "git-daemon(1)"
@@ -26868,35 +20936,22 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:30
-msgid ""
-"A really simple TCP Git daemon that normally listens on port "
-"\"DEFAULT_GIT_PORT\" aka 9418. It waits for a connection asking for a "
-"service, and will serve that service if it is enabled."
+msgid "A really simple TCP Git daemon that normally listens on port \"DEFAULT_GIT_PORT\" aka 9418. It waits for a connection asking for a service, and will serve that service if it is enabled."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:36
-msgid ""
-"It verifies that the directory has the magic file \"git-daemon-export-ok\", "
-"and it will refuse to export any Git directory that hasn't explicitly been "
-"marked for export this way (unless the `--export-all` parameter is "
-"specified). If you pass some directory paths as 'git daemon' arguments, you "
-"can further restrict the offers to a whitelist comprising of those."
+msgid "It verifies that the directory has the magic file \"git-daemon-export-ok\", and it will refuse to export any Git directory that hasn't explicitly been marked for export this way (unless the `--export-all` parameter is specified). If you pass some directory paths as 'git daemon' arguments, you can further restrict the offers to a whitelist comprising of those."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:40
-msgid ""
-"By default, only `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'."
+msgid "By default, only `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'."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:43
-msgid ""
-"This is ideally suited for read-only updates, i.e., pulling from Git "
-"repositories."
+msgid "This is ideally suited for read-only updates, i.e., pulling from Git repositories."
msgstr ""
#. type: Plain text
@@ -26906,11 +20961,7 @@ 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. "
-"'git daemon' will refuse to start when this option is enabled and no "
-"whitelist is specified."
+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. 'git daemon' will refuse to start when this option is enabled and no whitelist is specified."
msgstr ""
#. type: Labeled list
@@ -26921,26 +20972,18 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:60
-msgid ""
-"Remap all the path requests as relative to the given path. This is sort of "
-"\"Git root\" - if you run 'git daemon' with '--base-path=/srv/git' on "
-"example.com, then if you later try to pull 'git://example.com/hello.git', "
-"'git daemon' will interpret the path as '/srv/git/hello.git'."
+msgid "Remap all the path requests as relative to the given path. This is sort of \"Git root\" - if you run 'git daemon' with '--base-path=/srv/git' on example.com, then if you later try to pull 'git://example.com/hello.git', 'git daemon' will interpret the path as '/srv/git/hello.git'."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:61
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--base-path-relaxed"
msgstr "--base-path-relaxed"
#. type: Plain text
#: en/git-daemon.txt:66
-msgid ""
-"If --base-path is enabled and repo lookup fails, with this option 'git "
-"daemon' will attempt to lookup without prefixing the base path. This is "
-"useful for switching to --base-path usage, while still allowing the old "
-"paths."
+msgid "If --base-path is enabled and repo lookup fails, with this option 'git daemon' will attempt to lookup without prefixing the base path. This is useful for switching to --base-path usage, while still allowing the old paths."
msgstr ""
#. type: Labeled list
@@ -26951,34 +20994,23 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:76
-msgid ""
-"To support virtual hosting, an interpolated path template can be used to "
-"dynamically construct alternate paths. The template supports %H for the "
-"target hostname as supplied by the client but converted to all lowercase, "
-"%CH for the canonical hostname, %IP for the server's IP address, %P for the "
-"port number, and %D for the absolute path of the named repository. After "
-"interpolation, the path is validated against the directory whitelist."
+msgid "To support virtual hosting, an interpolated path template can be used to dynamically construct alternate paths. The template supports %H for the target hostname as supplied by the client but converted to all lowercase, %CH for the canonical hostname, %IP for the server's IP address, %P for the port number, and %D for the absolute path of the named repository. After interpolation, the path is validated against the directory whitelist."
msgstr ""
#. 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-"
-"daemon-export-ok' file."
+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-daemon-export-ok' file."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:82
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--inetd"
msgstr "--inetd"
#. type: Plain text
#: en/git-daemon.txt:86
-msgid ""
-"Have the server run as an inetd service. Implies --syslog. Incompatible "
-"with --detach, --port, --listen, --user and --group options."
+msgid "Have the server run as an inetd service. Implies --syslog. Incompatible with --detach, --port, --listen, --user and --group options."
msgstr ""
#. type: Labeled list
@@ -26989,12 +21021,7 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:94
-msgid ""
-"Listen on a specific IP address or hostname. IP addresses can be either an "
-"IPv4 address or an IPv6 address if supported. If IPv6 is not supported, "
-"then --listen=hostname is also not supported and --listen must be given an "
-"IPv4 address. Can be given more than once. Incompatible with `--inetd` "
-"option."
+msgid "Listen on a specific IP address or hostname. IP addresses can be either an IPv4 address or an IPv6 address if supported. If IPv6 is not supported, then --listen=hostname is also not supported and --listen must be given an IPv4 address. Can be given more than once. Incompatible with `--inetd` option."
msgstr ""
#. type: Labeled list
@@ -27016,10 +21043,7 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:102
-msgid ""
-"Timeout (in seconds) between the moment the connection is established and "
-"the client request is received (typically a rather low value, since that "
-"should be basically immediate)."
+msgid "Timeout (in seconds) between the moment the connection is established and the client request is received (typically a rather low value, since that should be basically immediate)."
msgstr ""
#. type: Labeled list
@@ -27030,10 +21054,7 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:107
-msgid ""
-"Timeout (in seconds) for specific client sub-requests. This includes the "
-"time it takes for the server to process the sub-request and the time spent "
-"waiting for the next client's request."
+msgid "Timeout (in seconds) for specific client sub-requests. This includes the time it takes for the server to process the sub-request and the time spent waiting for the next client's request."
msgstr ""
#. type: Labeled list
@@ -27044,27 +21065,23 @@ 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."
+msgid "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, ignore-translated
+#, no-wrap
msgid "--syslog"
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."
+msgid "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, ignore-translated
+#, no-wrap
msgid "--user-path"
msgstr "--user-path"
@@ -27076,12 +21093,7 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:125
-msgid ""
-"Allow {tilde}user notation to be used in requests. When specified with no "
-"parameter, requests to git://host/{tilde}alice/foo is taken as a request to "
-"access 'foo' repository in the home directory of user `alice`. If `--user-"
-"path=path` is specified, the same request is taken as a request to access "
-"`path/foo` repository in the home directory of user `alice`."
+msgid "Allow {tilde}user notation to be used in requests. When specified with no parameter, requests to git://host/{tilde}alice/foo is taken as a request to access 'foo' repository in the home directory of user `alice`. If `--user-path=path` is specified, the same request is taken as a request to access `path/foo` repository in the home directory of user `alice`."
msgstr ""
#. type: Plain text
@@ -27091,15 +21103,13 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:129
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--reuseaddr"
msgstr "--reuseaddr"
#. type: Plain text
#: en/git-daemon.txt:133
-msgid ""
-"Use SO_REUSEADDR when binding the listening socket. This allows the server "
-"to restart without waiting for old connections to time out."
+msgid "Use SO_REUSEADDR when binding the listening socket. This allows the server to restart without waiting for old connections to time out."
msgstr ""
#. type: Plain text
@@ -27115,9 +21125,7 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:140
-msgid ""
-"Save the process id in 'file'. Ignored when the daemon is run under "
-"`--inetd`."
+msgid "Save the process id in 'file'. Ignored when the daemon is run under `--inetd`."
msgstr ""
#. type: Labeled list
@@ -27134,29 +21142,17 @@ 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."
+msgid "Change daemon's uid and gid before entering the service loop. When only `--user` is given without `--group`, the primary group ID for the user is used. The values of the option are given to `getpwnam(3)` and `getgrnam(3)` and numeric IDs are not supported."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:152
-msgid ""
-"Giving these options is an error when used with `--inetd`; use the facility "
-"of inet daemon to achieve the same before spawning 'git daemon' if needed."
+msgid "Giving these options is an error when used with `--inetd`; use the facility of inet daemon to achieve the same before spawning 'git daemon' if needed."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:159
-msgid ""
-"Like many programs that switch user id, the daemon does not reset "
-"environment variables such as `$HOME` when it runs git programs, e.g. "
-"`upload-pack` and `receive-pack`. When using this option, you may also want "
-"to set and export `HOME` to point at the home directory of `<user>` before "
-"starting the daemon, and make sure any Git configuration files in that "
-"directory are readable by `<user>`."
+msgid "Like many programs that switch user id, the daemon does not reset environment variables such as `$HOME` when it runs git programs, e.g. `upload-pack` and `receive-pack`. When using this option, you may also want to set and export `HOME` to point at the home directory of `<user>` before starting the daemon, and make sure any Git configuration files in that directory are readable by `<user>`."
msgstr ""
#. type: Labeled list
@@ -27173,11 +21169,7 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:167
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -27194,26 +21186,18 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:173
-msgid ""
-"Allow/forbid overriding the site-wide default with per repository "
-"configuration. By default, all the services may be overridden."
+msgid "Allow/forbid overriding the site-wide default with per repository configuration. By default, all the services may be overridden."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:174
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]informative-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 "
-"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."
+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 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."
msgstr ""
#. type: Labeled list
@@ -27224,31 +21208,17 @@ 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 "
-"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."
+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 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."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:197
-msgid ""
-"The external command can optionally write a single line to its standard "
-"output to be sent to the requestor as an error message when it declines the "
-"service."
+msgid "The external command can optionally write a single line to its standard output to be sent to the requestor as an error message when it declines the service."
msgstr ""
#. type: Plain text
#: en/git-daemon.txt:202
-msgid ""
-"A directory to add to the whitelist of allowed directories. Unless --strict-"
-"paths is specified this will also include subdirectories of each named "
-"directory."
+msgid "A directory to add to the whitelist of allowed directories. Unless --strict-paths is specified this will also include subdirectories of each named directory."
msgstr ""
#. type: Title -
@@ -27259,12 +21229,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"daemon serves), the per-repository configuration file can be used to enable "
-"or disable them."
+msgid "These services can be globally enabled/disabled using the command-line options of this command. If finer-grained control is desired (e.g. to allow 'git archive' to be run against only in a few selected repositories the daemon serves), the per-repository configuration file can be used to enable or disable them."
msgstr ""
#. type: Labeled list
@@ -27276,10 +21241,7 @@ msgstr "git-add(1)"
#. type: Plain text
#: en/git-daemon.txt:218
-msgid ""
-"This serves 'git fetch-pack' and 'git ls-remote' clients. It is enabled by "
-"default, but a repository can disable it by setting `daemon.uploadpack` "
-"configuration item to `false`."
+msgid "This serves 'git fetch-pack' and 'git ls-remote' clients. It is enabled by default, but a repository can disable it by setting `daemon.uploadpack` configuration item to `false`."
msgstr ""
#. type: Labeled list
@@ -27291,10 +21253,7 @@ msgstr "git-commit(1)"
#. type: Plain text
#: en/git-daemon.txt:223
-msgid ""
-"This serves 'git archive --remote'. It is disabled by default, but a "
-"repository can enable it by setting `daemon.uploadarch` configuration item "
-"to `true`."
+msgid "This serves 'git archive --remote'. It is disabled by default, but a repository can enable it by setting `daemon.uploadarch` configuration item to `true`."
msgstr ""
#. type: Labeled list
@@ -27306,13 +21265,7 @@ msgstr "git-commit(1)"
#. type: Plain text
#: en/git-daemon.txt:233
-msgid ""
-"This serves 'git send-pack' clients, allowing anonymous push. It is "
-"disabled by default, as there is _no_ authentication in the protocol (in "
-"other words, anybody can push anything into the repository, including "
-"removal of refs). This is solely meant for a closed LAN setting where "
-"everybody is friendly. This service can be enabled by setting "
-"`daemon.receivepack` configuration item to `true`."
+msgid "This serves 'git send-pack' clients, allowing anonymous push. It is disabled by default, as there is _no_ authentication in the protocol (in other words, anybody can push anything into the repository, including removal of refs). This is solely meant for a closed LAN setting where everybody is friendly. This service can be enabled by setting `daemon.receivepack` configuration item to `true`."
msgstr ""
#. type: Labeled list
@@ -27337,10 +21290,7 @@ 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 "
-"like the following into /etc/inetd all on one line:"
+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 like the following into /etc/inetd all on one line:"
msgstr ""
#. type: delimited block -
@@ -27360,10 +21310,7 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:261
-msgid ""
-"To set up 'git daemon' as an inetd service that handles repositories for "
-"different virtual hosts, `www.example.com` and `www.example.org`, place an "
-"entry like the following into `/etc/inetd` all on one line:"
+msgid "To set up 'git daemon' as an inetd service that handles repositories for different virtual hosts, `www.example.com` and `www.example.org`, place an entry like the following into `/etc/inetd` all on one line:"
msgstr ""
#. type: delimited block -
@@ -27380,12 +21327,7 @@ 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 "
-"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."
+msgid "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."
msgstr ""
#. type: Labeled list
@@ -27396,10 +21338,7 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:283
-msgid ""
-"To set up 'git daemon' as a regular, non-inetd service that handles "
-"repositories for multiple virtual hosts based on their IP addresses, start "
-"the daemon like this:"
+msgid "To set up 'git daemon' as a regular, non-inetd service that handles repositories for multiple virtual hosts based on their IP addresses, start the daemon like this:"
msgstr ""
#. type: delimited block -
@@ -27414,10 +21353,7 @@ 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 "
-"accessed by hostname though, assuming they correspond to these IP addresses."
+msgid "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 ""
#. type: Labeled list
@@ -27428,10 +21364,7 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:301
-msgid ""
-"To enable 'git archive --remote' and disable 'git fetch' against a "
-"repository, have the following in the configuration file in the repository "
-"(that is the file 'config' next to `HEAD`, 'refs' and 'objects')."
+msgid "To enable 'git archive --remote' and disable 'git fetch' against a repository, have the following in the configuration file in the repository (that is the file 'config' next to `HEAD`, 'refs' and 'objects')."
msgstr ""
#. type: delimited block -
@@ -27445,22 +21378,18 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:315
-msgid ""
-"'git daemon' will set REMOTE_ADDR to the IP address of the client that "
-"connected to it, if the IP address is available. REMOTE_ADDR will be "
-"available in the environment of hooks called when services are performed."
+msgid "'git daemon' will set REMOTE_ADDR to the IP address of the client that connected to it, if the IP address is available. REMOTE_ADDR will be available in the environment of hooks called when services are performed."
msgstr ""
#. type: Title =
#: en/git-describe.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-describe(1)"
msgstr "git-describe(1)"
#. type: Plain text
#: en/git-describe.txt:7
-msgid ""
-"git-describe - Describe a commit using the most recent tag reachable from it"
+msgid "git-describe - Describe a commit using the most recent tag reachable from it"
msgstr ""
#. type: Plain text
@@ -27473,19 +21402,12 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:22
-msgid ""
-"The command finds the most recent tag that is reachable from a commit. If "
-"the tag points to the commit, then only the tag is shown. Otherwise, it "
-"suffixes the tag name with the number of additional commits on top of the "
-"tagged object and the abbreviated object name of the most recent commit."
+msgid "The command finds the most recent tag that is reachable from a commit. If the tag points to the commit, then only the tag is shown. Otherwise, it suffixes the tag name with the number of additional commits on top of the tagged object and the abbreviated object name of the most recent commit."
msgstr ""
#. type: Plain text
#: en/git-describe.txt:26
-msgid ""
-"By default (without --all or --tags) `git describe` only shows annotated "
-"tags. For more information about creating annotated tags see the -a and -s "
-"options to linkgit:git-tag[1]."
+msgid "By default (without --all or --tags) `git describe` only shows annotated tags. For more information about creating annotated tags see the -a and -s options to linkgit:git-tag[1]."
msgstr ""
#. type: Labeled list
@@ -27507,45 +21429,33 @@ 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."
+msgid "Describe the working tree. It means describe HEAD and appends <mark> (`-dirty` by default) if the working tree is dirty."
msgstr ""
#. type: Plain text
#: en/git-describe.txt:41
-msgid ""
-"Instead of using only the annotated tags, use any ref found in `refs/` "
-"namespace. This option enables matching any known branch, remote-tracking "
-"branch, or lightweight tag."
+msgid "Instead of using only the annotated tags, use any ref found in `refs/` namespace. This option enables matching any known branch, remote-tracking branch, or lightweight tag."
msgstr ""
#. type: Plain text
#: en/git-describe.txt:46
-msgid ""
-"Instead of using only the annotated tags, use any tag found in `refs/tags` "
-"namespace. This option enables matching a lightweight (non-annotated) tag."
+msgid "Instead of using only the annotated tags, use any tag found in `refs/tags` namespace. This option enables matching a lightweight (non-annotated) tag."
msgstr ""
#. type: Labeled list
#: en/git-describe.txt:47
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--contains"
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."
+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."
msgstr ""
#. type: Plain text
#: en/git-describe.txt:57
-msgid ""
-"Instead of using the default 7 hexadecimal digits as the abbreviated object "
-"name, use <n> digits, or as many digits as needed to form a unique object "
-"name. An <n> of 0 will suppress long format, only showing the closest tag."
+msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
msgstr ""
#. type: Labeled list
@@ -27556,49 +21466,34 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates. Increasing <n> above 10 will take slightly longer but may produce a more accurate result. An <n> of 0 will cause only exact matches to be output."
msgstr ""
#. type: Labeled list
#: en/git-describe.txt:65
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--exact-match"
msgstr "--exact-match"
#. type: Plain text
#: en/git-describe.txt:68
-msgid ""
-"Only output exact matches (a tag directly references the supplied commit). "
-"This is a synonym for --candidates=0."
+msgid "Only output exact matches (a tag directly references the supplied commit). This is a synonym for --candidates=0."
msgstr ""
#. type: Labeled list
#: en/git-describe.txt:69 en/git-ls-files.txt:151
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--debug"
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."
+msgid "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
#: en/git-describe.txt:82
-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....)."
+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....)."
msgstr ""
#. type: Labeled list
@@ -27609,12 +21504,7 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:90
-msgid ""
-"Only consider tags matching the given `glob(7)` pattern, excluding the "
-"\"refs/tags/\" prefix. This can be used to avoid leaking private tags from "
-"the repository. If given multiple times, a list of patterns will be "
-"accumulated, and tags matching any of the patterns will be considered. Use "
-"`--no-match` to clear and reset the list of patterns."
+msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. This can be used to avoid leaking private tags from the repository. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered. Use `--no-match` to clear and reset the list of patterns."
msgstr ""
#. type: Labeled list
@@ -27625,19 +21515,12 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:100
-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 "
-"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."
+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 be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
msgstr ""
#. type: Labeled list
#: en/git-describe.txt:101 en/git-diff-tree.txt:111 en/git-name-rev.txt:61
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--always"
msgstr "--always"
@@ -27648,16 +21531,13 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:104 en/rev-list-options.txt:121
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--first-parent"
msgstr "--first-parent"
#. type: Plain text
#: en/git-describe.txt:108
-msgid ""
-"Follow only the first parent commit upon seeing a merge commit. This is "
-"useful when you wish to not match tags on branches merged in the history of "
-"the target commit."
+msgid "Follow only the first parent commit upon seeing a merge commit. This is useful when you wish to not match tags on branches merged in the history of the target commit."
msgstr ""
#. type: Plain text
@@ -27675,23 +21555,12 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:122
-msgid ""
-"i.e. the current head of my \"parent\" branch is based on v1.0.4, but since "
-"it has a few commits on top of that, describe has added the number of "
-"additional commits (\"14\") and an abbreviated object name for the commit "
-"itself (\"2414721\") at the end."
+msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\") at the end."
msgstr ""
#. type: Plain text
#: 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 "
-"`2414721b194453f058079d897d13c4e377f92dc6`). The \"g\" prefix stands for "
-"\"git\" and is used to allow describing the version of a software depending "
-"on the SCM the software is managed with. This is useful in an environment "
-"where people may use different SCMs."
+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 `2414721b194453f058079d897d13c4e377f92dc6`). The \"g\" prefix stands for \"git\" and is used to allow describing the version of a software depending on the SCM the software is managed with. This is useful in an environment where people may use different SCMs."
msgstr ""
#. type: Plain text
@@ -27709,9 +21578,7 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:138
-msgid ""
-"With --all, the command can use branch heads as references, so the output "
-"shows the reference path as well:"
+msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
msgstr ""
#. type: Plain text
@@ -27732,9 +21599,7 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:147
-msgid ""
-"With --abbrev set to 0, the command can be used to find the closest tagname "
-"without any suffix:"
+msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
msgstr ""
#. type: Plain text
@@ -27747,12 +21612,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Title -
@@ -27763,66 +21623,41 @@ 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 "
-"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."
+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 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."
msgstr ""
#. type: Plain text
#: en/git-describe.txt:173
-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."
+msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged. The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
msgstr ""
#. type: Plain text
#: en/git-describe.txt:179
-msgid ""
-"If multiple tags were found during the walk then the tag which has the "
-"fewest commits different from the input commit-ish will be selected and "
-"output. Here fewest commits different is defined as the number of commits "
-"which would be shown by `git log tag..input` will be the smallest number of "
-"commits possible."
+msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output. Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
msgstr ""
#. type: Title =
#: en/git-diff-files.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-diff-files(1)"
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;"
+#| msgid "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 "
-"de l'index, encore une fois, avant d'utiliser la commande 'commit',"
+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',"
#. 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
#: en/git-diff-files.txt:20
-msgid ""
-"Compares the files in the working tree and the index. When paths are "
-"specified, compares only those named paths. Otherwise all entries in the "
-"index are compared. The output format is the same as for 'git diff-index' "
-"and 'git diff-tree'."
+msgid "Compares the files in the working tree and the index. When paths are specified, compares only those named paths. Otherwise all entries in the index are compared. The output format is the same as for 'git diff-index' and 'git diff-tree'."
msgstr ""
#. type: Labeled list
@@ -27845,32 +21680,24 @@ msgstr ""
#. type: Plain text
#: en/git-diff-files.txt:32
-msgid ""
-"Diff against the \"base\" version, \"our branch\" or \"their branch\" "
-"respectively. With these options, diffs for merged entries are not shown."
+msgid "Diff against the \"base\" version, \"our branch\" or \"their branch\" respectively. With these options, diffs for merged entries are not shown."
msgstr ""
#. type: Plain text
#: en/git-diff-files.txt:36
-msgid ""
-"The default is to diff against our branch (-2) and the cleanly resolved "
-"paths. The option -0 can be given to omit diff output for unmerged entries "
-"and just show \"Unmerged\"."
+msgid "The default is to diff against our branch (-2) and the cleanly resolved paths. The option -0 can be given to omit diff output for unmerged entries and just show \"Unmerged\"."
msgstr ""
#. type: Labeled list
#: en/git-diff-files.txt:38 en/git-diff-tree.txt:101
#: en/rev-list-options.txt:873
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--cc"
msgstr "--cc"
#. type: Plain text
#: en/git-diff-files.txt:43
-msgid ""
-"This compares stage 2 (our branch), stage 3 (their branch) and the working "
-"tree file and outputs a combined diff, similar to the way 'diff-tree' shows "
-"a merge commit with these flags."
+msgid "This compares stage 2 (our branch), stage 3 (their branch) and the working tree file and outputs a combined diff, similar to the way 'diff-tree' shows a merge commit with these flags."
msgstr ""
#. type: Plain text
@@ -27880,7 +21707,7 @@ msgstr ""
#. type: Title =
#: en/git-diff-index.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-diff-index(1)"
msgstr "git-diff-index(1)"
@@ -27894,18 +21721,12 @@ 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
#: en/git-diff-index.txt:21
-msgid ""
-"Compares the content and mode of the blobs found in a tree object with the "
-"corresponding tracked files in the working tree, or with the corresponding "
-"paths in the index. When <path> arguments are present, compares only paths "
-"matching those patterns. Otherwise all tracked files are compared."
+msgid "Compares the content and mode of the blobs found in a tree object with the corresponding tracked files in the working tree, or with the corresponding paths in the index. When <path> arguments are present, compares only paths matching those patterns. Otherwise all tracked files are compared."
msgstr ""
#. type: Plain text
@@ -27922,10 +21743,7 @@ msgstr "Laisser le message inchang챕."
#. type: Plain text
#: en/git-diff-index.txt:37
-msgid ""
-"By default, files recorded in the index but not checked out are reported as "
-"deleted. This flag makes 'git diff-index' say that all non-checked-out "
-"files are up to date."
+msgid "By default, files recorded in the index but not checked out are reported as deleted. This flag makes 'git diff-index' say that all non-checked-out files are up to date."
msgstr ""
#. type: Title -
@@ -27936,11 +21754,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:46
-msgid ""
-"You can choose whether you want to trust the index file entirely (using the "
-"`--cached` flag) or ask the diff logic to show any files that don't match "
-"the stat state as being \"tentatively changed\". Both of these operations "
-"are very useful indeed."
+msgid "You can choose whether you want to trust the index file entirely (using the `--cached` flag) or ask the diff logic to show any files that don't match the stat state as being \"tentatively changed\". Both of these operations are very useful indeed."
msgstr ""
#. type: Title -
@@ -27964,11 +21778,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:58
-msgid ""
-"For example, let's say that you have worked on your working directory, "
-"updated some files in the index and are ready to commit. You want to see "
-"exactly *what* you are going to commit, without having to write a new tree "
-"object and compare it that way, and to do that, you just do"
+msgid "For example, let's say that you have worked on your working directory, updated some files in the index and are ready to commit. You want to see exactly *what* you are going to commit, without having to write a new tree object and compare it that way, and to do that, you just do"
msgstr ""
#. type: Plain text
@@ -27979,11 +21789,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:65
-msgid ""
-"Example: let's say I had renamed `commit.c` to `git-commit.c`, and I had "
-"done an `update-index` to make that effective in the index file. `git diff-"
-"files` wouldn't show anything at all, since the index file matches my "
-"working directory. But doing a 'git diff-index' does:"
+msgid "Example: let's say I had renamed `commit.c` to `git-commit.c`, and I had done an `update-index` to make that effective in the index file. `git diff-files` wouldn't show anything at all, since the index file matches my working directory. But doing a 'git diff-index' does:"
msgstr ""
#. type: Plain text
@@ -28002,18 +21808,12 @@ 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 "
-"much nicer for the case where you just want to check where you are."
+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 much nicer for the case where you just want to check where you are."
msgstr ""
#. type: Plain text
#: 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\"."
+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\"."
msgstr ""
#. type: Title -
@@ -28024,11 +21824,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:86
-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:"
+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:"
msgstr ""
#. type: Plain text
@@ -28041,20 +21837,12 @@ 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:99
-msgid ""
-"The twist is that if some file doesn't match the index, we don't have a "
-"backing store thing for it, and we use the magic \"all-zero\" sha1 to show "
-"that. So let's say that you have edited `kernel/sched.c`, but have not "
-"actually done a 'git update-index' on it yet - there is no \"object\" "
-"associated with the new state, and you get:"
+msgid "The twist is that if some file doesn't match the index, we don't have a backing store thing for it, and we use the magic \"all-zero\" sha1 to show that. So let's say that you have edited `kernel/sched.c`, but have not actually done a 'git update-index' on it yet - there is no \"object\" associated with the new state, and you get:"
msgstr ""
#. type: Plain text
@@ -28067,35 +21855,22 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:107
-msgid ""
-"i.e., it shows that the tree has changed, and that `kernel/sched.c` has is "
-"not up-to-date and may contain new stuff. The all-zero sha1 means that to "
-"get the real diff, you need to look at the object in the working directory "
-"directly rather than do an object-to-object diff."
+msgid "i.e., it shows that the tree has changed, and that `kernel/sched.c` has is not up-to-date and may contain new stuff. The all-zero sha1 means that to get the real diff, you need to look at the object in the working directory directly rather than do an object-to-object diff."
msgstr ""
#. 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 "
-"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."
+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 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 ""
#. type: Plain text
#: en/git-diff-index.txt:119
-msgid ""
-"You can have a mixture of files show up as \"has been updated\" and \"is "
-"still dirty in the working directory\" together. You can always tell which "
-"file is in which state, since the \"has been updated\" ones show a valid "
-"sha1, and the \"not in sync with the index\" ones will always have the "
-"special all-zero sha1."
+msgid "You can have a mixture of files show up as \"has been updated\" and \"is still dirty in the working directory\" together. You can always tell which file is in which state, since the \"has been updated\" ones show a valid sha1, and the \"not in sync with the index\" ones will always have the special all-zero sha1."
msgstr ""
#. type: Title =
#: en/git-difftool.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-difftool(1)"
msgstr "git-difftool(1)"
@@ -28112,35 +21887,29 @@ msgstr ""
#. type: Plain text
#: en/git-difftool.txt:19
-msgid ""
-"'git difftool' is a Git command that allows you to compare and edit files "
-"between revisions using common diff tools. 'git difftool' is a frontend to "
-"'git diff' and accepts the same options and arguments. See linkgit:git-"
-"diff[1]."
+msgid "'git difftool' is a Git command that allows you to compare and edit files between revisions using common diff tools. 'git difftool' is a frontend to 'git diff' and accepts the same options and arguments. See linkgit:git-diff[1]."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:23
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--dir-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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:28 en/git-mergetool.txt:70
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-y"
msgstr "-y"
#. type: Labeled list
#: en/git-difftool.txt:29 en/git-mergetool.txt:71
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-prompt"
msgstr "--no-prompt"
@@ -28151,15 +21920,13 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:32 en/git-mergetool.txt:78
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--prompt"
msgstr "--prompt"
#. type: Plain text
#: en/git-difftool.txt:36
-msgid ""
-"Prompt before each invocation of the diff tool. This is the default "
-"behaviour; the option is provided to override any configuration settings."
+msgid "Prompt before each invocation of the diff tool. This is the default behaviour; the option is provided to override any configuration settings."
msgstr ""
#. type: Labeled list
@@ -28177,53 +21944,32 @@ msgstr "diff"
#. type: Plain text
#: en/git-difftool.txt:42
-msgid ""
-"Use the diff tool specified by <tool>. Valid values include emerge, "
-"kompare, meld, and vimdiff. Run `git difftool --tool-help` for the list of "
-"valid <tool> settings."
+msgid "Use the diff tool specified by <tool>. Valid values include emerge, kompare, meld, and vimdiff. Run `git difftool --tool-help` for the list of valid <tool> settings."
msgstr ""
#. type: Plain text
#: 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."
+msgid "If a diff tool is not specified, 'git difftool' will use the configuration variable `diff.tool`. If the configuration variable `diff.tool` is not set, 'git difftool' will pick a suitable default."
msgstr ""
#. type: Plain text
#: en/git-difftool.txt:53
-msgid ""
-"You can explicitly provide a full path to the tool by setting the "
-"configuration variable `difftool.<tool>.path`. For example, you can "
-"configure the absolute path to kdiff3 by setting `difftool.kdiff3.path`. "
-"Otherwise, 'git difftool' assumes the tool is available in PATH."
+msgid "You can explicitly provide a full path to the tool by setting the configuration variable `difftool.<tool>.path`. For example, you can configure the absolute path to kdiff3 by setting `difftool.kdiff3.path`. Otherwise, 'git difftool' assumes the tool is available in PATH."
msgstr ""
#. type: Plain text
#: en/git-difftool.txt:58
-msgid ""
-"Instead of running one of the known diff tools, 'git difftool' can be "
-"customized to run an alternative program by specifying the command line to "
-"invoke in a configuration variable `difftool.<tool>.cmd`."
+msgid "Instead of running one of the known diff tools, 'git difftool' can be customized to run an alternative program by specifying the command line to invoke in a configuration variable `difftool.<tool>.cmd`."
msgstr ""
#. 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 "
-"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`."
+msgid "When 'git difftool' is invoked with this tool (either through the `-t` or `--tool` option or the `diff.tool` configuration variable) the configured command line will be invoked with the following variables available: `$LOCAL` is set to the name of the temporary file containing the contents of the diff pre-image and `$REMOTE` is set to the name of the temporary file containing the contents of the diff post-image. `$MERGED` is the name of the file which is being compared. `$BASE` is provided for compatibility with custom merge tool commands and has the same value as `$MERGED`."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:69 en/git-mergetool.txt:67
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--tool-help"
msgstr "--tool-help"
@@ -28234,23 +21980,18 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:72
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]symlinks"
msgstr "--[no-]symlinks"
#. type: Plain text
#: en/git-difftool.txt:77
-msgid ""
-"'git difftool''s default behavior is create symlinks to the working tree "
-"when run in `--dir-diff` mode and the right-hand side of the comparison "
-"yields the same content as the file in the working tree."
+msgid "'git difftool''s default behavior is create symlinks to the working tree when run in `--dir-diff` mode and the right-hand side of the comparison yields the same content as the file in the working tree."
msgstr ""
#. type: Plain text
#: en/git-difftool.txt:80
-msgid ""
-"Specifying `--no-symlinks` instructs 'git difftool' to create copies "
-"instead. `--no-symlinks` is the default on Windows."
+msgid "Specifying `--no-symlinks` instructs 'git difftool' to create copies instead. `--no-symlinks` is the default on Windows."
msgstr ""
#. type: Labeled list
@@ -28268,53 +22009,41 @@ msgstr ""
#. type: Plain text
#: en/git-difftool.txt:87
-msgid ""
-"Specify a custom command for viewing diffs. 'git-difftool' ignores the "
-"configured defaults and runs `$command $LOCAL $REMOTE` when this option is "
-"specified. Additionally, `$BASE` is set in the environment."
+msgid "Specify a custom command for viewing diffs. 'git-difftool' ignores the configured defaults and runs `$command $LOCAL $REMOTE` when this option is specified. Additionally, `$BASE` is set in the environment."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:88 en/git-help.txt:46 en/git-show-branch.txt:111
#: en/git-update-index.txt:114 en/rev-list-options.txt:245
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "-g"
msgstr "-g"
#. type: Labeled list
#: en/git-difftool.txt:89
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]gui"
msgstr "--[no-]gui"
#. type: Plain text
#: en/git-difftool.txt:94
-msgid ""
-"When 'git-difftool' is invoked with the `-g` or `--gui` option the default "
-"diff tool will be read from the configured `diff.guitool` variable instead "
-"of `diff.tool`. The `--no-gui` option can be used to override this setting."
+msgid "When 'git-difftool' is invoked with the `-g` or `--gui` option the default diff tool will be read from the configured `diff.guitool` variable instead of `diff.tool`. The `--no-gui` option can be used to override this setting."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:95
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]trust-exit-code"
msgstr "--[no-]trust-exit-code"
#. type: Plain text
#: en/git-difftool.txt:100
-msgid ""
-"'git-difftool' invokes a diff tool individually on each file. Errors "
-"reported by the diff tool are ignored by default. Use `--trust-exit-code` "
-"to make 'git-difftool' exit when an invoked diff tool returns a non-zero "
-"exit code."
+msgid "'git-difftool' invokes a diff tool individually on each file. Errors reported by the diff tool are ignored by default. Use `--trust-exit-code` to make 'git-difftool' exit when an invoked diff tool returns a non-zero exit code."
msgstr ""
#. type: Plain text
#: en/git-difftool.txt:103
-msgid ""
-"'git-difftool' will forward the exit code of the invoked tool when `--trust-"
-"exit-code` is used."
+msgid "'git-difftool' will forward the exit code of the invoked tool when `--trust-exit-code` is used."
msgstr ""
#. type: Plain text
@@ -28330,9 +22059,7 @@ msgstr ""
#. type: Plain text
#: en/git-difftool.txt:110
-msgid ""
-"'git difftool' falls back to 'git mergetool' config variables when the "
-"difftool equivalents have not been defined."
+msgid "'git difftool' falls back to 'git mergetool' config variables when the difftool equivalents have not been defined."
msgstr ""
#. type: Plain text
@@ -28342,7 +22069,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:114
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "diff.guitool"
msgstr "diff.guitool"
@@ -28363,7 +22090,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:129
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "difftool.trustExitCode"
msgstr "difftool.trustExitCode"
@@ -28394,15 +22121,13 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
#. type: Plain text
#: en/git-diff-tree.txt:7
-msgid ""
-"git-diff-tree - Compares the content and mode of blobs found via two tree "
-"objects"
+msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
msgstr ""
#. type: Plain text
@@ -28421,15 +22146,12 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:22
-msgid ""
-"If there is only one <tree-ish> given, the commit is compared with its "
-"parents (see --stdin below)."
+msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:24
-msgid ""
-"Note that 'git diff-tree' can use the tree encapsulated in a commit object."
+msgid "Note that 'git diff-tree' can use the tree encapsulated in a commit object."
msgstr ""
#. type: Plain text
@@ -28445,10 +22167,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:38
-msgid ""
-"If provided, the results are limited to a subset of files matching one of "
-"these prefix strings. i.e., file matches `/^<pattern1>|<pattern2>|.../` "
-"Note that this parameter does not provide any wildcard or regexp features."
+msgid "If provided, the results are limited to a subset of files matching one of these prefix strings. i.e., file matches `/^<pattern1>|<pattern2>|.../` Note that this parameter does not provide any wildcard or regexp features."
msgstr ""
#. type: Plain text
@@ -28463,109 +22182,68 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:48
-msgid ""
-"When `--root` is specified the initial commit will be shown as a big "
-"creation event. This is equivalent to a diff against the NULL tree."
+msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:55
-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.)"
+msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:60
-msgid ""
-"When two trees are given, it compares the first tree with the second. When "
-"a single commit is given, it compares the commit with its parents. The "
-"remaining commits, when given, are used as if they are parents of the first "
-"commit."
+msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:65
-msgid ""
-"When comparing two trees, the ID of both trees (separated by a space and "
-"terminated by a newline) is printed before the difference. When comparing "
-"commits, the ID of the first (or only) commit, followed by a newline, is "
-"printed."
+msgid "When comparing two trees, the ID of both trees (separated by a space and terminated by a newline) is printed before the difference. When comparing commits, the ID of the first (or only) commit, followed by a newline, is printed."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:68
-msgid ""
-"The following flags further affect the behavior when comparing commits (but "
-"not trees)."
+msgid "The following flags further affect the behavior when comparing commits (but not trees)."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:74
-msgid ""
-"By default, 'git diff-tree --stdin' does not show differences for merge "
-"commits. With this flag, it shows differences to that commit from all of "
-"its parents. See also `-c`."
+msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:80
-msgid ""
-"By default, 'git diff-tree --stdin' shows differences, either in machine-"
-"readable form (without `-p`) or in patch form (with `-p`). This output can "
-"be suppressed. It is only useful with `-v` flag."
+msgid "By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is only useful with `-v` flag."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:84
-msgid ""
-"This flag causes 'git diff-tree --stdin' to also show the commit message "
-"before the differences."
+msgid "This flag causes 'git diff-tree --stdin' to also show the commit message before the differences."
msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:87
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-commit-id"
msgstr "--no-commit-id"
#. type: Plain text
#: en/git-diff-tree.txt:90
-msgid ""
-"'git diff-tree' outputs a line with the commit ID when applicable. This "
-"flag suppressed the commit ID output."
+msgid "'git diff-tree' outputs a line with the commit ID when applicable. This flag suppressed the commit ID output."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:100
-msgid ""
-"This flag changes the way a merge commit is displayed (which means it is "
-"useful only when the command is given one <tree-ish>, or `--stdin`). It "
-"shows the differences from each of the parents to the merge result "
-"simultaneously instead of showing pairwise diff between a parent and the "
-"result one at a time (which is what the `-m` option does). Furthermore, it "
-"lists only files which were modified from all parents."
+msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:110
-msgid ""
-"This flag changes the way a merge commit patch is displayed, in a similar "
-"way to the `-c` option. It implies the `-c` and `-p` options and further "
-"compresses the patch output by omitting uninteresting hunks whose the "
-"contents in the parents have only two variants and the merge result picks "
-"one of them without modification. When all hunks are uninteresting, the "
-"commit itself and the commit log message is not shown, just like in any "
-"other \"empty diff\" case."
+msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
msgstr ""
#. 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."
+msgid "Show the commit itself and the commit log message even if the diff itself is empty."
msgstr ""
#. type: Title -
@@ -28576,9 +22254,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:123
-msgid ""
-"If you're only interested in differences in a subset of files, for example "
-"some architecture-specific files, you might do:"
+msgid "If you're only interested in differences in a subset of files, for example some architecture-specific files, you might do:"
msgstr ""
#. type: Plain text
@@ -28594,8 +22270,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:129
-msgid ""
-"Or if you are searching for what changed in just `kernel/sched.c`, just do"
+msgid "Or if you are searching for what changed in just `kernel/sched.c`, just do"
msgstr ""
#. type: Plain text
@@ -28611,11 +22286,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:138
-msgid ""
-"The pattern is always the prefix, and is matched exactly. There are no "
-"wildcards. Even stricter, it has to match a complete path component. I.e. "
-"\"foo\" does not pick up `foobar.h`. \"foo\" does match `foo/bar.h` so it "
-"can be used to name subdirectories."
+msgid "The pattern is always the prefix, and is matched exactly. There are no wildcards. Even stricter, it has to match a complete path component. I.e. \"foo\" does not pick up `foobar.h`. \"foo\" does match `foo/bar.h` so it can be used to name subdirectories."
msgstr ""
#. type: Plain text
@@ -28633,9 +22304,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:146
-msgid ""
-"which tells you that the last commit changed just one file (it's from this "
-"one:"
+msgid "which tells you that the last commit changed just one file (it's from this one:"
msgstr ""
#. type: delimited block -
@@ -28670,7 +22339,7 @@ msgstr ""
#. type: Title =
#: en/git-diff.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-diff(1)"
msgstr "git-diff(1)"
@@ -28692,10 +22361,7 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
msgstr ""
#. type: Labeled list
@@ -28706,11 +22372,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:31
-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]."
+msgid "This form is to view the changes you made relative to the index (staging area for the next commit). In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't. You can stage these changes by using linkgit:git-add[1]."
msgstr ""
#. type: Labeled list
@@ -28721,11 +22383,7 @@ 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 "
-"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."
+msgid "This form is to compare the given two paths on the filesystem. You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git."
msgstr ""
#. type: Labeled list
@@ -28736,12 +22394,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:50
-msgid ""
-"This form is to view the changes you staged for the next commit relative to "
-"the named <commit>. Typically you would want comparison with the latest "
-"commit, so if you do not give <commit>, it defaults to HEAD. If HEAD does "
-"not exist (e.g. unborn branches) and <commit> is not given, it shows all "
-"staged changes. --staged is a synonym of --cached."
+msgid "This form is to view the changes you staged for the next commit relative to the named <commit>. Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD. If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes. --staged is a synonym of --cached."
msgstr ""
#. type: Labeled list
@@ -28752,10 +22405,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:58
-msgid ""
-"This form is to view the changes you have in your working tree relative to "
-"the named <commit>. You can use HEAD to compare it with the latest commit, "
-"or a branch name to compare with the tip of a different branch."
+msgid "This form is to view the changes you have in your working tree relative to the named <commit>. You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
msgstr ""
#. type: Labeled list
@@ -28777,9 +22427,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:69
-msgid ""
-"This is synonymous to the previous form. If <commit> on one side is "
-"omitted, it will have the same effect as using HEAD instead."
+msgid "This is synonymous to the previous form. If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
msgstr ""
#. type: Labeled list
@@ -28790,29 +22438,17 @@ msgstr ""
#. 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 "
-"omit any one of <commit>, which has the same effect as using HEAD instead."
+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 omit any one of <commit>, which has the same effect as using HEAD instead."
msgstr ""
#. type: Plain text
#: en/git-diff.txt:82
-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>."
+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 ""
#. type: Plain text
#: en/git-diff.txt:89
-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]."
+msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]. However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Labeled list
@@ -28823,16 +22459,12 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:94
-msgid ""
-"This form is to view the differences between the raw contents of two blob "
-"objects."
+msgid "This form is to view the differences between the raw contents of two blob 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)."
+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 ""
#. type: Labeled list
@@ -28853,26 +22485,18 @@ msgstr ""
#. type: Plain text
#: 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;"
+#| msgid "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 "
-"de l'index, encore une fois, avant d'utiliser la commande 'commit',"
+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',"
#. 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."
+msgid "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
#: en/git-diff.txt:124
-msgid ""
-"Changes in the working tree since your last commit; what you would be "
-"committing if you run \"git commit -a\""
+msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
msgstr ""
#. type: Labeled list
@@ -28892,16 +22516,12 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:135
-msgid ""
-"Instead of using the tip of the current branch, compare with the tip of "
-"\"test\" branch."
+msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
msgstr ""
#. type: Plain text
#: en/git-diff.txt:138
-msgid ""
-"Instead of comparing with the tip of \"test\" branch, compare with the tip "
-"of the current branch, but limit the comparison to the file \"test\"."
+msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
msgstr ""
#. type: Plain text
@@ -28937,9 +22557,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:152
-msgid ""
-"Changes that occurred on the master branch since when the topic branch was "
-"started off it."
+msgid "Changes that occurred on the master branch since when the topic branch was started off it."
msgstr ""
#. type: Labeled list
@@ -28959,8 +22577,7 @@ 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
@@ -28989,9 +22606,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:176
-msgid ""
-"Spend extra cycles to find renames, copies and complete rewrites (very "
-"expensive)."
+msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
msgstr ""
#. type: Plain text
@@ -29002,19 +22617,13 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:186
#, fuzzy
-#| msgid ""
-#| "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]"
-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-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]"
+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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
@@ -29031,16 +22640,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:18
-msgid ""
-"This program dumps the given revisions in a form suitable to be piped into "
-"'git fast-import'."
+msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:22
-msgid ""
-"You can use it as a human-readable bundle replacement (see linkgit:git-"
-"bundle[1]), or as a kind of an interactive 'git filter-branch'."
+msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a kind of an interactive 'git filter-branch'."
msgstr ""
#. type: Labeled list
@@ -29051,9 +22656,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:29
-msgid ""
-"Insert 'progress' statements every <n> objects, to be shown by 'git fast-"
-"import' during import."
+msgid "Insert 'progress' statements every <n> objects, to be shown by 'git fast-import' during import."
msgstr ""
#. type: Labeled list
@@ -29064,20 +22667,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:34
-msgid ""
-"Specify how to handle signed tags. Since any transformation after the "
-"export can change the tag names (which can also happen when excluding "
-"revisions) the signatures will not match."
+msgid "Specify how to handle signed tags. Since any transformation after the export can change the tag names (which can also happen when excluding revisions) the signatures will not match."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:41
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -29088,20 +22683,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:46
-msgid ""
-"Specify how to handle tags whose tagged object is filtered out. Since "
-"revisions and files to export can be limited by path, tagged objects may be "
-"filtered completely."
+msgid "Specify how to handle tags whose tagged object is filtered out. Since revisions and files to export can be limited by path, tagged objects may be filtered completely."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:52
-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])"
+msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
#. type: Labeled list
@@ -29112,17 +22699,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:58
-msgid ""
-"Perform move and/or copy detection, as described in the linkgit:git-diff[1] "
-"manual page, and use it to generate rename and copy commands in the output "
-"dump."
+msgid "Perform move and/or copy detection, as described in the linkgit:git-diff[1] manual page, and use it to generate rename and copy commands in the output dump."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:61
-msgid ""
-"Note that earlier versions of this command did not complain and produced "
-"incorrect results if you gave these options."
+msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
msgstr ""
#. type: Labeled list
@@ -29133,14 +22715,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:73
-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 "
-"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."
+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 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."
msgstr ""
#. type: Labeled list
@@ -29151,103 +22726,78 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:78
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:83
-msgid ""
-"Any commits that have already been marked will not be exported again. If "
-"the backend uses a similar --import-marks file, this allows for incremental "
-"bidirectional exporting of the repository by keeping the marks the same "
-"across runs."
+msgid "Any commits that have already been marked will not be exported again. If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:84
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
#. type: Plain text
#: en/git-fast-export.txt:89
-msgid ""
-"Some old repositories have tags without a tagger. The fast-import protocol "
-"was pretty strict about that, and did not allow that. So fake a tagger to "
-"be able to fast-import the output."
+msgid "Some old repositories have tags without a tagger. The fast-import protocol was pretty strict about that, and did not allow that. So fake a tagger to be able to fast-import the output."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:90
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--use-done-feature"
msgstr "--use-done-feature"
#. type: Plain text
#: en/git-fast-export.txt:93
-msgid ""
-"Start the stream with a 'feature done' stanza, and terminate it with a "
-"'done' command."
+msgid "Start the stream with a 'feature done' stanza, and terminate it with a 'done' command."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:94
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-data"
msgstr "--no-data"
#. type: Plain text
#: en/git-fast-export.txt:101
-msgid ""
-"Skip output of blob objects and instead refer to blobs via their original "
-"SHA-1 hash. This is useful when rewriting the directory structure or "
-"history of a repository without touching the contents of individual files. "
-"Note that the resulting stream can only be used by a repository which "
-"already contains the necessary objects."
+msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--full-tree"
msgstr "--full-tree"
#. type: Plain text
#: en/git-fast-export.txt:107
-msgid ""
-"This option will cause fast-export to issue a \"deleteall\" directive for "
-"each commit followed by a full list of all files in the commit (as opposed "
-"to just listing the files which are different from the commit's first "
-"parent)."
+msgid "This option will cause fast-export to issue a \"deleteall\" directive for each commit followed by a full list of all files in the commit (as opposed to just listing the files which are different from the commit's first parent)."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:108
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--anonymize"
msgstr "--anonymize"
#. type: Plain text
#: en/git-fast-export.txt:112
-msgid ""
-"Anonymize the contents of the repository while still retaining the shape of "
-"the history and stored tree. See the section on `ANONYMIZING` below."
+msgid "Anonymize the contents of the repository while still retaining the shape of the history and stored tree. See the section on `ANONYMIZING` below."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:113
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
#: en/git-fast-export.txt:116
-msgid ""
-"Apply the specified refspec to each ref exported. Multiple of them can be "
-"specified."
+msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
@@ -29259,11 +22809,7 @@ msgstr "<git-rev-list-args>"
#. type: Plain text
#: en/git-fast-export.txt:123
-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."
+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."
msgstr ""
#. type: delimited block -
@@ -29274,10 +22820,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:134
-msgid ""
-"This will export the whole repository and import it into the existing empty "
-"repository. Except for reencoding commits that are not in UTF-8, it would "
-"be a one-to-one mirror."
+msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
@@ -29291,16 +22834,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:143
-msgid ""
-"This makes a new branch called 'other' from 'master~5..master' (i.e. if "
-"'master' has linear history, it will take the last 5 commits)."
+msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
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'."
+msgid "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 -
@@ -29311,36 +22850,17 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:158
-msgid ""
-"If the `--anonymize` option is given, git will attempt to remove all "
-"identifying information from the repository while still retaining enough of "
-"the original tree and history patterns to reproduce some bugs. The goal is "
-"that a git bug which is found on a private repository will persist in the "
-"anonymized repository, and the latter can be shared with git developers to "
-"help solve the bug."
+msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:170
-msgid ""
-"With this option, git will replace all refnames, paths, blob contents, "
-"commit and tag messages, names, and email addresses in the output with "
-"anonymized data. Two instances of the same string will be replaced "
-"equivalently (e.g., two commits with the same author will have the same "
-"anonymized author in the output, but bear no resemblance to the original "
-"author string). The relationship between commits, branches, and tags is "
-"retained, as well as the commit timestamps (but the commit messages and "
-"refnames bear no resemblance to the originals). The relative makeup of the "
-"tree is retained (e.g., if you have a root tree with 10 files and 3 trees, "
-"so will the output), but their names and the contents of the files will be "
-"replaced."
+msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:173
-msgid ""
-"If you think you have found a git bug, you can start by exporting an "
-"anonymized stream of the whole repository:"
+msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
@@ -29351,10 +22871,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:181
-msgid ""
-"Then confirm that the bug persists in a repository created from that stream "
-"(many bugs will not, as they really do depend on the exact repository "
-"contents):"
+msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
@@ -29369,12 +22886,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:194
-msgid ""
-"If the anonymized repository shows the bug, it may be worth sharing `anon-"
-"stream` along with a regular bug report. Note that the anonymized stream "
-"compresses very well, so gzipping it is encouraged. If you want to examine "
-"the stream to see that it does not contain any private data, you can peruse "
-"it directly before sending. You may also want to try:"
+msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
@@ -29385,11 +22897,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:203
-msgid ""
-"which shows all of the unique lines (with numbers converted to \"X\", to "
-"collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much "
-"smaller output, and it is usually easy to quickly confirm that there is no "
-"private data in the stream."
+msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Title -
@@ -29400,15 +22908,12 @@ 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 "
-"instead of a commit."
+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 instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
@@ -29425,59 +22930,38 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:20
-msgid ""
-"This program is usually not what the end user wants to run directly. Most "
-"end users want to use one of the existing frontend programs, which parses a "
-"specific type of foreign source and feeds the contents stored there to 'git "
-"fast-import'."
+msgid "This program is usually not what the end user wants to run directly. Most end users want to use one of the existing frontend programs, which parses a specific type of foreign source and feeds the contents stored there to 'git fast-import'."
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 "
-"received on standard input, fast import writes out updated branch and tag "
-"refs, fully updating the current repository with the newly imported data."
+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 received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
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 "
-"existing populated repository. Whether or not incremental imports are "
-"supported from a particular foreign source depends on the frontend program "
-"in use."
+msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:41
-msgid ""
-"Force updating modified existing branches, even if doing so would cause "
-"commits to be lost (as the new commit does not contain the old commit)."
+msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:46
-msgid ""
-"Disable all non-fatal output, making fast-import silent when it is "
-"successful. This option disables the output shown by --stats."
+msgid "Disable all non-fatal output, making fast-import silent when it is successful. This option disables the output shown by --stats."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:47
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--stats"
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."
+msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
msgstr ""
#. type: Title ~
@@ -29494,10 +22978,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:61
-msgid ""
-"Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file "
-"descriptor <fd> instead of `stdout`. Allows `progress` output intended for "
-"the end-user to be separated from other output."
+msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`. Allows `progress` output intended for the end-user to be separated from other output."
msgstr ""
#. type: Labeled list
@@ -29508,24 +22989,18 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:68
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--done"
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."
+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."
msgstr ""
#. type: Title ~
@@ -29536,22 +23011,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:85
-msgid ""
-"Dumps the internal marks table to <file> when complete. Marks are written "
-"one per line as `:markid SHA-1`. Frontends 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 checkpoint (or "
-"completion) the same path can also be safely given to --import-marks."
+msgid "Dumps the internal marks table to <file> when complete. Marks are written one per line as `:markid SHA-1`. Frontends 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 checkpoint (or completion) the same path can also be safely given to --import-marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:93
-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."
+msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
@@ -29562,32 +23027,23 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:97
-msgid ""
-"Like --import-marks but instead of erroring out, silently skips the file if "
-"it does not exist."
+msgid "Like --import-marks but instead of erroring out, silently skips the file if it does not exist."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:98
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
#. type: Plain text
#: en/git-fast-import.txt:105
-msgid ""
-"After specifying --relative-marks the paths specified with --import-marks= "
-"and --export-marks= are relative to an internal directory in the current "
-"repository. In git-fast-import this means that the paths are relative to "
-"the .git/info/fast-import directory. However, other importers may use a "
-"different location."
+msgid "After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location."
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."
+msgid "Relative and non-relative marks may be combined by interweaving --(no-)-relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
@@ -29604,9 +23060,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:115
-msgid ""
-"Maximum number of branches to maintain active at once. See ``Memory "
-"Utilization'' below for details. Default is 5."
+msgid "Maximum number of branches to maintain active at once. See ``Memory Utilization'' below for details. Default is 5."
msgstr ""
#. type: Labeled list
@@ -29617,10 +23071,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -29643,17 +23094,11 @@ msgstr ""
#. type: Plain text
#: 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 "
-"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'."
+msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
msgstr ""
#. 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 ""
@@ -29679,23 +23124,12 @@ msgstr "Configuration"
#. type: Plain text
#: en/git-fast-import.txt:150
-msgid ""
-"The design of fast-import allows it to import large projects in a minimum "
-"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."
+msgid "The design of fast-import allows it to import large projects in a minimum 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."
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)."
+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)."
msgstr ""
#. type: Title -
@@ -29706,13 +23140,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:166
-msgid ""
-"A typical frontend for fast-import tends to weigh in at approximately 200 "
-"lines of Perl/Python/Ruby code. Most developers have been able to create "
-"working importers in just a couple of hours, even though it is their first "
-"exposure to fast-import, and sometimes even to Git. This is an ideal "
-"situation, given that most conversion tools are throw-away (use once, and "
-"never look back)."
+msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
msgstr ""
#. type: Title -
@@ -29723,32 +23151,17 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:174
-msgid ""
-"Like 'git push' or 'git fetch', imports handled by fast-import are safe to "
-"run alongside parallel `git repack -a -d` or `git gc` invocations, or any "
-"other Git operation (including 'git prune', as loose objects are never used "
-"by fast-import)."
+msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:183
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:187
-msgid ""
-"Branch updates can be forced with --force, but it's recommended that this "
-"only be used on an otherwise quiet repository. Using --force is not "
-"necessary for an initial import into an empty repository."
+msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
msgstr ""
#. type: Title -
@@ -29759,25 +23172,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:197
-msgid ""
-"fast-import tracks a set of branches in memory. Any branch can be created "
-"or modified at any point during the import process by sending a `commit` "
-"command on the input stream. This design allows a frontend program to "
-"process an unlimited number of branches simultaneously, generating commits "
-"in the order they are available from the source data. It also simplifies "
-"the frontend programs considerably."
+msgid "fast-import tracks a set of branches in memory. Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream. This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data. It also simplifies the frontend programs considerably."
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 "
-"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-"
-"import to run very quickly, as it does not need to perform any costly file "
-"update operations when switching between branches."
+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 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-import to run very quickly, as it does not need to perform any costly file update operations when switching between branches."
msgstr ""
#. type: Title ~
@@ -29789,22 +23189,12 @@ 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."
+msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:222
-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."
+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."
msgstr ""
#. type: Title ~
@@ -29816,13 +23206,7 @@ msgstr "$ git commit\n"
#. type: Plain text
#: en/git-fast-import.txt:231
-msgid ""
-"To aid in debugging frontends fast-import ignores any line that begins with "
-"`#` (ASCII pound/hash) up to and including the line ending `LF`. A comment "
-"line may contain any sequence of bytes that does not contain an LF and "
-"therefore may be used to include any detailed debugging information that "
-"might be specific to the frontend and useful when inspecting a fast-import "
-"data stream."
+msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
msgstr ""
#. type: Title ~
@@ -29833,58 +23217,38 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:237
-msgid ""
-"The following date formats are supported. A frontend should select the "
-"format it will use for this import by passing the format name in the --date-"
-"format=<fmt> command-line option."
+msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:238
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`raw`"
msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:242
-msgid ""
-"This is the Git native format and is `<time> SP <offutc>`. It is also fast-"
-"import's default format, if --date-format was not specified."
+msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
msgstr ""
#. type: Plain text
#: 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."
+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."
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."
+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."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:258
-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 "
-"could be assumed."
+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 could be assumed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:261
-msgid ""
-"Unlike the `rfc2822` format, this format is very strict. Any variation in "
-"formatting will cause fast-import to reject the value."
+msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value."
msgstr ""
#. type: Labeled list
@@ -29896,94 +23260,59 @@ msgstr ""
#. type: Plain text
#: 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`."
+#| msgid "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 "
-"exemple `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`."
#. type: Plain text
#: en/git-fast-import.txt:269
-msgid ""
-"An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is "
-"accurate, but a little on the lenient side. It is the same parser used by "
-"'git am' when applying patches received from email."
+msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:275
-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."
+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."
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 "
-"accurate as possible."
+msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:285
-msgid ""
-"If the source material uses RFC 2822 style dates, the frontend should let "
-"fast-import handle the parsing and conversion (rather than attempting to do "
-"it itself) as the Git parser has been well tested in the wild."
+msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:291
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`now`"
msgstr "`now`"
#. 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>`."
+msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:299
-msgid ""
-"This is a toy format. The current time and time zone of this system is "
-"always copied into the identity string at the time it is being created by "
-"fast-import. There is no way to specify a different time or time zone."
+msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:304
-msgid ""
-"This particular format is supplied as it's short to implement and may be "
-"useful to a process that wants to create a new commit right now, without "
-"needing to use a working directory or 'git update-index'."
+msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
#: 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 "
-"identity information has the same timestamp is to omit `author` (thus "
-"copying from `committer`) or to use a date format other than `now`."
+msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
@@ -29994,179 +23323,144 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:317
-msgid ""
-"fast-import accepts several commands to update the current repository and "
-"control the current import process. More detailed discussion (with "
-"examples) of each command follows later."
+msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:318 en/git-fast-import.txt:380
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:322
-msgid ""
-"Creates a new branch or updates an existing branch by creating a new commit "
-"and updating the branch to point at the newly created commit."
+msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:323 en/git-fast-import.txt:744
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:328
-msgid ""
-"Creates an annotated tag object from an existing commit or branch. "
-"Lightweight tags are not supported by this command, as they are not "
-"recommended for recording meaningful points in time."
+msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:329 en/git-fast-import.txt:787
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:333
-msgid ""
-"Reset an existing branch (or a new branch) to a specific revision. This "
-"command must be used to change a branch to a specific revision without "
-"making a commit on it."
+msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:334 en/git-fast-import.txt:816
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:338
-msgid ""
-"Convert raw file data into a blob, for future use in a `commit` command. "
-"This command is optional and is not needed to perform an import."
+msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:339 en/git-fast-import.txt:888
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:344
-msgid ""
-"Forces fast-import to close the current packfile, generate its unique SHA-1 "
-"checksum and index, and start a new packfile. This command is optional and "
-"is not needed to perform an import."
+msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:345 en/git-fast-import.txt:916
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`progress`"
msgstr "`progress`"
#. 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."
+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."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:350 en/git-fast-import.txt:1126
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`done`"
msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:354
-msgid ""
-"Marks the end of the stream. This command is optional unless the `done` "
-"feature was requested using the `--done` command-line option or `feature "
-"done` command."
+msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:355 en/git-fast-import.txt:941
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:359
-msgid ""
-"Causes fast-import to print the SHA-1 corresponding to a mark to the file "
-"descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
+msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:360 en/git-fast-import.txt:960
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:364
-msgid ""
-"Causes fast-import to print a blob in 'cat-file --batch' format to the file "
-"descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
+msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:365 en/git-fast-import.txt:990
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`ls`"
msgstr "`ls`"
#. 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 "
-"unspecified."
+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 unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:370 en/git-fast-import.txt:1043
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:373
-msgid ""
-"Enable the specified feature. This requires that fast-import supports the "
-"specified feature, and aborts if it does not."
+msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:374 en/git-fast-import.txt:1098
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`option`"
msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:378
-msgid ""
-"Specify any of the options listed under OPTIONS that do not change stream "
-"semantic to suit the frontend's needs. This command is optional and is not "
-"needed to perform an import."
+msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
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."
+msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
@@ -30186,45 +23480,22 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:402
-msgid ""
-"where `<ref>` is the name of the branch to make the commit on. Typically "
-"branch names are prefixed with `refs/heads/` in Git, so importing the CVS "
-"branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value "
-"of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` "
-"is not valid in a Git refname, no quoting or escaping syntax is supported "
-"here."
+msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:408
-msgid ""
-"A `mark` command may optionally appear, requesting fast-import to save a "
-"reference to the newly created commit for future use by the frontend (see "
-"below for format). It is very common for frontends to mark every commit "
-"they create, thereby allowing future branch creation from any imported "
-"commit."
+msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
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."
+msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:422
-msgid ""
-"Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, "
-"`filedeleteall` and `notemodify` commands may be included to update the "
-"contents of the branch prior to creating the commit. These commands may be "
-"supplied in any order. However it is recommended that a `filedeleteall` "
-"command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` "
-"commands in the same commit, as `filedeleteall` wipes the branch clean (see "
-"below)."
+msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
@@ -30235,86 +23506,55 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:426
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`author`"
msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:432
-msgid ""
-"An `author` command may optionally appear, if the author information might "
-"differ from the committer information. If `author` is omitted then fast-"
-"import will automatically use the committer's information for the author "
-"portion of the commit. See below for a description of the fields in "
-"`author`, as they are identical to `committer`."
+msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:434
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:437
-msgid ""
-"The `committer` command indicates who made this commit, and when they made "
-"it."
+msgid "The `committer` command indicates who made this commit, and when they made it."
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 "
-"`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 "
-"sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 "
-"encoded."
+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 `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 sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:450
-msgid ""
-"The time of the change is specified by `<when>` using the date format that "
-"was selected by the --date-format=<fmt> command-line option. See ``Date "
-"Formats'' above for the set of supported formats, and their syntax."
+msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:452
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`from`"
msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:458
-msgid ""
-"The `from` command is used to specify the commit to initialize this branch "
-"from. This revision will be the first ancestor of the new commit. The "
-"state of the tree built at this commit will begin with the state at the "
-"`from` commit, and be altered by the content modifications in this commit."
+msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
#: 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."
+msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:471
-msgid ""
-"As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or "
-"escaping syntax is supported within `<commit-ish>`."
+msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
@@ -30324,10 +23564,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:477
-msgid ""
-"The name of an existing branch already in fast-import's internal branch "
-"table. If fast-import doesn't know the name, it's treated as a SHA-1 "
-"expression."
+msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
@@ -30337,12 +23574,7 @@ 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 "
-"base-10 digits."
+msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
@@ -30357,23 +23589,17 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:492
-msgid ""
-"Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING "
-"REVISIONS'' in linkgit:gitrevisions[7] for details."
+msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
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."
+msgid "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:"
+msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
@@ -30384,50 +23610,34 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:507
-msgid ""
-"The `^0` suffix is necessary as fast-import does not permit a branch to "
-"start from itself, and the branch is created in memory before the `from` "
-"command is even read from the input. Adding `^0` will force fast-import to "
-"resolve the commit through Git's revision parsing library, rather than its "
-"internal branch table, thereby loading in the existing value of the branch."
+msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:517
-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 "
-"with no files. An unlimited number of `merge` commands per commit are "
-"permitted by fast-import, thereby establishing an n-way merge."
+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 with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:520
-msgid ""
-"Here `<commit-ish>` is any of the commit specification expressions also "
-"accepted by `from` (see above)."
+msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:522
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`filemodify`"
msgstr "`filemodify`"
#. 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 "
-"content of the file."
+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 content of the file."
msgstr ""
#. type: Labeled list
@@ -30439,9 +23649,7 @@ msgstr "Format interne de Git"
#. type: Plain text
#: en/git-fast-import.txt:530
-msgid ""
-"The data content for the file was already supplied by a prior `blob` "
-"command. The frontend just needs to connect it."
+msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
@@ -30452,12 +23660,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:540
-msgid ""
-"Here usually `<dataref>` must 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. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte "
-"SHA-1 of an existing Git tree object or a mark reference set with `--import-"
-"marks`."
+msgid "Here usually `<dataref>` must 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. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
@@ -30469,9 +23672,7 @@ 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."
+msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
@@ -30489,16 +23690,12 @@ 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:"
+msgid "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."
+msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
@@ -30513,43 +23710,27 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:566
-msgid ""
-"`040000`: A subdirectory. Subdirectories can only be specified by SHA or "
-"through a tree mark set with `--import-marks`."
+msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:569
-msgid ""
-"In both formats `<path>` is the complete path of the file to be added (if "
-"not already existing) or modified (if already existing)."
+msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
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 "
-"quote (`\"`)."
+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 quote (`\"`)."
msgstr ""
#. type: Plain text
#: 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, "
-"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\"`)."
+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, 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\"`)."
msgstr ""
#. type: Plain text
@@ -30574,15 +23755,12 @@ 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)."
+msgid "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
@@ -30592,18 +23770,13 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:594
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:600
-msgid ""
-"Included in a `commit` command to remove a file or recursively delete an "
-"entire directory from the branch. If the file or directory removal makes "
-"its parent directory empty, the parent directory will be automatically "
-"removed too. This cascades up the tree until the first non-empty directory "
-"or the root is reached."
+msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
@@ -30614,25 +23787,18 @@ 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 "
-"`<path>`."
+msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:610
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:615
-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."
+msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
@@ -30643,33 +23809,23 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:624 en/git-fast-import.txt:644
-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."
+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."
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 "
-"location will not impact the destination of the copy."
+msgid "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 ""
#. type: Title ^
#: en/git-fast-import.txt:631
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:635
-msgid ""
-"Renames an existing file or subdirectory to a different location within the "
-"branch. The existing file or directory must exist. If the destination "
-"exists it will be replaced by the source directory."
+msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
@@ -30680,38 +23836,23 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:649
-msgid ""
-"A `filerename` command takes effect immediately. Once the source location "
-"has been renamed to the destination any future commands applied to the "
-"source location will create new files there and not impact the destination "
-"of the rename."
+msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:658
-msgid ""
-"Note that a `filerename` is the same as a `filecopy` followed by a "
-"`filedelete` of the source location. There is a slight performance "
-"advantage to using `filerename`, but the advantage is so small that it is "
-"never worth trying to convert a delete/add pair in source material into a "
-"rename for fast-import. This `filerename` command is provided just to "
-"simplify frontends that already have rename information and don't want "
-"bother with decomposing it into a `filecopy` followed by a `filedelete`."
+msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:660
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:665
-msgid ""
-"Included in a `commit` command to remove all files (and also all "
-"directories) from the branch. This command resets the internal branch "
-"structure to have no files in it, allowing the frontend to subsequently add "
-"all interesting files from scratch."
+msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
@@ -30722,47 +23863,28 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:674
-msgid ""
-"This command is extremely useful if the frontend does not know (or does not "
-"care to know) what files are currently on the branch, and therefore cannot "
-"generate the proper `filedelete` commands to update the content."
+msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:682
-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."
+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."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:684
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
#: 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 "
-"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 "
-"of the note."
+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 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 of the note."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:698
-msgid ""
-"The data content for the note was already supplied by a prior `blob` "
-"command. The frontend just needs to connect it to the commit that is to be "
-"annotated."
+msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
@@ -30773,16 +23895,12 @@ 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."
+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."
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."
+msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
@@ -30795,25 +23913,18 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:721
-msgid ""
-"In both formats `<commit-ish>` is any of the commit specification "
-"expressions also accepted by `from` (see above)."
+msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:723
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`mark`"
msgstr "`mark`"
#. 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 "
-"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."
+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 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."
msgstr ""
#. type: delimited block .
@@ -30824,25 +23935,17 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. 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."
+msgid "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
#: en/git-fast-import.txt:747
-msgid ""
-"Creates an annotated tag referring to a specific commit. To create "
-"lightweight (non-annotated) tags see the `reset` command below."
+msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
@@ -30862,64 +23965,37 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:761
-msgid ""
-"Tag names are automatically prefixed with `refs/tags/` when stored in Git, "
-"so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just "
-"`RELENG-1_0-FINAL` for `<name>`, and fast-import will write the "
-"corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
+msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:765
-msgid ""
-"The value of `<name>` must be a valid refname in Git and therefore may "
-"contain forward slashes. As `LF` is not valid in a Git refname, no quoting "
-"or escaping syntax is supported here."
+msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:768
-msgid ""
-"The `from` command is the same as in the `commit` command; see above for "
-"details."
+msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:771
-msgid ""
-"The `tagger` command uses the same format as `committer` within `commit`; "
-"again see above for details."
+msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
#: 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 "
-"other encodings to be specified."
+msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
#: 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 "
-"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."
+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 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."
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."
+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."
msgstr ""
#. type: delimited block .
@@ -30933,16 +24009,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:801
-msgid ""
-"For a detailed description of `<ref>` and `<commit-ish>` see above under "
-"`commit` and `from`."
+msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:806
-msgid ""
-"The `reset` command can also be used to create lightweight (non-annotated) "
-"tags. For example:"
+msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
@@ -30955,17 +24027,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:814
-msgid ""
-"would create the lightweight tag `refs/tags/938` referring to whatever "
-"commit mark `:938` references."
+msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:821
-msgid ""
-"Requests writing one file revision to the packfile. The revision is not "
-"connected to any commit; this connection must be formed in a subsequent "
-"`commit` command by referencing the blob through an assigned mark."
+msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
@@ -30979,37 +24046,23 @@ msgstr ""
#. type: Plain text
#: 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 "
-"inexpensive to store and easy to use."
+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 inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:834
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`data`"
msgstr "`data`"
#. type: Plain text
#: 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 "
-"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."
+msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:846
-msgid ""
-"Comment lines appearing within the `<raw>` part of `data` commands are "
-"always taken to be part of the body of the data and are therefore never "
-"ignored by fast-import. This makes it safe to import any file/message "
-"content whose lines might start with `#`."
+msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
@@ -31033,20 +24086,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:859
-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."
+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."
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`."
+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`."
msgstr ""
#. type: Labeled list
@@ -31058,10 +24103,7 @@ msgstr "Format interne de Git"
#. type: Plain text
#: 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."
+msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
@@ -31076,13 +24118,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"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."
+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 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."
msgstr ""
#. type: Plain text
@@ -31092,9 +24128,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:891
-msgid ""
-"Forces fast-import to close the current packfile, start a new one, and to "
-"save out all current branch refs, tags and marks."
+msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
@@ -31107,39 +24141,22 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:901
-msgid ""
-"Note that fast-import automatically switches packfiles when the current "
-"packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. "
-"During an automatic packfile switch fast-import does not update the branch "
-"refs, tags or marks."
+msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:906
-msgid ""
-"As a `checkpoint` can require a significant amount of CPU time and disk IO "
-"(to compute the overall pack SHA-1 checksum, generate the corresponding "
-"index file, and update the refs) it can easily take several minutes for a "
-"single `checkpoint` command to complete."
+msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:912
-msgid ""
-"Frontends may choose to issue checkpoints during extremely large and long "
-"running imports, or when they need to allow another Git process access to a "
-"branch. However given that a 30 GiB Subversion repository can be loaded "
-"into Git through fast-import in about 3 hours, explicit checkpointing may "
-"not be necessary."
+msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:921
-msgid ""
-"Causes fast-import to print the entire `progress` line unmodified to its "
-"standard output channel (file descriptor 1) when the command is processed "
-"from the input stream. The command otherwise has no impact on the current "
-"import, or on any of fast-import's internal state."
+msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
@@ -31152,11 +24169,7 @@ msgstr ""
#. type: Plain text
#: 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:"
+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:"
msgstr ""
#. type: delimited block =
@@ -31167,20 +24180,12 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:947
-msgid ""
-"Causes fast-import to print the SHA-1 corresponding to a mark to stdout or "
-"to the file descriptor previously arranged with the `--cat-blob-fd` "
-"argument. The command otherwise has no impact on the current import; its "
-"purpose is to retrieve SHA-1s that later commits might want to refer to in "
-"their commit messages."
+msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
@@ -31191,27 +24196,18 @@ 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:958 en/git-fast-import.txt:988
#: en/git-fast-import.txt:1041
-msgid ""
-"See ``Responses To Commands'' below for details about how to read this "
-"output safely."
+msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:966
-msgid ""
-"Causes fast-import to print a blob to a file descriptor previously arranged "
-"with the `--cat-blob-fd` argument. The command otherwise has no impact on "
-"the current import; its main purpose is to retrieve blobs that may be in "
-"fast-import's memory but not accessible from the target repository."
+msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
@@ -31222,9 +24218,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:974
-msgid ""
-"The `<dataref>` can be either a mark reference (`:<idnum>`) set previously "
-"or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
+msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
@@ -31242,26 +24236,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."
+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."
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 "
-"from a previous commit for use in the current one (with `filemodify`)."
+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 from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:999
-msgid ""
-"The `ls` command can be used anywhere in the stream that comments are "
-"accepted, including the middle of a commit."
+msgid "The `ls` command can be used anywhere in the stream that comments are accepted, including the middle of a commit."
msgstr ""
#. type: Labeled list
@@ -31272,10 +24257,7 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
@@ -31292,11 +24274,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1015
-msgid ""
-"The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte "
-"SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be "
-"written. The path is relative to the top level of the tree named by "
-"`<dataref>`."
+msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
@@ -31323,16 +24301,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1031
-msgid ""
-"The <dataref> represents the blob, tree, or commit object at <path> and can "
-"be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
+msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1034
-msgid ""
-"If there is no file or subtree at that path, 'git fast-import' will instead "
-"report"
+msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
@@ -31343,9 +24317,7 @@ 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."
+msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
@@ -31391,9 +24363,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1061
-msgid ""
-"Act as though the corresponding command-line option with a leading `--` was "
-"passed on the command line (see OPTIONS, above)."
+msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
@@ -31410,13 +24380,7 @@ 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."
+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."
msgstr ""
#. type: Labeled list
@@ -31439,12 +24403,7 @@ 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."
+msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
@@ -31455,10 +24414,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1088
-msgid ""
-"Require that the backend support the 'notemodify' (N) subcommand to the "
-"'commit' command. Versions of fast-import not supporting notes will exit "
-"with a message indicating so."
+msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
@@ -31469,21 +24425,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1096
-msgid ""
-"Error out if the stream ends without a 'done' command. Without this "
-"feature, errors causing the frontend to end abruptly at a convenient point "
-"in the stream can go undetected. This may occur, for example, if an import "
-"front end dies in mid-operation without emitting SIGTERM or SIGKILL at its "
-"subordinate git fast-import instance."
+msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
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."
+msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
@@ -31494,25 +24441,17 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
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."
+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."
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:"
+msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
@@ -31522,16 +24461,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1129
-msgid ""
-"If the `done` feature is not in use, treated as if EOF was read. This can "
-"be used to tell fast-import to finish early."
+msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. 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."
+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."
msgstr ""
#. type: Title -
@@ -31542,22 +24477,12 @@ 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 "
-"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."
+msgid "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."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1149
-msgid ""
-"For some frontends, though, it is useful to be able to read back data from "
-"the current repository as it is being updated (for example when the source "
-"material describes objects in terms of patches to be applied to previously "
-"imported objects). This can be accomplished by connecting the frontend and "
-"fast-import via bidirectional pipes:"
+msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
@@ -31571,17 +24496,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1158
-msgid ""
-"A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-"
-"blob` commands to read information from the import in progress."
+msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
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 fast-import that might block."
+msgid "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 ""
#. type: Title -
@@ -31592,33 +24512,17 @@ msgstr ""
#. type: Plain text
#: 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 "
-"fast-import state as well as the most recent commands that lead up to the "
-"crash."
+msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1177
-msgid ""
-"All recent commands (including stream comments, file changes and progress "
-"commands) are shown in the command history within the crash report, but raw "
-"file data and commit messages are excluded from the crash report. This "
-"exclusion saves space within the report file and reduces the amount of "
-"buffering that fast-import must perform during execution."
+msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
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."
+msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
@@ -31751,9 +24655,7 @@ 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."
+msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
@@ -31764,21 +24666,12 @@ 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."
+msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. 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."
+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."
msgstr ""
#. type: Title ~
@@ -31789,19 +24682,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1275
-msgid ""
-"Don't bother trying to optimize the frontend to stick to one branch at a "
-"time during an import. Although doing so might be slightly faster for fast-"
-"import, it tends to increase the complexity of the frontend code "
-"considerably."
+msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Title ~
@@ -31812,10 +24698,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1286
-msgid ""
-"When importing a renamed file or directory, simply delete the old name(s) "
-"and modify the new name(s) during the corresponding commit. Git performs "
-"rename detection after-the-fact, rather than explicitly during a commit."
+msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
@@ -31826,46 +24709,27 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1292
-msgid ""
-"Some other SCM systems let the user create a tag from multiple files which "
-"are not from the same commit/changeset. Or to create tags which are a "
-"subset of the files available in the repository."
+msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1299
-msgid ""
-"Importing these tags as-is in Git is impossible without making at least one "
-"commit which ``fixes up'' the files to match the content of the tag. Use "
-"fast-import's `reset` command to reset a dummy branch outside of your normal"
-" branch space to the base commit for the tag, then commit one or more file "
-"fixup commits, and finally tag the dummy branch."
+msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1305
-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`)."
+msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. 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 "
-"properly annotate the source files."
+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 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."
+msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
@@ -31876,29 +24740,17 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1320
-msgid ""
-"As soon as fast-import completes the Git repository is completely valid and "
-"ready for use. Typically this takes only a very short time, even for "
-"considerably large projects (100,000+ commits)."
+msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1327
-msgid ""
-"However repacking the repository is necessary to improve data locality and "
-"access performance. It can also take hours on extremely large projects "
-"(especially if -f and a large --window parameter is used). Since repacking "
-"is safe to run alongside readers and writers, run the repack in the "
-"background and let it finish when it finishes. There is no reason to wait "
-"to explore your new Git project!"
+msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1332
-msgid ""
-"If you choose to wait for the repack, don't try to run benchmarks or "
-"performance tests until repacking is completed. fast-import outputs "
-"suboptimal packfiles that are simply never seen in real use situations."
+msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
@@ -31909,12 +24761,7 @@ 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."
+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."
msgstr ""
#. type: Title ~
@@ -31925,12 +24772,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1350
-msgid ""
-"Every once in a while have your frontend emit a `progress` message to fast-"
-"import. The contents of the messages are entirely free-form, so one "
-"suggestion would be to output the current month and year each time the "
-"current commit date moves into the next month. Your users will feel better "
-"knowing how much of the data stream has been processed."
+msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
@@ -31941,45 +24783,22 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1359
-msgid ""
-"When packing a blob fast-import always attempts to deltify against the last "
-"blob written. Unless specifically arranged for by the frontend, this will "
-"probably not be a prior version of the same file, so the generated delta "
-"will not be the smallest possible. The resulting packfile will be "
-"compressed, but will not be optimal."
+msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
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 "
-"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."
+msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. 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 "
-"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."
+msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1381
-msgid ""
-"For this reason it is strongly recommended that users repack the repository "
-"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)."
+msgid "For this reason it is strongly recommended that users repack the repository 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)."
msgstr ""
#. type: Title -
@@ -31990,12 +24809,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1390
-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."
+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."
msgstr ""
#. type: Title ~
@@ -32006,23 +24820,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1399
-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 "
-"memory."
+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 memory."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1405
-msgid ""
-"The object table is actually a hashtable keyed on the object name (the "
-"unique SHA-1). This storage configuration allows fast-import to reuse an "
-"existing or already written object and avoid writing duplicates to the "
-"output packfile. Duplicate blobs are surprisingly common in an import, "
-"typically due to branch merges in the source."
+msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
@@ -32033,11 +24836,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1413
-msgid ""
-"Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, "
-"depending on pointer size) per mark. Although the array is sparse, "
-"frontends are still strongly encouraged to use marks between 1 and n, where "
-"n is the total number of marks required for this import."
+msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
@@ -32048,45 +24847,27 @@ 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."
+msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1424
-msgid ""
-"Inactive branches are stored in a structure which uses 96 or 120 bytes (32 "
-"bit or 64 bit systems, respectively), plus the length of the branch name "
-"(typically under 200 bytes), per branch. fast-import will easily handle as "
-"many as 10,000 inactive branches in under 2 MiB of memory."
+msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1435
-msgid ""
-"As active branches store metadata about the files contained on that branch, "
-"their in-memory storage size can grow to a considerable size (see below)."
+msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1440
-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=."
+msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
@@ -32098,11 +24879,7 @@ msgstr "Mode interactif"
#. type: Plain text
#: en/git-fast-import.txt:1447
-msgid ""
-"Trees (aka directories) use just 12 bytes of memory on top of the memory "
-"required for their entries (see ``per active file'' below). The cost of a "
-"tree is virtually 0, as its overhead amortizes out over the individual file "
-"entries."
+msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
@@ -32114,21 +24891,12 @@ msgstr "Mode interactif"
#. type: Plain text
#: 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 "
-"just 16 bytes (after including the string header overhead) no matter how "
-"many times it occurs within the project."
+msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1460
-msgid ""
-"The active branch LRU, when coupled with the filename string pool and lazy "
-"loading of subtrees, allows fast-import to efficiently import projects with "
-"2,000+ branches and 45,114+ files in a very limited memory footprint (less "
-"than 2.7 MiB per active branch)."
+msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
@@ -32139,16 +24907,12 @@ 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."
+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."
msgstr ""
#. type: Title =
#: en/git-fetch-pack.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-fetch-pack(1)"
msgstr "git-fetch-pack(1)"
@@ -32171,26 +24935,17 @@ msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:21
-msgid ""
-"Usually you would want to use 'git fetch', which is a higher level wrapper "
-"of this command, instead."
+msgid "Usually you would want to use 'git fetch', which is a higher level wrapper of this command, instead."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:27
-msgid ""
-"Invokes 'git-upload-pack' on a possibly remote repository and asks it to "
-"send objects missing from this repository, to update the named heads. The "
-"list of commits available locally is found out by scanning the local refs/ "
-"hierarchy and sent to 'git-upload-pack' running on the other end."
+msgid "Invokes 'git-upload-pack' on a possibly remote repository and asks it to send objects missing from this repository, to update the named heads. The list of commits available locally is found out by scanning the local refs/ hierarchy and sent to 'git-upload-pack' running on the other end."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:31
-msgid ""
-"This command degenerates to download everything to complete the asked refs "
-"from the remote side when the local side does not have a common ancestor "
-"commit."
+msgid "This command degenerates to download everything to complete the asked refs from the remote side when the local side does not have a common ancestor commit."
msgstr ""
#. type: Plain text
@@ -32200,62 +24955,44 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "Take the list of refs from stdin, one per line. If there are refs specified on the command line in addition to this option, then the refs from stdin are processed after those on the command line."
msgstr ""
#. 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 "
-"packet, and the list must end with a flush packet."
+msgid "If `--stateless-rpc` is specified together with this option then the list of refs must be in packet format (pkt-line). Each ref must be in a separate packet, and the list must end with a flush packet."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:52
-msgid ""
-"Pass `-q` flag to 'git unpack-objects'; this makes the cloning process less "
-"verbose."
+msgid "Pass `-q` flag to 'git unpack-objects'; this makes the cloning process less verbose."
msgstr ""
#. type: Plain text
#: 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."
+msgid "Do not invoke 'git unpack-objects' on received data, but create a single packfile out of it instead, and store it in the object database. If provided twice then the pack is locked against repacking."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:60 en/git-pack-objects.txt:184
-#: en/git-send-pack.txt:64
-#, no-wrap, ignore-translated
+#: en/git-fetch-pack.txt:60 en/git-pack-objects.txt:184 en/git-send-pack.txt:64
+#, no-wrap
msgid "--thin"
msgstr "--thin"
#. type: Plain text
#: en/git-fetch-pack.txt:63
-msgid ""
-"Fetch a \"thin\" pack, which records objects in deltified form based on "
-"objects not included in the pack to reduce network traffic."
+msgid "Fetch a \"thin\" pack, which records objects in deltified form based on objects not included in the pack to reduce network traffic."
msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:64 en/git-pack-objects.txt:81
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--include-tag"
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."
+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."
msgstr ""
#. type: Labeled list
@@ -32267,15 +25004,7 @@ msgstr "git-add(1)"
#. type: Plain text
#: en/git-fetch-pack.txt:81
-msgid ""
-"Use this to specify the path to 'git-upload-pack' on the remote side, if is "
-"not found on your $PATH. Installations of sshd ignores the user's "
-"environment setup scripts for login shells (e.g. .bash_profile) and your "
-"privately installed git may not be found on the system default $PATH. "
-"Another workaround suggested is to set up your $PATH in \".bashrc\", but "
-"this flag is for people who do not want to pay the overhead for non-"
-"interactive shells by having a lean .bashrc file (they set most of the "
-"things up in .bash_profile)."
+msgid "Use this to specify the path to 'git-upload-pack' on the remote side, if is not found on your $PATH. Installations of sshd ignores the user's environment setup scripts for login shells (e.g. .bash_profile) and your privately installed git may not be found on the system default $PATH. Another workaround suggested is to set up your $PATH in \".bashrc\", but this flag is for people who do not want to pay the overhead for non-interactive shells by having a lean .bashrc file (they set most of the things up in .bash_profile)."
msgstr ""
#. type: Labeled list
@@ -32292,35 +25021,28 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "Limit fetching to ancestor-chains not longer than n. 'git-upload-pack' treats the special depth 2147483647 as infinite even if there is an ancestor-chain that long."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:93
-msgid ""
-"Deepen or shorten the history of a shallow'repository to include all "
-"reachable commits after <date>."
+msgid "Deepen or shorten the history of a shallow'repository to include all reachable commits after <date>."
msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:99
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--deepen-relative"
msgstr "--deepen-relative"
#. type: Plain text
#: en/git-fetch-pack.txt:103
-msgid ""
-"Argument --depth specifies the number of commits from the current shallow "
-"boundary instead of from the tip of each remote branch history."
+msgid "Argument --depth specifies the number of commits from the current shallow boundary instead of from the tip of each remote branch history."
msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:104 en/merge-options.txt:113
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-progress"
msgstr "--no-progress"
@@ -32331,15 +25053,13 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:107 en/git-index-pack.txt:77
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--check-self-contained-and-connected"
msgstr "--check-self-contained-and-connected"
#. type: Plain text
#: en/git-fetch-pack.txt:110
-msgid ""
-"Output \"connectivity-ok\" if the received pack is self-contained and "
-"connected."
+msgid "Output \"connectivity-ok\" if the received pack is self-contained and connected."
msgstr ""
#. type: Plain text
@@ -32370,23 +25090,17 @@ 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:125
-msgid ""
-"If the remote has enabled the options `uploadpack.allowTipSHA1InWant`, "
-"`uploadpack.allowReachableSHA1InWant`, or `uploadpack.allowAnySHA1InWant`, "
-"they may alternatively be 40-hex sha1s present on the remote."
+msgid "If the remote has enabled the options `uploadpack.allowTipSHA1InWant`, `uploadpack.allowReachableSHA1InWant`, or `uploadpack.allowAnySHA1InWant`, they may alternatively be 40-hex sha1s present on the remote."
msgstr ""
#. type: Title =
#: en/git-fetch.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-fetch(1)"
msgstr "git-fetch(1)"
@@ -32409,46 +25123,27 @@ msgstr ""
#. type: Plain text
#: 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)."
+msgid "Fetch branches and/or tags (collectively, \"refs\") from one or more other repositories, along with the objects necessary to complete their histories. Remote-tracking branches are updated (see the description of <refspec> below for ways to control this behavior)."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:32
-msgid ""
-"By default, any tag that points into the histories being fetched is also "
-"fetched; the effect is to fetch tags that point at branches that you are "
-"interested in. This default behavior can be changed by using the --tags or "
-"--no-tags options or by configuring remote.<name>.tagOpt. By using a "
-"refspec that fetches tags explicitly, you can fetch tags that do not point "
-"into branches you are interested in as well."
+msgid "By default, any tag that points into the histories being fetched is also fetched; the effect is to fetch tags that point at branches that you are interested in. This default behavior can be changed by using the --tags or --no-tags options or by configuring remote.<name>.tagOpt. By using a refspec that fetches tags explicitly, you can fetch tags that do not point into branches you are interested in as well."
msgstr ""
#. type: Plain text
#: 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])."
+msgid "'git fetch' can fetch from either a single named repository or URL, or from several repositories at once if <group> is given and there is a remotes.<group> entry in the configuration file. (See linkgit:git-config[1])."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:40
-msgid ""
-"When no remote is specified, by default the `origin` remote will be used, "
-"unless there's an upstream branch configured for the current branch."
+msgid "When no remote is specified, by default the `origin` remote will be used, unless there's an upstream branch configured for the current branch."
msgstr ""
#. type: Plain text
#: 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]."
+msgid "The names of refs that are fetched, together with the object names they point at, are written to `.git/FETCH_HEAD`. This information may be used by scripts or other git commands, such as linkgit:git-pull[1]."
msgstr ""
#. type: Title -
@@ -32459,11 +25154,7 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "You often interact with the same remote repository by regularly and repeatedly fetching from it. In order to keep track of the progress of such a remote repository, `git fetch` allows you to configure `remote.<repository>.fetch` configuration variables."
msgstr ""
#. type: Plain text
@@ -32486,53 +25177,27 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "When `git fetch` is run without specifying what branches and/or tags to fetch on the command line, e.g. `git fetch origin` or `git fetch`, `remote.<repository>.fetch` values are used as the refspecs--they specify which refs to fetch and which local refs to update. The example above will fetch all branches that exist in the `origin` (i.e. any ref that matches the left-hand side of the value, `refs/heads/*`) and update the corresponding remote-tracking branches in the `refs/remotes/origin/*` hierarchy."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:97
-msgid ""
-"When `git fetch` is run with explicit branches and/or tags to fetch on the "
-"command line, e.g. `git fetch origin master`, the <refspec>s given on the "
-"command line determine what are to be fetched (e.g. `master` in the example,"
-" which is a short-hand for `master:`, which in turn means \"fetch the "
-"'master' branch but I do not explicitly say what remote-tracking branch to "
-"update with it from the command line\"), and the example command will fetch "
-"_only_ the 'master' branch. The `remote.<repository>.fetch` values "
-"determine which remote-tracking branch, if any, is updated. When used in "
-"this way, the `remote.<repository>.fetch` values do not have any effect in "
-"deciding _what_ gets fetched (i.e. the values are not used as refspecs when "
-"the command-line lists refspecs); they are only used to decide _where_ the "
-"refs that are fetched are stored by acting as a mapping."
+msgid "When `git fetch` is run with explicit branches and/or tags to fetch on the command line, e.g. `git fetch origin master`, the <refspec>s given on the command line determine what are to be fetched (e.g. `master` in the example, which is a short-hand for `master:`, which in turn means \"fetch the 'master' branch but I do not explicitly say what remote-tracking branch to update with it from the command line\"), and the example command will fetch _only_ the 'master' branch. The `remote.<repository>.fetch` values determine which remote-tracking branch, if any, is updated. When used in this way, the `remote.<repository>.fetch` values do not have any effect in deciding _what_ gets fetched (i.e. the values are not used as refspecs when the command-line lists refspecs); they are only used to decide _where_ the refs that are fetched are stored by acting as a mapping."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:101
-msgid ""
-"The latter use of the `remote.<repository>.fetch` values can be overridden "
-"by giving the `--refmap=<refspec>` parameter(s) on the command line."
+msgid "The latter use of the `remote.<repository>.fetch` values can be overridden by giving the `--refmap=<refspec>` parameter(s) on the command line."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:108
-msgid ""
-"The output of \"git fetch\" depends on the transport method used; this "
-"section describes the output when fetching over the Git protocol (either "
-"locally or via ssh) and Smart HTTP protocol."
+msgid "The output of \"git fetch\" depends on the transport method used; this section describes the output when fetching over the Git protocol (either locally or via ssh) and Smart HTTP protocol."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:111
-msgid ""
-"The status of the fetch is output in tabular form, with each line "
-"representing the status of a single ref. Each line is of the form:"
+msgid "The status of the fetch is output in tabular form, with each line representing the status of a single ref. Each line is of the form:"
msgstr ""
#. type: delimited block -
@@ -32543,17 +25208,12 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:118
-msgid ""
-"The status of up-to-date refs is shown only if the --verbose option is used."
+msgid "The status of up-to-date refs is shown only if the --verbose option is used."
msgstr ""
#. type: Plain text
#: 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/*`."
+msgid "In compact output mode, specified with configuration variable fetch.output, if either entire `<from>` or `<to>` is found in the other string, it will be substituted with `*` in the other string. For example, `master -> origin/master` becomes `master -> origin/*`."
msgstr ""
#. type: Labeled list
@@ -32591,7 +25251,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:128 en/git-push.txt:332
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`-`"
msgstr "`-`"
@@ -32602,7 +25262,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:129
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`t`"
msgstr "`t`"
@@ -32652,11 +25312,7 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:139
-msgid ""
-"For a successfully fetched ref, the summary shows the old and new values of "
-"the ref in a form suitable for using as an argument to `git log` (this is "
-"`<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-"
-"forward updates)."
+msgid "For a successfully fetched ref, the summary shows the old and new values of the ref in a form suitable for using as an argument to `git log` (this is `<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-forward updates)."
msgstr ""
#. type: Labeled list
@@ -32667,9 +25323,7 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:144
-msgid ""
-"The name of the remote ref being fetched from, minus its `refs/<type>/` "
-"prefix. In the case of deletion, the name of the remote ref is \"(none)\"."
+msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` prefix. In the case of deletion, the name of the remote ref is \"(none)\"."
msgstr ""
#. type: Plain text
@@ -32680,8 +25334,7 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:148
-msgid ""
-"The name of the local ref being updated, minus its `refs/<type>/` prefix."
+msgid "The name of the local ref being updated, minus its `refs/<type>/` prefix."
msgstr ""
#. type: Labeled list
@@ -32692,10 +25345,7 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "A human-readable explanation. In the case of successfully fetched refs, no explanation is needed. For a failed ref, the reason for failure is described."
msgstr ""
#. type: Plain text
@@ -32712,10 +25362,7 @@ msgstr "$ git commit\n"
#. type: Plain text
#: en/git-fetch.txt:167
-msgid ""
-"The above command copies all branches from the remote refs/heads/ namespace "
-"and stores them to the local refs/remotes/origin/ namespace, unless the "
-"branch.<name>.fetch option is used to specify a non-default refspec."
+msgid "The above command copies all branches from the remote refs/heads/ namespace and stores them to the local refs/remotes/origin/ namespace, unless the branch.<name>.fetch option is used to specify a non-default refspec."
msgstr ""
#. type: Plain text
@@ -32732,24 +25379,17 @@ 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` "
-"from the remote repository."
+msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively) `pu` and `maint` from the remote repository."
msgstr ""
#. 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:183
-msgid ""
-"Peek at a remote's branch, without configuring the remote in your local "
-"repository:"
+msgid "Peek at a remote's branch, without configuring the remote in your local repository:"
msgstr ""
#. type: delimited block -
@@ -32762,12 +25402,7 @@ 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])."
+msgid "The first command fetches the `maint` branch from the repository at `git://git.kernel.org/pub/scm/git/git.git` and the second command uses `FETCH_HEAD` to examine the branch with linkgit:git-log[1]. The fetched objects will eventually be removed by git's built-in housekeeping (see linkgit:git-gc[1])."
msgstr ""
#. type: Title -
@@ -32780,17 +25415,12 @@ 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."
+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."
msgstr ""
#. type: Title =
#: en/git-filter-branch.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-filter-branch(1)"
msgstr "git-filter-branch(1)"
@@ -32814,23 +25444,12 @@ 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."
+msgid "Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:34
-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."
+msgid "The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted."
msgstr ""
#. type: Plain text
@@ -32859,18 +25478,12 @@ msgstr ""
#. type: Plain text
#: 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/'."
+msgid "Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace 'refs/original/'."
msgstr ""
#. 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."
+msgid "Note that since this operation is very I/O expensive, it might be a good idea to redirect the temporary directory off-disk with the `-d` option, e.g. on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
@@ -32881,34 +25494,17 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:71
-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, "
-"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 "
-"replacement commit created by linkgit:git-commit-tree[1] after the filters "
-"have run."
+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, 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 replacement commit created by linkgit:git-commit-tree[1] after the filters have run."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:74
-msgid ""
-"If any evaluation of <command> returns a non-zero exit status, the whole "
-"operation will be aborted."
+msgid "If any evaluation of <command> returns a non-zero exit status, the whole operation will be aborted."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:80
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -32919,11 +25515,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:91
-msgid ""
-"This filter may be used if you only need to modify the environment in which "
-"the commit will be performed. Specifically, you might want to rewrite the "
-"author/committer name/email/time environment variables (see linkgit:git-"
-"commit-tree[1] for details). Do not forget to re-export the variables."
+msgid "This filter may be used if you only need to modify the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment variables (see linkgit:git-commit-tree[1] for details). Do not forget to re-export the variables."
msgstr ""
#. type: Labeled list
@@ -32934,12 +25526,7 @@ 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*!)."
+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*!)."
msgstr ""
#. type: Labeled list
@@ -32950,11 +25537,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:106
-msgid ""
-"This is the filter for rewriting the index. It is similar to the tree "
-"filter but does not check out the tree, which makes it much faster. "
-"Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES "
-"below. For hairy cases, see linkgit:git-update-index[1]."
+msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]."
msgstr ""
#. type: Labeled list
@@ -32965,12 +25548,7 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
@@ -32981,10 +25559,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:120
-msgid ""
-"This is the filter for rewriting the commit messages. The argument is "
-"evaluated in the shell with the original commit message on standard input; "
-"its standard output is used as the new commit message."
+msgid "This is the filter for rewriting the commit messages. The argument is evaluated in the shell with the original commit message on standard input; its standard output is used as the new commit message."
msgstr ""
#. type: Labeled list
@@ -32995,36 +25570,22 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:127
-msgid ""
-"This is the filter for performing the commit. If this filter is specified, "
-"it will be called instead of the 'git commit-tree' command, with arguments "
-"of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message "
-"on stdin. The commit id is expected on stdout."
+msgid "This is the filter for performing the commit. If this filter is specified, it will be called instead of the 'git commit-tree' command, with arguments of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message on stdin. The commit id is expected on stdout."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:131
-msgid ""
-"As a special extension, the commit filter may emit multiple commit ids; in "
-"that case, the rewritten children of the original commit will have all of "
-"them as parents."
+msgid "As a special extension, the commit filter may emit multiple commit ids; in that case, the rewritten children of the original commit will have all of them as parents."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:136
-msgid ""
-"You can use the 'map' convenience function in this filter, and other "
-"convenience functions, too. For example, calling 'skip_commit \"$@\"' will "
-"leave out the current commit (but not its changes! If you want that, use "
-"'git rebase' instead)."
+msgid "You can use the 'map' convenience function in this filter, and other convenience functions, too. For example, calling 'skip_commit \"$@\"' will leave out the current commit (but not its changes! If you want that, use 'git rebase' instead)."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:140
-msgid ""
-"You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git "
-"commit-tree \"$@\"` if you don't wish to keep commits with a single parent "
-"and that makes no change to the tree."
+msgid "You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git commit-tree \"$@\"` if you don't wish to keep commits with a single parent and that makes no change to the tree."
msgstr ""
#. type: Labeled list
@@ -33035,35 +25596,17 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:147
-msgid ""
-"This is the filter for rewriting tag names. When passed, it will be called "
-"for every tag ref that points to a rewritten object (or to a tag object "
-"which points to a rewritten object). The original tag name is passed via "
-"standard input, and the new tag name is expected on standard output."
+msgid "This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object). The original tag name is passed via standard input, and the new tag name is expected on standard output."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:152
-msgid ""
-"The original tags are not deleted, but can be overwritten; use \"--tag-name-"
-"filter cat\" to simply update the tags. In this case, be very careful and "
-"make sure you have the old tags backed up in case the conversion has run "
-"afoul."
+msgid "The original tags are not deleted, but can be overwritten; use \"--tag-name-filter cat\" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:163
-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 "
-"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 "
-"timestamp (or the tag message for that matter). Tags which point to other "
-"tags will be rewritten to point to the underlying commit."
+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 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 timestamp (or the tag message for that matter). Tags which point to other tags will be rewritten to point to the underlying commit."
msgstr ""
#. type: Labeled list
@@ -33074,27 +25617,18 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:168
-msgid ""
-"Only look at the history which touches the given subdirectory. The result "
-"will contain that directory (and only that) as its project root. Implies "
-"<<Remap_to_ancestor>>."
+msgid "Only look at the history which touches the given subdirectory. The result will contain that directory (and only that) as its project root. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:169
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--prune-empty"
msgstr "--prune-empty"
#. type: Plain text
#: en/git-filter-branch.txt:176
-msgid ""
-"Some filters will generate empty commits that leave the tree untouched. "
-"This option instructs git-filter-branch to remove such commits if they have "
-"exactly one or zero non-pruned parents; merge commits will therefore remain "
-"intact. This option cannot be used together with `--commit-filter`, though "
-"the same effect can be achieved by using the provided "
-"`git_commit_non_empty_tree` function in a commit filter."
+msgid "Some filters will generate empty commits that leave the tree untouched. This option instructs git-filter-branch to remove such commits if they have exactly one or zero non-pruned parents; merge commits will therefore remain intact. This option cannot be used together with `--commit-filter`, though the same effect can be achieved by using the provided `git_commit_non_empty_tree` function in a commit filter."
msgstr ""
#. type: Labeled list
@@ -33105,9 +25639,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:180
-msgid ""
-"Use this option to set the namespace where the original commits will be "
-"stored. The default value is 'refs/original'."
+msgid "Use this option to set the namespace where the original commits will be stored. The default value is 'refs/original'."
msgstr ""
#. type: Labeled list
@@ -33118,19 +25650,12 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:188
-msgid ""
-"Use this option to set the path to the temporary directory used for "
-"rewriting. When applying a tree filter, the command needs to temporarily "
-"check out the tree to some directory, which may consume considerable space "
-"in case of large projects. By default it does this in the '.git-rewrite/' "
-"directory but you can override that choice by this parameter."
+msgid "Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporarily check out the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the '.git-rewrite/' directory but you can override that choice by this parameter."
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."
+msgid "'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
@@ -33141,11 +25666,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:200
-msgid ""
-"Arguments for 'git rev-list'. All positive refs included by these options "
-"are rewritten. You may also specify options such as `--all`, but you must "
-"use `--` to separate them from the 'git filter-branch' options. Implies "
-"<<Remap_to_ancestor>>."
+msgid "Arguments for 'git rev-list'. All positive refs included by these options are rewritten. You may also specify options such as `--all`, but you must use `--` to separate them from the 'git filter-branch' options. Implies <<Remap_to_ancestor>>."
msgstr ""
#. type: Title ~
@@ -33156,19 +25677,12 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:211
-msgid ""
-"By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can "
-"limit the set of revisions which get rewritten. However, positive refs on "
-"the command line are distinguished: we don't let them be excluded by such "
-"limiters. For this purpose, they are instead rewritten to point at the "
-"nearest ancestor that was not excluded."
+msgid "By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can limit the set of revisions which get rewritten. However, positive refs on the command line are distinguished: we don't let them be excluded by such limiters. For this purpose, they are instead rewritten to point at the nearest ancestor that was not excluded."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:218
-msgid ""
-"Suppose you want to remove a file (containing confidential information or "
-"copyright violation) from all commits:"
+msgid "Suppose you want to remove a file (containing confidential information or copyright violation) from all commits:"
msgstr ""
#. type: delimited block -
@@ -33179,28 +25693,18 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:226
-msgid ""
-"However, if the file is absent from the tree of some commit, a simple `rm "
-"filename` will fail for that tree and commit. Thus you may instead want to "
-"use `rm -f filename` as the script."
+msgid "However, if the file is absent from the tree of some commit, a simple `rm filename` will fail for that tree and commit. Thus you may instead want to use `rm -f filename` as the script."
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`:"
+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`:"
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
@@ -33210,9 +25714,7 @@ 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:"
+msgid "To rewrite the repository to look as if `foodir/` had been its project root, and discard all other history:"
msgstr ""
#. type: delimited block -
@@ -33223,18 +25725,12 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:249
-msgid ""
-"Thus you can, e.g., turn a library subdirectory into a repository of its "
-"own. Note the `--` that separates 'filter-branch' options from revision "
-"options, and the `--all` to rewrite all branches and tags."
+msgid "Thus you can, e.g., turn a library subdirectory into a repository of its own. Note the `--` that separates 'filter-branch' options from revision options, and the `--all` to rewrite all branches and tags."
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 "
-"behind the current history:"
+msgid "To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history:"
msgstr ""
#. type: delimited block -
@@ -33245,11 +25741,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:262
-msgid ""
-"(if the parent string is empty - which happens when we are dealing with the "
-"initial commit - add graftcommit as a parent). Note that this assumes "
-"history with a single root (that is, no merge without common ancestors "
-"happened). If this is not the case, use:"
+msgid "(if the parent string is empty - which happens when we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use:"
msgstr ""
#. type: delimited block -
@@ -33314,12 +25806,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:307
-msgid ""
-"The shift magic first throws away the tree id and then the -p parameters. "
-"Note that this handles merges properly! In case Darl committed a merge "
-"between P1 and P2, it will be propagated properly and all children of the "
-"merge will become merge commits with P1,P2 as their parents instead of the "
-"merge commit."
+msgid "The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit."
msgstr ""
#. type: Plain text
@@ -33334,10 +25821,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:316
-msgid ""
-"You can rewrite the commit log messages using `--msg-filter`. For example, "
-"'git svn-id' strings in a repository created by 'git svn' can be removed "
-"this way:"
+msgid "You can rewrite the commit log messages using `--msg-filter`. For example, 'git svn-id' strings in a repository created by 'git svn' can be removed this way:"
msgstr ""
#. type: delimited block -
@@ -33351,9 +25835,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:325
-msgid ""
-"If you need to add 'Acked-by' lines to, say, the last 10 commits (none of "
-"which is a merge), use this command:"
+msgid "If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command:"
msgstr ""
#. type: delimited block -
@@ -33368,11 +25850,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:337
-msgid ""
-"The `--env-filter` option can be used to modify committer and/or author "
-"identity. For example, if you found out that your commits have the wrong "
-"identity due to a misconfigured user.email, you can make a correction, "
-"before publishing the project, like this:"
+msgid "The `--env-filter` option can be used to modify committer and/or author identity. For example, if you found out that your commits have the wrong identity due to a misconfigured user.email, you can make a correction, before publishing the project, like this:"
msgstr ""
#. type: delimited block -
@@ -33395,10 +25873,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:357
-msgid ""
-"To restrict rewriting to only part of the history, specify a revision range "
-"in addition to the new branch name. The new branch name will point to the "
-"top-most revision that a 'git rev-list' of this range will print."
+msgid "To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range will print."
msgstr ""
#. type: Plain text
@@ -33463,58 +25938,37 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:400
-msgid ""
-"git-filter-branch can be used to get rid of a subset of files, usually with "
-"some combination of `--index-filter` and `--subdirectory-filter`. People "
-"expect the resulting repository to be smaller than the original, but you "
-"need a few more steps to actually make it smaller, because Git tries hard "
-"not to lose your objects until you tell it to. First make sure that:"
+msgid "git-filter-branch can be used to get rid of a subset of files, usually with some combination of `--index-filter` and `--subdirectory-filter`. People expect the resulting repository to be smaller than the original, but you need a few more steps to actually make it smaller, because Git tries hard not to lose your objects until you tell it to. First make sure that:"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:404
-msgid ""
-"You really removed all variants of a filename, if a blob was moved over its "
-"lifetime. `git log --name-only --follow --all -- filename` can help you "
-"find renames."
+msgid "You really removed all variants of a filename, if a blob was moved over its lifetime. `git log --name-only --follow --all -- filename` can help you find renames."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:407
-msgid ""
-"You really filtered all refs: use `--tag-name-filter cat -- --all` when "
-"calling git-filter-branch."
+msgid "You really filtered all refs: use `--tag-name-filter cat -- --all` when calling git-filter-branch."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:410
-msgid ""
-"Then there are two ways to get a smaller repository. A safer way is to "
-"clone, that keeps your original intact."
+msgid "Then there are two ways to get a smaller repository. A safer way is to clone, that keeps your original intact."
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!)"
+msgid "Clone it with `git clone file:///path/to/repo`. The clone will not have the removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain path just hardlinks everything!)"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:419
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:423
-msgid ""
-"Remove the original refs backed up by git-filter-branch: say `git for-each-"
-"ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
+msgid "Remove the original refs backed up by git-filter-branch: say `git for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
msgstr ""
#. type: Plain text
@@ -33524,56 +25978,32 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:429
-msgid ""
-"Garbage collect all unreferenced objects with `git gc --prune=now` (or if "
-"your git-gc is not new enough to support arguments to `--prune`, use `git "
-"repack -ad; git prune` instead)."
+msgid "Garbage collect all unreferenced objects with `git gc --prune=now` (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead)."
msgstr ""
#. 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 "
-"_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:"
+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 _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:"
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:449
-msgid ""
-"Any particular version of a file is cleaned exactly _once_. The BFG, unlike "
-"git-filter-branch, does not give you the opportunity to handle a file "
-"differently based on where or when it was committed within your history. "
-"This constraint gives the core performance benefit of The BFG, and is well-"
-"suited to the task of cleansing bad data - you don't care _where_ the bad "
-"data is, you just want it _gone_."
+msgid "Any particular version of a file is cleaned exactly _once_. The BFG, unlike git-filter-branch, does not give you the opportunity to handle a file differently based on where or when it was committed within your history. This constraint gives the core performance benefit of The BFG, and is well-suited to the task of cleansing bad data - you don't care _where_ the bad data is, you just want it _gone_."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:460
-msgid ""
-"The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options] are "
-"much more restrictive than git-filter branch, and dedicated just to the "
-"tasks of removing unwanted data- e.g: `--strip-blobs-bigger-than 1M`."
+msgid "The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options] are much more restrictive than git-filter branch, and dedicated just to the tasks of removing unwanted data- e.g: `--strip-blobs-bigger-than 1M`."
msgstr ""
#. type: Title =
#: en/git-fmt-merge-msg.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-fmt-merge-msg(1)"
msgstr "git-fmt-merge-msg(1)"
@@ -33592,17 +26022,12 @@ msgstr ""
#. type: Plain text
#: 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'."
+msgid "Takes the list of merged objects on stdin and produces a suitable commit message to be used for the merge commit, usually to be passed as the '<merge-message>' argument of 'git merge'."
msgstr ""
#. type: Plain text
#: en/git-fmt-merge-msg.txt:23
-msgid ""
-"This command is intended mostly for internal use by scripts automatically "
-"invoking 'git merge'."
+msgid "This command is intended mostly for internal use by scripts automatically invoking 'git merge'."
msgstr ""
#. type: Labeled list
@@ -33613,36 +26038,29 @@ msgstr ""
#. type: Plain text
#: en/git-fmt-merge-msg.txt:33
-msgid ""
-"In addition to branch names, populate the log message with one-line "
-"descriptions from the actual commits that are being merged. At most <n> "
-"commits from each merge parent will be used (20 if <n> is omitted). This "
-"overrides the `merge.log` configuration variable."
+msgid "In addition to branch names, populate the log message with one-line descriptions from the actual commits that are being merged. At most <n> commits from each merge parent will be used (20 if <n> is omitted). This overrides the `merge.log` configuration variable."
msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:46
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-log"
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, ignore-translated
+#, no-wrap
msgid "--[no-]summary"
msgstr "--[no-]summary"
#. type: Plain text
#: en/git-fmt-merge-msg.txt:41
-msgid ""
-"Synonyms to --log and --no-log; these are deprecated and will be removed in "
-"the future."
+msgid "Synonyms to --log and --no-log; these are deprecated and will be removed in the future."
msgstr ""
#. type: Labeled list
@@ -33653,9 +26071,7 @@ msgstr ""
#. type: Plain text
#: en/git-fmt-merge-msg.txt:46
-msgid ""
-"Use <message> instead of the branch names for the first line of the log "
-"message. For use with `--log`."
+msgid "Use <message> instead of the branch names for the first line of the log message. For use with `--log`."
msgstr ""
#. type: Labeled list
@@ -33687,9 +26103,7 @@ 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."
+msgid "Synonym to `merge.log`; this is deprecated and will be removed in the future."
msgstr ""
#. type: delimited block -
@@ -33702,14 +26116,12 @@ msgstr ""
#. type: Plain text
#: en/git-fmt-merge-msg.txt:70
-msgid ""
-"Print a log message describing a merge of the \"master\" branch from the "
-"\"origin\" remote."
+msgid "Print a log message describing a merge of the \"master\" branch from the \"origin\" remote."
msgstr ""
#. type: Title =
#: en/git-for-each-ref.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-for-each-ref(1)"
msgstr "git-for-each-ref(1)"
@@ -33732,13 +26144,7 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "Iterate over all refs that match `<pattern>` and show them according to the given `<format>`, after sorting them according to the given set of `<key>`. If `<count>` is given, stop after showing that many refs. The interpolated values in `<format>` can optionally be quoted as string literals in the specified host language allowing their direct evaluation in that language."
msgstr ""
#. type: Labeled list
@@ -33749,9 +26155,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:32
-msgid ""
-"By default the command shows all refs that match `<pattern>`. This option "
-"makes it stop after showing that many refs."
+msgid "By default the command shows all refs that match `<pattern>`. This option makes it stop after showing that many refs."
msgstr ""
#. type: Labeled list
@@ -33762,10 +26166,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:39
-msgid ""
-"A field name to sort on. Prefix `-` to sort in descending order of the "
-"value. When unspecified, `refname` is used. You may use the --sort=<key> "
-"option multiple times, in which case the last key becomes the primary key."
+msgid "A field name to sort on. Prefix `-` to sort in descending order of the value. When unspecified, `refname` is used. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key."
msgstr ""
#. type: Labeled list
@@ -33777,14 +26178,7 @@ msgstr "Configuration"
#. type: Plain text
#: en/git-for-each-ref.txt:51
-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` "
-"interpolates to `\\0` (NUL), `%09` to `\\t` (TAB) and `%0a` to `\\n` (LF)."
+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` interpolates to `\\0` (NUL), `%09` to `\\t` (TAB) and `%0a` to `\\n` (LF)."
msgstr ""
#. type: Labeled list
@@ -33795,42 +26189,36 @@ 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."
+msgid "If one or more patterns are given, only refs are shown that match against at least one pattern, either using fnmatch(3) or literally, in the latter case matching completely or from the beginning up to a slash."
msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:58
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--shell"
msgstr "--shell"
#. type: Labeled list
#: en/git-for-each-ref.txt:59
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--perl"
msgstr "--perl"
#. type: Labeled list
#: en/git-for-each-ref.txt:60
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--python"
msgstr "--python"
#. type: Labeled list
#: en/git-for-each-ref.txt:61
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--tcl"
msgstr "--tcl"
#. type: Plain text
#: en/git-for-each-ref.txt:66
-msgid ""
-"If given, strings that substitute `%(fieldname)` placeholders are quoted as "
-"string literals suitable for the specified host language. This is meant to "
-"produce a scriptlet that can directly be `eval`ed."
+msgid "If given, strings that substitute `%(fieldname)` placeholders are quoted as string literals suitable for the specified host language. This is meant to produce a scriptlet that can directly be `eval`ed."
msgstr ""
#. type: Plain text
@@ -33846,9 +26234,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:73
-msgid ""
-"Only list refs whose tips are reachable from the specified commit (HEAD if "
-"not specified)."
+msgid "Only list refs whose tips are reachable from the specified commit (HEAD if not specified)."
msgstr ""
#. type: Labeled list
@@ -33859,9 +26245,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:77
-msgid ""
-"Only list refs whose tips are not reachable from the specified commit (HEAD "
-"if not specified)."
+msgid "Only list refs whose tips are not reachable from the specified commit (HEAD if not specified)."
msgstr ""
#. type: Labeled list
@@ -33872,8 +26256,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:81
-msgid ""
-"Only list refs which contain the specified commit (HEAD if not specified)."
+msgid "Only list refs which contain the specified commit (HEAD if not specified)."
msgstr ""
#. type: Plain text
@@ -33889,9 +26272,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:91
-msgid ""
-"Various values from structured fields in referenced objects can be used to "
-"interpolate into the resulting output, or as sort keys."
+msgid "Various values from structured fields in referenced objects can be used to interpolate into the resulting output, or as sort keys."
msgstr ""
#. type: Plain text
@@ -33907,20 +26288,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:110
-msgid ""
-"The name of the ref (the part after $GIT_DIR/). For a non-ambiguous short "
-"name of the ref append `:short`. The option core.warnAmbiguousRefs is used "
-"to select the strict abbreviation mode. If `lstrip=<N>` (`rstrip=<N>`) is "
-"appended, strips `<N>` slash-separated path components from the front (back)"
-" of the refname (e.g. `%(refname:lstrip=2)` turns `refs/tags/foo` into `foo`"
-" and `%(refname:rstrip=2)` turns `refs/tags/foo` into `refs`). If `<N>` is "
-"a negative number, strip as many path components as necessary from the "
-"specified end to leave `-<N>` path components (e.g. `%(refname:lstrip=-2)` "
-"turns `refs/tags/foo` into `tags/foo` and `%(refname:rstrip=-1)` turns "
-"`refs/tags/foo` into `refs`). When the ref does not have enough components, "
-"the result becomes an empty string if stripping with positive <N>, or it "
-"becomes the full refname if stripping with negative <N>. Neither is an "
-"error."
+msgid "The name of the ref (the part after $GIT_DIR/). For a non-ambiguous short name of the ref append `:short`. The option core.warnAmbiguousRefs is used to select the strict abbreviation mode. If `lstrip=<N>` (`rstrip=<N>`) is appended, strips `<N>` slash-separated path components from the front (back) of the refname (e.g. `%(refname:lstrip=2)` turns `refs/tags/foo` into `foo` and `%(refname:rstrip=2)` turns `refs/tags/foo` into `refs`). If `<N>` is a negative number, strip as many path components as necessary from the specified end to leave `-<N>` path components (e.g. `%(refname:lstrip=-2)` turns `refs/tags/foo` into `tags/foo` and `%(refname:rstrip=-1)` turns `refs/tags/foo` into `refs`). When the ref does not have enough components, the result becomes an empty string if stripping with positive <N>, or it becomes the full refname if stripping with negative <N>. Neither is an error."
msgstr ""
#. type: Plain text
@@ -33958,11 +26326,7 @@ 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."
+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."
msgstr ""
#. type: Labeled list
@@ -33973,17 +26337,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -33994,11 +26348,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"`@{push}` ref is configured."
+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 `@{push}` ref is configured."
msgstr ""
#. type: Labeled list
@@ -34009,15 +26359,12 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:151
-msgid ""
-"'*' if HEAD matches current ref (the checked out branch), ' ' otherwise."
+msgid "'*' if HEAD matches current ref (the checked out branch), ' ' otherwise."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:155
-msgid ""
-"Change output color. Followed by `:<colorname>`, where names are described "
-"in `color.branch.*`."
+msgid "Change output color. Followed by `:<colorname>`, where names are described in `color.branch.*`."
msgstr ""
#. type: Labeled list
@@ -34028,17 +26375,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:170
-msgid ""
-"Left-, middle-, or right-align the content between %(align:...) and %(end). "
-"The \"align:\" is followed by `width=<width>` and `position=<position>` in "
-"any order separated by a comma, where the `<position>` is either left, right"
-" or middle, default being left and `<width>` is the total length of the "
-"content with alignment. For brevity, the \"width=\" and/or \"position=\" "
-"prefixes may be omitted, and bare <width> and <position> used instead. For "
-"instance, `%(align:<width>,<position>)`. If the contents length is more than"
-" the width then no alignment is performed. If used with `--quote` everything"
-" in between %(align:...) and %(end) is quoted, but if nested then only the "
-"topmost level performs quoting."
+msgid "Left-, middle-, or right-align the content between %(align:...) and %(end). The \"align:\" is followed by `width=<width>` and `position=<position>` in any order separated by a comma, where the `<position>` is either left, right or middle, default being left and `<width>` is the total length of the content with alignment. For brevity, the \"width=\" and/or \"position=\" prefixes may be omitted, and bare <width> and <position> used instead. For instance, `%(align:<width>,<position>)`. If the contents length is more than the width then no alignment is performed. If used with `--quote` everything in between %(align:...) and %(end) is quoted, but if nested then only the topmost level performs quoting."
msgstr ""
#. type: Labeled list
@@ -34050,16 +26387,7 @@ msgstr "diff"
#. type: Plain text
#: en/git-for-each-ref.txt:183
-msgid ""
-"Used as %(if)...%(then)...%(end) or %(if)...%(then)...%(else)...%(end). If "
-"there is an atom with value or string literal after the %(if) then "
-"everything after the %(then) is printed, else if the %(else) atom is used, "
-"then everything after %(else) is printed. We ignore space when evaluating "
-"the string before %(then), this is useful when we use the %(HEAD) atom which"
-" prints either \"*\" or \" \" and we want to apply the 'if' condition only "
-"on the 'HEAD' ref. Append \":equals=<string>\" or \":notequals=<string>\" "
-"to compare the value between the %(if:...) and %(then) atoms with the given "
-"string."
+msgid "Used as %(if)...%(then)...%(end) or %(if)...%(then)...%(else)...%(end). If there is an atom with value or string literal after the %(if) then everything after the %(then) is printed, else if the %(else) atom is used, then everything after %(else) is printed. We ignore space when evaluating the string before %(then), this is useful when we use the %(HEAD) atom which prints either \"*\" or \" \" and we want to apply the 'if' condition only on the 'HEAD' ref. Append \":equals=<string>\" or \":notequals=<string>\" to compare the value between the %(if:...) and %(then) atoms with the given string."
msgstr ""
#. type: Labeled list
@@ -34070,102 +26398,62 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:189
-msgid ""
-"The ref which the given symbolic ref refers to. If not a symbolic ref, "
-"nothing is printed. Respects the `:short`, `:lstrip` and `:rstrip` options "
-"in the same way as `refname` above."
+msgid "The ref which the given symbolic ref refers to. If not a symbolic ref, nothing is printed. Respects the `:short`, `:lstrip` and `:rstrip` options in the same way as `refname` above."
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 "
-"value in the header field."
+msgid "In addition to the above, for commit and tag objects, the header field names (`tree`, `parent`, `object`, `type`, and `tag`) can be used to specify the value in the header field."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:198
-msgid ""
-"For commit and tag objects, the special `creatordate` and `creator` fields "
-"will correspond to the appropriate date or name-email-date tuple from the "
-"`committer` or `tagger` fields depending on the object type. These are "
-"intended for working on a mix of annotated and lightweight tags."
+msgid "For commit and tag objects, the special `creatordate` and `creator` fields will correspond to the appropriate date or name-email-date tuple from the `committer` or `tagger` fields depending on the object type. These are intended for working on a mix of annotated and lightweight tags."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:202
-msgid ""
-"Fields that have name-email-date tuple as its value (`author`, `committer`, "
-"and `tagger`) can be suffixed with `name`, `email`, and `date` to extract "
-"the named component."
+msgid "Fields that have name-email-date tuple as its value (`author`, `committer`, and `tagger`) can be suffixed with `name`, `email`, and `date` to extract the named component."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:211
-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'."
+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'."
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."
+msgid "For sorting purposes, fields with numeric values sort in numeric order (`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`). All other fields are used to sort in their byte-value order."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:218
-msgid ""
-"There is also an option to sort by versions, this can be done by using the "
-"fieldname `version:refname` or its alias `v:refname`."
+msgid "There is also an option to sort by versions, this can be done by using the fieldname `version:refname` or its alias `v:refname`."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:222
-msgid ""
-"In any case, a field name that refers to a field inapplicable to the object "
-"referred by the ref does not cause an error. It returns an empty string "
-"instead."
+msgid "In any case, a field name that refers to a field inapplicable to the object referred by the ref does not cause an error. It returns an empty string instead."
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)."
+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)."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:229
-msgid ""
-"Some atoms like %(align) and %(if) always require a matching %(end). We "
-"call them \"opening atoms\" and sometimes denote them as %($open)."
+msgid "Some atoms like %(align) and %(if) always require a matching %(end). We call them \"opening atoms\" and sometimes denote them as %($open)."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:234
-msgid ""
-"When a scripting language specific quoting is in effect, everything between "
-"a top-level opening atom and its matching %(end) is evaluated according to "
-"the semantics of the opening atom and only its result from the top-level is "
-"quoted."
+msgid "When a scripting language specific quoting is in effect, everything between a top-level opening atom and its matching %(end) is evaluated according to the semantics of the opening atom and only its result from the top-level is quoted."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:241
-msgid ""
-"An example directly producing formatted text. Show the most recent 3 tagged"
-" commits:"
+msgid "An example directly producing formatted text. Show the most recent 3 tagged commits:"
msgstr ""
#. type: delimited block -
@@ -34196,9 +26484,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:258
-msgid ""
-"A simple example showing the use of shell eval on the output, demonstrating "
-"the use of --shell. List the prefixes of all heads:"
+msgid "A simple example showing the use of shell eval on the output, demonstrating the use of --shell. List the prefixes of all heads:"
msgstr ""
#. type: delimited block -
@@ -34215,9 +26501,7 @@ 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:"
+msgid "A bit more elaborate report on tags, demonstrating that the format may be an entire script:"
msgstr ""
#. type: delimited block -
@@ -34297,37 +26581,29 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:325
-msgid ""
-"An example to show the usage of %(if)...%(then)...%(else)...%(end). This "
-"prefixes the current branch with a star."
+msgid "An example to show the usage of %(if)...%(then)...%(else)...%(end). This prefixes the current branch with a star."
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
#: en/git-for-each-ref.txt:333
-msgid ""
-"An example to show the usage of %(if)...%(then)...%(end). This prints the "
-"authorname, if present."
+msgid "An example to show the usage of %(if)...%(then)...%(end). This prints the authorname, if present."
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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-format-patch(1)"
msgstr "git-format-patch(1)"
@@ -34360,10 +26636,7 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:36
-msgid ""
-"Prepare each commit with its patch in one file per commit, formatted to "
-"resemble UNIX mailbox format. The output of this command is convenient for "
-"e-mail submission or for use with 'git am'."
+msgid "Prepare each commit with its patch in one file per commit, formatted to resemble UNIX mailbox format. The output of this command is convenient for e-mail submission or for use with 'git am'."
msgstr ""
#. type: Plain text
@@ -34373,74 +26646,42 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:42
-msgid ""
-"A single commit, <since>, specifies that the commits leading to the tip of "
-"the current branch that are not in the history that leads to the <since> to "
-"be output."
+msgid "A single commit, <since>, specifies that the commits leading to the tip of the current branch that are not in the history that leads to the <since> to be output."
msgstr ""
#. 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."
+msgid "Generic <revision range> expression (see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]) means the commits in the specified range."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:52
-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>`."
+msgid "The first rule takes precedence in the case of a single <commit>. To apply the second rule, i.e., format everything since the beginning of history up until <commit>, use the '\\--root' option: `git format-patch --root <commit>`. If you want to format only <commit> itself, you can do this with `git format-patch -1 <commit>`."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:59
-msgid ""
-"By default, each output file is numbered sequentially from 1, and uses the "
-"first line of the commit message (massaged for pathname safety) as the "
-"filename. With the `--numbered-files` option, the output file names will "
-"only be numbers, without the first line of the commit appended. The names "
-"of the output files are printed to standard output, unless the `--stdout` "
-"option is specified."
+msgid "By default, each output file is numbered sequentially from 1, and uses the first line of the commit message (massaged for pathname safety) as the filename. With the `--numbered-files` option, the output file names will only be numbers, without the first line of the commit appended. The names of the output files are printed to standard output, unless the `--stdout` option is specified."
msgstr ""
#. 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 "
-"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 .`."
+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 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 .`."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:70
-msgid ""
-"By default, the subject of a single patch is \"[PATCH] \" followed by the "
-"concatenation of lines from the commit message up to the first blank line "
-"(see the DISCUSSION section of linkgit:git-commit[1])."
+msgid "By default, the subject of a single patch is \"[PATCH] \" followed by the concatenation of lines from the commit message up to the first blank line (see the DISCUSSION section of linkgit:git-commit[1])."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:74
-msgid ""
-"When multiple patches are output, the subject prefix will instead be "
-"\"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. "
-"To omit patch numbers from the subject, use `-N`."
+msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
msgstr ""
#. type: Plain text
#: 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 "
-"reference."
+msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
msgstr ""
#. type: Labeled list
@@ -34468,14 +26709,12 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:92
-msgid ""
-"Use <dir> to store the resulting files, instead of the current working "
-"directory."
+msgid "Use <dir> to store the resulting files, instead of the current working directory."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:94 en/git-shortlog.txt:30
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--numbered"
msgstr "--numbered"
@@ -34486,7 +26725,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:98
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-numbered"
msgstr "--no-numbered"
@@ -34508,48 +26747,40 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:104
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--numbered-files"
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."
+msgid "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, ignore-translated
+#, no-wrap
msgid "--keep-subject"
msgstr "--keep-subject"
#. type: Plain text
#: en/git-format-patch.txt:112
-msgid ""
-"Do not strip/add '[PATCH]' from the first line of the commit log message."
+msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:118
-msgid ""
-"Add `Signed-off-by:` line to the commit message, using the committer "
-"identity of yourself. See the signoff option in linkgit:git-commit[1] for "
-"more information."
+msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:119 en/git-pack-objects.txt:57
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--stdout"
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."
+msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
msgstr ""
#. type: Labeled list
@@ -34560,22 +26791,18 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:127
-msgid ""
-"Create multipart/mixed attachment, the first part of which is the commit "
-"message and the patch itself in the second part, with `Content-Disposition: "
-"attachment`."
+msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:128
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-attach"
msgstr "--no-attach"
#. type: Plain text
#: en/git-format-patch.txt:131
-msgid ""
-"Disable the creation of an attachment, overriding the configuration setting."
+msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
#. type: Labeled list
@@ -34586,10 +26813,7 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:136
-msgid ""
-"Create multipart/mixed attachment, the first part of which is the commit "
-"message and the patch itself in the second part, with `Content-Disposition: "
-"inline`."
+msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
msgstr ""
#. type: Labeled list
@@ -34600,42 +26824,28 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:138
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-thread"
msgstr "--no-thread"
#. type: Plain text
#: en/git-format-patch.txt:143
-msgid ""
-"Controls addition of `In-Reply-To` and `References` headers to make the "
-"second and subsequent mails appear as replies to the first. Also controls "
-"generation of the `Message-Id` header to reference."
+msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-Id` header to reference."
msgstr ""
#. type: Plain text
#: 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 "
-"mail, in this order. 'deep' threading makes every mail a reply to the "
-"previous one."
+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 mail, in this order. 'deep' threading makes every mail a reply to the previous one."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:153
-msgid ""
-"The default is `--no-thread`, unless the `format.thread` configuration is "
-"set. If `--thread` is specified without a style, it defaults to the style "
-"specified by `format.thread` if any, or else `shallow`."
+msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
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 "
-"ensure that threading is disabled for `git send-email`."
+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 ensure that threading is disabled for `git send-email`."
msgstr ""
#. type: Labeled list
@@ -34646,25 +26856,18 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:162
-msgid ""
-"Make the first mail (or all the mails with `--no-thread`) appear as a reply "
-"to the given Message-Id, which avoids breaking threads to provide a new "
-"patch series."
+msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to provide a new patch series."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:163
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ignore-if-in-upstream"
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."
+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."
msgstr ""
#. type: Labeled list
@@ -34675,24 +26878,18 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:175
-msgid ""
-"Instead of the standard '[PATCH]' prefix in the subject line, instead use "
-"'[<Subject-Prefix>]'. This allows for useful naming of a patch series, and "
-"can be combined with the `--numbered` option."
+msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<Subject-Prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:176
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--rfc"
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."
+msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
msgstr ""
#. type: Labeled list
@@ -34709,12 +26906,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -34725,10 +26917,7 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:195
-msgid ""
-"Add a `To:` header to the email headers. This is in addition to any "
-"configured headers, and may be used multiple times. The negated form `--no-"
-"to` discards all `To:` headers added so far (from config or command line)."
+msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
@@ -34739,15 +26928,12 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:201
-msgid ""
-"Add a `Cc:` header to the email headers. This is in addition to any "
-"configured headers, and may be used multiple times. The negated form `--no-"
-"cc` discards all `Cc:` headers added so far (from config or command line)."
+msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:202
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--from"
msgstr "--from"
@@ -34759,21 +26945,12 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:209
-msgid ""
-"Use `ident` in the `From:` header of each commit email. If the author ident "
-"of the commit is not textually identical to the provided `ident`, place a "
-"`From:` header in the body of the message with the original author. If no "
-"`ident` is given, use the committer ident."
+msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:216
-msgid ""
-"Note that this option is only useful if you are actually sending the emails "
-"and want to identify yourself as the sender, but retain the original author "
-"(and `git am` will correctly pick up the in-body header). Note also that "
-"`git send-email` already handles this transformation for you, and this "
-"option should not be used if you are feeding the result to `git send-email`."
+msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`."
msgstr ""
#. type: Labeled list
@@ -34784,26 +26961,18 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:224
-msgid ""
-"Add an arbitrary header to the email headers. This is in addition to any "
-"configured headers, and may be used multiple times. For example, `--add-"
-"header=\"Organization: git-foo\"`. The negated form `--no-add-header` "
-"discards *all* (`To:`, `Cc:`, and custom) headers added so far from config "
-"or command line."
+msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:225
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
#. type: Plain text
#: en/git-format-patch.txt:229
-msgid ""
-"In addition to the patches, generate a cover letter file containing the "
-"branch description, shortlog and the overall diffstat. You can fill in a "
-"description in the file before sending it out."
+msgid "In addition to the patches, generate a cover letter file containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out."
msgstr ""
#. type: Labeled list
@@ -34814,21 +26983,12 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:233
-msgid ""
-"Append the notes (see linkgit:git-notes[1]) for the commit after the three-"
-"dash line."
+msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
#. type: Plain text
#: 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 "
-"after `format-patch` has run but before sending, keeping them as Git notes "
-"allows them to be maintained between versions of the patch series (but see "
-"the discussion of the `notes.rewrite` configuration options in linkgit:git-"
-"notes[1] to use this workflow)."
+msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
msgstr ""
#. type: Labeled list
@@ -34839,10 +26999,7 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:247
-msgid ""
-"Add a signature to each message produced. Per RFC 3676 the signature is "
-"separated from the body by a line with '-- ' on it. If the signature option "
-"is omitted the signature defaults to the Git version number."
+msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
msgstr ""
#. type: Labeled list
@@ -34864,17 +27021,12 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:256
-msgid ""
-"Instead of using `.patch` as the suffix for generated filenames, use "
-"specified suffix. A common alternative is `--suffix=.txt`. Leaving this "
-"empty will remove the `.patch` suffix."
+msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:259
-msgid ""
-"Note that the leading character does not have to be a dot; for example, you "
-"can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
+msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
msgstr ""
#. type: Plain text
@@ -34884,29 +27036,24 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:264
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-binary"
msgstr "--no-binary"
#. type: Plain text
#: en/git-format-patch.txt:269
-msgid ""
-"Do not output contents of changes in binary files, instead display a notice "
-"that those files changed. Patches generated using this option cannot be "
-"applied properly, but they are still useful for code review."
+msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:270
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--zero-commit"
msgstr "--zero-commit"
#. type: Plain text
#: en/git-format-patch.txt:273
-msgid ""
-"Output an all-zero hash in each patch's From header instead of the hash of "
-"the commit."
+msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
msgstr ""
#. type: Labeled list
@@ -34918,27 +27065,17 @@ msgstr "git-commit(1)"
#. type: Plain text
#: en/git-format-patch.txt:278
-msgid ""
-"Record the base tree information to identify the state the patch series "
-"applies to. See the BASE TREE INFORMATION section below for details."
+msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details."
msgstr ""
#. type: Plain text
#: 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 "
-"patches, independently of this flag."
+msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:292
-msgid ""
-"You can specify extra mail header lines to be added to each message, "
-"defaults for the subject prefix and file suffix, number patches when "
-"outputting more than one patch, add \"To\" or \"Cc:\" headers, configure "
-"attachments, and sign off patches with configuration variables."
+msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To\" or \"Cc:\" headers, configure attachments, and sign off patches with configuration variables."
msgstr ""
#. type: delimited block -
@@ -34959,10 +27096,7 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:313
-msgid ""
-"The patch produced by 'git format-patch' is in UNIX mailbox format, with a "
-"fixed \"magic\" time stamp to indicate that the file is output from format-"
-"patch rather than a real mailbox, like so:"
+msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
msgstr ""
#. type: delimited block -
@@ -34997,22 +27131,12 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:337
-msgid ""
-"Typically it will be placed in a MUA's drafts folder, edited to add timely "
-"commentary that should not go in the changelog after the three dashes, and "
-"then sent as a message whose body, in our example, starts with \"arch/arm "
-"config files were...\". On the receiving end, readers can save interesting "
-"patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
+msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:343
-msgid ""
-"When a patch is part of an ongoing discussion, the patch generated by 'git "
-"format-patch' can be tweaked to take advantage of the 'git am --scissors' "
-"feature. After your response to the discussion comes a line that consists "
-"solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch "
-"with unnecessary header fields removed:"
+msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
msgstr ""
#. type: delimited block -
@@ -35047,13 +27171,7 @@ 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 "
-"example above."
+msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
msgstr ""
#. type: Title ~
@@ -35064,9 +27182,7 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:368
-msgid ""
-"Many mailers if not set up properly will corrupt whitespace. Here are two "
-"common types of corruption:"
+msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
msgstr ""
#. type: Plain text
@@ -35076,8 +27192,7 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:373
-msgid ""
-"Non-empty context lines that have one extra whitespace at the beginning."
+msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
#. type: Plain text
@@ -35087,15 +27202,12 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:379
-msgid ""
-"Send the patch to yourself, exactly the way you would, except with To: and "
-"Cc: lines that do not contain the list and maintainer address."
+msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:382
-msgid ""
-"Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
+msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
msgstr ""
#. type: Plain text
@@ -35120,29 +27232,17 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:401
-msgid ""
-"The MUA corrupted your patch; \"am\" would complain that the patch does not "
-"apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' "
-"file contains and check for the common corruption patterns mentioned above."
+msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:409
-msgid ""
-"While at it, check the 'info' and 'final-commit' files as well. If what is "
-"in 'final-commit' is not exactly what you would want to see in the commit "
-"log message, it is very likely that the receiver would end up hand editing "
-"the log message when applying your patch. Things like \"Hi, this is my "
-"first patch.\\n\" in the patch e-mail should come after the three-dash line "
-"that signals the end of the commit message."
+msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
msgstr ""
#. type: Title -
@@ -35153,9 +27253,7 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:414
-msgid ""
-"Here are some hints on how to successfully submit patches inline using "
-"various mailers."
+msgid "Here are some hints on how to successfully submit patches inline using various mailers."
msgstr ""
#. type: Title ~
@@ -35166,26 +27264,17 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:422
-msgid ""
-"GMail does not have any way to turn off line wrapping in the web interface, "
-"so it will mangle any emails that you send. You can however use \"git send-"
-"email\" and send your patches through the GMail SMTP server, or use any IMAP"
-" email client to connect to the google IMAP server and forward the emails "
-"through that."
+msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:425
-msgid ""
-"For hints on using 'git send-email' to send your patches through the GMail "
-"SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
+msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
msgstr ""
#. 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]."
+msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
@@ -35196,18 +27285,12 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:438
-msgid ""
-"There are three different approaches: use an add-on to turn off line wraps, "
-"configure Thunderbird to not mangle patches, or use an external editor to "
-"keep Thunderbird from mangling the patches."
+msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
msgstr ""
#. type: Title ^
@@ -35219,13 +27302,7 @@ 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."
+msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
msgstr ""
#. type: Title ^
@@ -35242,9 +27319,7 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:456
-msgid ""
-"Configure your mail server composition as plain text: Edit...Account "
-"Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
+msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
#. type: Plain text
@@ -35254,33 +27329,22 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:461
-msgid ""
-"In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages "
-"at 0"
+msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:467
-msgid ""
-"In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for "
-"\"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. "
-"Also, search for \"mailnews.wraplength\" and set the value to 0."
+msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:472
-msgid ""
-"Disable the use of format=flowed: Edit..Preferences..Advanced..Config "
-"Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make "
-"sure it is set to `false`."
+msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:476
-msgid ""
-"After that is done, you should be able to compose email as you otherwise "
-"would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the "
-"patches will not be mangled."
+msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
msgstr ""
#. type: Title ^
@@ -35292,10 +27356,7 @@ 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"
+msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
#. type: Plain text
@@ -35305,18 +27366,12 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
msgstr ""
#. 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:"
+msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
#. type: delimited block -
@@ -35334,16 +27389,12 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:504
-msgid ""
-"In the external editor window, read in the patch file and exit the editor "
-"normally."
+msgid "In the external editor window, read in the patch file and exit the editor normally."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:507
-msgid ""
-"Side note: it may be possible to do step 2 with about:config and the "
-"following settings but no one's tried yet."
+msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
msgstr ""
#. type: delimited block -
@@ -35357,10 +27408,7 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:517
-msgid ""
-"There is a script in contrib/thunderbird-patch-inline which can help you "
-"include patches with Thunderbird in an easy way. To use it, do the steps "
-"above and then use the script as the external editor."
+msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
msgstr ""
#. type: Title ~
@@ -35386,9 +27434,7 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:528
-msgid ""
-"Go under \"Options\" in the Composer window and be sure that \"Word wrap\" "
-"is not set."
+msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
msgstr ""
#. type: Plain text
@@ -35398,9 +27444,7 @@ 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."
+msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
@@ -35412,31 +27456,17 @@ msgstr "FORMATS DE DATE"
#. type: Plain text
#: en/git-format-patch.txt:544
-msgid ""
-"The base tree information block is used for maintainers or third party "
-"testers to know the exact state the patch series applies to. It consists of "
-"the 'base commit', which is a well-known commit that is part of the stable "
-"part of the project history everybody else works off of, and zero or more "
-"'prerequisite patches', which are well-known patches in flight that is not "
-"yet part of the 'base commit' that need to be applied on top of 'base "
-"commit' in topological order before the patches can be applied."
+msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:550
-msgid ""
-"The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of "
-"the commit object name. A 'prerequisite patch' is shown as \"prerequisite-"
-"patch-id: \" followed by the 40-hex 'patch id', which can be obtained by "
-"passing the patch through the `git patch-id --stable` command."
+msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:554
-msgid ""
-"Imagine that on top of the public commit P, you applied well-known patches "
-"X, Y and Z from somebody else, and then built your three-patch series A, B, "
-"C, the history would be like:"
+msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
msgstr ""
#. type: delimited block .
@@ -35447,11 +27477,7 @@ 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:"
+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:"
msgstr ""
#. type: delimited block -
@@ -35480,27 +27506,17 @@ 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 "
-"first message."
+msgid "You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:589
-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."
+msgid "If set `--base=auto` in cmdline, it will track base commit automatically, the base commit will be the merge base of tip commit of the remote-tracking branch and revision-range specified in cmdline. For a local branch, you need to track a remote branch by `git branch --set-upstream-to` before using this option."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:595
-msgid ""
-"Extract commits between revisions R1 and R2, and apply them on top of the "
-"current branch using 'git am' to cherry-pick them:"
+msgid "Extract commits between revisions R1 and R2, and apply them on top of the current branch using 'git am' to cherry-pick them:"
msgstr ""
#. type: delimited block -
@@ -35511,9 +27527,7 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:602
-msgid ""
-"Extract all commits which are in the current branch but not in the origin "
-"branch:"
+msgid "Extract all commits which are in the current branch but not in the origin branch:"
msgstr ""
#. type: delimited block -
@@ -35529,9 +27543,7 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:611
-msgid ""
-"Extract all commits that lead to 'origin' since the inception of the "
-"project:"
+msgid "Extract all commits that lead to 'origin' since the inception of the project:"
msgstr ""
#. type: delimited block -
@@ -35553,19 +27565,12 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:627
-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."
+msgid "Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. Note that non-Git \"patch\" programs won't understand renaming patches, so use it only when you know the recipient uses Git to apply your patch."
msgstr ""
#. 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:"
+msgid "Extract three topmost commits from the current branch and format them as e-mailable patches:"
msgstr ""
#. type: delimited block -
@@ -35583,22 +27588,16 @@ msgstr "git-commit(1)"
#. type: Title =
#: en/git-fsck-objects.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-fsck-objects(1)"
msgstr "git-fsck-objects(1)"
#. type: Plain text
#: en/git-fsck-objects.txt:7
#, fuzzy
-#| msgid ""
-#| "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"
-msgstr ""
-"git-fsck-objects - V챕rifier la connectivit챕 et la validit챕 des objets en "
-"base de donn챕es"
+#| msgid "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"
+msgstr "git-fsck-objects - V챕rifier la connectivit챕 et la validit챕 des objets en base de donn챕es"
#. type: Plain text
#: en/git-fsck-objects.txt:13
@@ -35609,34 +27608,22 @@ msgstr "'git fsck-objects' ...\n"
#. type: Plain text
#: en/git-fsck-objects.txt:19
#, fuzzy
-#| msgid ""
-#| "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-fsck[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."
+#| msgid "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-fsck[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-fsck.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-fsck(1)"
msgstr "git-fsck(1)"
#. type: Plain text
#: en/git-fsck.txt:7
#, fuzzy
-#| msgid ""
-#| "git-fsck - 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"
-msgstr ""
-"git-fsck - V챕rifier la connectivit챕 et la validit챕 des objets dans la base "
-"de donn챕es"
+#| msgid "git-fsck - 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"
+msgstr "git-fsck - V챕rifier la connectivit챕 et la validit챕 des objets dans la base de donn챕es"
#. type: Plain text
#: en/git-fsck.txt:16
@@ -35665,36 +27652,29 @@ msgstr ""
#. type: Plain text
#: en/git-fsck.txt:29
-msgid ""
-"If no objects are given, 'git fsck' defaults to using the index file, all "
-"SHA-1 references in `refs` namespace, and all reflogs (unless --no-reflogs "
-"is given) as heads."
+msgid "If no objects are given, 'git fsck' defaults to using the index file, all SHA-1 references in `refs` namespace, and all reflogs (unless --no-reflogs is given) as heads."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:30
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--unreachable"
msgstr "--unreachable"
#. type: Plain text
#: en/git-fsck.txt:33
-msgid ""
-"Print out objects that exist but that aren't reachable from any of the "
-"reference nodes."
+msgid "Print out objects that exist but that aren't reachable from any of the reference nodes."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:34
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]dangling"
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."
+msgid "Print objects that exist but that are never 'directly' used (default). `--no-dangling` can be used to omit this information from the output."
msgstr ""
#. type: Plain text
@@ -35709,7 +27689,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:44
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--cache"
msgstr "--cache"
@@ -35719,72 +27699,53 @@ msgstr "--cache"
#| msgid ""
#| "<object>::\n"
#| "\tAn object to treat as the head of an unreachability trace.\n"
-msgid ""
-"Consider any object recorded in the index also as a head node for an "
-"unreachability trace."
+msgid "Consider any object recorded in the index also as a head node for an unreachability trace."
msgstr ""
"<objet>::\n"
"\tUn objet 횪 traiter comme la t챗te d'une trace d'inaccessibilit챕.\n"
#. type: Labeled list
#: en/git-fsck.txt:48
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-reflogs"
msgstr "--no-reflogs"
#. type: Plain text
#: en/git-fsck.txt:53
-msgid ""
-"Do not consider commits that are referenced only by an entry in a reflog to "
-"be reachable. This option is meant only to search for commits that used to "
-"be in a ref, but now aren't, but are still in that corresponding reflog."
+msgid "Do not consider commits that are referenced only by an entry in a reflog to be reachable. This option is meant only to search for commits that used to be in a ref, but now aren't, but are still in that corresponding reflog."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:54
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--full"
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."
+msgid "Check not just objects in GIT_OBJECT_DIRECTORY ($GIT_DIR/objects), but also the ones found in alternate object pools listed in GIT_ALTERNATE_OBJECT_DIRECTORIES or $GIT_DIR/objects/info/alternates, and in packed Git archives found in $GIT_DIR/objects/pack and corresponding pack subdirectories in alternate object pools. This is now default; you can turn it off with --no-full."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:64
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--connectivity-only"
msgstr "--connectivity-only"
#. type: Plain text
#: en/git-fsck.txt:68
-msgid ""
-"Check only the connectivity of tags, commits and tree objects. By avoiding "
-"to unpack blobs, this speeds up the operation, at the expense of missing "
-"corrupt objects or other problematic issues."
+msgid "Check only the connectivity of tags, commits and tree objects. By avoiding to unpack blobs, this speeds up the operation, at the expense of missing corrupt objects or other problematic issues."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:69 en/git-index-pack.txt:74 en/git-unpack-objects.txt:44
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--strict"
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 "
-"objects that triggers this check, but it is recommended to check new "
-"projects with this flag."
+msgid "Enable more strict checking, namely to catch a file mode recorded with g+w bit set, which was created by older versions of Git. Existing repositories, including the Linux kernel, Git itself, and sparse repository have old objects that triggers this check, but it is recommended to check new projects with this flag."
msgstr ""
#. type: Plain text
@@ -35794,58 +27755,39 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:80
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--lost-found"
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 "
-"written into the file, rather than its object name."
+msgid "Write dangling objects into .git/lost-found/commit/ or .git/lost-found/other/, depending on type. If the object is a blob, the contents are written into the file, rather than its object name."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:86
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--name-objects"
msgstr "--name-objects"
#. type: Plain text
#: en/git-fsck.txt:91
-msgid ""
-"When displaying names of reachable objects, in addition to the SHA-1 also "
-"display a name that describes *how* they are reachable, compatible with "
-"linkgit:git-rev-parse[1], e.g. `HEAD@{1234567890}~25^2:src/`."
+msgid "When displaying names of reachable objects, in addition to the SHA-1 also display a name that describes *how* they are reachable, compatible with linkgit:git-rev-parse[1], e.g. `HEAD@{1234567890}~25^2:src/`."
msgstr ""
#. type: Plain text
#: 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 "
-"directed to a terminal."
+msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless --no-progress or --verbose is specified. --progress forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. 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)."
+msgid "git-fsck tests SHA-1 and general object sanity, and it does full tracking of the resulting reachability and everything else. It prints out any corruption it finds (missing or bad objects), and if you use the `--unreachable` flag it will also print out objects that exist but that aren't reachable from any of the specified head nodes (or the default set, as mentioned above)."
msgstr ""
#. 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)."
+msgid "Any corrupt objects you will have to find in backups or other archives (i.e., you can just remove them and do an 'rsync' with some other site in the hopes that somebody else has the object you have corrupted)."
msgstr ""
#. type: Title -
@@ -35857,15 +27799,12 @@ 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
#: en/git-fsck.txt:120
-msgid ""
-"You haven't specified any nodes as heads so it won't be possible to "
-"differentiate between un-parented commits and root nodes."
+msgid "You haven't specified any nodes as heads so it won't be possible to differentiate between un-parented commits and root nodes."
msgstr ""
#. type: Labeled list
@@ -35887,12 +27826,7 @@ msgstr ""
#. type: Plain text
#: en/git-fsck.txt:131
-msgid ""
-"The <type> object <object>, isn't actually referred to directly or "
-"indirectly in any of the trees or commits seen. This can mean that there's "
-"another root node that you're not specifying or that the tree is corrupt. If"
-" you haven't missed a root node then you might as well delete unreachable "
-"nodes since they can't be used."
+msgid "The <type> object <object>, isn't actually referred to directly or indirectly in any of the trees or commits seen. This can mean that there's another root node that you're not specifying or that the tree is corrupt. If you haven't missed a root node then you might as well delete unreachable nodes since they can't be used."
msgstr ""
#. type: Labeled list
@@ -35903,9 +27837,7 @@ msgstr ""
#. type: Plain text
#: en/git-fsck.txt:135
-msgid ""
-"The <type> object <object>, is referred to but isn't present in the "
-"database."
+msgid "The <type> object <object>, is referred to but isn't present in the database."
msgstr ""
#. type: Labeled list
@@ -35916,9 +27848,7 @@ msgstr ""
#. type: Plain text
#: en/git-fsck.txt:139
-msgid ""
-"The <type> object <object>, is present in the database but never 'directly' "
-"used. A dangling commit could be a root node."
+msgid "The <type> object <object>, is present in the database but never 'directly' used. A dangling commit could be a root node."
msgstr ""
#. type: Labeled list
@@ -35929,9 +27859,7 @@ msgstr ""
#. type: Plain text
#: en/git-fsck.txt:144
-msgid ""
-"The database has an object who's sha1 doesn't match the database value. "
-"This indicates a serious data integrity problem."
+msgid "The database has an object who's sha1 doesn't match the database value. This indicates a serious data integrity problem."
msgstr ""
#. type: Title -
@@ -35977,7 +27905,7 @@ msgstr ""
#. type: Title =
#: en/git-gc.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-gc(1)"
msgstr "git-gc(1)"
@@ -35989,34 +27917,22 @@ 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
#: en/git-gc.txt:20
-msgid ""
-"Runs a number of housekeeping tasks within the current repository, such as "
-"compressing file revisions (to reduce disk space and increase performance) "
-"and removing unreachable objects which may have been created from prior "
-"invocations of 'git add'."
+msgid "Runs a number of housekeeping tasks within the current repository, such as compressing file revisions (to reduce disk space and increase performance) and removing unreachable objects which may have been created from prior invocations of 'git add'."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:24
-msgid ""
-"Users are encouraged to run this task on a regular basis within each "
-"repository to maintain good disk space utilization and good operating "
-"performance."
+msgid "Users are encouraged to run this task on a regular basis within each repository to maintain good disk space utilization and good operating performance."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:28
-msgid ""
-"Some git commands may automatically run 'git gc'; see the `--auto` flag "
-"below for details. If you know what you're doing and all you want is to "
-"disable this behavior permanently without further considerations, just do:"
+msgid "Some git commands may automatically run 'git gc'; see the `--auto` flag below for details. If you know what you're doing and all you want is to disable this behavior permanently without further considerations, just do:"
msgstr ""
#. type: delimited block -
@@ -36027,51 +27943,34 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:36 en/git-read-tree.txt:71
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--aggressive"
msgstr "--aggressive"
#. type: Plain text
#: en/git-gc.txt:43
-msgid ""
-"Usually 'git gc' runs very quickly while providing good disk space "
-"utilization and performance. This option will cause 'git gc' to more "
-"aggressively optimize the repository at the expense of taking much more "
-"time. The effects of this optimization are persistent, so this option only "
-"needs to be used occasionally; every few hundred changesets or so."
+msgid "Usually 'git gc' runs very quickly while providing good disk space utilization and performance. This option will cause 'git gc' to more aggressively optimize the repository at the expense of taking much more time. The effects of this optimization are persistent, so this option only needs to be used occasionally; every few hundred changesets or so."
msgstr ""
#. type: Labeled list
#: en/git-gc.txt:44
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--auto"
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."
+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."
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."
+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."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:62
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -36082,17 +27981,12 @@ msgstr ""
#. type: Plain text
#: en/git-gc.txt:70
-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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-gc.txt:71 en/git-pack-refs.txt:57
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-prune"
msgstr "--no-prune"
@@ -36118,38 +28012,22 @@ 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."
+msgid "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'."
+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'."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:98
-msgid ""
-"The optional configuration variable `gc.reflogExpireUnreachable` can be set "
-"to indicate how long historical reflog entries which are not part of the "
-"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'."
+msgid "The optional configuration variable `gc.reflogExpireUnreachable` can be set to indicate how long historical reflog entries which are not part of the 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'."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:102
-msgid ""
-"The above two configuration variables can be given to a pattern. For "
-"example, this sets non-default expiry values only to remote-tracking "
-"branches:"
+msgid "The above two configuration variables can be given to a pattern. For example, this sets non-default expiry values only to remote-tracking branches:"
msgstr ""
#. type: delimited block -
@@ -36163,136 +28041,80 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "The optional configuration variable `gc.rerereResolved` indicates how long 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 "
-"to 15 days."
+msgid "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 ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:128
-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 "
-"documentation for the --window' option in linkgit:git-repack[1] for more "
-"details. This defaults to 250."
+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 documentation for the --window' option in linkgit:git-repack[1] for more details. This defaults to 250."
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."
+msgid "Similarly, the optional configuration variable `gc.aggressiveDepth` controls --depth option in linkgit:git-repack[1]. This defaults to 50."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:135
-msgid ""
-"The optional configuration variable `gc.pruneExpire` controls how old the "
-"unreferenced loose objects have to be before they are pruned. The default "
-"is \"2 weeks ago\"."
+msgid "The optional configuration variable `gc.pruneExpire` controls how old the unreferenced loose objects have to be before they are pruned. The default is \"2 weeks ago\"."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:150
-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."
+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."
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:"
+msgid "On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using but hasn't created a reference to. This may just cause the other process to fail or may corrupt the repository if the other process later adds a reference to the deleted object. Git has two features that significantly mitigate this problem:"
msgstr ""
#. type: Plain text
#: en/git-gc.txt:160
-msgid ""
-"Any object with modification time newer than the `--prune` date is kept, "
-"along with everything reachable from it."
+msgid "Any object with modification time newer than the `--prune` date is kept, along with everything reachable from it."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:164
-msgid ""
-"Most operations that add an object to the database update the modification "
-"time of the object if it is already present so that #1 applies."
+msgid "Most operations that add an object to the database update the modification time of the object if it is already present so that #1 applies."
msgstr ""
#. type: Plain text
#: 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 "
-"with 'git config gc.auto 0'."
+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 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."
-msgid ""
-"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."
+#| msgid "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."
+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."
#. type: Plain text
#: en/git-gc.txt:183
-#, ignore-translated
-msgid ""
-"linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] "
-"linkgit:git-rerere[1]"
-msgstr ""
-"linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] "
-"linkgit:git-rerere[1]"
+msgid "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
+msgstr "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
#. type: Title =
#: en/git-get-tar-commit-id.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-get-tar-commit-id(1)"
msgstr "git-get-tar-commit-id(1)"
#. type: Plain text
#: en/git-get-tar-commit-id.txt:7
-msgid ""
-"git-get-tar-commit-id - Extract commit ID from an archive created using git-"
-"archive"
+msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
msgstr ""
#. type: Plain text
@@ -36303,25 +28125,17 @@ msgstr ""
#. type: Plain text
#: en/git-get-tar-commit-id.txt:22
-msgid ""
-"Read a tar archive created by 'git archive' from the standard input and "
-"extract the commit ID stored in it. It reads only the first 1024 bytes of "
-"input, thus its runtime is not influenced by the size of the tar archive "
-"very much."
+msgid "Read a tar archive created by 'git archive' from the standard input and extract the commit ID stored in it. It reads only the first 1024 bytes of input, thus its runtime is not influenced by the size of the tar archive very much."
msgstr ""
#. type: Plain text
#: 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."
+msgid "If no commit ID is found, 'git get-tar-commit-id' quietly exists with a return code of 1. This can happen if the archive had not been created using 'git archive' or if the first parameter of 'git archive' had been a tree ID instead of a commit ID or tag."
msgstr ""
#. type: Title =
#: en/git-grep.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-grep(1)"
msgstr "git-grep(1)"
@@ -36358,18 +28172,12 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:39
-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."
+msgid "Look for specified patterns in the tracked files in the work tree, blobs registered in the index file, or blobs in given tree objects. Patterns are lists of one or more search expressions separated by newline characters. An empty string as search expression matches all lines."
msgstr ""
#. 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)."
+msgid "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
@@ -36386,15 +28194,9 @@ msgstr ""
#. type: Plain text
#: 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;"
-msgid ""
-"Instead of searching tracked files in the working tree, search blobs "
-"registered in the index file."
-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',"
+#| msgid "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."
+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',"
#. type: Plain text
#: en/git-grep.txt:78
@@ -36403,57 +28205,42 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:79
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--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;"
-msgid ""
-"In addition to searching in the tracked files in the working tree, search "
-"also in untracked files."
-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',"
+#| msgid "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."
+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',"
#. type: Labeled list
#: en/git-grep.txt:83
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-exclude-standard"
msgstr "--no-exclude-standard"
#. type: Plain text
#: en/git-grep.txt:86
-msgid ""
-"Also search in ignored files by not honoring the `.gitignore` mechanism. "
-"Only useful with `--untracked`."
+msgid "Also search in ignored files by not honoring the `.gitignore` mechanism. Only useful with `--untracked`."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:87 en/git-ls-files.txt:97
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--exclude-standard"
msgstr "--exclude-standard"
#. type: Plain text
#: en/git-grep.txt:91
-msgid ""
-"Do not pay attention to ignored files specified via the\t`.gitignore` "
-"mechanism. Only useful when searching files in the current directory with "
-"`--no-index`."
+msgid "Do not pay attention to ignored files specified via the\t`.gitignore` mechanism. Only useful when searching files in the current directory with `--no-index`."
msgstr ""
#. type: Plain text
#: en/git-grep.txt:97
-msgid ""
-"Recursively search in each submodule that has been initialized and checked "
-"out in the repository. When used in combination with the <tree> option the "
-"prefix of all submodule output will be the name of the parent project's "
-"<tree> object."
+msgid "Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object."
msgstr ""
#. type: Labeled list
@@ -36464,11 +28251,7 @@ 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 "
-"output with the parent's name rather than the SHA1 of the submodule."
+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 output with the parent's name rather than the SHA1 of the submodule."
msgstr ""
#. type: Plain text
@@ -36510,31 +28293,23 @@ 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 "
-"<pathspec> contains active wildcards. In other words if \"a*\" matches a "
-"directory named \"a*\", \"*\" is matched literally so --max-depth is still "
-"effective."
+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 <pathspec> contains active wildcards. In other words if \"a*\" matches a directory named \"a*\", \"*\" is matched literally so --max-depth is still effective."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:132
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--word-regexp"
msgstr "--word-regexp"
#. type: Plain text
#: en/git-grep.txt:136
-msgid ""
-"Match the pattern only at word boundary (either begin at the beginning of a "
-"line, or preceded by a non-word character; end at the end of a line or "
-"followed by a non-word character)."
+msgid "Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character)."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:138
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--invert-match"
msgstr "--invert-match"
@@ -36545,24 +28320,18 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:148
-msgid ""
-"By default, the command shows the filename for each match. `-h` option is "
-"used to suppress this output. `-H` is there for completeness and does not "
-"do anything except it overrides `-h` given earlier on the command line."
+msgid "By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:149 en/git-ls-files.txt:136 en/git-ls-tree.txt:68
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--full-name"
msgstr "--full-name"
#. type: Plain text
#: en/git-grep.txt:154 en/git-ls-files.txt:141
-msgid ""
-"When run from a subdirectory, the command usually outputs paths relative to "
-"the current directory. This option forces paths to be output relative to "
-"the project top directory."
+msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
msgstr ""
#. type: Labeled list
@@ -36573,7 +28342,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:156 en/rev-list-options.txt:85
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--extended-regexp"
msgstr "--extended-regexp"
@@ -36585,27 +28354,24 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:158 en/rev-list-options.txt:80
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--basic-regexp"
msgstr "--basic-regexp"
#. type: Plain text
#: en/git-grep.txt:161
-msgid ""
-"Use POSIX extended/basic regexp for patterns. Default is to use basic "
-"regexp."
+msgid "Use POSIX extended/basic regexp for patterns. Default is to use basic regexp."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:163 en/rev-list-options.txt:94
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--perl-regexp"
msgstr "--perl-regexp"
#. type: Plain text
#: en/git-grep.txt:166
-msgid ""
-"Use Perl-compatible regexp for patterns. Requires libpcre to be compiled in."
+msgid "Use Perl-compatible regexp for patterns. Requires libpcre to be compiled in."
msgstr ""
#. type: Labeled list
@@ -36616,7 +28382,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:168 en/rev-list-options.txt:90
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--fixed-strings"
msgstr "--fixed-strings"
@@ -36627,7 +28393,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:173
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--line-number"
msgstr "--line-number"
@@ -36638,7 +28404,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:177
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--files-with-matches"
msgstr "--files-with-matches"
@@ -36650,16 +28416,13 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:180
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--files-without-match"
msgstr "--files-without-match"
#. type: Plain text
#: en/git-grep.txt:185
-msgid ""
-"Instead of showing every matched line, show only the names of files that "
-"contain (or do not contain) matches. For better compatibility with 'git "
-"diff', `--name-only` is a synonym for `--files-with-matches`."
+msgid "Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with 'git diff', `--name-only` is a synonym for `--files-with-matches`."
msgstr ""
#. type: Labeled list
@@ -36676,13 +28439,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:195
-msgid ""
-"Open the matching files in the pager (not the output of 'grep'). If the "
-"pager happens to be \"less\" or \"vi\", and the user specified only one "
-"pattern, the first file is positioned at the first match automatically. The "
-"`pager` argument is optional; if specified, it must be stuck to the option "
-"without a space. If `pager` is unspecified, the default pager will be used "
-"(see `core.pager` in linkgit:git-config[1])."
+msgid "Open the matching files in the pager (not the output of 'grep'). If the pager happens to be \"less\" or \"vi\", and the user specified only one pattern, the first file is positioned at the first match automatically. The `pager` argument is optional; if specified, it must be stuck to the option without a space. If `pager` is unspecified, the default pager will be used (see `core.pager` in linkgit:git-config[1])."
msgstr ""
#. type: Plain text
@@ -36692,33 +28449,28 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:202 en/rev-list-options.txt:848
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--count"
msgstr "--count"
#. type: Plain text
#: en/git-grep.txt:205
-msgid ""
-"Instead of showing every matched line, show the number of lines that match."
+msgid "Instead of showing every matched line, show the number of lines that match."
msgstr ""
#. type: Plain text
#: en/git-grep.txt:209
-msgid ""
-"Show colored matches. The value must be always (the default), never, or "
-"auto."
+msgid "Show colored matches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-grep.txt:214
-msgid ""
-"Turn off match highlighting, even when the configuration file gives the "
-"default to color output. Same as `--color=never`."
+msgid "Turn off match highlighting, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:215
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--break"
msgstr "--break"
@@ -36729,30 +28481,24 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:218
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--heading"
msgstr "--heading"
#. type: Plain text
#: en/git-grep.txt:221
-msgid ""
-"Show the filename above the matches in that file instead of at the start of "
-"each shown line."
+msgid "Show the filename above the matches in that file instead of at the start of each shown line."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:223
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--show-function"
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])."
+msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
@@ -36775,9 +28521,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:235
-msgid ""
-"Show <num> leading and trailing lines, and place a line containing `--` "
-"between contiguous groups of matches."
+msgid "Show <num> leading and trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
@@ -36794,9 +28538,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:240
-msgid ""
-"Show <num> trailing lines, and place a line containing `--` between "
-"contiguous groups of matches."
+msgid "Show <num> trailing lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Labeled list
@@ -36813,17 +28555,12 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:245
-msgid ""
-"Show <num> leading lines, and place a line containing `--` between "
-"contiguous groups of matches."
+msgid "Show <num> leading lines, and place a line containing `--` between contiguous groups of matches."
msgstr ""
#. type: Plain text
#: en/git-grep.txt:252
-msgid ""
-"Show the surrounding text from the previous line containing a function name "
-"up to the one before the next function name, effectively showing the whole "
-"function in which the match was found."
+msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
msgstr ""
#. type: Labeled list
@@ -36834,9 +28571,7 @@ 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."
+msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
msgstr ""
#. type: Labeled list
@@ -36852,27 +28587,24 @@ msgstr ""
#. type: Plain text
#: 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'."
+msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:266
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--and"
msgstr "--and"
#. type: Labeled list
#: en/git-grep.txt:267
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--or"
msgstr "--or"
#. type: Labeled list
#: en/git-grep.txt:268 en/git-rev-parse.txt:129 en/rev-list-options.txt:131
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--not"
msgstr "--not"
@@ -36884,30 +28616,23 @@ 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."
+msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:275 en/rev-list-options.txt:67
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--all-match"
msgstr "--all-match"
#. type: Plain text
#: en/git-grep.txt:279
-msgid ""
-"When giving multiple pattern expressions combined with `--or`, this flag is "
-"specified to limit the match to files that have lines to match all of them."
+msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
msgstr ""
#. type: Plain text
#: en/git-grep.txt:284
-msgid ""
-"Do not output matched lines; instead, exit with status 0 when there is a "
-"match and with non-zero status when there isn't."
+msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
msgstr ""
#. type: Labeled list
@@ -36919,28 +28644,18 @@ msgstr ""
#. type: Plain text
#: 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;"
-msgid ""
-"Instead of searching tracked files in the working tree, search blobs in the "
-"given trees."
-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',"
+#| msgid "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."
+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',"
#. type: Plain text
#: en/git-grep.txt:292
-msgid ""
-"Signals the end of options; the rest of the parameters are <pathspec> "
-"limiters."
+msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
msgstr ""
#. type: Plain text
#: en/git-grep.txt:296
-msgid ""
-"If given, limit the search to paths matching at least one pattern. Both "
-"leading paths match and glob(7) patterns are supported."
+msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
msgstr ""
#. type: Labeled list
@@ -36952,15 +28667,9 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:303
#, fuzzy
-#| msgid ""
-#| "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."
-msgstr ""
-"Ajouter le contenu de tous le fichiers `*.txt` sous le r챕pertoire "
-"`Documentation` et ses sous r챕pertoires."
+#| msgid "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."
+msgstr "Ajouter le contenu de tous le fichiers `*.txt` sous le r챕pertoire `Documentation` et ses sous r챕pertoires."
#. type: Labeled list
#: en/git-grep.txt:304
@@ -36970,8 +28679,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:307
-msgid ""
-"Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
+msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
@@ -36982,14 +28690,12 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:311
-msgid ""
-"Looks for a line that has `NODE` or `Unexpected` in files that have lines "
-"that match both."
+msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
msgstr ""
#. type: Title =
#: en/git-gui.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-gui(1)"
msgstr "git-gui(1)"
@@ -37006,34 +28712,23 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:19
-msgid ""
-"A Tcl/Tk based graphical user interface to Git. 'git gui' focuses on "
-"allowing users to make changes to their repository by making new commits, "
-"amending existing ones, creating branches, performing local merges, and "
-"fetching/pushing to remote repositories."
+msgid "A Tcl/Tk based graphical user interface to Git. 'git gui' focuses on allowing users to make changes to their repository by making new commits, amending existing ones, creating branches, performing local merges, and fetching/pushing to remote repositories."
msgstr ""
#. type: Plain text
#: en/git-gui.txt:24
-msgid ""
-"Unlike 'gitk', 'git gui' focuses on commit generation and single file "
-"annotation and does not show project history. It does however supply menu "
-"actions to start a 'gitk' session from within 'git gui'."
+msgid "Unlike 'gitk', 'git gui' focuses on commit generation and single file annotation and does not show project history. It does however supply menu actions to start a 'gitk' session from within 'git gui'."
msgstr ""
#. type: Plain text
#: en/git-gui.txt:29
-msgid ""
-"'git gui' is known to work on all popular UNIX systems, Mac OS X, and "
-"Windows (under both Cygwin and MSYS). To the extent possible OS specific "
-"user interface guidelines are followed, making 'git gui' a fairly native "
-"interface for users."
+msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Windows (under both Cygwin and MSYS). To the extent possible OS specific user interface guidelines are followed, making 'git gui' a fairly native interface for users."
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 ""
@@ -37046,9 +28741,7 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:35
-msgid ""
-"Start a blame viewer on the specified file on the given version (or working "
-"directory if not specified)."
+msgid "Start a blame viewer on the specified file on the given version (or working directory if not specified)."
msgstr ""
#. type: Labeled list
@@ -37059,9 +28752,7 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:40
-msgid ""
-"Start a tree browser showing all files in the specified commit. Files "
-"selected through the browser are opened in the blame viewer."
+msgid "Start a tree browser showing all files in the specified commit. Files selected through the browser are opened in the blame viewer."
msgstr ""
#. type: Labeled list
@@ -37072,11 +28763,7 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:46
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -37098,12 +28785,7 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:61
-msgid ""
-"Show the contents of the file 'Makefile' in the current working directory, "
-"and provide annotations for both the original author of each line, and who "
-"moved the line to its current location. The uncommitted file is annotated, "
-"and uncommitted changes (if any) are explicitly attributed to 'Not Yet "
-"Committed'."
+msgid "Show the contents of the file 'Makefile' in the current working directory, and provide annotations for both the original author of each line, and who moved the line to its current location. The uncommitted file is annotated, and uncommitted changes (if any) are explicitly attributed to 'Not Yet Committed'."
msgstr ""
#. type: Labeled list
@@ -37114,10 +28796,7 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:68
-msgid ""
-"Show the contents of 'Makefile' in revision 'v0.99.8' and provide "
-"annotations for each line. Unlike the above example the file is read from "
-"the object database and not the working directory."
+msgid "Show the contents of 'Makefile' in revision 'v0.99.8' and provide annotations for each line. Unlike the above example the file is read from the object database and not the working directory."
msgstr ""
#. type: Labeled list
@@ -37128,9 +28807,7 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:73
-msgid ""
-"Loads annotations as described above and automatically scrolls the view to "
-"center on line '100'."
+msgid "Loads annotations as described above and automatically scrolls the view to center on line '100'."
msgstr ""
#. type: Labeled list
@@ -37142,10 +28819,7 @@ msgstr "$ git commit\n"
#. type: Plain text
#: en/git-gui.txt:79
-msgid ""
-"Make one commit and return to the shell when it is complete. This command "
-"returns a non-zero exit code if the window was closed in any way other than "
-"by making a commit."
+msgid "Make one commit and return to the shell when it is complete. This command returns a non-zero exit code if the window was closed in any way other than by making a commit."
msgstr ""
#. type: Labeled list
@@ -37169,11 +28843,7 @@ msgstr "$ git commit\n"
#. type: Plain text
#: en/git-gui.txt:91
-msgid ""
-"Behave as normal citool, but instead of making a commit simply terminate "
-"with a zero exit code. It still checks that the index does not contain any "
-"unmerged entries, so you can use it as a GUI version of linkgit:git-"
-"mergetool[1]"
+msgid "Behave as normal citool, but instead of making a commit simply terminate with a zero exit code. It still checks that the index does not contain any unmerged entries, so you can use it as a GUI version of linkgit:git-mergetool[1]"
msgstr ""
#. type: Labeled list
@@ -37198,17 +28868,12 @@ msgstr ""
#. type: Plain text
#: en/git-gui.txt:101
-msgid ""
-"Show a browser for the tree of the 'maint' branch. Files selected in the "
-"browser can be viewed with the internal blame viewer."
+msgid "Show a browser for the tree of the 'maint' branch. Files selected in the browser can be viewed with the internal blame viewer."
msgstr ""
#. type: Plain text
#: en/git-gui.txt:108
-msgid ""
-"The Git repository browser. Shows branches, commit history and file "
-"differences. gitk is the utility started by 'git gui''s Repository "
-"Visualize actions."
+msgid "The Git repository browser. Shows branches, commit history and file differences. gitk is the utility started by 'git gui''s Repository Visualize actions."
msgstr ""
#. type: Title -
@@ -37219,10 +28884,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
@@ -37249,15 +28911,13 @@ msgstr ""
#. type: Title =
#: en/git-hash-object.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-hash-object(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"
+msgid "git-hash-object - Compute object ID and optionally creates a blob from a file"
msgstr ""
#. type: Plain text
@@ -37270,13 +28930,7 @@ msgstr ""
#. type: Plain text
#: en/git-hash-object.txt:24
-msgid ""
-"Computes the object ID value for an object with specified type with the "
-"contents of the named file (which can be outside of the work tree), and "
-"optionally writes the resulting object into the object database. Reports "
-"its object ID to its standard output. This is used by 'git cvsimport' to "
-"update the index without modifying files in the work tree. When <type> is "
-"not specified, it defaults to \"blob\"."
+msgid "Computes the object ID value for an object with specified type with the contents of the named file (which can be outside of the work tree), and optionally writes the resulting object into the object database. Reports its object ID to its standard output. This is used by 'git cvsimport' to update the index without modifying files in the work tree. When <type> is not specified, it defaults to \"blob\"."
msgstr ""
#. type: Labeled list
@@ -37304,62 +28958,45 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:37
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--stdin-paths"
msgstr "--stdin-paths"
#. type: Plain text
#: en/git-hash-object.txt:40
-msgid ""
-"Read file names from the standard input, one per line, instead of from the "
-"command-line."
+msgid "Read file names from the standard input, one per line, instead of from the command-line."
msgstr ""
#. type: Plain text
#: 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 "
-"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 "
-"directory or files read from stdin."
+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 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 directory or files read from stdin."
msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:51
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-filters"
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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:57
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--literally"
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."
+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."
msgstr ""
#. type: Title =
#: en/git-help.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-help(1)"
msgstr "git-help(1)"
@@ -37378,39 +29015,27 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-help.txt:23
-msgid ""
-"If the option `--all` or `-a` is given, all available commands are printed "
-"on the standard output."
+msgid "If the option `--all` or `-a` is given, all available commands are printed on the standard output."
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."
+msgid "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
#: en/git-help.txt:31
-msgid ""
-"If a command, or a guide, is given, a manual page for that command or guide "
-"is brought up. The 'man' program is used by default for this purpose, but "
-"this can be overridden by other options or configuration variables."
+msgid "If a command, or a guide, is given, a manual page for that command or guide is brought up. The 'man' program is used by default for this purpose, but this can be overridden by other options or configuration variables."
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."
+msgid "Note that `git --help ...` is identical to `git help ...` because the former is internally converted into the latter."
msgstr ""
#. type: Plain text
@@ -37425,79 +29050,61 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:45
-msgid ""
-"Prints all the available commands on the standard output. This option "
-"overrides any given command or guide name."
+msgid "Prints all the available commands on the standard output. This option overrides any given command or guide name."
msgstr ""
#. type: Labeled list
#: en/git-help.txt:47
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--guides"
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."
+msgid "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, ignore-translated
+#, no-wrap
msgid "--info"
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."
+msgid "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, ignore-translated
+#, no-wrap
msgid "--man"
msgstr "--man"
#. type: Plain text
#: en/git-help.txt:61
-msgid ""
-"Display manual page for the command in the 'man' format. This option may be "
-"used to override a value set in the `help.format` configuration variable."
+msgid "Display manual page for the command in the 'man' format. This option may be used to override a value set in the `help.format` configuration variable."
msgstr ""
#. type: Plain text
#: en/git-help.txt:65
-msgid ""
-"By default the 'man' program will be used to display the manual page, but "
-"the `man.viewer` configuration variable may be used to choose other display "
-"programs (see below)."
+msgid "By default the 'man' program will be used to display the manual page, but the `man.viewer` configuration variable may be used to choose other display programs (see below)."
msgstr ""
#. type: Labeled list
#: en/git-help.txt:67
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--web"
msgstr "--web"
#. type: Plain text
#: en/git-help.txt:70
-msgid ""
-"Display manual page for the command in the 'web' (HTML) format. A web "
-"browser will be used for that purpose."
+msgid "Display manual page for the command in the 'web' (HTML) format. A web browser will be used for that purpose."
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."
+msgid "The web browser can be specified using the configuration variable `help.browser`, or `web.browser` if the former is not set. If none of these config variables is set, the 'git web{litdd}browse' helper script (called by 'git help') will pick a suitable default. See linkgit:git-web{litdd}browse[1] for more information about this."
msgstr ""
#. type: Title -
@@ -37510,11 +29117,7 @@ msgstr "ENVIRONNEMENT ET VARIABLES DE CONFIGURATION"
#. type: Plain text
#: en/git-help.txt:87
-msgid ""
-"If no command-line option is passed, the `help.format` configuration "
-"variable will be checked. The following values are supported for this "
-"variable; they make 'git help' behave as their corresponding command- line "
-"option:"
+msgid "If no command-line option is passed, the `help.format` configuration variable will be checked. The following values are supported for this variable; they make 'git help' behave as their corresponding command- line option:"
msgstr ""
#. type: Plain text
@@ -37540,18 +29143,12 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:99
-msgid ""
-"The `help.browser`, `web.browser` and `browser.<tool>.path` will also be "
-"checked if the 'web' format is chosen (either by command-line option or "
-"configuration variable). See '-w|--web' in the OPTIONS section above and "
-"linkgit:git-web{litdd}browse[1]."
+msgid "The `help.browser`, `web.browser` and `browser.<tool>.path` will also be checked if the 'web' format is chosen (either by command-line option or configuration variable). See '-w|--web' in the OPTIONS section above and linkgit:git-web{litdd}browse[1]."
msgstr ""
#. type: Plain text
#: en/git-help.txt:105
-msgid ""
-"The `man.viewer` configuration variable will be checked if the 'man' format "
-"is chosen. The following values are currently supported:"
+msgid "The `man.viewer` configuration variable will be checked if the 'man' format is chosen. The following values are currently supported:"
msgstr ""
#. type: Plain text
@@ -37561,31 +29158,22 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:109
-msgid ""
-"\"woman\": use 'emacsclient' to launch the \"woman\" mode in emacs (this "
-"only works starting with emacsclient versions 22),"
+msgid "\"woman\": use 'emacsclient' to launch the \"woman\" mode in emacs (this only works starting with emacsclient versions 22),"
msgstr ""
#. type: Plain text
#: en/git-help.txt:111
-msgid ""
-"\"konqueror\": use 'kfmclient' to open the man page in a new konqueror tab "
-"(see 'Note about konqueror' below)."
+msgid "\"konqueror\": use 'kfmclient' to open the man page in a new konqueror tab (see 'Note about konqueror' below)."
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)."
+msgid "Values for other tools can be used if there is a corresponding `man.<tool>.cmd` configuration entry (see below)."
msgstr ""
#. type: Plain text
#: en/git-help.txt:118
-msgid ""
-"Multiple values may be given to the `man.viewer` configuration variable. "
-"Their corresponding programs will be tried in the order listed in the "
-"configuration file."
+msgid "Multiple values may be given to the `man.viewer` configuration variable. Their corresponding programs will be tried in the order listed in the configuration file."
msgstr ""
#. type: Plain text
@@ -37604,36 +29192,22 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:129
-msgid ""
-"will try to use konqueror first. But this may fail (for example, if DISPLAY "
-"is not set) and in that case emacs' woman mode will be tried."
+msgid "will try to use konqueror first. But this may fail (for example, if DISPLAY is not set) and in that case emacs' woman mode will be tried."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-help.txt:142
-msgid ""
-"You can explicitly provide a full path to your preferred man viewer by "
-"setting the configuration variable `man.<tool>.path`. For example, you can "
-"configure the absolute path to konqueror by setting 'man.konqueror.path'. "
-"Otherwise, 'git help' assumes the tool is available in PATH."
+msgid "You can explicitly provide a full path to your preferred man viewer by setting the configuration variable `man.<tool>.path`. For example, you can configure the absolute path to konqueror by setting 'man.konqueror.path'. Otherwise, 'git help' assumes the tool is available in PATH."
msgstr ""
#. type: Plain text
#: en/git-help.txt:152
-msgid ""
-"When the man viewer, specified by the `man.viewer` configuration variables, "
-"is not among the supported ones, then the corresponding `man.<tool>.cmd` "
-"configuration variable will be looked up. If this variable exists then the "
-"specified tool will be treated as a custom command and a shell eval will be "
-"used to run the command with the man page passed as arguments."
+msgid "When the man viewer, specified by the `man.viewer` configuration variables, is not among the supported ones, then the corresponding `man.<tool>.cmd` configuration variable will be looked up. If this variable exists then the specified tool will be treated as a custom command and a shell eval will be used to run the command with the man page passed as arguments."
msgstr ""
#. type: Title -
@@ -37644,25 +29218,17 @@ 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 "
-"konqueror in a new tab if possible."
+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 konqueror in a new tab if possible."
msgstr ""
#. type: Plain text
#: en/git-help.txt:163
-msgid ""
-"For consistency, we also try such a trick if 'man.konqueror.path' is set to "
-"something like 'A_PATH_TO/konqueror'. That means we will try to launch "
-"'A_PATH_TO/kfmclient' instead."
+msgid "For consistency, we also try such a trick if 'man.konqueror.path' is set to something like 'A_PATH_TO/konqueror'. That means we will try to launch 'A_PATH_TO/kfmclient' instead."
msgstr ""
#. type: Plain text
#: en/git-help.txt:166 en/git-web--browse.txt:100
-msgid ""
-"If you really want to use 'konqueror', then you can use something like the "
-"following:"
+msgid "If you really want to use 'konqueror', then you can use something like the following:"
msgstr ""
#. type: delimited block -
@@ -37689,9 +29255,7 @@ 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:"
+msgid "Note that all these configuration variables should probably be set using the `--global` flag, for example like this:"
msgstr ""
#. type: delimited block -
@@ -37704,14 +29268,12 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:188 en/git-web--browse.txt:121
-msgid ""
-"as they are probably more user specific than repository specific. See "
-"linkgit:git-config[1] for more information about this."
+msgid "as they are probably more user specific than repository specific. See linkgit:git-config[1] for more information about this."
msgstr ""
#. type: Title =
#: en/git-http-backend.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-http-backend(1)"
msgstr "git-http-backend(1)"
@@ -37728,38 +29290,22 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:20
-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 "
-"the smart HTTP protocol."
+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 the smart HTTP protocol."
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:25
-msgid ""
-"It verifies that the directory has the magic file \"git-daemon-export-ok\", "
-"and it will refuse to export any Git directory that hasn't explicitly been "
-"marked for export this way (unless the `GIT_HTTP_EXPORT_ALL` environmental "
-"variable is set)."
+msgid "It verifies that the directory has the magic file \"git-daemon-export-ok\", and it will refuse to export any Git directory that hasn't explicitly been marked for export this way (unless the `GIT_HTTP_EXPORT_ALL` environmental variable is set)."
msgstr ""
#. type: Plain text
#: 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-"
-"pack` service is enabled, which serves 'git send-pack' clients, which is "
-"invoked from 'git push'."
+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-pack` service is enabled, which serves 'git send-pack' clients, which is invoked from 'git push'."
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:36
-msgid ""
-"These services can be enabled/disabled using the per-repository "
-"configuration file:"
+msgid "These services can be enabled/disabled using the per-repository configuration file:"
msgstr ""
#. type: Labeled list
@@ -37770,12 +29316,7 @@ msgstr ""
#. type: Plain text
#: 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`."
+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`."
msgstr ""
#. type: Labeled list
@@ -37786,10 +29327,7 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:49
-msgid ""
-"This serves 'git fetch-pack' and 'git ls-remote' clients. It is enabled by "
-"default, but a repository can disable it by setting this configuration item "
-"to `false`."
+msgid "This serves 'git fetch-pack' and 'git ls-remote' clients. It is enabled by default, but a repository can disable it by setting this configuration item to `false`."
msgstr ""
#. type: Labeled list
@@ -37800,11 +29338,7 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:56
-msgid ""
-"This serves 'git send-pack' clients, allowing push. It is disabled by "
-"default for anonymous users, and enabled by default for users authenticated "
-"by the web server. It can be disabled by setting this item to `false`, or "
-"enabled for all users, including anonymous users, by setting it to `true`."
+msgid "This serves 'git send-pack' clients, allowing push. It is disabled by default for anonymous users, and enabled by default for users authenticated by the web server. It can be disabled by setting this item to `false`, or enabled for all users, including anonymous users, by setting it to `true`."
msgstr ""
#. type: Title -
@@ -37815,20 +29349,12 @@ msgstr ""
#. type: Plain text
#: 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 "
-"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."
+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 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."
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`."
+msgid "All of the following examples map `http://$hostname/git/foo/bar.git` to `/var/www/git/foo/bar.git`."
msgstr ""
#. type: Labeled list
@@ -37839,9 +29365,7 @@ 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:"
+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:"
msgstr ""
#. type: delimited block -
@@ -37855,11 +29379,7 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:86
-msgid ""
-"To enable anonymous read access but authenticated write access, require "
-"authorization for both the initial ref advertisement (which we detect as a "
-"push via the service parameter in the query string), and the receive-pack "
-"invocation itself:"
+msgid "To enable anonymous read access but authenticated write access, require authorization for both the initial ref advertisement (which we detect as a push via the service parameter in the query string), and the receive-pack invocation itself:"
msgstr ""
#. type: delimited block -
@@ -37894,9 +29414,7 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:107
-msgid ""
-"If you do not have `mod_rewrite` available to match against the query "
-"string, it is sufficient to just protect `git-receive-pack` itself, like:"
+msgid "If you do not have `mod_rewrite` available to match against the query string, it is sufficient to just protect `git-receive-pack` itself, like:"
msgstr ""
#. type: delimited block -
@@ -37913,22 +29431,12 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:128
-msgid ""
-"To require authentication for both reads and writes, use a Location "
-"directive around the repository, or one of its parent directories:"
+msgid "To require authentication for both reads and writes, use a Location directive around the repository, or one of its parent directories:"
msgstr ""
#. type: delimited block -
@@ -37945,9 +29453,7 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:141
-msgid ""
-"To serve gitweb at the same url, use a ScriptAliasMatch to only those URLs "
-"that 'git http-backend' can handle, and forward the rest to gitweb:"
+msgid "To serve gitweb at the same url, use a ScriptAliasMatch to only those URLs that 'git http-backend' can handle, and forward the rest to gitweb:"
msgstr ""
#. type: delimited block -
@@ -37972,9 +29478,7 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:157
-msgid ""
-"To serve multiple repositories from different linkgit:gitnamespaces[7] in a "
-"single repository:"
+msgid "To serve multiple repositories from different linkgit:gitnamespaces[7] in a single repository:"
msgstr ""
#. type: delimited block -
@@ -37993,11 +29497,7 @@ 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 "
-"ask the kernel to copy the file contents from the file system directly to "
-"the network:"
+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 ask the kernel to copy the file contents from the file system directly to the network:"
msgstr ""
#. type: delimited block -
@@ -38043,10 +29543,7 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:197
-msgid ""
-"Ensure that `mod_cgi`, `mod_alias`, `mod_auth`, `mod_setenv` are loaded, "
-"then set `GIT_PROJECT_ROOT` appropriately and redirect all requests to the "
-"CGI:"
+msgid "Ensure that `mod_cgi`, `mod_alias`, `mod_auth`, `mod_setenv` are loaded, then set `GIT_PROJECT_ROOT` appropriately and redirect all requests to the CGI:"
msgstr ""
#. type: delimited block -
@@ -38115,9 +29612,7 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:246
-msgid ""
-"'git http-backend' relies upon the `CGI` environment variables set by the "
-"invoking web server, including:"
+msgid "'git http-backend' relies upon the `CGI` environment variables set by the invoking web server, including:"
msgstr ""
#. type: Plain text
@@ -38152,43 +29647,27 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:257
-msgid ""
-"The `GIT_HTTP_EXPORT_ALL` environmental variable may be passed to 'git-http-"
-"backend' to bypass the check for the \"git-daemon-export-ok\" file in each "
-"repository before allowing export of that repository."
+msgid "The `GIT_HTTP_EXPORT_ALL` environmental variable may be passed to 'git-http-backend' to bypass the check for the \"git-daemon-export-ok\" file in each repository before allowing export of that repository."
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."
+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."
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:271
-msgid ""
-"The backend process sets GIT_COMMITTER_NAME to '$REMOTE_USER' and "
-"GIT_COMMITTER_EMAIL to '$\\{REMOTE_USER}@http.$\\{REMOTE_ADDR\\}', ensuring "
-"that any reflogs created by 'git-receive-pack' contain some identifying "
-"information of the remote user who performed the push."
+msgid "The backend process sets GIT_COMMITTER_NAME to '$REMOTE_USER' and GIT_COMMITTER_EMAIL to '$\\{REMOTE_USER}@http.$\\{REMOTE_ADDR\\}', ensuring that any reflogs created by 'git-receive-pack' contain some identifying information of the remote user who performed the push."
msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:274
-msgid ""
-"All `CGI` environment variables are available to each of the hooks invoked "
-"by the 'git-receive-pack'."
+msgid "All `CGI` environment variables are available to each of the hooks invoked by the 'git-receive-pack'."
msgstr ""
#. type: Title =
#: en/git-http-fetch.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-http-fetch(1)"
msgstr "git-http-fetch(1)"
@@ -38202,9 +29681,7 @@ 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
@@ -38261,16 +29738,12 @@ 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."
+msgid "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
#: en/git-http-fetch.txt:43
-msgid ""
-"Instead of a commit id on the command line (which is not expected in this "
-"case), 'git http-fetch' expects lines on stdin in the format"
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' expects lines on stdin in the format"
msgstr ""
#. type: Plain text
@@ -38281,20 +29754,18 @@ msgstr ""
#. type: Labeled list
#: en/git-http-fetch.txt:46
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--recover"
msgstr "--recover"
#. type: Plain text
#: en/git-http-fetch.txt:49
-msgid ""
-"Verify that everything reachable from target is fetched. Used after an "
-"earlier fetch is interrupted."
+msgid "Verify that everything reachable from target is fetched. Used after an earlier fetch is interrupted."
msgstr ""
#. type: Title =
#: en/git-http-push.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-http-push(1)"
msgstr "git-http-push(1)"
@@ -38308,15 +29779,12 @@ 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
#: en/git-http-push.txt:18
-msgid ""
-"Sends missing objects to remote repository, and updates the remote branch."
+msgid "Sends missing objects to remote repository, and updates the remote branch."
msgstr ""
#. type: Plain text
@@ -38330,18 +29798,12 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:36 en/git-send-pack.txt:60
-msgid ""
-"Usually, the command refuses to update a remote ref that is not an ancestor "
-"of the local ref used to overwrite it. This flag disables the check. What "
-"this means is that the remote repository can lose commits; use it with care."
+msgid "Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. This flag disables the check. What this means is that the remote repository can lose commits; use it with care."
msgstr ""
#. type: Plain text
@@ -38351,17 +29813,12 @@ msgstr ""
#. type: Plain text
#: en/git-http-push.txt:43
-msgid ""
-"Report the list of objects being walked locally and the list of objects "
-"successfully sent to the remote repository."
+msgid "Report the list of objects being walked locally and the list of objects successfully sent to the remote repository."
msgstr ""
#. type: Plain text
#: 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:"
+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:"
msgstr ""
#. type: Plain text
@@ -38398,20 +29855,12 @@ msgstr ""
#. type: Plain text
#: en/git-http-push.txt:65
-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>'."
+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>'."
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:71
-msgid ""
-"Each pattern pair consists of the source side (before the colon) and the "
-"destination side (after the colon). The ref to be pushed is determined by "
-"finding a match that matches the source side, and where it is pushed is "
-"determined by using the destination side."
+msgid "Each pattern pair consists of the source side (before the colon) and the destination side (after the colon). The ref to be pushed is determined by finding a match that matches the source side, and where it is pushed is determined by using the destination side."
msgstr ""
#. type: Plain text
@@ -38426,27 +29875,17 @@ msgstr ""
#. type: Plain text
#: en/git-http-push.txt:79 en/git-send-pack.txt:132
-msgid ""
-"it has to start with \"refs/\"; <dst> is used as the destination literally "
-"in this case."
+msgid "it has to start with \"refs/\"; <dst> is used as the destination literally in this case."
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:83 en/git-send-pack.txt:136
-msgid ""
-"<src> == <dst> and the ref that matched the <src> must not exist in the set "
-"of remote refs; the ref matched <src> locally is used as the name of the "
-"destination."
+msgid "<src> == <dst> and the ref that matched the <src> must not exist in the set of remote refs; the ref matched <src> locally is used as the name of the destination."
msgstr ""
#. type: Plain text
#: en/git-http-push.txt:89 en/git-send-pack.txt:142
-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."
+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."
msgstr ""
#. type: Plain text
@@ -38456,21 +29895,18 @@ msgstr ""
#. type: Plain text
#: en/git-http-push.txt:94 en/git-send-pack.txt:147
-msgid ""
-"Optionally, a <ref> parameter can be prefixed with a plus '+' sign to "
-"disable the fast-forward check only on that ref."
+msgid "Optionally, a <ref> parameter can be prefixed with a plus '+' sign to disable the fast-forward check only on that ref."
msgstr ""
#. type: Title =
#: en/git-imap-send.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-imap-send(1)"
msgstr "git-imap-send(1)"
#. type: Plain text
#: en/git-imap-send.txt:7
-msgid ""
-"git-imap-send - Send a collection of patches from stdin to an IMAP folder"
+msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
msgstr ""
#. type: Plain text
@@ -38481,12 +29917,7 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:23
-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\", "
-"\"Date\", and \"Subject\" in that order."
+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\", \"Date\", and \"Subject\" in that order."
msgstr ""
#. type: Plain text
@@ -38506,35 +29937,29 @@ msgstr ""
#. type: Labeled list
#: en/git-imap-send.txt:40
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--curl"
msgstr "--curl"
#. type: Plain text
#: en/git-imap-send.txt:44
-msgid ""
-"Use libcurl to communicate with the IMAP server, unless tunneling into it. "
-"Ignored if Git was built without the USE_CURL_FOR_IMAP_SEND option set."
+msgid "Use libcurl to communicate with the IMAP server, unless tunneling into it. Ignored if Git was built without the USE_CURL_FOR_IMAP_SEND option set."
msgstr ""
#. type: Labeled list
#: en/git-imap-send.txt:45
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-curl"
msgstr "--no-curl"
#. type: Plain text
#: en/git-imap-send.txt:49
-msgid ""
-"Talk to the IMAP server using git's own IMAP routines instead of using "
-"libcurl. Ignored if Git was built with the NO_OPENSSL option set."
+msgid "Talk to the IMAP server using git's own IMAP routines instead of using libcurl. Ignored if Git was built with the NO_OPENSSL option set."
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."
+msgid "To use the tool, imap.folder and either imap.tunnel or imap.host must be set to appropriate values."
msgstr ""
#. type: Labeled list
@@ -38545,10 +29970,7 @@ 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."
+msgid "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
@@ -38559,10 +29981,7 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:69
-msgid ""
-"Command used to setup a tunnel to the IMAP server through which commands "
-"will be piped instead of using a direct network connection to the server. "
-"Required when imap.host is not set."
+msgid "Command used to setup a tunnel to the IMAP server through which commands will be piped instead of using a direct network connection to the server. Required when imap.host is not set."
msgstr ""
#. type: Labeled list
@@ -38573,10 +29992,7 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:74
-msgid ""
-"A URL identifying the server. Use a `imap://` prefix for non-secure "
-"connections and a `imaps://` prefix for secure connections. Ignored when "
-"imap.tunnel is set, but required otherwise."
+msgid "A URL identifying the server. Use a `imap://` prefix for non-secure connections and a `imaps://` prefix for secure connections. Ignored when imap.tunnel is set, but required otherwise."
msgstr ""
#. type: Labeled list
@@ -38609,9 +30025,7 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:85
-msgid ""
-"An integer port number to connect to on the server. Defaults to 143 for "
-"imap:// hosts and 993 for imaps:// hosts. Ignored when imap.tunnel is set."
+msgid "An integer port number to connect to on the server. Defaults to 143 for imap:// hosts and 993 for imaps:// hosts. Ignored when imap.tunnel is set."
msgstr ""
#. type: Labeled list
@@ -38622,9 +30036,7 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:90
-msgid ""
-"A boolean to enable/disable verification of the server certificate used by "
-"the SSL/TLS connection. Default is `true`. Ignored when imap.tunnel is set."
+msgid "A boolean to enable/disable verification of the server certificate used by the SSL/TLS connection. Default is `true`. Ignored when imap.tunnel is set."
msgstr ""
#. type: Labeled list
@@ -38635,11 +30047,7 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:97
-msgid ""
-"A boolean to enable/disable the use of html encoding when sending a patch. "
-"An html encoded patch will be bracketed with <pre> and have a content type "
-"of text/html. Ironically, enabling this option causes Thunderbird to send "
-"the patch as a plain/text, format=fixed email. Default is `false`."
+msgid "A boolean to enable/disable the use of html encoding when sending a patch. An html encoded patch will be bracketed with <pre> and have a content type of text/html. Ironically, enabling this option causes Thunderbird to send the patch as a plain/text, format=fixed email. Default is `false`."
msgstr ""
#. type: Labeled list
@@ -38650,12 +30058,7 @@ 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."
+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."
msgstr ""
#. type: Plain text
@@ -38708,9 +30111,7 @@ 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:"
+msgid "To submit patches using GMail's IMAP interface, first, edit your ~/.gitconfig to specify your account settings:"
msgstr ""
#. type: delimited block -
@@ -38727,9 +30128,7 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:155
-msgid ""
-"You might need to instead use: folder = \"[Google Mail]/Drafts\" if you get "
-"an error that the \"Folder doesn't exist\"."
+msgid "You might need to instead use: folder = \"[Google Mail]/Drafts\" if you get an error that the \"Folder doesn't exist\"."
msgstr ""
#. type: Plain text
@@ -38740,17 +30139,12 @@ 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
#: en/git-imap-send.txt:163
-msgid ""
-"Just make sure to disable line wrapping in the email client (GMail's web "
-"interface will wrap lines no matter what, so you need to use a real IMAP "
-"client)."
+msgid "Just make sure to disable line wrapping in the email client (GMail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
msgstr ""
#. type: Title -
@@ -38761,12 +30155,7 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:172
-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."
+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."
msgstr ""
#. type: Plain text
@@ -38785,7 +30174,7 @@ msgstr ""
#. type: Title =
#: en/git-index-pack.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-index-pack(1)"
msgstr "git-index-pack(1)"
@@ -38805,10 +30194,7 @@ msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:23
-msgid ""
-"Reads a packed archive (.pack) from the specified file, and builds a pack "
-"index file (.idx) for it. The packed archive together with the pack index "
-"can then be placed in the objects/pack/ directory of a Git repository."
+msgid "Reads a packed archive (.pack) from the specified file, and builds a pack index file (.idx) for it. The packed archive together with the pack index can then be placed in the objects/pack/ directory of a Git repository."
msgstr ""
#. type: Plain text
@@ -38824,47 +30210,28 @@ 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 "
-"file by replacing .pack with .idx (and the program fails if the name of "
-"packed archive does not end with .pack)."
+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 file by replacing .pack with .idx (and the program fails if the name of packed archive does not end with .pack)."
msgstr ""
#. type: Plain text
#: 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 "
-"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'."
+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 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'."
msgstr ""
#. type: Labeled list
#: en/git-index-pack.txt:48
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--fix-thin"
msgstr "--fix-thin"
#. type: Plain text
#: en/git-index-pack.txt:53
-msgid ""
-"Fix a \"thin\" pack produced by `git pack-objects --thin` (see linkgit:git-"
-"pack-objects[1] for details) by adding the excluded objects the deltified "
-"objects are based on to the pack. This option only makes sense in "
-"conjunction with --stdin."
+msgid "Fix a \"thin\" pack produced by `git pack-objects --thin` (see linkgit:git-pack-objects[1] for details) by adding the excluded objects the deltified objects are based on to the pack. This option only makes sense in conjunction with --stdin."
msgstr ""
#. type: Plain text
#: 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 "
-"contained in the pack."
+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 contained in the pack."
msgstr ""
#. type: Labeled list
@@ -38875,11 +30242,7 @@ msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:68
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -38890,10 +30253,7 @@ msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:73 en/git-pack-objects.txt:229
-msgid ""
-"This is intended to be used by the test suite only. It allows to force the "
-"version for the generated pack index, and to force 64-bit index entries on "
-"objects located above the given offset."
+msgid "This is intended to be used by the test suite only. It allows to force the version for the generated pack index, and to force 64-bit index entries on objects located above the given offset."
msgstr ""
#. type: Plain text
@@ -38914,13 +30274,7 @@ msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:89
-msgid ""
-"Specifies the number of threads to spawn when resolving deltas. This "
-"requires that index-pack be compiled with pthreads otherwise this option is "
-"ignored with a warning. This is meant to reduce packing time on "
-"multiprocessor machines. The required amount of memory for the delta search "
-"window is however multiplied by the number of threads. Specifying 0 will "
-"cause Git to auto-detect the number of CPU's and use maximum 3 threads."
+msgid "Specifies the number of threads to spawn when resolving deltas. This requires that index-pack be compiled with pthreads otherwise this option is ignored with a warning. This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. Specifying 0 will cause Git to auto-detect the number of CPU's and use maximum 3 threads."
msgstr ""
#. type: Labeled list
@@ -38942,11 +30296,7 @@ msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:100
-msgid ""
-"Once the index has been created, the list of object names is sorted and the "
-"SHA-1 hash of that list is printed to stdout. If --stdin was also used then "
-"this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file "
-"was successfully created. This is useful to remove a"
+msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
msgstr ""
#. type: Block title
@@ -38962,7 +30312,7 @@ msgstr ""
#. type: Title =
#: en/git-init-db.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-init-db(1)"
msgstr "git-init-db(1)"
@@ -38976,27 +30326,19 @@ 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
#: en/git-init-db.txt:20
#, fuzzy
-#| msgid ""
-#| "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-init[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."
+#| msgid "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-init[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-init.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-init(1)"
msgstr "git-init(1)"
@@ -39004,8 +30346,7 @@ msgstr "git-init(1)"
#: en/git-init.txt:7
#, fuzzy
#| msgid "git-commit - Record changes to the repository"
-msgid ""
-"git-init - Create an empty Git repository or reinitialize an existing one"
+msgid "git-init - Create an empty Git repository or reinitialize an existing one"
msgstr "git-commit - Enregistrer les modifications dans le d챕p척t"
#. type: Plain text
@@ -39019,71 +30360,47 @@ msgstr ""
#. 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."
+msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files. An initial `HEAD` file that references the HEAD of the master branch is also created."
msgstr ""
#. type: Plain text
#: en/git-init.txt:27
-msgid ""
-"If the `$GIT_DIR` environment variable is set then it specifies a path to "
-"use instead of `./.git` for the base of the repository."
+msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
msgstr ""
#. 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 - "
-"otherwise the default `$GIT_DIR/objects` directory is used."
+msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Plain text
#: en/git-init.txt:37
-msgid ""
-"Running 'git init' in an existing repository is safe. It will not overwrite "
-"things that are already there. The primary reason for rerunning 'git init' "
-"is to pick up newly added templates (or to move the repository to another "
-"place if --separate-git-dir is given)."
+msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
msgstr ""
#. type: Plain text
#: en/git-init.txt:47
-msgid ""
-"Only print error and warning messages; all other output will be suppressed."
+msgid "Only print error and warning messages; all other output will be suppressed."
msgstr ""
#. type: Plain text
#: en/git-init.txt:52
-msgid ""
-"Create a bare repository. If `GIT_DIR` environment is not set, it is set to "
-"the current working directory."
+msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
msgstr ""
#. type: Plain text
#: en/git-init.txt:57
-msgid ""
-"Specify the directory from which templates will be used. (See the "
-"\"TEMPLATE DIRECTORY\" section below.)"
+msgid "Specify the directory from which templates will be used. (See the \"TEMPLATE DIRECTORY\" section below.)"
msgstr ""
#. type: Plain text
#: en/git-init.txt:64
-msgid ""
-"Instead of initializing the repository as a directory to either `$GIT_DIR` "
-"or `./.git/`, create a text file there containing the path to the actual "
-"repository. This file acts as filesystem-agnostic Git symbolic link to the "
-"repository."
+msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository. This file acts as filesystem-agnostic Git symbolic link to the repository."
msgstr ""
#. type: Plain text
#: en/git-init.txt:66
-msgid ""
-"If this is reinitialization, the repository will be moved to the specified "
-"path."
+msgid "If this is reinitialization, the repository will be moved to the specified path."
msgstr ""
#. type: Labeled list
@@ -39094,20 +30411,12 @@ 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 "
-"permissions. When not specified, Git will use permissions reported by "
-"umask(2)."
+msgid "Specify that the Git repository is to be shared amongst several users. This allows users belonging to the same group to push into that repository. When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions. When not specified, Git will use permissions reported by umask(2)."
msgstr ""
#. type: Plain text
#: en/git-init.txt:78
-msgid ""
-"The option can have the following values, defaulting to 'group' if no value "
-"is given:"
+msgid "The option can have the following values, defaulting to 'group' if no value is given:"
msgstr ""
#. type: Labeled list
@@ -39118,9 +30427,7 @@ msgstr ""
#. type: Plain text
#: en/git-init.txt:84
-msgid ""
-"Use permissions reported by umask(2). The default, when `--shared` is not "
-"specified."
+msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
msgstr ""
#. type: Labeled list
@@ -39131,13 +30438,7 @@ msgstr ""
#. type: Plain text
#: en/git-init.txt:93
-msgid ""
-"Make the repository group-writable, (and g+sx, since the git group may be "
-"not the primary group of all users). This is used to loosen the permissions "
-"of an otherwise safe umask(2) value. Note that the umask still applies to "
-"the other permission bits (e.g. if umask is '0022', using 'group' will not "
-"remove read privileges from other (non-group) users). See '0xxx' for how to "
-"exactly specify the repository permissions."
+msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
msgstr ""
#. type: Labeled list
@@ -39159,28 +30460,17 @@ msgstr ""
#. type: Plain text
#: en/git-init.txt:105
-msgid ""
-"'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will "
-"override users' umask(2) value (and not only loosen permissions as 'group' "
-"and 'all' does). '0640' will create a repository which is group-readable, "
-"but not group-writable or accessible to others. '0660' will create a repo "
-"that is readable and writable to the current user and group, but "
-"inaccessible to others."
+msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
msgstr ""
#. type: Plain text
#: en/git-init.txt:110
-msgid ""
-"By default, the configuration flag `receive.denyNonFastForwards` is enabled "
-"in shared repositories, so that you cannot force a non fast-forwarding push "
-"into it."
+msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
msgstr ""
#. type: Plain text
#: en/git-init.txt:113
-msgid ""
-"If you provide a 'directory', the command is run inside it. If this "
-"directory does not exist, it will be created."
+msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
msgstr ""
#. type: Title -
@@ -39191,9 +30481,7 @@ 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."
+msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
msgstr ""
#. type: Plain text
@@ -39223,16 +30511,12 @@ msgstr ""
#. type: Plain text
#: en/git-init.txt:134
-msgid ""
-"The default template directory includes some directory structure, suggested "
-"\"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
+msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
msgstr ""
#. type: Plain text
#: en/git-init.txt:137
-msgid ""
-"The sample hooks are all disabled by default, To enable one of the sample "
-"hooks rename it by removing its `.sample` suffix."
+msgid "The sample hooks are all disabled by default, To enable one of the sample hooks rename it by removing its `.sample` suffix."
msgstr ""
#. type: Plain text
@@ -39275,7 +30559,7 @@ msgstr ""
#. type: Title =
#: en/git-instaweb.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-instaweb(1)"
msgstr "git-instaweb(1)"
@@ -39295,9 +30579,7 @@ msgstr ""
#. type: Plain text
#: en/git-instaweb.txt:19
-msgid ""
-"A simple script to set up `gitweb` and a web server for browsing the local "
-"repository."
+msgid "A simple script to set up `gitweb` and a web server for browsing the local repository."
msgstr ""
#. type: Plain text
@@ -39307,35 +30589,29 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:28
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--httpd"
msgstr "--httpd"
#. type: Plain text
#: en/git-instaweb.txt:34
-msgid ""
-"The HTTP daemon command-line that will be executed. Command-line options "
-"may be specified here, and the configuration file will be added at the end "
-"of the command-line. Currently apache2, lighttpd, mongoose, plackup and "
-"webrick are supported. (Default: lighttpd)"
+msgid "The HTTP daemon command-line that will be executed. Command-line options may be specified here, and the configuration file will be added at the end of the command-line. Currently apache2, lighttpd, mongoose, plackup and webrick are supported. (Default: lighttpd)"
msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:36
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--module-path"
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)"
+msgid "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, ignore-translated
+#, no-wrap
msgid "--port"
msgstr "--port"
@@ -39346,17 +30622,13 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:45
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--browser"
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 "
-"about this. If the script fails, the URL will be printed to stdout."
+msgid "The web browser that should be used to view the gitweb page. This will be passed to the 'git web{litdd}browse' helper script along with the URL of the gitweb instance. See linkgit:git-web{litdd}browse[1] for more information about this. If the script fails, the URL will be printed to stdout."
msgstr ""
#. type: Labeled list
@@ -39367,15 +30639,13 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:53
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--start"
msgstr "--start"
#. type: Plain text
#: en/git-instaweb.txt:56
-msgid ""
-"Start the httpd instance and exit. Regenerate configuration files as "
-"necessary for spawning a new instance."
+msgid "Start the httpd instance and exit. Regenerate configuration files as necessary for spawning a new instance."
msgstr ""
#. type: Labeled list
@@ -39386,16 +30656,13 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:58
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--stop"
msgstr "--stop"
#. type: Plain text
#: en/git-instaweb.txt:62
-msgid ""
-"Stop the httpd instance and exit. This does not generate any of the "
-"configuration files for spawning a new instance, nor does it close the "
-"browser."
+msgid "Stop the httpd instance and exit. This does not generate any of the configuration files for spawning a new instance, nor does it close the browser."
msgstr ""
#. type: Labeled list
@@ -39406,15 +30673,13 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:64
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--restart"
msgstr "--restart"
#. type: Plain text
#: en/git-instaweb.txt:67
-msgid ""
-"Restart the httpd instance and exit. Regenerate configuration files as "
-"necessary for spawning a new instance."
+msgid "Restart the httpd instance and exit. Regenerate configuration files as necessary for spawning a new instance."
msgstr ""
#. type: Plain text
@@ -39436,15 +30701,12 @@ msgstr ""
#. type: Plain text
#: en/git-instaweb.txt:86
-msgid ""
-"If the configuration variable `instaweb.browser` is not set, `web.browser` "
-"will be used instead if it is defined. See linkgit:git-web{litdd}browse[1] "
-"for more information about this."
+msgid "If the configuration variable `instaweb.browser` is not set, `web.browser` will be used instead if it is defined. See linkgit:git-web{litdd}browse[1] for more information about this."
msgstr ""
#. type: Title =
#: en/git-interpret-trailers.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-interpret-trailers(1)"
msgstr "git-interpret-trailers(1)"
@@ -39452,54 +30714,33 @@ msgstr "git-interpret-trailers(1)"
#: 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"
+msgid "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
#: en/git-interpret-trailers.txt:18
-msgid ""
-"Help adding 'trailers' lines, that look similar to RFC 822 e-mail headers, "
-"at the end of the otherwise free-form part of a commit message."
+msgid "Help adding 'trailers' lines, that look similar to RFC 822 e-mail headers, at the end of the otherwise free-form part of a commit message."
msgstr ""
#. type: Plain text
#: 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 "
-"commit message part of each input file. The result is emitted on the "
-"standard output."
+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 commit message part of each input file. The result is emitted on the standard output."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:29
-msgid ""
-"Some configuration variables control the way the `--trailer` arguments are "
-"applied to each commit message and the way any existing trailer in the "
-"commit message is changed. They also make it possible to automatically add "
-"some trailers."
+msgid "Some configuration variables control the way the `--trailer` arguments are applied to each commit message and the way any existing trailer in the commit message is changed. They also make it possible to automatically add some trailers."
msgstr ""
#. 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 "
-"trailer has a different (<token>, <value>) pair (or if there is no existing "
-"trailer). The <token> and <value> parts will be trimmed to remove starting "
-"and trailing whitespace, and the resulting trimmed <token> and <value> will "
-"appear in the message like this:"
+msgid "By default, a '<token>=<value>' or '<token>:<value>' argument given using `--trailer` will be appended after the existing trailers only if the last trailer has a different (<token>, <value>) pair (or if there is no existing trailer). The <token> and <value> parts will be trimmed to remove starting and trailing whitespace, and the resulting trimmed <token> and <value> will appear in the message like this:"
msgstr ""
#. type: delimited block -
@@ -39510,53 +30751,32 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:43
-msgid ""
-"This means that the trimmed <token> and <value> will be separated by `': '` "
-"(one colon followed by one space)."
+msgid "This means that the trimmed <token> and <value> will be separated by `': '` (one colon followed by one space)."
msgstr ""
#. type: Plain text
#: 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 "
-"spaces at the end of the commit message part, one blank line will be added "
-"before the new trailer."
+msgid "By default the new trailer will appear at the end of all the existing trailers. If there is no existing trailer, the new trailer will appear after the commit message part of the output, and, if there is no line with only spaces at the end of the commit message part, one blank line will be added before the new trailer."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:58
-msgid ""
-"Existing trailers are extracted from the input message by looking for a "
-"group of one or more lines that (i) are all trailers, or (ii) contains at "
-"least one Git-generated or user-configured trailer and consists of at least "
-"25% trailers. The group must be preceded by one or more empty (or "
-"whitespace-only) lines. The group must either be at the end of the message "
-"or be the last non-whitespace lines before a line that starts with '---'. "
-"Such three minus signs start the patch part of the message."
+msgid "Existing trailers are extracted from the input message by looking for a group of one or more lines that (i) are all trailers, or (ii) contains at least one Git-generated or user-configured trailer and consists of at least 25% trailers. The group must be preceded by one or more empty (or whitespace-only) lines. The group must either be at the end of the message or be the last non-whitespace lines before a line that starts with '---'. Such three minus signs start the patch part of the message."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:63
-msgid ""
-"When reading trailers, there can be whitespaces after the token, the "
-"separator and the value. There can also be whitespaces inside the token and "
-"the value. The value may be split over multiple lines with each subsequent "
-"line starting with whitespace, like the \"folding\" in RFC 822."
+msgid "When reading trailers, there can be whitespaces after the token, the separator and the value. There can also be whitespaces inside the token and the value. The value may be split over multiple lines with each subsequent line starting with whitespace, like the \"folding\" in RFC 822."
msgstr ""
#. 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 "
-"probably many other rules."
+msgid "Note that 'trailers' do not follow and are not intended to follow many rules for RFC 822 headers. For example they do not follow the encoding rules and probably many other rules."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:70
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--in-place"
msgstr "--in-place"
@@ -39567,16 +30787,13 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:73
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--trim-empty"
msgstr "--trim-empty"
#. type: Plain text
#: en/git-interpret-trailers.txt:77
-msgid ""
-"If the <value> part of any trailer contains only whitespace, the whole "
-"trailer will be removed from the resulting message. This applies to "
-"existing trailers as well as new trailers."
+msgid "If the <value> part of any trailer contains only whitespace, the whole trailer will be removed from the resulting message. This applies to existing trailers as well as new trailers."
msgstr ""
#. type: Labeled list
@@ -39587,9 +30804,7 @@ 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."
+msgid "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
@@ -39600,29 +30815,17 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:91
-msgid ""
-"This option tells which characters are recognized as trailer separators. By "
-"default only ':' is recognized as a trailer separator, except that '=' is "
-"always accepted on the command line for compatibility with other git "
-"commands."
+msgid "This option tells which characters are recognized as trailer separators. By default only ':' is recognized as a trailer separator, except that '=' is always accepted on the command line for compatibility with other git commands."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:95
-msgid ""
-"The first character given by this option will be the default character used "
-"when another separator is not specified in the config for this trailer."
+msgid "The first character given by this option will be the default character used when another separator is not specified in the config for this trailer."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:102
-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)."
+msgid "For example, if the value for this option is \"%=$\", then only lines using the format '<token><sep><value>' with <sep> containing '%', '=' or '$' and then spaces will be considered trailers. And '%' will be the default separator used, so by default trailers will appear like: '<token>% <value>' (one percent sign and one space will appear between the token and the value)."
msgstr ""
#. type: Labeled list
@@ -39643,30 +30846,22 @@ 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."
+msgid "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."
+msgid "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
#: en/git-interpret-trailers.txt:116
-msgid ""
-"If it is `after`, then each new trailer will appear just after the last "
-"trailer with the same <token>."
+msgid "If it is `after`, then each new trailer will appear just after the last trailer with the same <token>."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:119
-msgid ""
-"If it is `before`, then each new trailer will appear just before the first "
-"trailer with the same <token>."
+msgid "If it is `before`, then each new trailer will appear just before the first trailer with the same <token>."
msgstr ""
#. type: Labeled list
@@ -39677,53 +30872,37 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:124
-msgid ""
-"This option makes it possible to choose what action will be performed when "
-"there is already at least one trailer with the same <token> in the message."
+msgid "This option makes it possible to choose what action will be performed when there is already at least one trailer with the same <token> in the message."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:127
-msgid ""
-"The valid values for this option are: `addIfDifferentNeighbor` (this is the "
-"default), `addIfDifferent`, `add`, `overwrite` or `doNothing`."
+msgid "The valid values for this option are: `addIfDifferentNeighbor` (this is the default), `addIfDifferent`, `add`, `overwrite` or `doNothing`."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:131
-msgid ""
-"With `addIfDifferentNeighbor`, a new trailer will be added only if no "
-"trailer with the same (<token>, <value>) pair is above or below the line "
-"where the new trailer will be added."
+msgid "With `addIfDifferentNeighbor`, a new trailer will be added only if no trailer with the same (<token>, <value>) pair is above or below the line where the new trailer will be added."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:134
-msgid ""
-"With `addIfDifferent`, a new trailer will be added only if no trailer with "
-"the same (<token>, <value>) pair is already in the message."
+msgid "With `addIfDifferent`, a new trailer will be added only if no trailer with the same (<token>, <value>) pair is already in the message."
msgstr ""
#. 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."
+msgid "With `add`, a new trailer will be added, even if some trailers with the same (<token>, <value>) pair are already in the message."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:142
-msgid ""
-"With `replace`, an existing trailer with the same <token> will be deleted "
-"and the new trailer will be added. The deleted trailer will be the closest "
-"one (with the same <token>) to the place where the new one will be added."
+msgid "With `replace`, an existing trailer with the same <token> will be deleted and the new trailer will be added. The deleted trailer will be the closest one (with the same <token>) to the place where the new one will be added."
msgstr ""
#. 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."
+msgid "With `doNothing`, nothing will be done; that is no new trailer will be added if there is already one with the same <token> in the message."
msgstr ""
#. type: Labeled list
@@ -39734,16 +30913,12 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:150
-msgid ""
-"This option makes it possible to choose what action will be performed when "
-"there is not yet any trailer with the same <token> in the message."
+msgid "This option makes it possible to choose what action will be performed when there is not yet any trailer with the same <token> in the message."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:153
-msgid ""
-"The valid values for this option are: `add` (this is the default) and "
-"`doNothing`."
+msgid "The valid values for this option are: `add` (this is the default) and `doNothing`."
msgstr ""
#. type: Plain text
@@ -39764,18 +30939,12 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:164
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:167
-msgid ""
-"If there is a separator, then the key will be used instead of both the "
-"<token> and the default separator when adding the trailer."
+msgid "If there is a separator, then the key will be used instead of both the <token> and the default separator when adding the trailer."
msgstr ""
#. type: Labeled list
@@ -39786,10 +30955,7 @@ msgstr ""
#. type: Plain text
#: 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>."
+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>."
msgstr ""
#. type: Labeled list
@@ -39800,10 +30966,7 @@ msgstr ""
#. type: Plain text
#: 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>."
+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>."
msgstr ""
#. type: Labeled list
@@ -39814,10 +30977,7 @@ msgstr ""
#. type: Plain text
#: 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>."
+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>."
msgstr ""
#. type: Labeled list
@@ -39828,42 +30988,27 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:187
-msgid ""
-"This option can be used to specify a shell command that will be called to "
-"automatically add or modify a trailer with the specified <token>."
+msgid "This option can be used to specify a shell command that will be called to automatically add or modify a trailer with the specified <token>."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:193
-msgid ""
-"When this option is specified, the behavior is as if a special "
-"'<token>=<value>' argument were added at the beginning of the command line, "
-"where <value> is taken to be the standard output of the specified command "
-"with any leading and trailing whitespace trimmed off."
+msgid "When this option is specified, the behavior is as if a special '<token>=<value>' argument were added at the beginning of the command line, where <value> is taken to be the standard output of the specified command with any leading and trailing whitespace trimmed off."
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, "
-"before the command is launched."
+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, before the command is launched."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:203
-msgid ""
-"If some '<token>=<value>' arguments are also passed on the command line, "
-"when a 'trailer.<token>.command' is configured, the command will also be "
-"executed for each of these arguments. And the <value> part of these "
-"arguments, if any, will be used to replace the `$ARG` string in the command."
+msgid "If some '<token>=<value>' arguments are also passed on the command line, when a 'trailer.<token>.command' is configured, the command will also be executed for each of these arguments. And the <value> part of these arguments, if any, will be used to replace the `$ARG` string in the command."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:209
-msgid ""
-"Configure a 'sign' trailer with a 'Signed-off-by' key, and then add two of "
-"these trailers to a message:"
+msgid "Configure a 'sign' trailer with a 'Signed-off-by' key, and then add two of these trailers to a message:"
msgstr ""
#. type: delimited block -
@@ -39932,9 +31077,7 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:246
-msgid ""
-"Extract the last commit as a patch, and add a 'Cc' and a 'Reviewed-by' "
-"trailer to it:"
+msgid "Extract the last commit as a patch, and add a 'Cc' and a 'Reviewed-by' trailer to it:"
msgstr ""
#. type: delimited block -
@@ -39948,10 +31091,7 @@ 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: ' "
-"already, and show how it works:"
+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: ' already, and show how it works:"
msgstr ""
#. type: delimited block -
@@ -39984,9 +31124,7 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:275
-msgid ""
-"Configure a 'fix' trailer with a key that contains a '#' and no space after "
-"this character, and show how it works:"
+msgid "Configure a 'fix' trailer with a key that contains a '#' and no space after this character, and show how it works:"
msgstr ""
#. type: delimited block -
@@ -40007,9 +31145,7 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:287
-msgid ""
-"Configure a 'see' trailer with a command to show the subject of a commit "
-"that is related, and show how it works:"
+msgid "Configure a 'see' trailer with a command to show the subject of a commit that is related, and show how it works:"
msgstr ""
#. type: delimited block -
@@ -40038,11 +31174,7 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:312
-msgid ""
-"Configure a commit template with some trailers with empty values (using sed "
-"to show and keep the trailing spaces at the end of the trailers), then "
-"configure a commit-msg hook that uses 'git interpret-trailers' to remove "
-"trailers with empty values and to add a 'git-version' trailer:"
+msgid "Configure a commit template with some trailers with empty values (using sed to show and keep the trailing spaces at the end of the trailers), then configure a commit-msg hook that uses 'git interpret-trailers' to remove trailers with empty values and to add a 'git-version' trailer:"
msgstr ""
#. type: delimited block -
@@ -40071,18 +31203,13 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:336
#, fuzzy
-#| msgid ""
-#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-#| "merge[1], linkgit:git-commit-tree[1]"
-msgid ""
-"linkgit:git-commit[1], linkgit:git-format-patch[1], linkgit:git-config[1]"
-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-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
+msgid "linkgit:git-commit[1], linkgit:git-format-patch[1], linkgit:git-config[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-log.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-log(1)"
msgstr "git-log(1)"
@@ -40104,28 +31231,23 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:22
-msgid ""
-"The command takes options applicable to the `git rev-list` command to "
-"control what is shown and how, and options applicable to the `git diff-*` "
-"commands to control how the changes each commit introduces are shown."
+msgid "The command takes options applicable to the `git rev-list` command to control what is shown and how, and options applicable to the `git diff-*` commands to control how the changes each commit introduces are shown."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:27
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--follow"
msgstr "--follow"
#. type: Plain text
#: en/git-log.txt:30
-msgid ""
-"Continue listing the history of a file beyond renames (works only for a "
-"single file)."
+msgid "Continue listing the history of a file beyond renames (works only for a single file)."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:31
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-decorate"
msgstr "--no-decorate"
@@ -40137,77 +31259,56 @@ msgstr ""
#. type: Plain text
#: 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 "
-"given, otherwise no ref names are shown. The default option is 'short'."
+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 given, otherwise no ref names are shown. The default option is 'short'."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:41
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--source"
msgstr "--source"
#. type: Plain text
#: en/git-log.txt:44
-msgid ""
-"Print out the ref name given on the command line by which each commit was "
-"reached."
+msgid "Print out the ref name given on the command line by which each commit was reached."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:45
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--use-mailmap"
msgstr "--use-mailmap"
#. type: Plain text
#: en/git-log.txt:49
-msgid ""
-"Use mailmap file to map author and committer names and email addresses to "
-"canonical real names and email addresses. See linkgit:git-shortlog[1]."
+msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:50
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--full-diff"
msgstr "--full-diff"
#. type: Plain text
#: en/git-log.txt:56
-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 "
-"full diff is shown for commits that touch the specified paths; this means "
-"that \"<path>...\" 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 full diff is shown for commits that touch the specified paths; this means that \"<path>...\" limits only commits, and doesn't limit diff for those commits."
msgstr ""
#. type: Plain text
#: en/git-log.txt:59
-msgid ""
-"Note that this affects all diff-based output types, e.g. those produced by "
-"`--stat`, etc."
+msgid "Note that this affects all diff-based output types, e.g. those produced by `--stat`, etc."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:60
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--log-size"
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 "
-"allocate space in advance."
+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 allocate space in advance."
msgstr ""
#. type: Labeled list
@@ -40224,12 +31325,7 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:74
-msgid ""
-"Trace the evolution of the line range given by \"<start>,<end>\" (or the "
-"function name regex <funcname>) within the <file>. You may not give any "
-"pathspec limiters. This is currently limited to a walk starting from a "
-"single revision, i.e., you may only give zero or one positive revision "
-"arguments. You can specify this option more than once."
+msgid "Trace the evolution of the line range given by \"<start>,<end>\" (or the function name regex <funcname>) within the <file>. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments. You can specify this option more than once."
msgstr ""
#. type: Labeled list
@@ -40240,13 +31336,7 @@ 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 "
-"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]."
+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 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]."
msgstr ""
#. type: Labeled list
@@ -40258,17 +31348,12 @@ msgstr "patch"
#. type: Plain text
#: en/git-log.txt:91
-msgid ""
-"Show only commits that are enough to explain how the files that match the "
-"specified paths came to be. See 'History Simplification' below for details "
-"and other simplification modes."
+msgid "Show only commits that are enough to explain how the files that match the specified paths came to be. See 'History Simplification' below for details and other simplification modes."
msgstr ""
#. type: Plain text
#: en/git-log.txt:94
-msgid ""
-"Paths may need to be prefixed with ``\\-- '' to separate them from options "
-"or the revision range, when confusion arises."
+msgid "Paths may need to be prefixed with ``\\-- '' to separate them from options or the revision range, when confusion arises."
msgstr ""
#. type: Title -
@@ -40296,9 +31381,7 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:117
-msgid ""
-"Show all commits since version 'v2.6.12' that changed any file in the "
-"`include/scsi` or `drivers/scsi` subdirectories"
+msgid "Show all commits since version 'v2.6.12' that changed any file in the `include/scsi` or `drivers/scsi` subdirectories"
msgstr ""
#. type: Labeled list
@@ -40309,9 +31392,7 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:123
-msgid ""
-"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'"
msgstr ""
#. type: Labeled list
@@ -40322,9 +31403,7 @@ 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."
+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."
msgstr ""
#. type: Labeled list
@@ -40335,9 +31414,7 @@ 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."
+msgid "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
@@ -40348,9 +31425,7 @@ 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)."
+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)."
msgstr ""
#. type: Labeled list
@@ -40361,9 +31436,7 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:146
-msgid ""
-"Shows all commits that are in local master but not in any remote repository "
-"master branches."
+msgid "Shows all commits that are in local master but not in any remote repository master branches."
msgstr ""
#. type: Labeled list
@@ -40374,12 +31447,7 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:154
-msgid ""
-"Shows the history including change diffs, but only from the ``main branch'' "
-"perspective, skipping commits that come from merged branches, and showing "
-"full diffs of changes introduced by the merges. This makes sense only when "
-"following a strict policy of merging all topic branches when staying on a "
-"single integration branch."
+msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges. This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
msgstr ""
#. type: Labeled list
@@ -40390,8 +31458,7 @@ 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
@@ -40407,52 +31474,38 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:174
-msgid ""
-"See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for "
-"settings related to diff generation."
+msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
msgstr ""
#. type: Plain text
#: en/git-log.txt:178
-msgid ""
-"Default for the `--format` option. (See 'Pretty Formats' above.) Defaults "
-"to `medium`."
+msgid "Default for the `--format` option. (See 'Pretty Formats' above.) Defaults to `medium`."
msgstr ""
#. type: Plain text
#: en/git-log.txt:183
-msgid ""
-"Encoding to use when displaying logs. (See 'Discussion' above.) Defaults "
-"to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
+msgid "Encoding to use when displaying logs. (See 'Discussion' above.) Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
msgstr ""
#. type: Plain text
#: 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`."
+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`."
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 "
-"shown without a diff attached. The default is `true`."
+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 shown without a diff attached. The default is `true`."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:201
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "log.showSignature"
msgstr "log.showSignature"
#. type: Plain text
#: en/git-log.txt:204
-msgid ""
-"If `true`, `git log` and related commands will act as if the `--show-"
-"signature` option was passed to them."
+msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
msgstr ""
#. type: Labeled list
@@ -40468,31 +31521,22 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:213
-msgid ""
-"Which refs, in addition to the default set by `core.notesRef` or "
-"`GIT_NOTES_REF`, to read notes from when showing commit messages with the "
-"`log` family of commands. See linkgit:git-notes[1]."
+msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands. See linkgit:git-notes[1]."
msgstr ""
#. type: Plain text
#: 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."
+msgid "May be an unabbreviated ref name or a glob and may be specified multiple times. A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
msgstr ""
#. 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."
+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."
msgstr ""
#. type: Title =
#: en/git-ls-files.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-ls-files(1)"
msgstr "git-ls-files(1)"
@@ -40500,9 +31544,7 @@ msgstr "git-ls-files(1)"
#: 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"
+msgid "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
@@ -40524,15 +31566,12 @@ msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:29
-msgid ""
-"This merges the file listing in the directory cache index with the actual "
-"working directory list, and shows different combinations of the two."
+msgid "This merges the file listing in the directory cache index with the actual working directory list, and shows different combinations of the two."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:32
-msgid ""
-"One or more of the options below may be used to determine the files shown:"
+msgid "One or more of the options below may be used to determine the files shown:"
msgstr ""
#. type: Plain text
@@ -40542,7 +31581,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:40
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--deleted"
msgstr "--deleted"
@@ -40553,7 +31592,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:44
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--modified"
msgstr "--modified"
@@ -40564,7 +31603,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:48
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--others"
msgstr "--others"
@@ -40575,46 +31614,40 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:52 en/git-status.txt:97
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ignored"
msgstr "--ignored"
#. type: Plain text
#: en/git-ls-files.txt:57
-msgid ""
-"Show only ignored files in the output. When showing files in the index, "
-"print only those matched by an exclude pattern. When showing \"other\" "
-"files, show only those matched by an exclude pattern."
+msgid "Show only ignored files in the output. When showing files in the index, print only those matched by an exclude pattern. When showing \"other\" files, show only those matched by an exclude pattern."
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:59
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--stage"
msgstr "--stage"
#. type: Plain text
#: en/git-ls-files.txt:61
-msgid ""
-"Show staged contents' object name, mode bits and stage number in the output."
+msgid "Show staged contents' object name, mode bits and stage number in the output."
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:62
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--directory"
msgstr "--directory"
#. type: Plain text
#: en/git-ls-files.txt:65
-msgid ""
-"If a whole directory is classified as \"other\", show just its name (with a "
-"trailing slash) and not its whole contents."
+msgid "If a whole directory is classified as \"other\", show just its name (with a trailing slash) and not its whole contents."
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:66
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-empty-directory"
msgstr "--no-empty-directory"
@@ -40625,7 +31658,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:70 en/git-update-index.txt:65
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--unmerged"
msgstr "--unmerged"
@@ -40636,22 +31669,18 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:74
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--killed"
msgstr "--killed"
#. type: Plain text
#: en/git-ls-files.txt:78
-msgid ""
-"Show files on the filesystem that need to be removed due to file/directory "
-"conflicts for checkout-index to succeed."
+msgid "Show files on the filesystem that need to be removed due to file/directory conflicts for checkout-index to succeed."
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."
+msgid "\\0 line termination on output and do not quote filenames. See OUTPUT below for more information."
msgstr ""
#. type: Labeled list
@@ -40662,9 +31691,7 @@ msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:88
-msgid ""
-"Skip untracked files matching pattern. Note that pattern is a shell "
-"wildcard pattern. See EXCLUDE PATTERNS below for more information."
+msgid "Skip untracked files matching pattern. Note that pattern is a shell wildcard pattern. See EXCLUDE PATTERNS below for more information."
msgstr ""
#. type: Labeled list
@@ -40692,29 +31719,23 @@ msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:96
-msgid ""
-"Read additional exclude patterns that apply only to the directory and its "
-"subdirectories in <file>."
+msgid "Read additional exclude patterns that apply only to the directory and its subdirectories in <file>."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:100
-msgid ""
-"Add the standard Git exclusions: .git/info/exclude, .gitignore in each "
-"directory, and the user's global exclusion file."
+msgid "Add the standard Git exclusions: .git/info/exclude, .gitignore in each directory, and the user's global exclusion file."
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:101
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--error-unmatch"
msgstr "--error-unmatch"
#. type: Plain text
#: en/git-ls-files.txt:104
-msgid ""
-"If any <file> does not appear in the index, treat this as an error (return "
-"1)."
+msgid "If any <file> does not appear in the index, treat this as an error (return 1)."
msgstr ""
#. type: Labeled list
@@ -40725,28 +31746,17 @@ msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:111
-msgid ""
-"When using --error-unmatch to expand the user supplied <file> (i.e. path "
-"pattern) arguments to paths, pretend that paths which were removed in the "
-"index since the named <tree-ish> are still present. Using this option with "
-"`-s` or `-u` options does not make any sense."
+msgid "When using --error-unmatch to expand the user supplied <file> (i.e. path pattern) arguments to paths, pretend that paths which were removed in the index since the named <tree-ish> are still present. Using this option with `-s` or `-u` options does not make any sense."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:119
-msgid ""
-"This feature is semi-deprecated. For scripting purpose, linkgit:git-"
-"status[1] `--porcelain` and linkgit:git-diff-files[1] `--name-status` are "
-"almost always superior alternatives, and users should look at linkgit:git-"
-"status[1] `--short` or linkgit:git-diff[1] `--name-status` for more user-"
-"friendly alternatives."
+msgid "This feature is semi-deprecated. For scripting purpose, linkgit:git-status[1] `--porcelain` and linkgit:git-diff-files[1] `--name-status` are almost always superior alternatives, and users should look at linkgit:git-status[1] `--short` or linkgit:git-diff[1] `--name-status` for more user-friendly alternatives."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:122
-msgid ""
-"This option identifies the file status with the following tags (followed by "
-"a space) at the start of each line:"
+msgid "This option identifies the file status with the following tags (followed by a space) at the start of each line:"
msgstr ""
#. type: Labeled list
@@ -40833,71 +31843,48 @@ msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:135
-msgid ""
-"Similar to `-t`, but use lowercase letters for files that are marked as "
-"'assume unchanged' (see linkgit:git-update-index[1])."
+msgid "Similar to `-t`, but use lowercase letters for files that are marked as 'assume unchanged' (see linkgit:git-update-index[1])."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:145
-msgid ""
-"Recursively calls ls-files on each submodule in the repository. Currently "
-"there is only support for the --cached mode."
+msgid "Recursively calls ls-files on each submodule in the repository. Currently there is only support for the --cached mode."
msgstr ""
#. type: Plain text
#: 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>."
+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>."
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 "
-"inspection; the exact format may change at any time."
+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 inspection; the exact format may change at any time."
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:157
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--eol"
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 \"\"."
+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 \"\"."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:165
-msgid ""
-"\"\" means the file is not a regular file, it is not in the index or not "
-"accessible in the working tree."
+msgid "\"\" means the file is not a regular file, it is not in the index or not accessible in the working tree."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:169
-msgid ""
-"<eolattr> is the attribute that is used when checking out or committing, it "
-"is either \"\", \"-text\", \"text\", \"text=auto\", \"text eol=lf\", \"text "
-"eol=crlf\". Since Git 2.10 \"text=auto eol=lf\" and \"text=auto eol=crlf\" "
-"are supported."
+msgid "<eolattr> is the attribute that is used when checking out or committing, it is either \"\", \"-text\", \"text\", \"text=auto\", \"text eol=lf\", \"text eol=crlf\". Since Git 2.10 \"text=auto eol=lf\" and \"text=auto eol=crlf\" are supported."
msgstr ""
#. type: Plain text
#: 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>\")."
+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>\")."
msgstr ""
#. type: Labeled list
@@ -40908,9 +31895,7 @@ msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:180
-msgid ""
-"Files to show. If no files are given all files which match the other "
-"specified criteria are shown."
+msgid "Files to show. If no files are given all files which match the other specified criteria are shown."
msgstr ""
#. type: Title -
@@ -40921,9 +31906,7 @@ msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:185
-msgid ""
-"'git ls-files' just outputs the filenames unless `--stage` is specified in "
-"which case it outputs:"
+msgid "'git ls-files' just outputs the filenames unless `--stage` is specified in which case it outputs:"
msgstr ""
#. type: Plain text
@@ -40942,19 +31925,12 @@ msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:193
-msgid ""
-"'git ls-files --unmerged' and 'git ls-files --stage' can be used to examine "
-"detailed information on unmerged paths."
+msgid "'git ls-files --unmerged' and 'git ls-files --stage' can be used to examine detailed information on unmerged paths."
msgstr ""
#. type: Plain text
#: 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 "
-"porcelain) to see what should eventually be recorded at the path. (see "
-"linkgit:git-read-tree[1] for more information on state)"
+msgid "For an unmerged path, instead of recording a single mode/SHA-1 pair, the index records up to three such pairs; one from tree O in stage 1, A in stage 2, and B in stage 3. This information can be used by the user (or the porcelain) to see what should eventually be recorded at the path. (see linkgit:git-read-tree[1] for more information on state)"
msgstr ""
#. type: Title -
@@ -40965,11 +31941,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
@@ -40979,51 +31951,34 @@ msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:219
-msgid ""
-"The command-line flag --exclude=<pattern> specifies a single pattern. "
-"Patterns are ordered in the same order they appear in the command line."
+msgid "The command-line flag --exclude=<pattern> specifies a single pattern. Patterns are ordered in the same order they appear in the command line."
msgstr ""
#. type: Plain text
#: 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."
+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."
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`. "
-"Files in deeper directories take precedence. Patterns are ordered in the "
-"same order they appear in the files."
+msgid "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 ""
#. 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:239
#, fuzzy
-#| msgid ""
-#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-#| "merge[1], linkgit:git-commit-tree[1]"
+#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgid "linkgit:git-read-tree[1], linkgit:gitignore[5]"
-msgstr ""
-"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-"merge[1], linkgit:git-commit-tree[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-ls-remote.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-ls-remote(1)"
msgstr "git-ls-remote(1)"
@@ -41043,28 +31998,23 @@ msgstr ""
#. type: Plain text
#: en/git-ls-remote.txt:20
-msgid ""
-"Displays references available in a remote repository along with the "
-"associated commit IDs."
+msgid "Displays references available in a remote repository along with the associated commit IDs."
msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:25 en/git-show-ref.txt:41
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--heads"
msgstr "--heads"
#. type: Plain text
#: en/git-ls-remote.txt:32
-msgid ""
-"Limit to only 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."
+msgid "Limit to only 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."
msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:33
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--refs"
msgstr "--refs"
@@ -41087,63 +32037,44 @@ msgstr "git-add(1)"
#. type: Plain text
#: en/git-ls-remote.txt:45
-msgid ""
-"Specify the full path of 'git-upload-pack' on the remote host. This allows "
-"listing references from repositories accessed via SSH and where the SSH "
-"daemon does not use the PATH configured by the user."
+msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
msgstr ""
#. type: Plain text
#: en/git-ls-remote.txt:51
-msgid ""
-"Exit with status \"2\" when no matching refs are found in the remote "
-"repository. Usually the command exits with status \"0\" to indicate it "
-"successfully talked with the remote repository, whether it found any "
-"matching refs."
+msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:52
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--get-url"
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."
+msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:57
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--symref"
msgstr "--symref"
#. type: Plain text
#: en/git-ls-remote.txt:62
-msgid ""
-"In addition to the object pointed by it, show the underlying ref pointed by "
-"it when showing a symbolic ref. Currently, upload-pack only shows the "
-"symref HEAD, so it will be the only one shown by ls-remote."
+msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
msgstr ""
#. type: Plain text
#: en/git-ls-remote.txt:67
-msgid ""
-"The \"remote\" repository to query. This parameter can be either a URL or "
-"the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-"
-"fetch[1])."
+msgid "The \"remote\" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
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."
+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."
msgstr ""
#. type: Plain text
@@ -41169,7 +32100,7 @@ msgstr ""
#. type: Title =
#: en/git-ls-tree.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-ls-tree(1)"
msgstr "git-ls-tree(1)"
@@ -41189,31 +32120,17 @@ msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:20
-msgid ""
-"Lists the contents of a given tree object, like what \"/bin/ls -a\" does in "
-"the current working directory. Note that:"
+msgid "Lists the contents of a given tree object, like what \"/bin/ls -a\" does in the current working directory. Note that:"
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:25
-msgid ""
-"the behaviour is slightly different from that of \"/bin/ls\" in that the "
-"'<path>' denotes just a list of patterns to match, e.g. so specifying "
-"directory name (without `-r`) will behave differently, and order of the "
-"arguments does not matter."
+msgid "the behaviour is slightly different from that of \"/bin/ls\" in that the '<path>' denotes just a list of patterns to match, e.g. so specifying directory name (without `-r`) will behave differently, and order of the arguments does not matter."
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:35
-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."
+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."
msgstr ""
#. type: Plain text
@@ -41233,9 +32150,7 @@ 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`."
+msgid "Show tree entries even when going to recurse them. Has no effect if `-r` was not passed. `-d` implies `-t`."
msgstr ""
#. type: Plain text
@@ -41245,9 +32160,7 @@ msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:58
-msgid ""
-"\\0 line termination on output and do not quote filenames. See OUTPUT "
-"FORMAT below for more information."
+msgid "\\0 line termination on output and do not quote filenames. See OUTPUT FORMAT below for more information."
msgstr ""
#. type: Plain text
@@ -41257,16 +32170,12 @@ 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."
+msgid "Instead of showing the path names relative to the current working directory, show the full path names."
msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:75
-msgid ""
-"Do not limit the listing to the current working directory. Implies --full-"
-"name."
+msgid "Do not limit the listing to the current working directory. Implies --full-name."
msgstr ""
#. type: Labeled list
@@ -41278,10 +32187,7 @@ msgstr "patch"
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Title -
@@ -41298,9 +32204,7 @@ msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:88
-msgid ""
-"This output format is compatible with what `--index-info --stdin` of 'git "
-"update-index' expects."
+msgid "This output format is compatible with what `--index-info --stdin` of 'git update-index' expects."
msgstr ""
#. type: Plain text
@@ -41316,49 +32220,34 @@ msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:96
-msgid ""
-"Object size identified by <object> is given in bytes, and right-justified "
-"with minimum width of 7 characters. Object size is given only for blobs "
-"(file) entries; for other entries `-` character is used in place of size."
+msgid "Object size identified by <object> is given in bytes, and right-justified with minimum width of 7 characters. Object size is given only for blobs (file) entries; for other entries `-` character is used in place of size."
msgstr ""
#. type: Title =
#: en/git-mailinfo.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-mailinfo(1)"
msgstr "git-mailinfo(1)"
#. type: Plain text
#: en/git-mailinfo.txt:7
-msgid ""
-"git-mailinfo - Extracts patch and authorship from a single e-mail message"
+msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
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 "
-"this command directly. See linkgit:git-am[1] instead."
+msgid "Reads a single e-mail message from the standard input, and writes the commit log message in <msg> file, and the patches in <patch> file. The author name, e-mail and e-mail subject are written out to the standard output to be used by 'git am' to create a commit. It is usually not necessary to use this command directly. See linkgit:git-am[1] instead."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:32
-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."
+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."
msgstr ""
#. type: Plain text
@@ -41388,40 +32277,27 @@ msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:46
-msgid ""
-"Finally, runs of whitespace are normalized to a single ASCII space "
-"character."
+msgid "Finally, runs of whitespace are normalized to a single ASCII space character."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:51
-msgid ""
-"When -k is not in effect, all leading strings bracketed with '[' and ']' "
-"pairs are stripped. This option limits the stripping to only the pairs "
-"whose bracketed string contains the word \"PATCH\"."
+msgid "When -k is not in effect, all leading strings bracketed with '[' and ']' pairs are stripped. This option limits the stripping to only the pairs whose bracketed string contains the word \"PATCH\"."
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 "
-"transliterating them. This used to be optional but now it is the default."
+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 transliterating them. This used to be optional but now it is the default."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:61
-msgid ""
-"Note that the patch is always used as-is without charset conversion, even "
-"with this flag."
+msgid "Note that the patch is always used as-is without charset conversion, even with this flag."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:65
-msgid ""
-"Similar to -u. But when re-coding, the charset specified here is used "
-"instead of the one specified by i18n.commitencoding or UTF-8."
+msgid "Similar to -u. But when re-coding, the charset specified here is used instead of the one specified by i18n.commitencoding or UTF-8."
msgstr ""
#. type: Plain text
@@ -41431,42 +32307,27 @@ 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:82
-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."
+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."
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 "
-"conclude it with a patch submission, separating the discussion and the "
-"beginning of the proposed commit log message with a scissors line."
+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 conclude it with a patch submission, separating the discussion and the beginning of the proposed commit log message with a scissors line."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:89
-msgid ""
-"This can be enabled by default with the configuration option "
-"mailinfo.scissors."
+msgid "This can be enabled by default with the configuration option mailinfo.scissors."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:92
-msgid ""
-"Ignore scissors lines. Useful for overriding mailinfo.scissors settings."
+msgid "Ignore scissors lines. Useful for overriding mailinfo.scissors settings."
msgstr ""
#. type: Labeled list
@@ -41477,9 +32338,7 @@ msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:96
-msgid ""
-"The commit log message extracted from e-mail, usually except the title line "
-"which comes from e-mail Subject."
+msgid "The commit log message extracted from e-mail, usually except the title line which comes from e-mail Subject."
msgstr ""
#. type: Labeled list
@@ -41496,7 +32355,7 @@ msgstr ""
#. type: Title =
#: en/git-mailsplit.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-mailsplit(1)"
msgstr "git-mailsplit(1)"
@@ -41515,16 +32374,12 @@ msgstr ""
#. type: Plain text
#: en/git-mailsplit.txt:18
-msgid ""
-"Splits a mbox file or a Maildir into a list of files: \"0001\" \"0002\" .. "
-"in the specified directory so you can process them further from there."
+msgid "Splits a mbox file or a Maildir into a list of files: \"0001\" \"0002\" .. in the specified directory so you can process them further from there."
msgstr ""
#. type: Plain text
#: en/git-mailsplit.txt:21
-msgid ""
-"Maildir splitting relies upon filenames being sorted to output patches in "
-"the correct order."
+msgid "Maildir splitting relies upon filenames being sorted to output patches in the correct order."
msgstr ""
#. type: Labeled list
@@ -41541,8 +32396,7 @@ msgstr ""
#| "--file=<file>::\n"
#| "\tTake the commit message from the given file. Use '-' to\n"
#| "\tread the message from the standard input.\n"
-msgid ""
-"Mbox file to split. If not given, the mbox is read from the standard input."
+msgid "Mbox file to split. If not given, the mbox is read from the standard input."
msgstr ""
"-F <fichier>::\n"
"--file=<fichier>::\n"
@@ -41557,9 +32411,7 @@ 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."
+msgid "Root of the Maildir to split. This directory should contain the cur, tmp and new subdirectories."
msgstr ""
#. type: Labeled list
@@ -41575,9 +32427,7 @@ msgstr ""
#. type: Plain text
#: en/git-mailsplit.txt:38
-msgid ""
-"If any file doesn't begin with a From line, assume it is a single mail "
-"message instead of signaling error."
+msgid "If any file doesn't begin with a From line, assume it is a single mail message instead of signaling error."
msgstr ""
#. type: Labeled list
@@ -41588,9 +32438,7 @@ msgstr ""
#. type: Plain text
#: en/git-mailsplit.txt:43
-msgid ""
-"Instead of the default 4 digits with leading zeros, different precision can "
-"be specified for the generated filenames."
+msgid "Instead of the default 4 digits with leading zeros, different precision can be specified for the generated filenames."
msgstr ""
#. type: Labeled list
@@ -41601,14 +32449,12 @@ msgstr ""
#. type: Plain text
#: en/git-mailsplit.txt:47
-msgid ""
-"Skip the first <nn> numbers, for example if -f3 is specified, start the "
-"numbering with 0004."
+msgid "Skip the first <nn> numbers, for example if -f3 is specified, start the numbering with 0004."
msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:48
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--keep-cr"
msgstr "--keep-cr"
@@ -41619,7 +32465,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:51
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--mboxrd"
msgstr "--mboxrd"
@@ -41630,7 +32476,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-base.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-merge-base(1)"
msgstr "git-merge-base(1)"
@@ -41652,13 +32498,7 @@ 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."
+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."
msgstr ""
#. type: Title -
@@ -41670,87 +32510,61 @@ msgstr "OPTIONS"
#. type: Plain text
#: en/git-merge-base.txt:33
-msgid ""
-"As the most common special case, specifying only two commits on the command "
-"line means computing the merge base between the given two commits."
+msgid "As the most common special case, specifying only two commits on the command line means computing the merge base between the given two commits."
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."
+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."
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:42
-msgid ""
-"As a consequence, the 'merge base' is not necessarily contained in each of "
-"the commit arguments if more than two commits are specified. This is "
-"different from linkgit:git-show-branch[1] when used with the `--merge-base` "
-"option."
+msgid "As a consequence, the 'merge base' is not necessarily contained in each of the commit arguments if more than two commits are specified. This is different from linkgit:git-show-branch[1] when used with the `--merge-base` option."
msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:43
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--octopus"
msgstr "--octopus"
#. type: Plain text
#: en/git-merge-base.txt:47
-msgid ""
-"Compute the best common ancestors of all supplied commits, in preparation "
-"for an n-way merge. This mimics the behavior of 'git show-branch --merge-"
-"base'."
+msgid "Compute the best common ancestors of all supplied commits, in preparation for an n-way merge. This mimics the behavior of 'git show-branch --merge-base'."
msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:48 en/git-show-branch.txt:90
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--independent"
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'."
+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'."
msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:55
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--is-ancestor"
msgstr "--is-ancestor"
#. type: Plain text
#: en/git-merge-base.txt:59
-msgid ""
-"Check if the first <commit> is an ancestor of the second <commit>, and exit "
-"with status 0 if true, or with status 1 if not. Errors are signaled by a "
-"non-zero status that is not 1."
+msgid "Check if the first <commit> is an ancestor of the second <commit>, and exit with status 0 if true, or with status 1 if not. Errors are signaled by a non-zero status that is not 1."
msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:60 en/git-rebase.txt:346
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--fork-point"
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)."
+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)."
msgstr ""
#. type: Plain text
@@ -41760,9 +32574,7 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:80
-msgid ""
-"Given two commits 'A' and 'B', `git merge-base A B` will output a commit "
-"which is reachable from both 'A' and 'B' through the parent relationship."
+msgid "Given two commits 'A' and 'B', `git merge-base A B` will output a commit which is reachable from both 'A' and 'B' through the parent relationship."
msgstr ""
#. type: Plain text
@@ -41786,10 +32598,7 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:92
-msgid ""
-"Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute "
-"the merge base between 'A' and a hypothetical commit 'M', which is a merge "
-"between 'B' and 'C'. For example, with this topology:"
+msgid "Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology:"
msgstr ""
#. type: Plain text
@@ -41805,9 +32614,7 @@ 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:"
+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:"
msgstr ""
#. type: Plain text
@@ -41823,24 +32630,17 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:112
-msgid ""
-"and the result of `git merge-base A M` is '1'. Commit '2' is also a common "
-"ancestor between 'A' and 'M', but '1' is a better common ancestor, because "
-"'2' is an ancestor of '1'. Hence, '2' is not a merge base."
+msgid "and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'. Hence, '2' is not a merge base."
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:115
-msgid ""
-"The result of `git merge-base --octopus A B C` is '2', because '2' is the "
-"best common ancestor of all commits."
+msgid "The result of `git merge-base --octopus A B C` is '2', because '2' is the best common ancestor of all commits."
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:118
-msgid ""
-"When the history involves criss-cross merges, there can be more than one "
-"'best' common ancestor for two commits. For example, with this topology:"
+msgid "When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology:"
msgstr ""
#. type: Plain text
@@ -41856,19 +32656,12 @@ 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."
+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."
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 "
-"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."
+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 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 ""
#. type: Plain text
@@ -41910,10 +32703,7 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:156
-msgid ""
-"After working on the `topic` branch created with `git checkout -b topic "
-"origin/master`, the history of remote-tracking branch `origin/master` may "
-"have been rewound and rebuilt, leading to a history of this shape:"
+msgid "After working on the `topic` branch created with `git checkout -b topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape:"
msgstr ""
#. type: Plain text
@@ -41931,12 +32721,7 @@ msgstr ""
#. type: Plain text
#: 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:"
+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:"
msgstr ""
#. type: Plain text
@@ -41957,18 +32742,13 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:180
#, fuzzy
-#| msgid ""
-#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-#| "merge[1], linkgit:git-commit-tree[1]"
-msgid ""
-"linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
-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-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
+msgid "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[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-merge-file.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-merge-file(1)"
msgstr "git-merge-file(1)"
@@ -41988,22 +32768,12 @@ msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:25
-msgid ""
-"'git merge-file' incorporates all changes that lead from the `<base-file>` "
-"to `<other-file>` into `<current-file>`. The result ordinarily goes into "
-"`<current-file>`. 'git merge-file' is useful for combining separate changes "
-"to an original. Suppose `<base-file>` is the original, and both `<current-"
-"file>` and `<other-file>` are modifications of `<base-file>`, then 'git "
-"merge-file' combines both changes."
+msgid "'git merge-file' incorporates all changes that lead from the `<base-file>` to `<other-file>` into `<current-file>`. The result ordinarily goes into `<current-file>`. 'git merge-file' is useful for combining separate changes to an original. Suppose `<base-file>` is the original, and both `<current-file>` and `<other-file>` are modifications of `<base-file>`, then 'git merge-file' combines both changes."
msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:30
-msgid ""
-"A conflict occurs if both `<current-file>` and `<other-file>` have changes "
-"in a common segment of lines. If a conflict is found, 'git merge-file' "
-"normally outputs a warning and brackets the conflict with lines containing "
-"<<<<<<< and >>>>>>> markers. A typical conflict will look like this:"
+msgid "A conflict occurs if both `<current-file>` and `<other-file>` have changes in a common segment of lines. If a conflict is found, 'git merge-file' normally outputs a warning and brackets the conflict with lines containing <<<<<<< and >>>>>>> markers. A typical conflict will look like this:"
msgstr ""
#. type: Plain text
@@ -42019,29 +32789,17 @@ msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:42
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:46
-msgid ""
-"The exit value of this program is negative on error, and the number of "
-"conflicts otherwise (truncated to 127 if there are more than that many "
-"conflicts). If the merge was clean, the exit value is 0."
+msgid "The exit value of this program is negative on error, and the number of conflicts otherwise (truncated to 127 if there are more than that many conflicts). If the merge was clean, the exit value is 0."
msgstr ""
#. type: Plain text
#: 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]."
+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]."
msgstr ""
#. type: Labeled list
@@ -42052,17 +32810,12 @@ msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:62
-msgid ""
-"This option may be given up to three times, and specifies labels to be used "
-"in place of the corresponding file names in conflict reports. That is, `git "
-"merge-file -L x -L y -L z a b c` generates output that looks like it came "
-"from files x, y and z instead of from files a, b and c."
+msgid "This option may be given up to three times, and specifies labels to be used in place of the corresponding file names in conflict reports. That is, `git merge-file -L x -L y -L z a b c` generates output that looks like it came from files x, y and z instead of from files a, b and c."
msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:66
-msgid ""
-"Send results to standard output instead of overwriting `<current-file>`."
+msgid "Send results to standard output instead of overwriting `<current-file>`."
msgstr ""
#. type: Plain text
@@ -42072,7 +32825,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:70
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--diff3"
msgstr "--diff3"
@@ -42083,15 +32836,13 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:75
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--union"
msgstr "--union"
#. type: Plain text
#: en/git-merge-file.txt:78
-msgid ""
-"Instead of leaving conflicts in the file, resolve conflicts favouring our "
-"(or their or both) side of the lines."
+msgid "Instead of leaving conflicts in the file, resolve conflicts favouring our (or their or both) side of the lines."
msgstr ""
#. type: Labeled list
@@ -42102,9 +32853,7 @@ 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."
+msgid "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
@@ -42115,14 +32864,12 @@ 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`."
+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`."
msgstr ""
#. type: Title =
#: en/git-merge-index.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-merge-index(1)"
msgstr "git-merge-index(1)"
@@ -42139,11 +32886,7 @@ msgstr ""
#. type: Plain text
#: en/git-merge-index.txt:20
-msgid ""
-"This looks up the <file>(s) in the index and, if there are any merge "
-"entries, passes the SHA-1 hash for those files as arguments 1, 2, 3 (empty "
-"argument if no file), and <file> as argument 4. File modes for the three "
-"files are passed as arguments 5, 6 and 7."
+msgid "This looks up the <file>(s) in the index and, if there are any merge entries, passes the SHA-1 hash for those files as arguments 1, 2, 3 (empty argument if no file), and <file> as argument 4. File modes for the three files are passed as arguments 5, 6 and 7."
msgstr ""
#. type: Plain text
@@ -42153,47 +32896,32 @@ msgstr ""
#. type: Plain text
#: en/git-merge-index.txt:34
-msgid ""
-"Instead of stopping at the first failed merge, do all of them in one shot - "
-"continue with merging even when previous merges returned errors, and only "
-"return the error code after all the merges."
+msgid "Instead of stopping at the first failed merge, do all of them in one shot - continue with merging even when previous merges returned errors, and only return the error code after all the merges."
msgstr ""
#. type: Plain text
#: en/git-merge-index.txt:39
-msgid ""
-"Do not complain about a failed merge program (a merge program failure "
-"usually indicates conflicts during the merge). This is for porcelains which "
-"might want to emit custom messages."
+msgid "Do not complain about a failed merge program (a merge program failure usually indicates conflicts during the merge). This is for porcelains which might want to emit custom messages."
msgstr ""
#. type: Plain text
#: en/git-merge-index.txt:43
-msgid ""
-"If 'git merge-index' is called with multiple <file>s (or -a) then it "
-"processes them in turn only stopping if merge returns a non-zero exit code."
+msgid "If 'git merge-index' is called with multiple <file>s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit code."
msgstr ""
#. type: Plain text
#: en/git-merge-index.txt:46
-msgid ""
-"Typically this is run with a script calling Git's imitation of the 'merge' "
-"command from the RCS package."
+msgid "Typically this is run with a script calling Git's imitation of the 'merge' command from the RCS package."
msgstr ""
#. type: Plain text
#: en/git-merge-index.txt:49
-msgid ""
-"A sample script called 'git merge-one-file' is included in the distribution."
+msgid "A sample script called 'git merge-one-file' is included in the distribution."
msgstr ""
#. type: Plain text
#: en/git-merge-index.txt:54
-msgid ""
-"ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS "
-"'merge' program merge object order. In the above ordering, the original is "
-"first. But the argument order to the 3-way merge program 'merge' is to have "
-"the original in the middle. Don't ask me why."
+msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
msgstr ""
#. type: Plain text
@@ -42226,23 +32954,18 @@ msgstr ""
#. type: Plain text
#: 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-"
-"index' didn't even try to merge the MM thing)."
+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-index' didn't even try to merge the MM thing)."
msgstr ""
#. type: Title =
#: en/git-merge-one-file.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-merge-one-file(1)"
msgstr "git-merge-one-file(1)"
#. type: Plain text
#: en/git-merge-one-file.txt:7
-msgid ""
-"git-merge-one-file - The standard helper program to use with git-merge-index"
+msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
msgstr ""
#. type: Plain text
@@ -42253,9 +32976,7 @@ 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'."
+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'."
msgstr ""
#. type: Title =
@@ -42277,26 +32998,17 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
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 "
-"tools."
+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 tools."
msgstr ""
#. type: Plain text
#: en/git-mergetool--lib.txt:27
-msgid ""
-"Before sourcing 'git-mergetool{litdd}lib', your script must set `TOOL_MODE` "
-"to define the operation mode for the functions listed below. 'diff' and "
-"'merge' are valid values."
+msgid "Before sourcing 'git-mergetool{litdd}lib', your script must set `TOOL_MODE` to define the operation mode for the functions listed below. 'diff' and 'merge' are valid values."
msgstr ""
#. type: Title -
@@ -42347,23 +33059,18 @@ msgstr ""
#. type: Plain text
#: en/git-mergetool--lib.txt:44
-msgid ""
-"launches a merge tool given the tool name and a true/false flag to indicate "
-"whether a merge base is present. '$MERGED', '$LOCAL', '$REMOTE', and "
-"'$BASE' must be defined for use by the merge tool."
+msgid "launches a merge tool given the tool name and a true/false flag to indicate whether a merge base is present. '$MERGED', '$LOCAL', '$REMOTE', and '$BASE' must be defined for use by the merge tool."
msgstr ""
#. type: Title =
#: en/git-mergetool.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-mergetool(1)"
msgstr "git-mergetool(1)"
#. type: Plain text
#: en/git-mergetool.txt:7
-msgid ""
-"git-mergetool - Run merge conflict resolution tools to resolve merge "
-"conflicts"
+msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
#. type: Plain text
@@ -42374,76 +33081,42 @@ msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:18
-msgid ""
-"Use `git mergetool` to run one of several merge utilities to resolve merge "
-"conflicts. It is typically run after 'git merge'."
+msgid "Use `git mergetool` to run one of several merge utilities to resolve merge conflicts. It is typically run after 'git merge'."
msgstr ""
#. type: Plain text
#: 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 "
-"program on every file with merge conflicts."
+msgid "If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file (skipping those without conflicts). Specifying a directory will include all unresolved files in that path. If no <file> names are specified, 'git mergetool' will run the merge tool program on every file with merge conflicts."
msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:33
-msgid ""
-"Use the merge resolution program specified by <tool>. Valid values include "
-"emerge, gvimdiff, kdiff3, meld, vimdiff, and tortoisemerge. Run `git "
-"mergetool --tool-help` for the list of valid <tool> settings."
+msgid "Use the merge resolution program specified by <tool>. Valid values include emerge, gvimdiff, kdiff3, meld, vimdiff, and tortoisemerge. Run `git mergetool --tool-help` for the list of valid <tool> settings."
msgstr ""
#. 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."
+msgid "If a merge resolution program is not specified, 'git mergetool' will use the configuration variable `merge.tool`. If the configuration variable `merge.tool` is not set, 'git mergetool' will pick a suitable default."
msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:44
-msgid ""
-"You can explicitly provide a full path to the tool by setting the "
-"configuration variable `mergetool.<tool>.path`. For example, you can "
-"configure the absolute path to kdiff3 by setting `mergetool.kdiff3.path`. "
-"Otherwise, 'git mergetool' assumes the tool is available in PATH."
+msgid "You can explicitly provide a full path to the tool by setting the configuration variable `mergetool.<tool>.path`. For example, you can configure the absolute path to kdiff3 by setting `mergetool.kdiff3.path`. Otherwise, 'git mergetool' assumes the tool is available in PATH."
msgstr ""
#. 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 "
-"to invoke in a configuration variable `mergetool.<tool>.cmd`."
+msgid "Instead of running one of the known merge tool programs, 'git mergetool' can be customized to run an alternative program by specifying the command line to invoke in a configuration variable `mergetool.<tool>.cmd`."
msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:60
-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."
+msgid "When 'git mergetool' is invoked with this tool (either through the `-t` or `--tool` option or the `merge.tool` configuration variable) the configured command line will be invoked with `$BASE` set to the name of a temporary file containing the common base for the merge, if available; `$LOCAL` set to the name of a temporary file containing the contents of the file on the current branch; `$REMOTE` set to the name of a temporary file containing the contents of the file to be merged, and `$MERGED` set to the name of the file to which the merge tool should write the result of the merge resolution."
msgstr ""
#. 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."
+msgid "If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable `mergetool.<tool>.trustExitCode` can be set to `true`. Otherwise, 'git mergetool' will prompt the user to indicate the success of the resolution after the custom tool has exited."
msgstr ""
#. type: Plain text
@@ -42453,26 +33126,17 @@ msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:77
-msgid ""
-"Don't prompt before each invocation of the merge resolution program. This "
-"is the default if the merge resolution program is explicitly specified with "
-"the `--tool` option or with the `merge.tool` configuration variable."
+msgid "Don't prompt before each invocation of the merge resolution program. This is the default if the merge resolution program is explicitly specified with the `--tool` option or with the `merge.tool` configuration variable."
msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:81
-msgid ""
-"Prompt before each invocation of the merge resolution program to give the "
-"user a chance to skip the path."
+msgid "Prompt before each invocation of the merge resolution program to give the user a chance to skip the path."
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`."
+msgid "Process files in the order specified in the <orderfile>, which has one shell glob pattern per line. This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`."
msgstr ""
#. type: Title -
@@ -42483,23 +33147,17 @@ 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` "
-"session has completed."
+msgid "`git mergetool` creates `*.orig` backup files while resolving merges. These are safe to remove once a file has been merged and its `git mergetool` session has completed."
msgstr ""
#. type: Plain text
#: 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."
+msgid "Setting the `mergetool.keepBackup` configuration variable to `false` causes `git mergetool` to automatically remove the backup as files are successfully merged."
msgstr ""
#. type: Title =
#: en/git-merge-tree.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-merge-tree(1)"
msgstr "git-merge-tree(1)"
@@ -42516,25 +33174,17 @@ msgstr ""
#. type: Plain text
#: en/git-merge-tree.txt:21
-msgid ""
-"Reads three tree-ish, and output trivial merge results and conflicting "
-"stages to the standard output. This is similar to what three-way 'git read-"
-"tree -m' does, but instead of storing the results in the index, the command "
-"outputs the entries to the standard output."
+msgid "Reads three tree-ish, and output trivial merge results and conflicting stages to the standard output. This is similar to what three-way 'git read-tree -m' does, but instead of storing the results in the index, the command outputs the entries to the standard output."
msgstr ""
#. type: Plain text
#: en/git-merge-tree.txt:26
-msgid ""
-"This is meant to be used by higher level scripts to compute merge results "
-"outside of the index, and stuff the results back into the index. For this "
-"reason, the output from the command omits entries that match the <branch1> "
-"tree."
+msgid "This is meant to be used by higher level scripts to compute merge results outside of the index, and stuff the results back into the index. For this reason, the output from the command omits entries that match the <branch1> tree."
msgstr ""
#. type: Title =
#: en/git-merge.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-merge(1)"
msgstr "git-merge(1)"
@@ -42558,17 +33208,12 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:27
-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."
+msgid "Incorporates changes from the named commits (since the time their histories diverged from the current branch) into the current branch. This command is used by 'git pull' to incorporate changes from another repository and can be used by hand to merge changes from one branch into another."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:30 en/git-pull.txt:40
-msgid ""
-"Assume the following history exists and the current branch is \"`master`\":"
+msgid "Assume the following history exists and the current branch is \"`master`\":"
msgstr ""
#. type: delimited block -
@@ -42582,12 +33227,7 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:42
-msgid ""
-"Then \"`git merge topic`\" will replay the changes made on the `topic` "
-"branch since it diverged from `master` (i.e., `E`) until its current commit "
-"(`C`) on top of `master`, and record the result in a new commit along with "
-"the names of the two parent commits and a log message from the user "
-"describing the changes."
+msgid "Then \"`git merge topic`\" will replay the changes made on the `topic` branch since it diverged from `master` (i.e., `E`) until its current commit (`C`) on top of `master`, and record the result in a new commit along with the names of the two parent commits and a log message from the user describing the changes."
msgstr ""
#. type: delimited block -
@@ -42601,22 +33241,12 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:52
-msgid ""
-"The second syntax (<msg> `HEAD` <commit>...) is supported for historical "
-"reasons. Do not use it from the command line or in new scripts. It is the "
-"same as `git merge -m <msg> <commit>...`."
+msgid "The second syntax (<msg> `HEAD` <commit>...) is supported for historical reasons. Do not use it from the command line or in new scripts. It is the same as `git merge -m <msg> <commit>...`."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:60
-msgid ""
-"The third syntax (\"`git merge --abort`\") can only be run after the merge "
-"has resulted in conflicts. 'git merge --abort' will abort the merge process "
-"and try to reconstruct the pre-merge state. However, if there were "
-"uncommitted changes when the merge started (and especially if those changes "
-"were further modified after the merge was started), 'git merge --abort' will"
-" in some cases be unable to reconstruct the original (pre-merge) changes. "
-"Therefore:"
+msgid "The third syntax (\"`git merge --abort`\") can only be run after the merge has resulted in conflicts. 'git merge --abort' will abort the merge process and try to reconstruct the pre-merge state. However, if there were uncommitted changes when the merge started (and especially if those changes were further modified after the merge was started), 'git merge --abort' will in some cases be unable to reconstruct the original (pre-merge) changes. Therefore:"
msgstr ""
#. type: Plain text
@@ -42630,9 +33260,7 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:67
-msgid ""
-"The fourth syntax (\"`git merge --continue`\") can only be run after the "
-"merge has resulted in conflicts."
+msgid "The fourth syntax (\"`git merge --continue`\") can only be run after the merge has resulted in conflicts."
msgstr ""
#. type: Plain text
@@ -42644,10 +33272,7 @@ msgstr ""
#| "\tGPG-sign commits. The `keyid` argument is optional and\n"
#| "\tdefaults to the committer identity; if specified, it must be\n"
#| "\tstuck to the option without a space.\n"
-msgid ""
-"GPG-sign the resulting merge commit. The `keyid` argument is optional and "
-"defaults to the committer identity; if specified, it must be stuck to the "
-"option without a space."
+msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgstr ""
"-S[<idcl챕>]::\n"
"--gpg-sign[=<idcl챕>]::\n"
@@ -42657,92 +33282,63 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:81
-msgid ""
-"Set the commit message to be used for the merge commit (in case one is "
-"created)."
+msgid "Set the commit message to be used for the merge commit (in case one is created)."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:84
-msgid ""
-"If `--log` is specified, a shortlog of the commits being merged will be "
-"appended to the specified message."
+msgid "If `--log` is specified, a shortlog of the commits being merged will be appended to the specified message."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:88
-msgid ""
-"The 'git fmt-merge-msg' command can be used to give a good default for "
-"automated 'git merge' invocations. The automated message can include the "
-"branch description."
+msgid "The 'git fmt-merge-msg' command can be used to give a good default for automated 'git merge' invocations. The automated message can include the branch description."
msgstr ""
#. type: Labeled list
#: en/git-merge.txt:89
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]rerere-autoupdate"
msgstr "--[no-]rerere-autoupdate"
#. type: Plain text
#: en/git-merge.txt:92
-msgid ""
-"Allow the rerere mechanism to update the index with the result of auto-"
-"conflict resolution if possible."
+msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:96
-msgid ""
-"Abort the current conflict resolution process, and try to reconstruct the "
-"pre-merge state."
+msgid "Abort the current conflict resolution process, and try to reconstruct the pre-merge state."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:101
-msgid ""
-"If there were uncommitted worktree changes present when the merge started, "
-"'git merge --abort' will in some cases be unable to reconstruct these "
-"changes. It is therefore recommended to always commit or stash your changes "
-"before running 'git merge'."
+msgid "If there were uncommitted worktree changes present when the merge started, 'git merge --abort' will in some cases be unable to reconstruct these changes. It is therefore recommended to always commit or stash your changes before running 'git merge'."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:104
-msgid ""
-"'git merge --abort' is equivalent to 'git reset --merge' when `MERGE_HEAD` "
-"is present."
+msgid "'git merge --abort' is equivalent to 'git reset --merge' when `MERGE_HEAD` is present."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:109
-msgid ""
-"After a 'git merge' stops due to conflicts you can conclude the merge by "
-"running 'git merge --continue' (see \"HOW TO RESOLVE CONFLICTS\" section "
-"below)."
+msgid "After a 'git merge' stops due to conflicts you can conclude the merge by running 'git merge --continue' (see \"HOW TO RESOLVE CONFLICTS\" section below)."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:114
-msgid ""
-"Commits, usually other branch heads, to merge into our branch. Specifying "
-"more than one commit will create a merge with more than two parents "
-"(affectionately called an Octopus merge)."
+msgid "Commits, usually other branch heads, to merge into our branch. Specifying more than one commit will create a merge with more than two parents (affectionately called an Octopus merge)."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:118
-msgid ""
-"If no commit is given from the command line, merge the remote-tracking "
-"branches that the current branch is configured to use as its upstream. See "
-"also the configuration section of this manual page."
+msgid "If no commit is given from the command line, merge the remote-tracking branches that the current branch is configured to use as its upstream. See also the configuration section of this manual page."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:122
-msgid ""
-"When `FETCH_HEAD` (and no other commit) is specified, the branches recorded "
-"in the `.git/FETCH_HEAD` file by the previous invocation of `git fetch` for "
-"merging are merged to the current branch."
+msgid "When `FETCH_HEAD` (and no other commit) is specified, the branches recorded in the `.git/FETCH_HEAD` file by the previous invocation of `git fetch` for merging are merged to the current branch."
msgstr ""
#. type: Title -
@@ -42753,28 +33349,17 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:133
-msgid ""
-"Before applying outside changes, you should get your own work in good shape "
-"and committed locally, so it will not be clobbered if there are conflicts. "
-"See also linkgit:git-stash[1]. 'git pull' and 'git merge' will stop without"
-" doing anything when local uncommitted changes overlap with files that 'git "
-"pull'/'git merge' may need to update."
+msgid "Before applying outside changes, you should get your own work in good shape and committed locally, so it will not be clobbered if there are conflicts. See also linkgit:git-stash[1]. 'git pull' and 'git merge' will stop without doing anything when local uncommitted changes overlap with files that 'git pull'/'git merge' may need to update."
msgstr ""
#. type: Plain text
#: 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 "
-"entries are in the state that would result from the merge already.)"
+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 entries are in the state that would result from the merge already.)"
msgstr ""
#. type: Plain text
#: en/git-merge.txt:142
-msgid ""
-"If all named commits are already ancestors of `HEAD`, 'git merge' will exit "
-"early with the message \"Already up-to-date.\""
+msgid "If all named commits are already ancestors of `HEAD`, 'git merge' will exit early with the message \"Already up-to-date.\""
msgstr ""
#. type: Title -
@@ -42785,14 +33370,7 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:154
-msgid ""
-"Often the current branch head is an ancestor of the named commit. This is "
-"the most common case especially when invoked from 'git pull': you are "
-"tracking an upstream repository, you have committed no local changes, and "
-"now you want to update to a newer upstream revision. In this case, a new "
-"commit is not needed to store the combined history; instead, the `HEAD` "
-"(along with the index) is updated to point at the named commit, without "
-"creating an extra merge commit."
+msgid "Often the current branch head is an ancestor of the named commit. This is the most common case especially when invoked from 'git pull': you are tracking an upstream repository, you have committed no local changes, and now you want to update to a newer upstream revision. In this case, a new commit is not needed to store the combined history; instead, the `HEAD` (along with the index) is updated to point at the named commit, without creating an extra merge commit."
msgstr ""
#. type: Plain text
@@ -42808,24 +33386,17 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:163
-msgid ""
-"Except in a fast-forward merge (see above), the branches to be merged must "
-"be tied together by a merge commit that has both of them as its parents."
+msgid "Except in a fast-forward merge (see above), the branches to be merged must be tied together by a merge commit that has both of them as its parents."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:168
-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."
+msgid "A merged version reconciling the changes from all branches to be merged is committed, and your `HEAD`, index, and working tree are updated to it. It is possible to have modifications in the working tree as long as they do not overlap; the update will preserve them."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:171
-msgid ""
-"When it is not obvious how to reconcile the changes, the following happens:"
+msgid "When it is not obvious how to reconcile the changes, the following happens:"
msgstr ""
#. type: Plain text
@@ -42840,34 +33411,22 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:176
-msgid ""
-"Paths that merged cleanly are updated both in the index file and in your "
-"working tree."
+msgid "Paths that merged cleanly are updated both in the index file and in your working tree."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:182
-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 `<<<` `===` `>>>`."
+msgid "For conflicting paths, the index file records up to three versions: stage 1 stores the version from the common ancestor, stage 2 from `HEAD`, and stage 3 from `MERGE_HEAD` (you can inspect the stages with `git ls-files -u`). The working tree files contain the result of the \"merge\" program; i.e. 3-way merge results with familiar conflict markers `<<<` `===` `>>>`."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:186
-msgid ""
-"No other changes are made. In particular, the local modifications you had "
-"before you started merge will stay the same and the index entries for them "
-"stay as they were, i.e. matching `HEAD`."
+msgid "No other changes are made. In particular, the local modifications you had before you started merge will stay the same and the index entries for them stay as they were, i.e. matching `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:189
-msgid ""
-"If you tried a merge which resulted in complex conflicts and want to start "
-"over, you can recover with `git merge --abort`."
+msgid "If you tried a merge which resulted in complex conflicts and want to start over, you can recover with `git merge --abort`."
msgstr ""
#. type: Title -
@@ -42878,28 +33437,17 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:198
-msgid ""
-"When merging an annotated (and possibly signed) tag, Git always creates a "
-"merge commit even if a fast-forward merge is possible, and the commit "
-"message template is prepared with the tag message. Additionally, if the tag"
-" is signed, the signature check is reported as a comment in the message "
-"template. See also linkgit:git-tag[1]."
+msgid "When merging an annotated (and possibly signed) tag, Git always creates a merge commit even if a fast-forward merge is possible, and the commit message template is prepared with the tag message. Additionally, if the tag is signed, the signature check is reported as a comment in the message template. See also linkgit:git-tag[1]."
msgstr ""
#. type: Plain text
#: 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."
+msgid "When you want to just integrate with the work leading to the commit that happens to be tagged, e.g. synchronizing with an upstream release point, you may not want to make an unnecessary merge commit."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:206
-msgid ""
-"In such a case, you can \"unwrap\" the tag yourself before feeding it to "
-"`git merge`, or pass `--ff-only` when you do not have any work on your own. "
-"e.g."
+msgid "In such a case, you can \"unwrap\" the tag yourself before feeding it to `git merge`, or pass `--ff-only` when you do not have any work on your own. e.g."
msgstr ""
#. type: delimited block -
@@ -42919,21 +33467,12 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:224
-msgid ""
-"During a merge, the working tree files are updated to reflect the result of "
-"the merge. Among the changes made to the common ancestor's version, non-"
-"overlapping ones (that is, you changed an area of the file while the other "
-"side left that area intact, or vice versa) are incorporated in the final "
-"result verbatim. When both sides made changes to the same area, however, "
-"Git cannot randomly pick one side over the other, and asks you to resolve it"
-" by leaving what both sides did to that area."
+msgid "During a merge, the working tree files are updated to reflect the result of the merge. Among the changes made to the common ancestor's version, non-overlapping ones (that is, you changed an area of the file while the other side left that area intact, or vice versa) are incorporated in the final result verbatim. When both sides made changes to the same area, however, Git cannot randomly pick one side over the other, and asks you to resolve it by leaving what both sides did to that area."
msgstr ""
#. 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:"
+msgid "By default, Git uses the same style as the one used by the \"merge\" program from the RCS suite to present such a conflicted hunk, like this:"
msgstr ""
#. type: delimited block -
@@ -42953,28 +33492,17 @@ 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 "
-"typically your side, and the part afterwards is typically their side."
+msgid "The area where a pair of conflicting changes happened is marked with markers `<<<<<<<`, `=======`, and `>>>>>>>`. The part before the `=======` is typically your side, and the part afterwards is typically their side."
msgstr ""
#. type: Plain text
#: 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."
+msgid "The default format does not show what the original said in the conflicting area. You cannot tell how many lines are deleted and replaced with Barbie's remark on your side. The only thing you can tell is that your side wants to say it is hard and you'd prefer to go shopping, while the other side wants to claim it is easy."
msgstr ""
#. 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:"
+msgid "An alternative style can be used by setting the \"merge.conflictStyle\" configuration variable to \"diff3\". In \"diff3\" style, the above conflict may look like this:"
msgstr ""
#. type: delimited block -
@@ -42996,13 +33524,7 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:274
-msgid ""
-"In addition to the `<<<<<<<`, `=======`, and `>>>>>>>` markers, it uses "
-"another `|||||||` marker that is followed by the original text. You can "
-"tell that the original just stated a fact, and your side simply gave in to "
-"that statement and gave up, while the other side tried to have a more "
-"positive attitude. You can sometimes come up with a better resolution by "
-"viewing the original."
+msgid "In addition to the `<<<<<<<`, `=======`, and `>>>>>>>` markers, it uses another `|||||||` marker that is followed by the original text. You can tell that the original just stated a fact, and your side simply gave in to that statement and gave up, while the other side tried to have a more positive attitude. You can sometimes come up with a better resolution by viewing the original."
msgstr ""
#. type: Title -
@@ -43018,18 +33540,12 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "Decide not to merge. The only clean-ups you need are to reset the index file to the `HEAD` commit to reverse 2. and to clean up working tree changes made by 2. and 3.; `git merge --abort` can be used for this."
msgstr ""
#. 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."
+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."
msgstr ""
#. type: Plain text
@@ -43039,38 +33555,27 @@ 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."
+msgid "Use a mergetool. `git mergetool` to launch a graphical mergetool which will work you through the merge."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:298
-msgid ""
-"Look at the diffs. `git diff` will show a three-way diff, highlighting "
-"changes from both the `HEAD` and `MERGE_HEAD` versions."
+msgid "Look at the diffs. `git diff` will show a three-way diff, highlighting changes from both the `HEAD` and `MERGE_HEAD` versions."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:302
-msgid ""
-"Look at the diffs from each branch. `git log --merge -p <path>` will show "
-"diffs first for the `HEAD` version and then the `MERGE_HEAD` version."
+msgid "Look at the diffs from each branch. `git log --merge -p <path>` will show diffs first for the `HEAD` version and then the `MERGE_HEAD` version."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:307
-msgid ""
-"Look at the originals. `git show :1:filename` shows the common ancestor, "
-"`git show :2:filename` shows the `HEAD` version, and `git show :3:filename` "
-"shows the `MERGE_HEAD` version."
+msgid "Look at the originals. `git show :1:filename` shows the common ancestor, `git show :2:filename` shows the `HEAD` version, and `git show :3:filename` shows the `MERGE_HEAD` version."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:314
-msgid ""
-"Merge branches `fixes` and `enhancements` on top of the current branch, "
-"making an octopus merge:"
+msgid "Merge branches `fixes` and `enhancements` on top of the current branch, making an octopus merge:"
msgstr ""
#. type: delimited block -
@@ -43081,9 +33586,7 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:321
-msgid ""
-"Merge branch `obsolete` into the current branch, using `ours` merge "
-"strategy:"
+msgid "Merge branch `obsolete` into the current branch, using `ours` merge strategy:"
msgstr ""
#. type: delimited block -
@@ -43094,9 +33597,7 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:328
-msgid ""
-"Merge branch `maint` into the current branch, but do not make a new commit "
-"automatically:"
+msgid "Merge branch `maint` into the current branch, but do not make a new commit automatically:"
msgstr ""
#. type: delimited block -
@@ -43108,44 +33609,29 @@ msgstr "$ git commit\n"
#. type: Plain text
#: en/git-merge.txt:335
-msgid ""
-"This can be used when you want to include further changes to the merge, or "
-"want to write your own merge commit message."
+msgid "This can be used when you want to include further changes to the merge, or want to write your own merge commit message."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:339
-msgid ""
-"You should refrain from abusing this option to sneak substantial changes "
-"into a merge commit. Small fixups like bumping release/version name would "
-"be acceptable."
+msgid "You should refrain from abusing this option to sneak substantial changes into a merge commit. Small fixups like bumping release/version name would be acceptable."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:351
-msgid ""
-"Sets default options for merging into branch <name>. The syntax and "
-"supported options are the same as those of 'git merge', but option values "
-"containing whitespace characters are currently not supported."
+msgid "Sets default options for merging into branch <name>. The syntax and supported options are the same as those of 'git merge', but option values containing whitespace characters are currently not supported."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:360
#, fuzzy
-#| msgid ""
-#| "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-"
-#| "mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
-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]"
-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-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]"
+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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-mktag(1)"
msgstr "git-mktag(1)"
@@ -43162,9 +33648,7 @@ msgstr ""
#. type: Plain text
#: en/git-mktag.txt:18
-msgid ""
-"Reads a tag contents on standard input and creates a tag object that can "
-"also be used to sign other objects."
+msgid "Reads a tag contents on standard input and creates a tag object that can also be used to sign other objects."
msgstr ""
#. type: Plain text
@@ -43180,9 +33664,7 @@ 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"
+msgid "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
@@ -43197,16 +33679,12 @@ msgstr ""
#. type: Plain text
#: en/git-mktag.txt:36
-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."
+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."
msgstr ""
#. type: Title =
#: en/git-mktree.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-mktree(1)"
msgstr "git-mktree(1)"
@@ -43225,11 +33703,7 @@ 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."
+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."
msgstr ""
#. type: Plain text
@@ -43239,30 +33713,23 @@ msgstr ""
#. type: Labeled list
#: en/git-mktree.txt:26
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--missing"
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."
+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."
msgstr ""
#. type: Plain text
#: en/git-mktree.txt:37
-msgid ""
-"Allow building of more than one tree object before exiting. Each tree is "
-"separated by as single blank line. The final new-line is optional. Note - "
-"if the `-z` option is used, lines are terminated with NUL."
+msgid "Allow building of more than one tree object before exiting. Each tree is separated by as single blank line. The final new-line is optional. Note - if the `-z` option is used, lines are terminated with NUL."
msgstr ""
#. type: Title =
#: en/git-mv.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-mv(1)"
msgstr "git-mv(1)"
@@ -43292,18 +33759,12 @@ msgstr ""
#. type: Plain text
#: en/git-mv.txt:25
-msgid ""
-"In the first form, it renames <source>, which must exist and be either a "
-"file, symlink or directory, to <destination>. In the second form, the last "
-"argument has to be an existing directory; the given sources will be moved "
-"into this directory."
+msgid "In the first form, it renames <source>, which must exist and be either a file, symlink or directory, to <destination>. In the second form, the last argument has to be an existing directory; the given sources will be moved into this directory."
msgstr ""
#. type: Plain text
#: en/git-mv.txt:28
-msgid ""
-"The index is updated after successful completion, but the change must still "
-"be committed."
+msgid "The index is updated after successful completion, but the change must still be committed."
msgstr ""
#. type: Plain text
@@ -43313,10 +33774,7 @@ 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."
+msgid "Skip move or rename actions which would lead to an error condition. An error happens when a source is neither existing nor controlled by Git, or when it would overwrite an existing file unless `-f` is given."
msgstr ""
#. type: Plain text
@@ -43345,30 +33803,17 @@ msgstr ""
#. type: Plain text
#: 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)."
+msgid "Moving a submodule using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will update the gitfile and core.worktree setting to make the submodule work in the new location. It also will attempt to update the submodule.<name>.path setting in the linkgit:gitmodules[5] file and stage that file (unless -n is used)."
msgstr ""
#. type: Plain text
#: en/git-mv.txt:66
-msgid ""
-"Each time a superproject update moves a populated submodule (e.g. when "
-"switching between commits before and after the move) a stale submodule "
-"checkout will remain in the old location and an empty directory will appear "
-"in the new location. To populate the submodule again in the new location the"
-" user will have to run \"git submodule update\" afterwards. Removing the old"
-" directory is only safe when it uses a gitfile, as otherwise the history of "
-"the submodule will be deleted too. Both steps will be obsolete when "
-"recursive submodule update has been implemented."
+msgid "Each time a superproject update moves a populated submodule (e.g. when switching between commits before and after the move) a stale submodule checkout will remain in the old location and an empty directory will appear in the new location. To populate the submodule again in the new location the user will have to run \"git submodule update\" afterwards. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. Both steps will be obsolete when recursive submodule update has been implemented."
msgstr ""
#. type: Title =
#: en/git-name-rev.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-name-rev(1)"
msgstr "git-name-rev(1)"
@@ -43387,9 +33832,7 @@ 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'."
+msgid "Finds symbolic names suitable for human digestion for revisions given in any format parsable by 'git rev-parse'."
msgstr ""
#. type: Plain text
@@ -43405,23 +33848,12 @@ msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:32
-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."
+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."
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 "
-"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."
+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 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."
msgstr ""
#. type: Plain text
@@ -43431,40 +33863,28 @@ msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:50
-msgid ""
-"Transform stdin by substituting all the 40-character SHA-1 hexes (say $hex) "
-"with \"$hex ($rev_name)\". When used with --name-only, substitute with "
-"\"$rev_name\", omitting $hex altogether. Intended for the scripter's use."
+msgid "Transform stdin by substituting all the 40-character SHA-1 hexes (say $hex) with \"$hex ($rev_name)\". When used with --name-only, substitute with \"$rev_name\", omitting $hex altogether. Intended for the scripter's use."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-name-rev.txt:57
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-undefined"
msgstr "--no-undefined"
#. type: Plain text
#: en/git-name-rev.txt:60
-msgid ""
-"Die with error code != 0 when a reference is undefined, instead of printing "
-"`undefined`."
+msgid "Die with error code != 0 when a reference is undefined, instead of printing `undefined`."
msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:71
-msgid ""
-"Given a commit, find out where it is relative to the local refs. Say "
-"somebody wrote you about that fantastic commit "
-"33db5f4d9027a10e477ccf054b2c1ab94f74c85a. Of course, you look into the "
-"commit, but that only tells you what happened, but not the context."
+msgid "Given a commit, find out where it is relative to the local refs. Say somebody wrote you about that fantastic commit 33db5f4d9027a10e477ccf054b2c1ab94f74c85a. Of course, you look into the commit, but that only tells you what happened, but not the context."
msgstr ""
#. type: Plain text
@@ -43484,9 +33904,7 @@ msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:80
-msgid ""
-"Now you are wiser, because you know that it happened 940 revisions before "
-"v0.99."
+msgid "Now you are wiser, because you know that it happened 940 revisions before v0.99."
msgstr ""
#. type: Plain text
@@ -43502,7 +33920,7 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-notes(1)"
msgstr "git-notes(1)"
@@ -43531,50 +33949,32 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-msgid ""
-"Adds, removes, or reads notes attached to objects, without touching the "
-"objects themselves."
+msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-msgid ""
-"A typical use of notes is to supplement a commit message without changing "
-"the commit itself. Notes can be shown by 'git log' along with the original "
-"commit message. To distinguish these notes from the message stored in the "
-"commit object, the notes are indented like the message, after an unindented "
-"line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
+msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
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 "
-"three dash separator line."
+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 three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-msgid ""
-"To change which notes are shown by 'git log', see the \"notes.displayRef\" "
-"configuration in linkgit:git-log[1]."
+msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-msgid ""
-"See the \"notes.rewrite.<command>\" configuration for a way to carry notes "
-"across commands that rewrite commits."
+msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
@@ -43591,11 +33991,7 @@ 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 "
-"object> <annotated object>\"). This is the default subcommand if no "
-"subcommand is given."
+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 object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
@@ -43606,12 +34002,7 @@ 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 - "
-"instead of aborting - the existing notes will be opened in the editor (like "
-"the `edit` subcommand)."
+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 - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
@@ -43622,12 +34013,7 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-msgid ""
-"Copy the notes for the first object onto the second object. Abort if the "
-"second object already has notes, or if the first object has none (use -f to "
-"overwrite existing notes to the second object). This subcommand is "
-"equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-"
-"object>`"
+msgid "Copy the notes for the first object onto the second object. Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
@@ -43643,10 +34029,7 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-msgid ""
-"on standard input, and copy the notes from each <from-object> to its "
-"corresponding <to-object>. (The optional `<rest>` is ignored so that the "
-"command can read the input given to the `post-rewrite` hook.)"
+msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
@@ -43657,9 +34040,7 @@ 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."
+msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
@@ -43692,22 +34073,12 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:102
-msgid ""
-"Merge the given notes ref into the current notes ref. This will try to "
-"merge the changes made by the given notes ref (called \"remote\") since the "
-"merge-base (if any) into the current notes ref (called \"local\")."
+msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: 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 "
-"finalize the merge with 'git notes merge --commit', or abort the merge with "
-"'git notes merge --abort'."
+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 finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
@@ -43718,10 +34089,7 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:117
-msgid ""
-"Remove the notes for given objects (defaults to HEAD). When giving zero or "
-"one object from the command line, this is equivalent to specifying an empty "
-"note message to the `edit` subcommand."
+msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
@@ -43743,16 +34111,12 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-msgid ""
-"Print the current notes ref. This provides an easy way to retrieve the "
-"current notes ref (e.g. from scripts)."
+msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-msgid ""
-"When adding notes to an object that already has notes, overwrite the "
-"existing notes (instead of aborting)."
+msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
@@ -43764,11 +34128,7 @@ msgstr ""
#| "\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 ""
-"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."
+msgid "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 ""
"-m <msg>::\n"
"--message=<msg>::\n"
@@ -43784,10 +34144,7 @@ msgstr ""
#| "--file=<file>::\n"
#| "\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."
+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."
msgstr ""
"-F <fichier>::\n"
"--file=<fichier>::\n"
@@ -43808,9 +34165,7 @@ 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.)"
+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.)"
msgstr ""
#. type: Labeled list
@@ -43833,9 +34188,7 @@ msgstr ""
#| "--reedit-message=<commit>::\n"
#| "\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."
+msgid "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"
@@ -43844,9 +34197,7 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:161
-msgid ""
-"Allow an empty note object to be stored. The default behavior is to "
-"automatically remove empty notes."
+msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
@@ -43857,33 +34208,22 @@ msgstr ""
#. type: Plain text
#: 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 "
-"otherwise `refs/notes/` is prefixed to form a full name of the ref."
+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 otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-msgid ""
-"Do not consider it an error to request removing notes from an object that "
-"does not have notes attached to it."
+msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-msgid ""
-"Also read the object names to remove notes from from the standard input "
-"(there is no reason you cannot combine this with object names from the "
-"command line)."
+msgid "Also read the object names to remove notes from from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-msgid ""
-"Do not remove anything; just report the object names whose notes would be "
-"removed."
+msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
@@ -43894,37 +34234,23 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--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."
+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."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-msgid ""
-"Abort/reset a in-progress 'git notes merge', i.e. a notes merge with "
-"conflicts. This simply removes all files related to the notes merge."
+msgid "Abort/reset a in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
@@ -43934,41 +34260,22 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-msgid ""
-"When merging notes, be more verbose. When pruning notes, report all object "
-"names whose notes are removed."
+msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
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 "
-"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 "
-"with the rest of the object ID.]."
+msgid "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 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 "
-"notes/commits`. Currently the commit message only records which operation "
-"triggered the update, and the commit authorship is determined according to "
-"the usual rules (see linkgit:git-commit[1]). These details may change in "
-"the future."
+msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-msgid ""
-"It is also permitted for a notes ref to point directly to a tree object, in "
-"which case the history of the notes can be read with `git log -p -g "
-"<refname>`."
+msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
@@ -43979,61 +34286,37 @@ 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'."
+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'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-msgid ""
-"Users may select an automated merge strategy from among the following using "
-"either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
+msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-msgid ""
-"\"ours\" automatically resolves conflicting notes in favor of the local "
-"version (i.e. the current notes ref)."
+msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-msgid ""
-"\"theirs\" automatically resolves notes conflicts in favor of the remote "
-"version (i.e. the given notes ref being merged into the current notes ref)."
+msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-msgid ""
-"\"union\" automatically resolves notes conflicts by concatenating the local "
-"and remote versions."
+msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: 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. "
-"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, "
-"these will also be removed by this notes merge strategy."
+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. 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, these will also be removed by this notes merge strategy."
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."
+msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
@@ -44056,10 +34339,7 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-msgid ""
-"In principle, a note is a regular Git blob, and any kind of (non-)format is "
-"accepted. You can binary-safely create notes from arbitrary files using "
-"'git hash-object':"
+msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
@@ -44073,29 +34353,17 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-msgid ""
-"(You cannot simply use `git notes --ref=built add -F a.out HEAD` because "
-"that is not binary-safe.) Of course, it doesn't make much sense to display "
-"non-text-format notes with 'git log', so if you use such notes, you'll "
-"probably need to write some special-purpose tools to do something useful "
-"with them."
+msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:318
-msgid ""
-"Notes ref to read and manipulate instead of `refs/notes/commits`. Must be "
-"an unabbreviated ref name. This setting can be overridden through the "
-"environment and command line."
+msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-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."
+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."
msgstr ""
#. type: Plain text
@@ -44105,140 +34373,101 @@ 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-msgid ""
-"Which ref (or refs, if a glob or specified more than once), in addition to "
-"the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from "
-"when showing commit messages with the 'git log' family of commands. This "
-"setting can be overridden on the command line or by the "
-"`GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
+msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-msgid ""
-"When rewriting commits with <command> (currently `amend` or `rebase`), if "
-"this variable is `false`, git will not copy notes from the original to the "
-"rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" "
-"below."
+msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-msgid ""
-"This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment "
-"variable."
+msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
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`."
+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`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-msgid ""
-"When copying notes during a rewrite, specifies the (fully qualified) ref "
-"whose notes should be copied. May be a glob, in which case notes in all "
-"matching refs will be copied. You may also specify this configuration "
-"several times."
+msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-msgid ""
-"Does not have a default value; you must configure this variable to enable "
-"note rewriting."
+msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-msgid ""
-"Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
+msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-msgid ""
-"Which ref to manipulate notes from, instead of `refs/notes/commits`. This "
-"overrides the `core.notesRef` setting."
+msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-msgid ""
-"A warning will be issued for refs that do not exist, but a glob that does "
-"not match any refs is silently ignored."
+msgid "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: Labeled list
#: en/git-notes.txt:389
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. 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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-msgid ""
-"When rewriting commits, which notes to copy from the original to the "
-"rewritten commit. Must be a colon-delimited list of refs or globs."
+msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-msgid ""
-"If not set in the environment, the list of notes to copy depends on the "
-"`notes.rewrite.<command>` and `notes.rewriteRef` settings."
+msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
#. type: Title =
#: en/git-p4.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-p4(1)"
msgstr "git-p4(1)"
@@ -44261,19 +34490,12 @@ 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
#: en/git-p4.txt:30
-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 "
-"current branch onto the updated p4 remote branch."
+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 current branch onto the updated p4 remote branch."
msgstr ""
#. type: Plain text
@@ -44303,9 +34525,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:50
-msgid ""
-"Update the Git repository with recent changes from p4, rebasing your work on"
-" top:"
+msgid "Update the Git repository with recent changes from p4, rebasing your work on top:"
msgstr ""
#. type: delimited block -
@@ -44334,9 +34554,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:69
-msgid ""
-"Generally, 'git p4 clone' is used to create a new Git directory from an "
-"existing p4 repository:"
+msgid "Generally, 'git p4 clone' is used to create a new Git directory from an existing p4 repository:"
msgstr ""
#. type: Plain text
@@ -44351,9 +34569,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:78
-msgid ""
-"Imports the full contents of the head revision from the given p4 depot path "
-"into a single commit in the Git branch 'refs/remotes/p4/master'."
+msgid "Imports the full contents of the head revision from the given p4 depot path into a single commit in the Git branch 'refs/remotes/p4/master'."
msgstr ""
#. type: Plain text
@@ -44363,9 +34579,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:83
-msgid ""
-"To reproduce the entire p4 history in Git, use the '@all' modifier on the "
-"depot path:"
+msgid "To reproduce the entire p4 history in Git, use the '@all' modifier on the depot path:"
msgstr ""
#. type: delimited block -
@@ -44382,9 +34596,7 @@ 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:"
+msgid "As development continues in the p4 repository, those changes can be included in the Git repository using:"
msgstr ""
#. type: delimited block -
@@ -44401,9 +34613,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:99
-msgid ""
-"P4 repositories can be added to an existing Git repository using 'git p4 "
-"sync' too:"
+msgid "P4 repositories can be added to an existing Git repository using 'git p4 sync' too:"
msgstr ""
#. type: delimited block -
@@ -44418,28 +34628,17 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:109
-msgid ""
-"This imports the specified depot into 'refs/remotes/p4/master' in an "
-"existing Git repository. The `--branch` option can be used to specify a "
-"different branch to be used for the p4 content."
+msgid "This imports the specified depot into 'refs/remotes/p4/master' in an existing Git repository. The `--branch` option can be used to specify a different branch to be used for the p4 content."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:114
-msgid ""
-"If a Git repository includes branches 'refs/remotes/origin/p4', these will "
-"be fetched and consulted first during a 'git p4 sync'. Since importing "
-"directly from p4 is considerably slower than pulling changes from a Git "
-"remote, this can be useful in a multi-developer environment."
+msgid "If a Git repository includes branches 'refs/remotes/origin/p4', these will be fetched and consulted first during a 'git p4 sync'. Since importing directly from p4 is considerably slower than pulling changes from a Git remote, this can be useful in a multi-developer environment."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:119
-msgid ""
-"If there are multiple branches, doing 'git p4 sync' will automatically use "
-"the \"BRANCH DETECTION\" algorithm to try to partition new changes into the "
-"right branch. This can be overridden with the `--branch` option to specify "
-"just a single branch to update."
+msgid "If there are multiple branches, doing 'git p4 sync' will automatically use the \"BRANCH DETECTION\" algorithm to try to partition new changes into the right branch. This can be overridden with the `--branch` option to specify just a single branch to update."
msgstr ""
#. type: Title ~
@@ -44450,12 +34649,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:128
-msgid ""
-"A common working pattern is to fetch the latest changes from the p4 depot "
-"and merge them with local uncommitted changes. Often, the p4 repository is "
-"the ultimate location for all code, thus a rebase workflow makes sense. "
-"This command does 'git p4 sync' followed by 'git rebase' to move local "
-"commits on top of updated p4 changes."
+msgid "A common working pattern is to fetch the latest changes from the p4 depot and merge them with local uncommitted changes. Often, the p4 repository is the ultimate location for all code, thus a rebase workflow makes sense. This command does 'git p4 sync' followed by 'git rebase' to move local commits on top of updated p4 changes."
msgstr ""
#. type: Title ~
@@ -44466,19 +34660,12 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:140
-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."
+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."
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:"
+msgid "To submit all changes that are in the current Git branch but not in the 'p4/master' branch, use:"
msgstr ""
#. type: Plain text
@@ -44494,18 +34681,12 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:154
-msgid ""
-"The upstream reference is generally 'refs/remotes/p4/master', but can be "
-"overridden using the `--origin=` command-line option."
+msgid "The upstream reference is generally 'refs/remotes/p4/master', but can be overridden using the `--origin=` command-line option."
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, "
-"which can be granted using 'p4 protect'."
+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, which can be granted using 'p4 protect'."
msgstr ""
#. type: Title ~
@@ -44543,9 +34724,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:179
-msgid ""
-"These options can be used in the initial 'clone' as well as in subsequent "
-"'sync' operations."
+msgid "These options can be used in the initial 'clone' as well as in subsequent 'sync' operations."
msgstr ""
#. type: Labeled list
@@ -44557,18 +34736,12 @@ msgstr "Mode interactif"
#. type: Plain text
#: en/git-p4.txt:184
-msgid ""
-"Import changes into <ref> instead of refs/remotes/p4/master. If <ref> "
-"starts with refs/, it is used as is. Otherwise, if it does not start with "
-"p4/, that prefix is added."
+msgid "Import changes into <ref> instead of refs/remotes/p4/master. If <ref> starts with refs/, it is used as is. Otherwise, if it does not start with p4/, that prefix is added."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
@@ -44578,9 +34751,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:193
-msgid ""
-"This example imports a new remote \"p4/proj2\" into an existing Git "
-"repository:"
+msgid "This example imports a new remote \"p4/proj2\" into an existing Git repository:"
msgstr ""
#. type: delimited block -
@@ -44593,15 +34764,13 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:199
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--detect-branches"
msgstr "--detect-branches"
#. type: Plain text
#: en/git-p4.txt:202
-msgid ""
-"Use the branch detection algorithm to find new paths in p4. It is "
-"documented below in \"BRANCH DETECTION\"."
+msgid "Use the branch detection algorithm to find new paths in p4. It is documented below in \"BRANCH DETECTION\"."
msgstr ""
#. type: Labeled list
@@ -44612,15 +34781,12 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:207
-msgid ""
-"Import exactly the p4 change numbers listed in 'file', one per line. "
-"Normally, 'git p4' inspects the current p4 repository state and detects the "
-"changes it should import."
+msgid "Import exactly the p4 change numbers listed in 'file', one per line. Normally, 'git p4' inspects the current p4 repository state and detects the changes it should import."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:208
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--silent"
msgstr "--silent"
@@ -44637,21 +34803,18 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:211
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--detect-labels"
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 "
-"changelists. Deprecated."
+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 changelists. Deprecated."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:216 en/git-p4.txt:331
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--import-labels"
msgstr "--import-labels"
@@ -44662,18 +34825,13 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:219
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--import-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 "
-"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."
+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 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."
msgstr ""
#. type: Labeled list
@@ -44684,11 +34842,7 @@ 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."
+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."
msgstr ""
#. type: Labeled list
@@ -44699,42 +34853,29 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:242
-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 "
-"should usually be suitable."
+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 should usually be suitable."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:243
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--keep-path"
msgstr "--keep-path"
#. type: Plain text
#: en/git-p4.txt:250
-msgid ""
-"The mapping of file names from the p4 depot path to Git, by default, "
-"involves removing the entire depot path. With this option, the full p4 "
-"depot path is retained in Git. For example, path '//depot/main/foo/bar.c', "
-"when imported from '//depot/main/', becomes 'foo/bar.c'. With `--keep-"
-"path`, the Git path is instead 'depot/main/foo/bar.c'."
+msgid "The mapping of file names from the p4 depot path to Git, by default, involves removing the entire depot path. With this option, the full p4 depot path is retained in Git. For example, path '//depot/main/foo/bar.c', when imported from '//depot/main/', becomes 'foo/bar.c'. With `--keep-path`, the Git path is instead 'depot/main/foo/bar.c'."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:251
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--use-client-spec"
msgstr "--use-client-spec"
#. type: Plain text
#: en/git-p4.txt:254
-msgid ""
-"Use a client spec to find the list of interesting files in p4. See the "
-"\"CLIENT SPEC\" section below."
+msgid "Use a client spec to find the list of interesting files in p4. See the \"CLIENT SPEC\" section below."
msgstr ""
#. type: Labeled list
@@ -44757,9 +34898,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:262
-msgid ""
-"These options can be used in an initial 'clone', along with the 'sync' "
-"options described above."
+msgid "These options can be used in an initial 'clone', along with the 'sync' options described above."
msgstr ""
#. type: Labeled list
@@ -44770,9 +34909,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:267
-msgid ""
-"Where to create the Git repository. If not provided, the last component in "
-"the p4 depot path is used to create a new directory."
+msgid "Where to create the Git repository. If not provided, the last component in the p4 depot path is used to create a new directory."
msgstr ""
#. type: Plain text
@@ -44802,80 +34939,61 @@ msgstr "git-commit(1)"
#. type: Plain text
#: en/git-p4.txt:279
-msgid ""
-"Upstream location from which commits are identified to submit to p4. By "
-"default, this is the most recent p4 commit reachable from `HEAD`."
+msgid "Upstream location from which commits are identified to submit to p4. By default, this is the most recent p4 commit reachable from `HEAD`."
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 copies, but there are variables for both moves and copies."
+msgid "Detect renames. See linkgit:git-diff[1]. Renames will be represented in p4 using explicit 'move' operations. There is no corresponding option to detect copies, but there are variables for both moves and copies."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:286
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--preserve-user"
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."
+msgid "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, ignore-translated
+#, no-wrap
msgid "--export-labels"
msgstr "--export-labels"
#. type: Plain text
#: en/git-p4.txt:293
-msgid ""
-"Export tags from Git as p4 labels. Tags found in Git are applied to the "
-"perforce working directory."
+msgid "Export tags from Git as p4 labels. Tags found in Git are applied to the perforce working directory."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:298
-msgid ""
-"Show just what commits would be submitted to p4; do not change state in Git "
-"or p4."
+msgid "Show just what commits would be submitted to p4; do not change state in Git or p4."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:299
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--prepare-p4-only"
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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:306
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--shelve"
msgstr "--shelve"
#. type: Plain text
#: en/git-p4.txt:310
-msgid ""
-"Instead of submitting create a series of shelved changelists. After "
-"creating each shelve, the relevant files are reverted/deleted. If you have "
-"multiple commits pending multiple shelves will be created."
+msgid "Instead of submitting create a series of shelved changelists. After creating each shelve, the relevant files are reverted/deleted. If you have multiple commits pending multiple shelves will be created."
msgstr ""
#. type: Labeled list
@@ -44886,8 +35004,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:314
-msgid ""
-"Update an existing shelved changelist with this commit. Implies --shelve."
+msgid "Update an existing shelved changelist with this commit. Implies --shelve."
msgstr ""
#. type: Labeled list
@@ -44898,12 +35015,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:321
-msgid ""
-"Conflicts can occur when applying a commit to p4. When this happens, the "
-"default behavior (\"ask\") is to prompt whether to skip this commit and "
-"continue, or quit. This option can be used to bypass the prompt, causing "
-"conflicting commits to be automatically skipped, or to quit trying to apply "
-"commits, without prompting."
+msgid "Conflicts can occur when applying a commit to p4. When this happens, the default behavior (\"ask\") is to prompt whether to skip this commit and continue, or quit. This option can be used to bypass the prompt, causing conflicting commits to be automatically skipped, or to quit trying to apply commits, without prompting."
msgstr ""
#. type: Labeled list
@@ -44915,9 +35027,7 @@ msgstr "Mode interactif"
#. type: Plain text
#: en/git-p4.txt:326
-msgid ""
-"After submitting, sync this named branch instead of the default p4/master. "
-"See the \"Sync options\" section above for more information."
+msgid "After submitting, sync this named branch instead of the default p4/master. See the \"Sync options\" section above for more information."
msgstr ""
#. type: Title ~
@@ -44944,10 +35054,7 @@ 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:"
+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:"
msgstr ""
#. type: Labeled list
@@ -44958,8 +35065,7 @@ 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
@@ -44992,14 +35098,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:358
-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."
+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."
msgstr ""
#. type: Plain text
@@ -45015,44 +35114,22 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:373
-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 "
-"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 "
-"looks only at the variable and does not have a command-line option."
+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 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 looks only at the variable and does not have a command-line option."
msgstr ""
#. type: Plain text
#: 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 "
-"unhandled wildcard."
+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 unhandled wildcard."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:385
-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'."
+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'."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:390
-msgid ""
-"The name of the client can be given to 'git p4' in multiple ways. The "
-"variable 'git-p4.client' takes precedence if it exists. Otherwise, normal "
-"p4 mechanisms of determining the client are used: environment variable "
-"P4CLIENT, a file referenced by P4CONFIG, or the local host name."
+msgid "The name of the client can be given to 'git p4' in multiple ways. The variable 'git-p4.client' takes precedence if it exists. Otherwise, normal p4 mechanisms of determining the client are used: environment variable P4CLIENT, a file referenced by P4CONFIG, or the local host name."
msgstr ""
#. type: Title -
@@ -45063,22 +35140,12 @@ 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 "
-"relationships."
+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 relationships."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:405
-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."
+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."
msgstr ""
#. type: Plain text
@@ -45118,22 +35185,12 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:423
-msgid ""
-"produces a separate branch in 'refs/remotes/p4/' for //depot/main, called "
-"'master', and one for //depot/branch1 called 'depot/branch1'."
+msgid "produces a separate branch in 'refs/remotes/p4/' for //depot/main, called 'master', and one for //depot/branch1 called 'depot/branch1'."
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 "
-"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:"
+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 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:"
msgstr ""
#. type: delimited block -
@@ -45154,18 +35211,12 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
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."
+msgid "The following config settings can be used to modify 'git p4' behavior. They all are in the 'git-p4' section."
msgstr ""
#. type: Title ~
@@ -45183,9 +35234,7 @@ msgstr "git-add(1)"
#. type: Plain text
#: en/git-p4.txt:459
-msgid ""
-"User specified as an option to all p4 commands, with '-u <user>'. The "
-"environment variable 'P4USER' can be used instead."
+msgid "User specified as an option to all p4 commands, with '-u <user>'. The environment variable 'P4USER' can be used instead."
msgstr ""
#. type: Labeled list
@@ -45196,9 +35245,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:464
-msgid ""
-"Password specified as an option to all p4 commands, with '-P <password>'. "
-"The environment variable 'P4PASS' can be used instead."
+msgid "Password specified as an option to all p4 commands, with '-P <password>'. The environment variable 'P4PASS' can be used instead."
msgstr ""
#. type: Labeled list
@@ -45210,9 +35257,7 @@ msgstr "git-add(1)"
#. type: Plain text
#: en/git-p4.txt:469
-msgid ""
-"Port specified as an option to all p4 commands, with '-p <port>'. The "
-"environment variable 'P4PORT' can be used instead."
+msgid "Port specified as an option to all p4 commands, with '-p <port>'. The environment variable 'P4PORT' can be used instead."
msgstr ""
#. type: Labeled list
@@ -45224,9 +35269,7 @@ msgstr "git-add(1)"
#. type: Plain text
#: en/git-p4.txt:474
-msgid ""
-"Host specified as an option to all p4 commands, with '-h <host>'. The "
-"environment variable 'P4HOST' can be used instead."
+msgid "Host specified as an option to all p4 commands, with '-h <host>'. The environment variable 'P4HOST' can be used instead."
msgstr ""
#. type: Labeled list
@@ -45238,9 +35281,7 @@ msgstr "git-add(1)"
#. type: Plain text
#: en/git-p4.txt:478
-msgid ""
-"Client specified as an option to all p4 commands, with '-c <client>', "
-"including the client spec."
+msgid "Client specified as an option to all p4 commands, with '-c <client>', including the client spec."
msgstr ""
#. type: Labeled list
@@ -45252,10 +35293,7 @@ msgstr "git-add(1)"
#. type: Plain text
#: en/git-p4.txt:484
-msgid ""
-"Specifies the number of times to retry a p4 command (notably, 'p4 sync') if "
-"the network times out. The default value is 3. Set the value to 0 to "
-"disable retries or if your p4 version does not support retries (pre 2012.2)."
+msgid "Specifies the number of times to retry a p4 command (notably, 'p4 sync') if the network times out. The default value is 3. Set the value to 0 to disable retries or if your p4 version does not support retries (pre 2012.2)."
msgstr ""
#. type: Title ~
@@ -45272,12 +35310,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:493
-msgid ""
-"Because importing commits from other Git repositories is much faster than "
-"importing them from p4, a mechanism exists to find p4 changes first in Git "
-"remotes. If branches exist under 'refs/remote/origin/p4', those will be "
-"fetched and used when syncing from p4. This variable can be set to 'false' "
-"to disable this behavior."
+msgid "Because importing commits from other Git repositories is much faster than importing them from p4, a mechanism exists to find p4 changes first in Git remotes. If branches exist under 'refs/remote/origin/p4', those will be fetched and used when syncing from p4. This variable can be set to 'false' to disable this behavior."
msgstr ""
#. type: Labeled list
@@ -45288,10 +35321,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -45302,10 +35332,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:505
-msgid ""
-"List of branches to be imported when branch detection is enabled. Each "
-"entry should be a pair of branch names separated by a colon (:). This "
-"example declares that both branchA and branchB were created from main:"
+msgid "List of branches to be imported when branch detection is enabled. Each entry should be a pair of branch names separated by a colon (:). This example declares that both branchA and branchB were created from main:"
msgstr ""
#. type: delimited block -
@@ -45324,9 +35351,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:514
-msgid ""
-"List of p4 labels to ignore. This is built automatically as unimportable "
-"labels are discovered."
+msgid "List of p4 labels to ignore. This is built automatically as unimportable labels are discovered."
msgstr ""
#. type: Labeled list
@@ -45348,9 +35373,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:521
-msgid ""
-"Only p4 labels matching this regular expression will be imported. The "
-"default value is '[a-zA-Z0-9_\\-.]+$'."
+msgid "Only p4 labels matching this regular expression will be imported. The default value is '[a-zA-Z0-9_\\-.]+$'."
msgstr ""
#. type: Labeled list
@@ -45361,11 +35384,7 @@ 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."
+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."
msgstr ""
#. type: Labeled list
@@ -45376,12 +35395,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"paths to UTF-8. As an example, Perforce on Windows often uses \"cp1252\" to "
-"encode path names."
+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 paths to UTF-8. As an example, Perforce on Windows often uses \"cp1252\" to encode path names."
msgstr ""
#. type: Labeled list
@@ -45392,12 +35406,7 @@ msgstr ""
#. type: Plain text
#: 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:"
+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:"
msgstr ""
#. type: delimited block -
@@ -45414,9 +35423,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:549
-msgid ""
-"All files matching a file extension in the list will be processed by the "
-"large file system. Do not prefix the extensions with '.'."
+msgid "All files matching a file extension in the list will be processed by the large file system. Do not prefix the extensions with '.'."
msgstr ""
#. type: Labeled list
@@ -45427,10 +35434,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:554
-msgid ""
-"All files with an uncompressed size exceeding the threshold will be "
-"processed by the large file system. By default the threshold is defined in "
-"bytes. Add the suffix k, m, or g to change the unit."
+msgid "All files with an uncompressed size exceeding the threshold will be processed by the large file system. By default the threshold is defined in bytes. Add the suffix k, m, or g to change the unit."
msgstr ""
#. type: Labeled list
@@ -45441,11 +35445,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:560
-msgid ""
-"All files with a compressed size exceeding the threshold will be processed "
-"by the large file system. This option might slow down your clone/sync "
-"process. By default the threshold is defined in bytes. Add the suffix k, m, "
-"or g to change the unit."
+msgid "All files with a compressed size exceeding the threshold will be processed by the large file system. This option might slow down your clone/sync process. By default the threshold is defined in bytes. Add the suffix k, m, or g to change the unit."
msgstr ""
#. type: Labeled list
@@ -45456,9 +35456,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:564
-msgid ""
-"Boolean variable which defines if large files are automatically pushed to a "
-"server."
+msgid "Boolean variable which defines if large files are automatically pushed to a server."
msgstr ""
#. type: Labeled list
@@ -45469,9 +35467,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:568
-msgid ""
-"A changelist that contains only excluded files will be imported as an empty "
-"commit if this boolean option is set to true."
+msgid "A changelist that contains only excluded files will be imported as an empty commit if this boolean option is set to true."
msgstr ""
#. type: Labeled list
@@ -45482,9 +35478,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:572
-msgid ""
-"Map a P4 user to a name and email address in Git. Use a string with the "
-"following format to create a mapping:"
+msgid "Map a P4 user to a name and email address in Git. Use a string with the following format to create a mapping:"
msgstr ""
#. type: delimited block -
@@ -45495,9 +35489,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:579
-msgid ""
-"A mapping will override any user information from P4. Mappings for multiple "
-"P4 user can be defined."
+msgid "A mapping will override any user information from P4. Mappings for multiple P4 user can be defined."
msgstr ""
#. type: Title ~
@@ -45514,9 +35506,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:585
-msgid ""
-"Detect renames. See linkgit:git-diff[1]. This can be true, false, or a "
-"score as expected by 'git diff -M'."
+msgid "Detect renames. See linkgit:git-diff[1]. This can be true, false, or a score as expected by 'git diff -M'."
msgstr ""
#. type: Labeled list
@@ -45527,9 +35517,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:589
-msgid ""
-"Detect copies. See linkgit:git-diff[1]. This can be true, false, or a "
-"score as expected by 'git diff -C'."
+msgid "Detect copies. See linkgit:git-diff[1]. This can be true, false, or a score as expected by 'git diff -C'."
msgstr ""
#. type: Labeled list
@@ -45551,9 +35539,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:596
-msgid ""
-"On submit, re-author changes to reflect the Git author, regardless of who "
-"invokes 'git p4 submit'."
+msgid "On submit, re-author changes to reflect the Git author, regardless of who invokes 'git p4 submit'."
msgstr ""
#. type: Labeled list
@@ -45564,9 +35550,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:601
-msgid ""
-"When 'preserveUser' is true, 'git p4' normally dies if it cannot find an "
-"author in the p4 user map. This setting submits the change regardless."
+msgid "When 'preserveUser' is true, 'git p4' normally dies if it cannot find an author in the p4 user map. This setting submits the change regardless."
msgstr ""
#. type: Labeled list
@@ -45577,9 +35561,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:606
-msgid ""
-"The submit process invokes the editor before each p4 change is submitted. "
-"If this setting is true, though, the editing step is skipped."
+msgid "The submit process invokes the editor before each p4 change is submitted. If this setting is true, though, the editing step is skipped."
msgstr ""
#. type: Labeled list
@@ -45590,10 +35572,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:611
-msgid ""
-"After editing the p4 change message, 'git p4' makes sure that the "
-"description really was changed by looking at the file modification time. "
-"This option disables that test."
+msgid "After editing the p4 change message, 'git p4' makes sure that the description really was changed by looking at the file modification time. This option disables that test."
msgstr ""
#. type: Labeled list
@@ -45604,12 +35583,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:618
-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 "
-"spaces."
+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 spaces."
msgstr ""
#. type: Labeled list
@@ -45620,9 +35594,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:623
-msgid ""
-"If the user running 'git p4 submit' does not exist in the p4 user map, 'git "
-"p4' exits. This option can be used to force submission regardless."
+msgid "If the user running 'git p4 submit' does not exist in the p4 user map, 'git p4' exits. This option can be used to force submission regardless."
msgstr ""
#. type: Labeled list
@@ -45633,10 +35605,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:629
-msgid ""
-"If enabled, 'git p4 submit' will attempt to cleanup RCS keywords ($Header$, "
-"etc). These would otherwise cause merge conflicts and prevent the submit "
-"going ahead. This option should be considered experimental at present."
+msgid "If enabled, 'git p4 submit' will attempt to cleanup RCS keywords ($Header$, etc). These would otherwise cause merge conflicts and prevent the submit going ahead. This option should be considered experimental at present."
msgstr ""
#. type: Labeled list
@@ -45658,9 +35627,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:636
-msgid ""
-"Only p4 labels matching this regular expression will be exported. The "
-"default value is '[a-zA-Z0-9_\\-.]+$'."
+msgid "Only p4 labels matching this regular expression will be exported. The default value is '[a-zA-Z0-9_\\-.]+$'."
msgstr ""
#. type: Labeled list
@@ -45672,9 +35639,7 @@ 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'."
+msgid "Specify submit behavior when a conflict with p4 is found, as per --conflict. The default behavior is 'ask'."
msgstr ""
#. type: Title -
@@ -45690,30 +35655,22 @@ 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'."
+msgid "Cloning or syncing does not require a p4 client; file contents are collected using 'p4 print'."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:649
-msgid ""
-"Submitting requires a p4 client, which is not in the same location as the "
-"Git repository. Patches are applied, one at a time, to this p4 client and "
-"submitted from there."
+msgid "Submitting requires a p4 client, which is not in the same location as the Git repository. Patches are applied, one at a time, to this p4 client and submitted from there."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:652
-msgid ""
-"Each commit imported by 'git p4' has a line at the end of the log message "
-"indicating the p4 depot location and change number. This line is used by "
-"later 'git p4 sync' operations to know which p4 changes are new."
+msgid "Each commit imported by 'git p4' has a line at the end of the log message indicating the p4 depot location and change number. This line is used by later 'git p4 sync' operations to know which p4 changes are new."
msgstr ""
#. type: Title =
#: en/git-pack-objects.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-pack-objects(1)"
msgstr "git-pack-objects(1)"
@@ -45735,45 +35692,27 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:23
-msgid ""
-"Reads list of objects from the standard input, and writes a packed archive "
-"with specified base-name, or to the standard output."
+msgid "Reads list of objects from the standard input, and writes a packed archive with specified base-name, or to the standard output."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:29
-msgid ""
-"A packed archive is an efficient way to transfer a set of objects between "
-"two repositories as well as an access efficient archival format. In a "
-"packed archive, an object is either stored as a compressed whole or as a "
-"difference from some other object. The latter is often called a delta."
+msgid "A packed archive is an efficient way to transfer a set of objects between two repositories as well as an access efficient archival format. In a packed archive, an object is either stored as a compressed whole or as a difference from some other object. The latter is often called a delta."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:33
-msgid ""
-"The packed archive format (.pack) is designed to be self-contained so that "
-"it can be unpacked without any further information. Therefore, each object "
-"that a delta depends upon must be present within the pack."
+msgid "The packed archive format (.pack) is designed to be self-contained so that it can be unpacked without any further information. Therefore, each object that a delta depends upon must be present within the pack."
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 "
-"directories on $GIT_ALTERNATE_OBJECT_DIRECTORIES) enables Git to read from "
-"the pack archive."
+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 directories on $GIT_ALTERNATE_OBJECT_DIRECTORIES) enables Git to read from the pack archive."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:45
-msgid ""
-"The 'git unpack-objects' command can read the packed archive and expand the "
-"objects contained in the pack into \"one-file one-object\" format; this is "
-"typically done by the smart-pull commands when a pack is created on-the-fly "
-"for efficient network transport by their peers."
+msgid "The 'git unpack-objects' command can read the packed archive and expand the objects contained in the pack into \"one-file one-object\" format; this is typically done by the smart-pull commands when a pack is created on-the-fly for efficient network transport by their peers."
msgstr ""
#. type: Labeled list
@@ -45784,64 +35723,44 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:56
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:60
-msgid ""
-"Write the pack contents (what would have been written to .pack file) out to "
-"the standard output."
+msgid "Write the pack contents (what would have been written to .pack file) out to the standard output."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:61
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--revs"
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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:70 en/rev-list-options.txt:693
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--unpacked"
msgstr "--unpacked"
#. type: Plain text
#: en/git-pack-objects.txt:74
-msgid ""
-"This implies `--revs`. When processing the list of revision arguments read "
-"from the standard input, limit the objects packed to those that are not "
-"already packed."
+msgid "This implies `--revs`. When processing the list of revision arguments read from the standard input, limit the objects packed to those that are not already packed."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:80
-msgid ""
-"This implies `--revs`. In addition to the list of revision arguments read "
-"from the standard input, pretend as if all refs under `refs/` are specified "
-"to be included."
+msgid "This implies `--revs`. In addition to the list of revision arguments read from the standard input, pretend as if all refs under `refs/` are specified to be included."
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 "
-"Git clients."
+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 Git clients."
msgstr ""
#. type: Labeled list
@@ -45852,15 +35771,7 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:98
-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 "
-"is 50."
+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 is 50."
msgstr ""
#. type: Labeled list
@@ -45871,57 +35782,38 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:109
-msgid ""
-"This option provides an additional limit on top of `--window`; the window "
-"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 "
-"usage unlimited. The default is taken from the `pack.windowMemory` "
-"configuration variable."
+msgid "This option provides an additional limit on top of `--window`; the window 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 usage unlimited. The default is taken from the `pack.windowMemory` configuration variable."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:117 en/git-repack.txt:115
-msgid ""
-"Maximum size of each output pack file. The size can be suffixed with \"k\", "
-"\"m\", or \"g\". The minimum size allowed is limited to 1 MiB. If "
-"specified, multiple packfiles may be created, which also prevents the "
-"creation of a bitmap index. The default is unlimited, unless the config "
-"variable `pack.packSizeLimit` is set."
+msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB. If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index. The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:118
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--honor-pack-keep"
msgstr "--honor-pack-keep"
#. type: Plain text
#: en/git-pack-objects.txt:122
-msgid ""
-"This flag causes an object already in a local pack that has a .keep file to "
-"be ignored, even if it would have otherwise been packed."
+msgid "This flag causes an object already in a local pack that has a .keep file to be ignored, even if it would have otherwise been packed."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:126
-msgid ""
-"This flag causes an object already in a pack to be ignored even if it would "
-"have otherwise been packed."
+msgid "This flag causes an object already in a pack to be ignored even if it would have otherwise been packed."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:131
-msgid ""
-"This flag causes an object that is borrowed from an alternate object store "
-"to be ignored even if it would have otherwise been packed."
+msgid "This flag causes an object that is borrowed from an alternate object store to be ignored even if it would have otherwise been packed."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:132
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--non-empty"
msgstr "--non-empty"
@@ -45932,71 +35824,51 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:142
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--all-progress"
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 "
-"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."
+msgid "When --stdout is specified then progress report is displayed during the object count and compression phases but inhibited during the write-out phase. The reason is that in some cases the output stream is directly linked to another command which may wish to display progress status of its own as it processes incoming pack data. This flag is like --progress except that it forces progress report for the write-out phase as well even if --stdout is used."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:153
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--all-progress-implied"
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."
+msgid "This is used to imply --all-progress whenever progress display is activated. Unlike --all-progress this flag doesn't actually force any progress display by itself."
msgstr ""
#. 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."
+msgid "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, ignore-translated
+#, no-wrap
msgid "--no-reuse-delta"
msgstr "--no-reuse-delta"
#. type: Plain text
#: en/git-pack-objects.txt:168
-msgid ""
-"When creating a packed archive in a repository that has existing packs, the "
-"command reuses existing deltas. This sometimes results in a slightly "
-"suboptimal pack. This flag tells the command not to reuse existing deltas "
-"but compute them from scratch."
+msgid "When creating a packed archive in a repository that has existing packs, the command reuses existing deltas. This sometimes results in a slightly suboptimal pack. This flag tells the command not to reuse existing deltas but compute them from scratch."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:169
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-reuse-object"
msgstr "--no-reuse-object"
#. type: Plain text
#: en/git-pack-objects.txt:175
-msgid ""
-"This flag tells the command not to reuse existing object data at all, "
-"including non deltified object, forcing recompression of everything. This "
-"implies --no-reuse-delta. Useful only in the obscure case where wholesale "
-"enforcement of a different compression level on the packed data is desired."
+msgid "This flag tells the command not to reuse existing object data at all, including non deltified object, forcing recompression of everything. This implies --no-reuse-delta. Useful only in the obscure case where wholesale enforcement of a different compression level on the packed data is desired."
msgstr ""
#. type: Labeled list
@@ -46007,107 +35879,70 @@ 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."
+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."
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 "
-"in conjunction with --stdout."
+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 in conjunction with --stdout."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:193
-msgid ""
-"Note: A thin pack violates the packed archive format by omitting required "
-"objects and is thus unusable by Git without making it self-contained. Use "
-"`git index-pack --fix-thin` (see linkgit:git-index-pack[1]) to restore the "
-"self-contained property."
+msgid "Note: A thin pack violates the packed archive format by omitting required objects and is thus unusable by Git without making it self-contained. Use `git index-pack --fix-thin` (see linkgit:git-index-pack[1]) to restore the self-contained property."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:194
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--shallow"
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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:199
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--delta-base-offset"
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."
+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."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:214
-msgid ""
-"Note: Porcelain commands such as `git gc` (see linkgit:git-gc[1]), `git "
-"repack` (see linkgit:git-repack[1]) pass this option by default in modern "
-"Git when they put objects in your repository into pack files. So does `git "
-"bundle` (see linkgit:git-bundle[1]) when it creates a bundle."
+msgid "Note: Porcelain commands such as `git gc` (see linkgit:git-gc[1]), `git repack` (see linkgit:git-repack[1]) pass this option by default in modern Git when they put objects in your repository into pack files. So does `git bundle` (see linkgit:git-bundle[1]) when it creates a bundle."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:224
-msgid ""
-"Specifies the number of threads to spawn when searching for best delta "
-"matches. This requires that pack-objects be compiled with pthreads "
-"otherwise this option is ignored with a warning. This is meant to reduce "
-"packing time on multiprocessor machines. The required amount of memory for "
-"the delta search window is however multiplied by the number of threads. "
-"Specifying 0 will cause Git to auto-detect the number of CPU's and set the "
-"number of threads accordingly."
+msgid "Specifies the number of threads to spawn when searching for best delta matches. This requires that pack-objects be compiled with pthreads otherwise this option is ignored with a warning. This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. Specifying 0 will cause Git to auto-detect the number of CPU's and set the number of threads accordingly."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:230
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--keep-true-parents"
msgstr "--keep-true-parents"
#. type: Plain text
#: en/git-pack-objects.txt:233
-msgid ""
-"With this option, parents that are hidden by grafts are packed nevertheless."
+msgid "With this option, parents that are hidden by grafts are packed nevertheless."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:239
-#, ignore-translated
-msgid ""
-"linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
-msgstr ""
-"linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
+msgid "linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
+msgstr "linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
#. type: Title =
#: en/git-pack-redundant.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-pack-redundant(1)"
msgstr "git-pack-redundant(1)"
@@ -46119,33 +35954,22 @@ 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
#: en/git-pack-redundant.txt:19
-msgid ""
-"This program computes which packs in your repository are redundant. The "
-"output is suitable for piping to `xargs rm` if you are in the root of the "
-"repository."
+msgid "This program computes which packs in your repository are redundant. The output is suitable for piping to `xargs rm` if you are in the root of the repository."
msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:24
-msgid ""
-"'git pack-redundant' accepts a list of objects on standard input. Any "
-"objects given will be ignored when checking which packs are required. This "
-"makes the following command useful when wanting to remove packs which "
-"contain unreachable objects."
+msgid "'git pack-redundant' accepts a list of objects on standard input. Any objects given will be ignored when checking which packs are required. This makes the following command useful when wanting to remove packs which contain unreachable objects."
msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:27
-msgid ""
-"git fsck --full --unreachable | cut -d ' ' -f3 | \\ git pack-redundant --all"
-" | xargs rm"
+msgid "git fsck --full --unreachable | cut -d ' ' -f3 | \\ git pack-redundant --all | xargs rm"
msgstr ""
#. type: Plain text
@@ -46155,15 +35979,13 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-redundant.txt:35
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--alt-odb"
msgstr "--alt-odb"
#. type: Plain text
#: en/git-pack-redundant.txt:38
-msgid ""
-"Don't require objects present in packs from alternate object directories to "
-"be present in local packs."
+msgid "Don't require objects present in packs from alternate object directories to be present in local packs."
msgstr ""
#. type: Plain text
@@ -46173,17 +35995,12 @@ msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:47
-#, ignore-translated
-msgid ""
-"linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-"
-"packed[1]"
-msgstr ""
-"linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-"
-"packed[1]"
+msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
#. type: Title =
#: en/git-pack-refs.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-pack-refs(1)"
msgstr "git-pack-refs(1)"
@@ -46200,78 +36017,48 @@ 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` "
-"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 "
-"hurts performance."
+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` 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 hurts performance."
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."
+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."
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."
+msgid "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 "
-"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."
+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 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."
msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:56
-msgid ""
-"The command by default packs all tags and refs that are already packed, and "
-"leaves other refs alone. This is because branches are expected to be "
-"actively developed and packing their tips does not help performance. This "
-"option causes branch tips to be packed as well. Useful for a repository "
-"with many branches of historical interests."
+msgid "The command by default packs all tags and refs that are already packed, and leaves other refs alone. This is because branches are expected to be actively developed and packing their tips does not help performance. This option causes branch tips to be packed as well. Useful for a repository with many branches of historical interests."
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."
+msgid "The command usually removes loose refs under `$GIT_DIR/refs` hierarchy after packing them. This option tells it not to."
msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:69
-msgid ""
-"Older documentation written before the packed-refs mechanism was introduced "
-"may still say things like \".git/refs/heads/<branch> file exists\" when it "
-"means \"branch <branch> exists\"."
+msgid "Older documentation written before the packed-refs mechanism was introduced may still say things like \".git/refs/heads/<branch> file exists\" when it means \"branch <branch> exists\"."
msgstr ""
#. type: Title =
#: en/git-parse-remote.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-parse-remote(1)"
msgstr "git-parse-remote(1)"
#. type: Plain text
#: en/git-parse-remote.txt:7
-msgid ""
-"git-parse-remote - Routines to help parsing remote repository access "
-"parameters"
+msgid "git-parse-remote - Routines to help parsing remote repository access parameters"
msgstr ""
#. type: Plain text
@@ -46282,15 +36069,12 @@ 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 "
-"that are related to fetching, pulling and pushing."
+msgid "This script is included in various scripts to supply routines to parse files under $GIT_DIR/remotes/ and $GIT_DIR/branches/ and configuration variables that are related to fetching, pulling and pushing."
msgstr ""
#. type: Title =
#: en/git-patch-id.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-patch-id(1)"
msgstr "git-patch-id(1)"
@@ -46312,12 +36096,7 @@ msgstr ""
#. type: Plain text
#: en/git-patch-id.txt:21
-msgid ""
-"A \"patch ID\" is nothing but a sum of SHA-1 of the file diffs associated "
-"with a patch, with whitespace and line numbers ignored. As such, it's "
-"\"reasonably stable\", but at the same time also reasonably unique, i.e., "
-"two patches that have the same \"patch ID\" are almost guaranteed to be the "
-"same thing."
+msgid "A \"patch ID\" is nothing but a sum of SHA-1 of the file diffs associated with a patch, with whitespace and line numbers ignored. As such, it's \"reasonably stable\", but at the same time also reasonably unique, i.e., two patches that have the same \"patch ID\" are almost guaranteed to be the same thing."
msgstr ""
#. type: Plain text
@@ -46327,17 +36106,12 @@ msgstr ""
#. type: Plain text
#: en/git-patch-id.txt:29
-msgid ""
-"When dealing with 'git diff-tree' output, it takes advantage of the fact "
-"that the patch is prefixed with the object name of the commit, and outputs "
-"two 40-byte hexadecimal strings. The first string is the patch ID, and the "
-"second string is the commit ID. This can be used to make a mapping from "
-"patch ID to commit ID."
+msgid "When dealing with 'git diff-tree' output, it takes advantage of the fact that the patch is prefixed with the object name of the commit, and outputs two 40-byte hexadecimal strings. The first string is the patch ID, and the second string is the commit ID. This can be used to make a mapping from patch ID to commit ID."
msgstr ""
#. type: Labeled list
#: en/git-patch-id.txt:33
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--stable"
msgstr "--stable"
@@ -46348,22 +36122,12 @@ msgstr ""
#. type: Plain text
#: en/git-patch-id.txt:41
-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;"
+msgid "Reordering file diffs that make up a patch does not affect the ID. In particular, two patches produced by comparing the same two trees with two different settings for \"-O<orderfile>\" result in the same patch ID signature, thereby allowing the computed result to be used as a key to index some meta-information about the change between the two trees;"
msgstr ""
#. 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 "
-"used on a diff output taken without any use of \"-O<orderfile>\", thereby "
-"making existing databases storing such \"unstable\" or historical patch-ids "
-"unusable."
+msgid "Result is different from the value produced by git 1.9 and older or produced when an \"unstable\" hash (see --unstable below) is configured - even when used on a diff output taken without any use of \"-O<orderfile>\", thereby making existing databases storing such \"unstable\" or historical patch-ids unusable."
msgstr ""
#. type: Plain text
@@ -46374,18 +36138,13 @@ msgstr ""
#. type: Labeled list
#: en/git-patch-id.txt:50
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--unstable"
msgstr "--unstable"
#. type: Plain text
#: en/git-patch-id.txt:56
-msgid ""
-"Use an \"unstable\" hash as the patch ID. With this option, the result "
-"produced is compatible with the patch-id value produced by git 1.9 and "
-"older. Users with pre-existing databases storing patch-ids produced by git "
-"1.9 and older (who do not deal with reordered patches) may want to use this "
-"option."
+msgid "Use an \"unstable\" hash as the patch ID. With this option, the result produced is compatible with the patch-id value produced by git 1.9 and older. Users with pre-existing databases storing patch-ids produced by git 1.9 and older (who do not deal with reordered patches) may want to use this option."
msgstr ""
#. type: Plain text
@@ -46400,7 +36159,7 @@ msgstr ""
#. type: Title =
#: en/git-prune-packed.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-prune-packed(1)"
msgstr "git-prune-packed(1)"
@@ -46417,10 +36176,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
@@ -46430,16 +36186,12 @@ msgstr ""
#. type: Plain text
#: en/git-prune-packed.txt:24 en/git-repack.txt:24
-msgid ""
-"A pack is a collection of objects, individually compressed, with delta "
-"compression applied, stored in a single file, with an associated index file."
+msgid "A pack is a collection of objects, individually compressed, with delta compression applied, stored in a single file, with an associated index file."
msgstr ""
#. type: Plain text
#: en/git-prune-packed.txt:27 en/git-repack.txt:27
-msgid ""
-"Packs are used to reduce the load on mirror systems, backup engines, disk "
-"storage, etc."
+msgid "Packs are used to reduce the load on mirror systems, backup engines, disk storage, etc."
msgstr ""
#. type: Plain text
@@ -46450,9 +36202,7 @@ msgstr ""
#| "--dry-run::\n"
#| "\tDon't actually add the file(s), just show if they exist and/or will\n"
#| "\tbe ignored.\n"
-msgid ""
-"Don't actually remove any objects, only show those that would have been "
-"removed."
+msgid "Don't actually remove any objects, only show those that would have been removed."
msgstr ""
"-n::\n"
"--dry-run::\n"
@@ -46466,13 +36216,12 @@ msgstr ""
#. type: Plain text
#: en/git-prune-packed.txt:44
-#, ignore-translated
msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Title =
#: en/git-prune.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-prune(1)"
msgstr "git-prune(1)"
@@ -46491,27 +36240,17 @@ msgstr ""
#. type: Plain text
#: en/git-prune.txt:19
-msgid ""
-"In most cases, users should run 'git gc', which calls 'git prune'. See the "
-"section \"NOTES\", below."
+msgid "In most cases, users should run 'git gc', which calls 'git prune'. See the section \"NOTES\", below."
msgstr ""
#. type: Plain text
#: 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 "
-"also found in packs by running 'git prune-packed'. It also removes entries "
-"from .git/shallow that are not reachable by any ref."
+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 also found in packs by running 'git prune-packed'. It also removes entries from .git/shallow that are not reachable by any ref."
msgstr ""
#. type: Plain text
#: en/git-prune.txt:32
-msgid ""
-"Note that unreachable, packed objects will remain. If this is not desired, "
-"see linkgit:git-repack[1]."
+msgid "Note that unreachable, packed objects will remain. If this is not desired, see linkgit:git-repack[1]."
msgstr ""
#. type: Plain text
@@ -46561,16 +36300,12 @@ msgstr ""
#. type: Plain text
#: en/git-prune.txt:55
-msgid ""
-"In addition to objects reachable from any of our references, keep objects "
-"reachable from listed <head>s."
+msgid "In addition to objects reachable from any of our references, keep objects reachable from listed <head>s."
msgstr ""
#. type: Plain text
#: en/git-prune.txt:62
-msgid ""
-"To prune objects not used by your repository or another that borrows from "
-"your repository via its `.git/objects/info/alternates`:"
+msgid "To prune objects not used by your repository or another that borrows from your repository via its `.git/objects/info/alternates`:"
msgstr ""
#. type: delimited block -
@@ -46581,41 +36316,30 @@ msgstr ""
#. type: Plain text
#: en/git-prune.txt:73
-msgid ""
-"In most cases, users will not need to call 'git prune' directly, but should "
-"instead call 'git gc', which handles pruning along with many other "
-"housekeeping tasks."
+msgid "In most cases, users will not need to call 'git prune' directly, but should instead call 'git gc', which handles pruning along with many other housekeeping tasks."
msgstr ""
#. type: Plain text
#: en/git-prune.txt:76
-msgid ""
-"For a description of which objects are considered for pruning, see 'git "
-"fsck''s --unreachable option."
+msgid "For a description of which objects are considered for pruning, see 'git fsck''s --unreachable option."
msgstr ""
#. type: Plain text
#: en/git-prune.txt:83
#, fuzzy
-#| msgid ""
-#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-#| "merge[1], linkgit:git-commit-tree[1]"
+#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgid "linkgit:git-fsck[1], linkgit:git-gc[1], linkgit:git-reflog[1]"
-msgstr ""
-"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-"merge[1], linkgit:git-commit-tree[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-pull.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-pull(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"
+msgid "git-pull - Fetch from and integrate with another repository or a local branch"
msgstr ""
#. type: Plain text
@@ -46626,37 +36350,22 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:21
-msgid ""
-"Incorporates changes from a remote repository into the current branch. In "
-"its default mode, `git pull` is shorthand for `git fetch` followed by `git "
-"merge FETCH_HEAD`."
+msgid "Incorporates changes from a remote repository into the current branch. In its default mode, `git pull` is shorthand for `git fetch` followed by `git merge FETCH_HEAD`."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:26
-msgid ""
-"More precisely, 'git pull' runs 'git fetch' with the given parameters and "
-"calls 'git merge' to merge the retrieved branch heads into the current "
-"branch. With `--rebase`, it runs 'git rebase' instead of 'git merge'."
+msgid "More precisely, 'git pull' runs 'git fetch' with the given parameters and calls 'git merge' to merge the retrieved branch heads into the current branch. With `--rebase`, it runs 'git rebase' instead of 'git merge'."
msgstr ""
#. 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."
+msgid "<repository> should be the name of a remote repository as passed to linkgit:git-fetch[1]. <refspec> can name an arbitrary remote ref (for example, the name of a tag) or even a collection of refs with corresponding remote-tracking branches (e.g., refs/heads/{asterisk}:refs/remotes/origin/{asterisk}), but usually it is the name of a branch in the remote repository."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:37
-msgid ""
-"Default values for <repository> and <branch> are read from the \"remote\" "
-"and \"merge\" configuration for the current branch as set by linkgit:git-"
-"branch[1] `--track`."
+msgid "Default values for <repository> and <branch> are read from the \"remote\" and \"merge\" configuration for the current branch as set by linkgit:git-branch[1] `--track`."
msgstr ""
#. type: delimited block -
@@ -46672,12 +36381,7 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "Then \"`git pull`\" will fetch and replay the changes from the remote `master` branch since it diverged from the local `master` (i.e., `E`) until its current commit (`C`) on top of `master` and record the result in a new commit along with the names of the two parent commits and a log message from the user describing the changes."
msgstr ""
#. type: delimited block -
@@ -46691,34 +36395,22 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:63
-msgid ""
-"See linkgit:git-merge[1] for details, including how conflicts are presented "
-"and handled."
+msgid "See linkgit:git-merge[1] for details, including how conflicts are presented and handled."
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."
+msgid "In Git 1.7.0 or later, to cancel a conflicting merge, use `git reset --merge`. *Warning*: In older versions of Git, running 'git pull' with uncommitted changes is discouraged: while possible, it leaves you in a state that may be hard to back out of in the case of a conflict."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:73
-msgid ""
-"If any of the remote changes overlap with local uncommitted changes, the "
-"merge will be automatically cancelled and the work tree untouched. It is "
-"generally best to get any local changes in working order before pulling or "
-"stash them away with linkgit:git-stash[1]."
+msgid "If any of the remote changes overlap with local uncommitted changes, the merge will be automatically cancelled and the work tree untouched. It is generally best to get any local changes in working order before pulling or stash them away with linkgit:git-stash[1]."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:82
-msgid ""
-"This is passed to both underlying git-fetch to squelch reporting of during "
-"transfer, and underlying git-merge to squelch output during merging."
+msgid "This is passed to both underlying git-fetch to squelch reporting of during transfer, and underlying git-merge to squelch output during merging."
msgstr ""
#. type: Plain text
@@ -46734,13 +36426,7 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:95
-msgid ""
-"This option controls if new commits of all populated submodules should be "
-"fetched too (see linkgit:git-config[1] and linkgit:gitmodules[5]). That "
-"might be necessary to get the data needed for merging submodule commits, a "
-"feature Git learned in 1.7.3. Notice that the result of a merge will not be "
-"checked out in the submodule, \"git submodule update\" has to be called "
-"afterwards to bring the work tree up to date with the merge result."
+msgid "This option controls if new commits of all populated submodules should be fetched too (see linkgit:git-config[1] and linkgit:gitmodules[5]). That might be necessary to get the data needed for merging submodule commits, a feature Git learned in 1.7.3. Notice that the result of a merge will not be checked out in the submodule, \"git submodule update\" has to be called afterwards to bring the work tree up to date with the merge result."
msgstr ""
#. type: Title ~
@@ -46757,18 +36443,12 @@ msgstr ""
#. type: Plain text
#: 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 "
-"uses that information to avoid rebasing non-local changes."
+msgid "When true, rebase the current branch on top of the upstream branch after fetching. If there is a remote-tracking branch corresponding to the upstream branch and the upstream branch was rebased since last fetched, the rebase uses that information to avoid rebasing non-local changes."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:113
-msgid ""
-"When set to preserve, rebase with the `--preserve-merges` option passed to "
-"`git rebase` so that locally created merge commits will not be flattened."
+msgid "When set to preserve, rebase with the `--preserve-merges` option passed to `git rebase` so that locally created merge commits will not be flattened."
msgstr ""
#. type: Plain text
@@ -46783,23 +36463,17 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:121
-msgid ""
-"See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in "
-"linkgit:git-config[1] if you want to make `git pull` always use `--rebase` "
-"instead of merging."
+msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:127
-msgid ""
-"This is a potentially _dangerous_ mode of operation. It rewrites history, "
-"which does not bode well when you published that history already. Do *not* "
-"use this option unless you have read linkgit:git-rebase[1] carefully."
+msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
msgstr ""
#. type: Labeled list
#: en/git-pull.txt:128 en/git-svn.txt:245
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-rebase"
msgstr "--no-rebase"
@@ -46810,23 +36484,19 @@ msgstr ""
#. type: Labeled list
#: en/git-pull.txt:131 en/git-rebase.txt:442
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
#: en/git-pull.txt:132 en/git-rebase.txt:443
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-autostash"
msgstr "--no-autostash"
#. type: Plain text
#: en/git-pull.txt:137
-msgid ""
-"Before starting rebase, stash local modifications away (see linkgit:git-"
-"stash[1]) if needed, and apply the stash when done. `--no-autostash` is "
-"useful to override the `rebase.autoStash` configuration variable (see "
-"linkgit:git-config[1])."
+msgid "Before starting rebase, stash local modifications away (see linkgit:git-stash[1]) if needed, and apply the stash when done. `--no-autostash` is useful to override the `rebase.autoStash` configuration variable (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
@@ -46848,32 +36518,17 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:159
-msgid ""
-"Often people use `git pull` without giving any parameter. Traditionally, "
-"this has been equivalent to saying `git pull origin`. However, when "
-"configuration `branch.<name>.remote` is present while on branch `<name>`, "
-"that value is used instead of `origin`."
+msgid "Often people use `git pull` without giving any parameter. Traditionally, this has been equivalent to saying `git pull origin`. However, when configuration `branch.<name>.remote` is present while on branch `<name>`, that value is used instead of `origin`."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:164
-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."
+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."
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:"
+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:"
msgstr ""
#. type: delimited block -
@@ -46884,41 +36539,27 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "A globbing refspec must have a non-empty RHS (i.e. must store what were fetched in remote-tracking branches), and its LHS and RHS must end with `/*`. The above specifies that all remote branches are tracked using remote-tracking branches in `refs/remotes/origin/` hierarchy under the same name."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:187
-msgid ""
-"The rule to determine which remote branch to merge after fetching is a bit "
-"involved, in order not to break backward compatibility."
+msgid "The rule to determine which remote branch to merge after fetching is a bit involved, in order not to break backward compatibility."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:190
-msgid ""
-"If explicit refspecs were given on the command line of `git pull`, they are "
-"all merged."
+msgid "If explicit refspecs were given on the command line of `git pull`, they are all merged."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:195
-msgid ""
-"When no refspec was given on the command line, then `git pull` uses the "
-"refspec from the configuration or `$GIT_DIR/remotes/<origin>`. In such "
-"cases, the following rules apply:"
+msgid "When no refspec was given on the command line, then `git pull` uses the refspec from the configuration or `$GIT_DIR/remotes/<origin>`. In such cases, the following rules apply:"
msgstr ""
#. type: Plain text
#: en/git-pull.txt:199
-msgid ""
-"If `branch.<name>.merge` configuration for the current branch `<name>` "
-"exists, that is the name of the branch at the remote site that is merged."
+msgid "If `branch.<name>.merge` configuration for the current branch `<name>` exists, that is the name of the branch at the remote site that is merged."
msgstr ""
#. type: Plain text
@@ -46933,9 +36574,7 @@ 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:"
+msgid "Update the remote-tracking branches for the repository you cloned from, then merge one of them into your current branch:"
msgstr ""
#. type: delimited block -
@@ -46947,10 +36586,7 @@ msgstr "$ git commit\n"
#. type: Plain text
#: en/git-pull.txt:219
-msgid ""
-"Normally the branch merged in is the HEAD of the remote repository, but the "
-"choice is determined by the branch.<name>.remote and branch.<name>.merge "
-"options; see linkgit:git-config[1] for details."
+msgid "Normally the branch merged in is the HEAD of the remote repository, but the choice is determined by the branch.<name>.remote and branch.<name>.merge options; see linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
@@ -46966,10 +36602,7 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:229
-msgid ""
-"This leaves a copy of `next` temporarily in FETCH_HEAD, but does not update "
-"any remote-tracking branches. Using remote-tracking branches, the same can "
-"be done by invoking fetch and merge:"
+msgid "This leaves a copy of `next` temporarily in FETCH_HEAD, but does not update any remote-tracking branches. Using remote-tracking branches, the same can be done by invoking fetch and merge:"
msgstr ""
#. type: delimited block -
@@ -46982,25 +36615,19 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:238
-msgid ""
-"If you tried a pull which resulted in complex conflicts and would want to "
-"start over, you can recover with 'git reset'."
+msgid "If you tried a pull which resulted in complex conflicts and would want to start over, you can recover with 'git reset'."
msgstr ""
#. type: Plain text
#: en/git-pull.txt:254
#, fuzzy
-#| msgid ""
-#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-#| "merge[1], linkgit:git-commit-tree[1]"
+#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgid "linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]"
-msgstr ""
-"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-"merge[1], linkgit:git-commit-tree[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-push.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-push(1)"
msgstr "git-push(1)"
@@ -47023,46 +36650,27 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:24
-msgid ""
-"Updates remote refs using local refs, while sending objects necessary to "
-"complete the given refs."
+msgid "Updates remote refs using local refs, while sending objects necessary to complete the given refs."
msgstr ""
#. type: Plain text
#: en/git-push.txt:28
-msgid ""
-"You can make interesting things happen to a repository every time you push "
-"into it, by setting up 'hooks' there. See documentation for linkgit:git-"
-"receive-pack[1]."
+msgid "You can make interesting things happen to a repository every time you push into it, by setting up 'hooks' there. See documentation for linkgit:git-receive-pack[1]."
msgstr ""
#. 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 "
-"consulted to determine where to push. If the configuration is missing, it "
-"defaults to 'origin'."
+msgid "When the command line does not specify where to push with the `<repository>` argument, `branch.*.remote` configuration for the current branch is consulted to determine where to push. If the configuration is missing, it defaults to 'origin'."
msgstr ""
#. type: Plain text
#: en/git-push.txt:39
-msgid ""
-"When the command line does not specify what to push with `<refspec>...` "
-"arguments or `--all`, `--mirror`, `--tags` options, the command finds the "
-"default `<refspec>` by consulting `remote.*.push` configuration, and if it "
-"is not found, honors `push.default` configuration to decide what to push "
-"(See linkgit:git-config[1] for the meaning of `push.default`)."
+msgid "When the command line does not specify what to push with `<refspec>...` arguments or `--all`, `--mirror`, `--tags` options, the command finds the default `<refspec>` by consulting `remote.*.push` configuration, and if it is not found, honors `push.default` configuration to decide what to push (See linkgit:git-config[1] for the meaning of `push.default`)."
msgstr ""
#. type: Plain text
#: en/git-push.txt:46
-msgid ""
-"When neither the command-line nor the configuration specify what to push, "
-"the default behavior is used, which corresponds to the `simple` value for "
-"`push.default`: the current branch is pushed to the corresponding upstream "
-"branch, but as a safety measure, the push is aborted if the upstream branch "
-"does not have the same name as the local one."
+msgid "When neither the command-line nor the configuration specify what to push, the default behavior is used, which corresponds to the `simple` value for `push.default`: the current branch is pushed to the corresponding upstream branch, but as a safety measure, the push is aborted if the upstream branch does not have the same name as the local one."
msgstr ""
#. type: Title -
@@ -47073,10 +36681,7 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:55
-msgid ""
-"The \"remote\" repository that is destination of a push operation. This "
-"parameter can be either a URL (see the section <<URLS,GIT URLS>> below) or "
-"the name of a remote (see the section <<REMOTES,REMOTES>> below)."
+msgid "The \"remote\" repository that is destination of a push operation. This parameter can be either a URL (see the section <<URLS,GIT URLS>> below) or the name of a remote (see the section <<REMOTES,REMOTES>> below)."
msgstr ""
#. type: Labeled list
@@ -47087,44 +36692,22 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:61
-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>."
+msgid "Specify what destination ref to update with what source object. The format of a <refspec> parameter is an optional plus `+`, followed by the source object <src>, followed by a colon `:`, followed by the destination ref <dst>."
msgstr ""
#. 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 "
-"linkgit:gitrevisions[7])."
+msgid "The <src> is often the name of the branch you would want to push, but it can be any arbitrary \"SHA-1 expression\", such as `master~4` or `HEAD` (see linkgit:gitrevisions[7])."
msgstr ""
#. type: Plain text
#: en/git-push.txt:75
-msgid ""
-"The <dst> tells which ref on the remote side is updated with this push. "
-"Arbitrary expressions cannot be used here, an actual ref must be named. If "
-"`git push [<repository>]` without any `<refspec>` argument is set to update "
-"some ref at the destination with `<src>` with `remote.<repository>.push` "
-"configuration variable, `:<dst>` part can be omitted--such a push will "
-"update a ref that `<src>` normally updates without any `<refspec>` on the "
-"command line. Otherwise, missing `:<dst>` means to update the same ref as "
-"the `<src>`."
+msgid "The <dst> tells which ref on the remote side is updated with this push. Arbitrary expressions cannot be used here, an actual ref must be named. If `git push [<repository>]` without any `<refspec>` argument is set to update some ref at the destination with `<src>` with `remote.<repository>.push` configuration variable, `:<dst>` part can be omitted--such a push will update a ref that `<src>` normally updates without any `<refspec>` on the command line. Otherwise, missing `:<dst>` means to update the same ref as the `<src>`."
msgstr ""
#. type: Plain text
#: en/git-push.txt:83
-msgid ""
-"The object referenced by <src> is used to update the <dst> reference on the "
-"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 "
-"details."
+msgid "The object referenced by <src> is used to update the <dst> reference on the 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 details."
msgstr ""
#. type: Plain text
@@ -47134,90 +36717,58 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:88
-msgid ""
-"Pushing an empty <src> allows you to delete the <dst> ref from the remote "
-"repository."
+msgid "Pushing an empty <src> allows you to delete the <dst> ref from the remote repository."
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."
+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."
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>."
+msgid "Push all branches (i.e. refs under `refs/heads/`); cannot be used with other <refspec>."
msgstr ""
#. type: Plain text
#: en/git-push.txt:105
-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` "
-"will be removed if `refs/heads/foo` doesn't exist."
+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` will be removed if `refs/heads/foo` doesn't exist."
msgstr ""
#. type: Plain text
#: en/git-push.txt:116
-msgid ""
-"Instead of naming each ref to push, specifies that all refs under `refs/` "
-"(which includes but is not limited to `refs/heads/`, `refs/remotes/`, and "
-"`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."
+msgid "Instead of naming each ref to push, specifies that all refs under `refs/` (which includes but is not limited to `refs/heads/`, `refs/remotes/`, and `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."
msgstr ""
#. type: Plain text
#: en/git-push.txt:125
-msgid ""
-"Produce machine-readable output. The output status line for each ref will "
-"be tab-separated and sent to stdout instead of stderr. The full symbolic "
-"names of the refs will be given."
+msgid "Produce machine-readable output. The output status line for each ref will be tab-separated and sent to stdout instead of stderr. The full symbolic names of the refs will be given."
msgstr ""
#. type: Plain text
#: en/git-push.txt:129
-msgid ""
-"All listed refs are deleted from the remote repository. This is the same as "
-"prefixing all refs with a colon."
+msgid "All listed refs are deleted from the remote repository. This is the same as prefixing all refs with a colon."
msgstr ""
#. type: Plain text
#: en/git-push.txt:134
-msgid ""
-"All refs under `refs/tags` are pushed, in addition to refspecs explicitly "
-"listed on the command line."
+msgid "All refs under `refs/tags` are pushed, in addition to refspecs explicitly listed on the command line."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:135
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--follow-tags"
msgstr "--follow-tags"
#. type: Plain text
#: en/git-push.txt:142
-msgid ""
-"Push all the refs that would be pushed without this option, and also push "
-"annotated tags in `refs/tags` that are missing from the remote but are "
-"pointing at commit-ish that are reachable from the refs being pushed. This "
-"can also be specified with configuration variable `push.followTags`. For "
-"more information, see `push.followTags` in linkgit:git-config[1]."
+msgid "Push all the refs that would be pushed without this option, and also push annotated tags in `refs/tags` that are missing from the remote but are pointing at commit-ish that are reachable from the refs being pushed. This can also be specified with configuration variable `push.followTags`. For more information, see `push.followTags` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:143 en/git-send-pack.txt:73
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]signed"
msgstr "--[no-]signed"
@@ -47229,42 +36780,29 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:153 en/git-send-pack.txt:83
-msgid ""
-"GPG-sign the push request to update refs on the receiving side, to allow it "
-"to be checked by the hooks and/or be logged. If `false` or `--no-signed`, "
-"no signing will be attempted. If `true` or `--signed`, the push will fail "
-"if the server does not support signed pushes. If set to `if-asked`, sign if"
-" and only if the server supports signed pushes. The push will also fail if "
-"the actual call to `gpg --sign` fails. See linkgit:git-receive-pack[1] for "
-"the details on the receiving end."
+msgid "GPG-sign the push request to update refs on the receiving side, to allow it to be checked by the hooks and/or be logged. If `false` or `--no-signed`, no signing will be attempted. If `true` or `--signed`, the push will fail if the server does not support signed pushes. If set to `if-asked`, sign if and only if the server supports signed pushes. The push will also fail if the actual call to `gpg --sign` fails. See linkgit:git-receive-pack[1] for the details on the receiving end."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:154
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]atomic"
msgstr "--[no-]atomic"
#. type: Plain text
#: en/git-push.txt:158
-msgid ""
-"Use an atomic transaction on the remote side if available. Either all refs "
-"are updated, or on error, no refs are updated. If the server does not "
-"support atomic pushes the push will fail."
+msgid "Use an atomic transaction on the remote side if available. Either all refs are updated, or on error, no refs are updated. If the server does not support atomic pushes the push will fail."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:160
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--push-option"
msgstr "--push-option"
#. type: Plain text
#: en/git-push.txt:164
-msgid ""
-"Transmit the given string to the server, which passes them to the pre-"
-"receive as well as the post-receive hook. The given string must not contain "
-"a NUL or LF character."
+msgid "Transmit the given string to the server, which passes them to the pre-receive as well as the post-receive hook. The given string must not contain a NUL or LF character."
msgstr ""
#. type: Labeled list
@@ -47283,15 +36821,12 @@ msgstr "git-commit(1)"
#. type: Plain text
#: en/git-push.txt:171 en/git-send-pack.txt:33
-msgid ""
-"Path to the 'git-receive-pack' program on the remote end. Sometimes useful "
-"when pushing to a remote repository over ssh, and you do not have the "
-"program in a directory on the default $PATH."
+msgid "Path to the 'git-receive-pack' program on the remote end. Sometimes useful when pushing to a remote repository over ssh, and you do not have the program in a directory on the default $PATH."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:172
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]force-with-lease"
msgstr "--[no-]force-with-lease"
@@ -47309,110 +36844,62 @@ 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."
+msgid "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
#: en/git-push.txt:180
-msgid ""
-"This option overrides this restriction if the current value of the remote "
-"ref is the expected value. \"git push\" fails otherwise."
+msgid "This option overrides this restriction if the current value of the remote ref is the expected value. \"git push\" fails otherwise."
msgstr ""
#. type: Plain text
#: en/git-push.txt:187
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-push.txt:194
-msgid ""
-"This option allows you to say that you expect the history you are updating "
-"is what you rebased and want to replace. If the remote ref still points at "
-"the commit you specified, you can be sure that no other people did anything "
-"to the ref. It is like taking a \"lease\" on the ref without explicitly "
-"locking it, and the remote ref is updated only if the \"lease\" is still "
-"valid."
+msgid "This option allows you to say that you expect the history you are updating is what you rebased and want to replace. If the remote ref still points at the commit you specified, you can be sure that no other people did anything to the ref. It is like taking a \"lease\" on the ref without explicitly locking it, and the remote ref is updated only if the \"lease\" is still valid."
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."
+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."
msgstr ""
#. type: Plain text
#: en/git-push.txt:204
-msgid ""
-"`--force-with-lease=<refname>`, without specifying the expected value, will "
-"protect the named ref (alone), if it is going to be updated, by requiring "
-"its current value to be the same as the remote-tracking branch we have for "
-"it."
+msgid "`--force-with-lease=<refname>`, without specifying the expected value, will protect the named ref (alone), if it is going to be updated, by requiring its current value to be the same as the remote-tracking branch we have for it."
msgstr ""
#. type: Plain text
#: en/git-push.txt:212
-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 "
-"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."
+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 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 ""
#. type: Plain text
#: en/git-push.txt:217
-msgid ""
-"Note that all forms other than `--force-with-lease=<refname>:<expect>` that "
-"specifies the expected current value of the ref explicitly are still "
-"experimental and their semantics may change as we gain experience with this "
-"feature."
+msgid "Note that all forms other than `--force-with-lease=<refname>:<expect>` that specifies the expected current value of the ref explicitly are still experimental and their semantics may change as we gain experience with this feature."
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."
+msgid "\"--no-force-with-lease\" will cancel all the previous --force-with-lease on the command line."
msgstr ""
#. type: Plain text
#: en/git-push.txt:228
-msgid ""
-"Usually, the command refuses to update a remote ref that is not an ancestor "
-"of the local ref used to overwrite it. Also, when `--force-with-lease` "
-"option is used, the command refuses to update a remote ref whose current "
-"value does not match what is expected."
+msgid "Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. Also, when `--force-with-lease` option is used, the command refuses to update a remote ref whose current value does not match what is expected."
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."
+msgid "This flag disables these checks, and can cause the remote repository to lose commits; use it with care."
msgstr ""
#. type: Plain text
#: en/git-push.txt:240
-msgid ""
-"Note that `--force` applies to all the refs that are pushed, hence using it "
-"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 "
-"`master` branch). See the `<refspec>...` section above for details."
+msgid "Note that `--force` applies to all the refs that are pushed, hence using it 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 `master` branch). See the `<refspec>...` section above for details."
msgstr ""
#. type: Labeled list
@@ -47423,39 +36910,28 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:244
-msgid ""
-"This option is equivalent to the <repository> argument. If both are "
-"specified, the command-line argument takes precedence."
+msgid "This option is equivalent to the <repository> argument. If both are specified, the command-line argument takes precedence."
msgstr ""
#. type: Plain text
#: en/git-push.txt:251
-msgid ""
-"For every branch that is up to date or successfully pushed, add upstream "
-"(tracking) reference, used by argument-less linkgit:git-pull[1] and other "
-"commands. For more information, see `branch.<name>.merge` in linkgit:git-"
-"config[1]."
+msgid "For every branch that is up to date or successfully pushed, add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:252
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]thin"
msgstr "--[no-]thin"
#. type: Plain text
#: en/git-push.txt:257
-msgid ""
-"These options are passed to linkgit:git-send-pack[1]. A thin transfer "
-"significantly reduces the amount of sent data when the sender and receiver "
-"share many of the same objects in common. The default is \\--thin."
+msgid "These options are passed to linkgit:git-send-pack[1]. A thin transfer significantly reduces the amount of sent data when the sender and receiver share many of the same objects in common. The default is \\--thin."
msgstr ""
#. type: Plain text
#: en/git-push.txt:263
-msgid ""
-"Suppress all output, including the listing of updated refs, unless an error "
-"occurs. Progress is not reported to the standard error stream."
+msgid "Suppress all output, including the listing of updated refs, unless an error occurs. Progress is not reported to the standard error stream."
msgstr ""
#. type: Labeled list
@@ -47466,48 +36942,28 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:289
-msgid ""
-"May be used to make sure all submodule commits used by the revisions to be "
-"pushed are available on a remote-tracking branch. If 'check' is used Git "
-"will verify that all submodule commits that changed in the revisions to be "
-"pushed are available on at least one remote of the submodule. If any commits"
-" are missing the push will be aborted and exit with non-zero status. If 'on-"
-"demand' is used all submodules that changed in the revisions to be pushed "
-"will be pushed. If on-demand was not able to push all necessary revisions it"
-" will also be aborted and exit with non-zero status. If 'only' is used all "
-"submodules will be recursively pushed while the superproject is left "
-"unpushed. A value of 'no' or using `--no-recurse-submodules` can be used to "
-"override the push.recurseSubmodules configuration variable when no submodule"
-" recursion is required."
+msgid "May be used to make sure all submodule commits used by the revisions to be pushed are available on a remote-tracking branch. If 'check' is used Git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing the push will be aborted and exit with non-zero status. If 'on-demand' is used all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If 'only' is used all submodules will be recursively pushed while the superproject is left unpushed. A value of 'no' or using `--no-recurse-submodules` can be used to override the push.recurseSubmodules configuration variable when no submodule recursion is required."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:290
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[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."
+msgid "Toggle the pre-push hook (see linkgit:githooks[5]). The default is --verify, giving the hook a chance to prevent the push. With --no-verify, the hook is bypassed completely."
msgstr ""
#. type: Plain text
#: en/git-push.txt:311
-msgid ""
-"The output of \"git push\" depends on the transport method used; this "
-"section describes the output when pushing over the Git protocol (either "
-"locally or via ssh)."
+msgid "The output of \"git push\" depends on the transport method used; this section describes the output when pushing over the Git protocol (either locally or via ssh)."
msgstr ""
#. type: Plain text
#: en/git-push.txt:314
-msgid ""
-"The status of the push is output in tabular form, with each line "
-"representing the status of a single ref. Each line is of the form:"
+msgid "The status of the push is output in tabular form, with each line representing the status of a single ref. Each line is of the form:"
msgstr ""
#. type: delimited block -
@@ -47529,9 +36985,7 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:327
-msgid ""
-"The status of up-to-date refs is shown only if --porcelain or --verbose "
-"option is used."
+msgid "The status of up-to-date refs is shown only if --porcelain or --verbose option is used."
msgstr ""
#. type: Plain text
@@ -47561,11 +37015,7 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:342
-msgid ""
-"For a successfully pushed ref, the summary shows the old and new values of "
-"the ref in a form suitable for using as an argument to `git log` (this is "
-"`<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-"
-"forward updates)."
+msgid "For a successfully pushed ref, the summary shows the old and new values of the ref in a form suitable for using as an argument to `git log` (this is `<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-forward updates)."
msgstr ""
#. type: Plain text
@@ -47582,9 +37032,7 @@ msgstr "contenu supprim챕"
#. type: Plain text
#: en/git-push.txt:349
-msgid ""
-"Git did not try to send the ref at all, typically because it is not a fast-"
-"forward and you did not force the update."
+msgid "Git did not try to send the ref at all, typically because it is not a fast-forward and you did not force the update."
msgstr ""
#. type: Labeled list
@@ -47596,13 +37044,7 @@ msgstr "contenu supprim챕"
#. type: Plain text
#: en/git-push.txt:358
-msgid ""
-"The remote end refused the update. Usually caused by a hook on the remote "
-"side, or because the remote repository has one of the following safety "
-"options in effect: `receive.denyCurrentBranch` (for pushes to the checked "
-"out branch), `receive.denyNonFastForwards` (for forced non-fast-forward "
-"updates), `receive.denyDeletes` or `receive.denyDeleteCurrent`. See "
-"linkgit:git-config[1]."
+msgid "The remote end refused the update. Usually caused by a hook on the remote side, or because the remote repository has one of the following safety options in effect: `receive.denyCurrentBranch` (for pushes to the checked out branch), `receive.denyNonFastForwards` (for forced non-fast-forward updates), `receive.denyDeletes` or `receive.denyDeleteCurrent`. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
@@ -47614,31 +37056,22 @@ msgstr "contenu supprim챕"
#. type: Plain text
#: en/git-push.txt:363
-msgid ""
-"The remote end did not report the successful update of the ref, perhaps "
-"because of a temporary error on the remote side, a break in the network "
-"connection, or other transient error."
+msgid "The remote end did not report the successful update of the ref, perhaps because of a temporary error on the remote side, a break in the network connection, or other transient error."
msgstr ""
#. type: Plain text
#: en/git-push.txt:369
-msgid ""
-"The name of the local ref being pushed, minus its `refs/<type>/` prefix. In "
-"the case of deletion, the name of the local ref is omitted."
+msgid "The name of the local ref being pushed, minus its `refs/<type>/` prefix. In the case of deletion, the name of the local ref is omitted."
msgstr ""
#. type: Plain text
#: en/git-push.txt:373
-msgid ""
-"The name of the remote ref being updated, minus its `refs/<type>/` prefix."
+msgid "The name of the remote ref being updated, minus its `refs/<type>/` prefix."
msgstr ""
#. type: Plain text
#: 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."
+msgid "A human-readable explanation. In the case of successfully pushed refs, no explanation is needed. For a failed ref, the reason for failure is described."
msgstr ""
#. type: Title -
@@ -47649,27 +37082,17 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:385
-msgid ""
-"When an update changes a branch (or more in general, a ref) that used to "
-"point at commit A to point at another commit B, it is called a fast-forward "
-"update if and only if B is a descendant of A."
+msgid "When an update changes a branch (or more in general, a ref) that used to point at commit A to point at another commit B, it is called a fast-forward update if and only if B is a descendant of A."
msgstr ""
#. type: Plain text
#: en/git-push.txt:389
-msgid ""
-"In a fast-forward update from A to B, the set of commits that the original "
-"commit A built on top of is a subset of the commits the new commit B builds "
-"on top of. Hence, it does not lose any history."
+msgid "In a fast-forward update from A to B, the set of commits that the original commit A built on top of is a subset of the commits the new commit B builds on top of. Hence, it does not lose any history."
msgstr ""
#. type: Plain text
#: en/git-push.txt:394
-msgid ""
-"In contrast, a non-fast-forward update will lose history. For example, "
-"suppose you and somebody else started at the same commit X, and you built a "
-"history leading to commit B while the other person built a history leading "
-"to commit A. The history looks like this:"
+msgid "In contrast, a non-fast-forward update will lose history. For example, suppose you and somebody else started at the same commit X, and you built a history leading to commit B while the other person built a history leading to commit A. The history looks like this:"
msgstr ""
#. type: delimited block -
@@ -47683,50 +37106,32 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:406
-msgid ""
-"Further suppose that the other person already pushed changes leading to A "
-"back to the original repository from which you two obtained the original "
-"commit X."
+msgid "Further suppose that the other person already pushed changes leading to A back to the original repository from which you two obtained the original commit X."
msgstr ""
#. type: Plain text
#: en/git-push.txt:409
-msgid ""
-"The push done by the other person updated the branch that used to point at "
-"commit X to point at commit A. It is a fast-forward."
+msgid "The push done by the other person updated the branch that used to point at commit X to point at commit A. It is a fast-forward."
msgstr ""
#. type: Plain text
#: en/git-push.txt:414
-msgid ""
-"But if you try to push, you will attempt to update the branch (that now "
-"points at A) with commit B. This does _not_ fast-forward. If you did so, "
-"the changes introduced by commit A will be lost, because everybody will now "
-"start building on top of B."
+msgid "But if you try to push, you will attempt to update the branch (that now points at A) with commit B. This does _not_ fast-forward. If you did so, the changes introduced by commit A will be lost, because everybody will now start building on top of B."
msgstr ""
#. type: Plain text
#: en/git-push.txt:417
-msgid ""
-"The command by default does not allow an update that is not a fast-forward "
-"to prevent such loss of history."
+msgid "The command by default does not allow an update that is not a fast-forward to prevent such loss of history."
msgstr ""
#. type: Plain text
#: en/git-push.txt:422
-msgid ""
-"If you do not want to lose your work (history from X to B) or the work by "
-"the other person (history from X to A), you would need to first fetch the "
-"history from the repository, create a history that contains changes done by "
-"both parties, and push the result back."
+msgid "If you do not want to lose your work (history from X to B) or the work by the other person (history from X to A), you would need to first fetch the history from the repository, create a history that contains changes done by both parties, and push the result back."
msgstr ""
#. type: Plain text
#: en/git-push.txt:426
-msgid ""
-"You can perform \"git pull\", resolve potential conflicts, and \"git push\" "
-"the result. A \"git pull\" will create a merge commit C between commits A "
-"and B."
+msgid "You can perform \"git pull\", resolve potential conflicts, and \"git push\" the result. A \"git pull\" will create a merge commit C between commits A and B."
msgstr ""
#. type: delimited block -
@@ -47740,17 +37145,12 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:437
-msgid ""
-"Updating A with the resulting merge commit will fast-forward and your push "
-"will be accepted."
+msgid "Updating A with the resulting merge commit will fast-forward and your push will be accepted."
msgstr ""
#. type: Plain text
#: en/git-push.txt:442
-msgid ""
-"Alternatively, you can rebase your change between X and B on top of A, with "
-"\"git pull --rebase\", and push the result back. The rebase will create a "
-"new commit D that builds the change between X and B on top of A."
+msgid "Alternatively, you can rebase your change between X and B on top of A, with \"git pull --rebase\", and push the result back. The rebase will create a new commit D that builds the change between X and B on top of A."
msgstr ""
#. type: delimited block -
@@ -47764,24 +37164,12 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:453
-msgid ""
-"Again, updating A with this commit will fast-forward and your push will be "
-"accepted."
+msgid "Again, updating A with this commit will fast-forward and your push will be accepted."
msgstr ""
#. type: Plain text
#: 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."
+msgid "There is another common situation where you may encounter non-fast-forward rejection when you try to push, and it is possible even when you are pushing into a repository nobody else pushes into. After you push commit A yourself (in the first picture in this section), replace it with \"git commit --amend\" to produce commit B, and you try to push it out, because forgot that you have pushed A out already. In such a case, and only if you are certain that nobody in the meantime fetched your earlier commit A (and started building on top of it), you can run \"git push --force\" to overwrite it. In other words, \"git push --force\" is a method reserved for a case where you do mean to lose history."
msgstr ""
#. type: Labeled list
@@ -47793,9 +37181,7 @@ msgstr "git-add(1)"
#. type: Plain text
#: en/git-push.txt:473
-msgid ""
-"Works like `git push <remote>`, where <remote> is the current branch's "
-"remote (or `origin`, if no remote is configured for the current branch)."
+msgid "Works like `git push <remote>`, where <remote> is the current branch's remote (or `origin`, if no remote is configured for the current branch)."
msgstr ""
#. type: Labeled list
@@ -47807,27 +37193,17 @@ msgstr "$ git commit\n"
#. type: Plain text
#: 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 "
-"otherwise."
+msgid "Without additional configuration, pushes the current branch to the configured upstream (`remote.origin.merge` configuration variable) if it has the same name as the current branch, and errors out without pushing otherwise."
msgstr ""
#. type: Plain text
#: 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."
+msgid "The default behavior of this command when no <refspec> is given can be configured by setting the `push` option of the remote, or the `push.default` configuration variable."
msgstr ""
#. 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`."
+msgid "For example, to default to pushing only the current branch to `origin` use `git config remote.origin.push HEAD`. Any valid <refspec> (like the ones in the examples below) can be configured as the default for `git push origin`."
msgstr ""
#. type: Labeled list
@@ -47839,10 +37215,7 @@ 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."
+msgid "Push \"matching\" branches to `origin`. See <refspec> in the <<OPTIONS,OPTIONS>> section above for a description of \"matching\" branches."
msgstr ""
#. type: Labeled list
@@ -47854,11 +37227,7 @@ msgstr "$ git commit\n"
#. type: Plain text
#: 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."
+msgid "Find a ref that matches `master` in the source repository (most likely, it would find `refs/heads/master`), and update the same ref (e.g. `refs/heads/master`) in `origin` repository with it. If `master` did not exist remotely, it would be created."
msgstr ""
#. type: Labeled list
@@ -47881,31 +37250,17 @@ msgstr ""
#. type: Plain text
#: 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`."
+msgid "Use the source ref that matches `master` (e.g. `refs/heads/master`) to update the ref that matches `satellite/master` (most probably `refs/remotes/satellite/master`) in the `mothership` repository; do the same for `dev` and `satellite/dev`."
msgstr ""
#. 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 "
-"connection to satellite because the latter is behind a firewall or does not "
-"run sshd)."
+msgid "This is to emulate `git fetch` run on the `mothership` using `git push` that is run in the opposite direction in order to integrate the work done on `satellite`, and is often necessary when you can only make connection in one way (i.e. satellite can ssh into mothership but mothership cannot initiate connection to satellite because the latter is behind a firewall or does not run sshd)."
msgstr ""
#. 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`."
+msgid "After running this `git push` on the `satellite` machine, you would ssh into the `mothership` and run `git merge` there to complete the emulation of `git pull` that were run on `mothership` to pull changes made on `satellite`."
msgstr ""
#. type: Labeled list
@@ -47916,10 +37271,7 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:527
-msgid ""
-"Push the current branch to the remote ref matching `master` in the `origin` "
-"repository. This form is convenient to push the current branch without "
-"thinking about its local name."
+msgid "Push the current branch to the remote ref matching `master` in the `origin` repository. This form is convenient to push the current branch without thinking about its local name."
msgstr ""
#. type: Labeled list
@@ -47930,11 +37282,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"different; otherwise, the ref name on its own will work."
+msgid "Create the branch `experimental` in the `origin` repository by copying the current `master` branch. This form is only needed to create a new branch or tag in the remote repository when the local name and the remote name are different; otherwise, the ref name on its own will work."
msgstr ""
#. type: Labeled list
@@ -47945,9 +37293,7 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:538
-msgid ""
-"Find a ref that matches `experimental` in the `origin` repository (e.g. "
-"`refs/heads/experimental`), and delete it."
+msgid "Find a ref that matches `experimental` in the `origin` repository (e.g. `refs/heads/experimental`), and delete it."
msgstr ""
#. type: Labeled list
@@ -47958,11 +37304,7 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:544
-msgid ""
-"Update the origin repository's master branch with the dev branch, allowing "
-"non-fast-forward updates. *This can leave unreferenced commits dangling in "
-"the origin repository.* Consider the following situation, where a fast-"
-"forward is not possible:"
+msgid "Update the origin repository's master branch with the dev branch, allowing non-fast-forward updates. *This can leave unreferenced commits dangling in the origin repository.* Consider the following situation, where a fast-forward is not possible:"
msgstr ""
#. type: delimited block -
@@ -47990,15 +37332,12 @@ 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."
+msgid "Commits A and B would no longer belong to a branch with a symbolic name, and so would be unreachable. As such, these commits would be removed by a `git gc` command on the origin repository."
msgstr ""
#. type: Title =
#: en/git-quiltimport.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-quiltimport(1)"
msgstr "git-quiltimport(1)"
@@ -48017,35 +37356,22 @@ msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:21
-msgid ""
-"Applies a quilt patchset onto the current Git branch, preserving the patch "
-"boundaries, patch order, and patch descriptions present in the quilt "
-"patchset."
+msgid "Applies a quilt patchset onto the current Git branch, preserving the patch boundaries, patch order, and patch descriptions present in the quilt patchset."
msgstr ""
#. type: Plain text
#: 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 "
-"displayed and the user is asked to interactively enter the author of the "
-"patch."
+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 displayed and the user is asked to interactively enter the author of the patch."
msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:30
-msgid ""
-"If a subject is not found in the patch description the patch name is "
-"preserved as the 1 line subject in the Git description."
+msgid "If a subject is not found in the patch description the patch name is preserved as the 1 line subject in the Git description."
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 "
-"missing author information is warned about."
+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 missing author information is warned about."
msgstr ""
#. type: Labeled list
@@ -48056,9 +37382,7 @@ msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:44
-msgid ""
-"The author name and email address to use when no author information can be "
-"found in the patch description."
+msgid "The author name and email address to use when no author information can be found in the patch description."
msgstr ""
#. type: Labeled list
@@ -48074,9 +37398,7 @@ 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."
+msgid "The default for the patch directory is patches or the value of the `$QUILT_PATCHES` environment variable."
msgstr ""
#. type: Labeled list
@@ -48092,14 +37414,12 @@ 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."
+msgid "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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-read-tree(1)"
msgstr "git-read-tree(1)"
@@ -48122,70 +37442,48 @@ msgstr ""
#. type: Plain text
#: 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])"
+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])"
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`, "
-"the `-u` flag causes it to also update the files in the work tree with the "
-"result of the merge."
+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`, the `-u` flag causes it to also update the files in the work tree with the result of the merge."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:31
-msgid ""
-"Trivial merges are done by 'git read-tree' itself. Only conflicting paths "
-"will be in unmerged state when 'git read-tree' returns."
+msgid "Trivial merges are done by 'git read-tree' itself. Only conflicting paths will be in unmerged state when 'git read-tree' returns."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:39
-msgid ""
-"Perform a merge, not just a read. The command will refuse to run if your "
-"index file has unmerged entries, indicating that you have not finished "
-"previous merge you started."
+msgid "Perform a merge, not just a read. The command will refuse to run if your index file has unmerged entries, indicating that you have not finished previous merge you started."
msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:40
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--reset"
msgstr "--reset"
#. type: Plain text
#: en/git-read-tree.txt:43
-msgid ""
-"Same as -m, except that unmerged entries are discarded instead of failing."
+msgid "Same as -m, except that unmerged entries are discarded instead of failing."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:47
-msgid ""
-"After a successful merge, update the files in the work tree with the result "
-"of the merge."
+msgid "After a successful merge, update the files in the work tree with the result of the merge."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:56
-msgid ""
-"Usually a merge requires the index file as well as the files in the working "
-"tree to be up to date with the current head commit, in order not to lose "
-"local changes. This flag disables the check with the working tree and is "
-"meant to be used when creating a merge of trees that are not directly "
-"related to the current working tree status into a temporary index file."
+msgid "Usually a merge requires the index file as well as the files in the working tree to be up to date with the current head commit, in order not to lose local changes. This flag disables the check with the working tree and is meant to be used when creating a merge of trees that are not directly related to the current working tree status into a temporary index file."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:61
-msgid ""
-"Check if the command would error out, without updating the index or the "
-"files in the working tree for real."
+msgid "Check if the command would error out, without updating the index or the files in the working tree for real."
msgstr ""
#. type: Plain text
@@ -48195,32 +37493,23 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:65
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--trivial"
msgstr "--trivial"
#. type: Plain text
#: en/git-read-tree.txt:70
-msgid ""
-"Restrict three-way merge by 'git read-tree' to happen only if there is no "
-"file-level merging required, instead of resolving merge for trivial cases "
-"and leaving conflicting files unresolved in the index."
+msgid "Restrict three-way merge by 'git read-tree' to happen only if there is no file-level merging required, instead of resolving merge for trivial cases and leaving conflicting files unresolved in the index."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:77
-msgid ""
-"Usually a three-way merge by 'git read-tree' resolves the merge for really "
-"trivial cases and leaves other cases unresolved in the index, so that "
-"porcelains can implement different merge policies. This flag makes the "
-"command resolve a few more cases internally:"
+msgid "Usually a three-way merge by 'git read-tree' resolves the merge for really trivial cases and leaves other cases unresolved in the index, so that porcelains can implement different merge policies. This flag makes the command resolve a few more cases internally:"
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."
+msgid "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
@@ -48230,17 +37519,12 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:83
-msgid ""
-"when both sides add a path identically. The resolution is to add that path."
+msgid "when both sides add a path identically. The resolution is to add that path."
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 "
-"entries that already existed in the original index file. Note that the "
-"`<prefix>/` value must end with a slash."
+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 entries that already existed in the original index file. Note that the `<prefix>/` value must end with a slash."
msgstr ""
#. type: Labeled list
@@ -48251,17 +37535,7 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:105
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -48272,19 +37546,12 @@ 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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:118
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-sparse-checkout"
msgstr "--no-sparse-checkout"
@@ -48295,7 +37562,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:122
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--empty"
msgstr "--empty"
@@ -48323,10 +37590,7 @@ 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."
+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."
msgstr ""
#. type: Title ~
@@ -48337,27 +37601,17 @@ 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 "
-"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)."
+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 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)."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:152
-msgid ""
-"This is used to avoid unnecessary false hits when 'git diff-files' is run "
-"after 'git read-tree'."
+msgid "This is used to avoid unnecessary false hits when 'git diff-files' is run after 'git read-tree'."
msgstr ""
#. type: Title ~
@@ -48368,17 +37622,12 @@ 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, "
-"which is simply ahead of $H (i.e. we are in a fast-forward situation)."
+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, which is simply ahead of $H (i.e. we are in a fast-forward situation)."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:164
-msgid ""
-"When two trees are specified, the user is telling 'git read-tree' the "
-"following:"
+msgid "When two trees are specified, the user is telling 'git read-tree' the following:"
msgstr ""
#. type: Plain text
@@ -48398,12 +37647,7 @@ msgstr ""
#. type: Plain text
#: 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:"
+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:"
msgstr ""
#. type: Plain text
@@ -48477,35 +37721,17 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
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 "
-"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 "
-"merge, but it would not show in `git diff-index --cached $M` output after "
-"the two-tree merge."
+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 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 merge, but it would not show in `git diff-index --cached $M` output after the two-tree merge."
msgstr ""
#. type: Plain text
#: 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 "
-"path is kept as long as $H and $M are the same."
+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 path is kept as long as $H and $M are the same."
msgstr ""
#. type: Title ~
@@ -48516,16 +37742,12 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:242
-msgid ""
-"Each \"index\" entry has two bits worth of \"stage\" state. stage 0 is the "
-"normal one, and is the only one you'd see in any kind of normal use."
+msgid "Each \"index\" entry has two bits worth of \"stage\" state. stage 0 is the normal one, and is the only one you'd see in any kind of normal use."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:245
-msgid ""
-"However, when you do 'git read-tree' with three trees, the \"stage\" starts "
-"out at 1."
+msgid "However, when you do 'git read-tree' with three trees, the \"stage\" starts out at 1."
msgstr ""
#. type: Plain text
@@ -48541,144 +37763,87 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:258
-msgid ""
-"and you will end up with an index with all of the <tree1> entries in "
-"\"stage1\", all of the <tree2> entries in \"stage2\" and all of the <tree3> "
-"entries in \"stage3\". When performing a merge of another branch into the "
-"current branch, we use the common ancestor tree as <tree1>, the current "
-"branch head as <tree2>, and the other branch head as <tree3>."
+msgid "and you will end up with an index with all of the <tree1> entries in \"stage1\", all of the <tree2> entries in \"stage2\" and all of the <tree3> entries in \"stage3\". When performing a merge of another branch into the current branch, we use the common ancestor tree as <tree1>, the current branch head as <tree2>, and the other branch head as <tree3>."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:262
-msgid ""
-"Furthermore, 'git read-tree' has special-case logic that says: if you see a "
-"file that matches in all respects in the following states, it \"collapses\" "
-"back to \"stage0\":"
+msgid "Furthermore, 'git read-tree' has special-case logic that says: if you see a file that matches in all respects in the following states, it \"collapses\" back to \"stage0\":"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:266
-msgid ""
-"stage 2 and 3 are the same; take one or the other (it makes no difference - "
-"the same work has been done on our branch in stage 2 and their branch in "
-"stage 3)"
+msgid "stage 2 and 3 are the same; take one or the other (it makes no difference - the same work has been done on our branch in stage 2 and their branch in stage 3)"
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 "
-"their branch in stage 3 worked on it)"
+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 their branch in stage 3 worked on it)"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:274
-msgid ""
-"stage 1 and stage 3 are the same and stage 2 is different take stage 2 (we "
-"did something while they did nothing)"
+msgid "stage 1 and stage 3 are the same and stage 2 is different take stage 2 (we did something while they did nothing)"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:278
-msgid ""
-"The 'git write-tree' command refuses to write a nonsensical tree, and it "
-"will complain about unmerged entries if it sees a single entry that is not "
-"stage 0."
+msgid "The 'git write-tree' command refuses to write a nonsensical tree, and it will complain about unmerged entries if it sees a single entry that is not stage 0."
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 "
-"(stage 2 and 3 respectively)."
+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 (stage 2 and 3 respectively)."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:289
-msgid ""
-"The order of stages 1, 2 and 3 (hence the order of three <tree-ish> command-"
-"line arguments) are significant when you start a 3-way merge with an index "
-"file that is already populated. Here is an outline of how the algorithm "
-"works:"
+msgid "The order of stages 1, 2 and 3 (hence the order of three <tree-ish> command-line arguments) are significant when you start a 3-way merge with an index file that is already populated. Here is an outline of how the algorithm works:"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:292
-msgid ""
-"if a file exists in identical format in all three trees, it will "
-"automatically collapse to \"merged\" state by 'git read-tree'."
+msgid "if a file exists in identical format in all three trees, it will automatically collapse to \"merged\" state by 'git read-tree'."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:297
-msgid ""
-"a file that has _any_ difference what-so-ever in the three trees will stay "
-"as separate entries in the index. It's up to \"porcelain policy\" to "
-"determine how to remove the non-0 stages, and insert a merged version."
+msgid "a file that has _any_ difference what-so-ever in the three trees will stay as separate entries in the index. It's up to \"porcelain policy\" to determine how to remove the non-0 stages, and insert a merged version."
msgstr ""
#. type: Plain text
#: 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 "
-"algorithm ends up being really simple:"
+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 algorithm ends up being really simple:"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:305
-msgid ""
-"you walk the index in order, and ignore all entries of stage 0, since "
-"they've already been done."
+msgid "you walk the index in order, and ignore all entries of stage 0, since they've already been done."
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), "
-"and you remove that entry."
+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), and you remove that entry."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:314
-msgid ""
-"if you find a matching \"stage2\" and \"stage3\" tree, you remove one of "
-"them, and turn the other into a \"stage0\" entry. Remove any matching "
-"\"stage1\" entry if it exists too. .. all the normal trivial rules .."
+msgid "if you find a matching \"stage2\" and \"stage3\" tree, you remove one of them, and turn the other into a \"stage0\" entry. Remove any matching \"stage1\" entry if it exists too. .. all the normal trivial rules .."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:319
-msgid ""
-"You would normally use 'git merge-index' with supplied 'git merge-one-file' "
-"to do this last step. The script updates the files in the working tree as "
-"it merges each path and at the end of a successful merge."
+msgid "You would normally use 'git merge-index' with supplied 'git merge-one-file' to do this last step. The script updates the files in the working tree as it merges each path and at the end of a successful merge."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:327
-msgid ""
-"When you start a 3-way merge with an index file that is already populated, "
-"it is assumed that it represents the state of the files in your work tree, "
-"and you can even have files with changes unrecorded in the index file. It "
-"is further assumed that this state is \"derived\" from the stage 2 tree. "
-"The 3-way merge refuses to run if it finds an entry in the original index "
-"file that does not match stage 2."
+msgid "When you start a 3-way merge with an index file that is already populated, it is assumed that it represents the state of the files in your work tree, and you can even have files with changes unrecorded in the index file. It is further assumed that this state is \"derived\" from the stage 2 tree. The 3-way merge refuses to run if it finds an entry in the original index file that does not match stage 2."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:332
-msgid ""
-"This is done to prevent you from losing your work-in-progress changes, and "
-"mixing your random changes in an unrelated merge commit. To illustrate, "
-"suppose you start from what has been committed last to your repository:"
+msgid "This is done to prevent you from losing your work-in-progress changes, and mixing your random changes in an unrelated merge commit. To illustrate, suppose you start from what has been committed last to your repository:"
msgstr ""
#. type: delimited block -
@@ -48691,10 +37856,7 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:341
-msgid ""
-"You do random edits, without running 'git update-index'. And then you "
-"notice that the tip of your \"upstream\" tree has advanced since you pulled "
-"from him:"
+msgid "You do random edits, without running 'git update-index'. And then you notice that the tip of your \"upstream\" tree has advanced since you pulled from him:"
msgstr ""
#. type: delimited block -
@@ -48707,11 +37869,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"the following sequence:"
+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 the following sequence:"
msgstr ""
#. type: delimited block -
@@ -48726,31 +37884,17 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:362
-msgid ""
-"what you would commit is a pure merge between $JC and $LT without your work-"
-"in-progress changes, and your work tree would be updated to the result of "
-"the merge."
+msgid "what you would commit is a pure merge between $JC and $LT without your work-in-progress changes, and your work tree would be updated to the result of the merge."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:366
-msgid ""
-"However, if you have local changes in the working tree that would be "
-"overwritten by this merge, 'git read-tree' will refuse to run to prevent "
-"your changes from being lost."
+msgid "However, if you have local changes in the working tree that would be overwritten by this merge, 'git read-tree' will refuse to run to prevent your changes from being lost."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:376
-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."
+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."
msgstr ""
#. type: Title -
@@ -48761,39 +37905,22 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:384
-msgid ""
-"\"Sparse checkout\" allows populating the working directory sparsely. It "
-"uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell Git "
-"whether a file in the working directory is worth looking at."
+msgid "\"Sparse checkout\" allows populating the working directory sparsely. It uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell Git whether a file in the working directory is worth looking at."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:393
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:397
-msgid ""
-"Then it compares the new skip-worktree value with the previous one. If skip-"
-"worktree turns from set to unset, it will add the corresponding file back. "
-"If it turns from unset to set, that file will be removed."
+msgid "Then it compares the new skip-worktree value with the previous one. If skip-worktree turns from set to unset, it will add the corresponding file back. If it turns from unset to set, that file will be removed."
msgstr ""
#. type: Plain text
#: 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`:"
+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`:"
msgstr ""
#. type: delimited block -
@@ -48806,12 +37933,7 @@ 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 "
-"with the `$GIT_DIR/info/sparse-checkout` file content as follows:"
+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 with the `$GIT_DIR/info/sparse-checkout` file content as follows:"
msgstr ""
#. type: delimited block -
@@ -48822,27 +37944,19 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:428
#, fuzzy
-#| msgid ""
-#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-#| "merge[1], linkgit:git-commit-tree[1]"
-msgid ""
-"linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; linkgit:gitignore[5]"
-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-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
+msgid "linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; linkgit:gitignore[5]"
+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-rebase.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-rebase(1)"
msgstr "git-rebase(1)"
@@ -48864,61 +37978,32 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:22
-msgid ""
-"If <branch> is specified, 'git rebase' will perform an automatic `git "
-"checkout <branch>` before doing anything else. Otherwise it remains on the "
-"current branch."
+msgid "If <branch> is specified, 'git rebase' will perform an automatic `git checkout <branch>` before doing anything else. Otherwise it remains on the current branch."
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."
+msgid "If <upstream> is not specified, the upstream configured in branch.<name>.remote and branch.<name>.merge options will be used (see linkgit:git-config[1] for details) and the `--fork-point` option is assumed. If you are currently not on any branch or if the current branch does not have a configured upstream, the rebase will abort."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:35
-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 "
-"specified."
+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 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 "
-"<upstream>` (or <newbase>). ORIG_HEAD is set to point at the tip of the "
-"branch before the reset."
+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 <upstream>` (or <newbase>). ORIG_HEAD is set to point at the tip of the branch before the reset."
msgstr ""
#. type: Plain text
#: 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)."
+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)."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:53
-msgid ""
-"It is possible that a merge failure will prevent this process from being "
-"completely automatic. You will have to resolve any such merge failure and "
-"run `git rebase --continue`. Another option is to bypass the commit that "
-"caused the merge failure with `git rebase --skip`. To check out the "
-"original <branch> and remove the .git/rebase-apply working files, use the "
-"command `git rebase --abort` instead."
+msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original <branch> and remove the .git/rebase-apply working files, use the command `git rebase --abort` instead."
msgstr ""
#. type: Plain text
@@ -48973,12 +38058,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:85
-msgid ""
-"If the upstream branch already contains a change you have made (e.g., "
-"because you mailed a patch which was applied upstream), then that commit "
-"will be skipped. For example, running `git rebase master` on the following "
-"history (in which `A'` and `A` introduce the same set of changes, but have "
-"different committer information):"
+msgid "If the upstream branch already contains a change you have made (e.g., because you mailed a patch which was applied upstream), then that commit will be skipped. For example, running `git rebase master` on the following history (in which `A'` and `A` introduce the same set of changes, but have different committer information):"
msgstr ""
#. type: delimited block -
@@ -49006,18 +38086,12 @@ msgstr ""
#. type: Plain text
#: 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`."
+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`."
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'."
+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'."
msgstr ""
#. type: delimited block -
@@ -49033,10 +38107,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:119
-msgid ""
-"We want to make 'topic' forked from branch 'master'; for example, because "
-"the functionality on which 'topic' depends was merged into the more stable "
-"'master' branch. We want our tree to look like this:"
+msgid "We want to make 'topic' forked from branch 'master'; for example, because the functionality on which 'topic' depends was merged into the more stable 'master' branch. We want our tree to look like this:"
msgstr ""
#. type: delimited block -
@@ -49065,9 +38136,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:135
-msgid ""
-"Another example of --onto option is to rebase part of a branch. If we have "
-"the following situation:"
+msgid "Another example of --onto option is to rebase part of a branch. If we have the following situation:"
msgstr ""
#. type: delimited block -
@@ -49115,9 +38184,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:162
-msgid ""
-"A range of commits could also be removed with rebase. If we have the "
-"following situation:"
+msgid "A range of commits could also be removed with rebase. If we have the following situation:"
msgstr ""
#. type: delimited block -
@@ -49145,20 +38212,12 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:180
-msgid ""
-"This is useful if F and G were flawed in some way, or should not be part of "
-"topicA. Note that the argument to --onto and the <upstream> parameter can "
-"be any valid commit-ish."
+msgid "This is useful if F and G were flawed in some way, or should not be part of topicA. Note that the argument to --onto and the <upstream> parameter can be any valid commit-ish."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:186
-msgid ""
-"In case of conflict, 'git rebase' will stop at the first problematic commit "
-"and leave conflict markers in the tree. You can use 'git diff' to locate "
-"the markers (<<<<<<) and make edits to resolve the conflict. For each file "
-"you edit, you need to tell Git that the conflict has been resolved, "
-"typically this would be done with"
+msgid "In case of conflict, 'git rebase' will stop at the first problematic commit and leave conflict markers in the tree. You can use 'git diff' to locate the markers (<<<<<<) and make edits to resolve the conflict. For each file you edit, you need to tell Git that the conflict has been resolved, typically this would be done with"
msgstr ""
#. type: Plain text
@@ -49169,9 +38228,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:193
-msgid ""
-"After resolving the conflict manually and updating the index with the "
-"desired resolution, you can continue the rebasing process with"
+msgid "After resolving the conflict manually and updating the index with the desired resolution, you can continue the rebasing process with"
msgstr ""
#. type: Plain text
@@ -49198,10 +38255,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
@@ -49217,26 +38271,17 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:232
-msgid ""
-"Starting point at which to create the new commits. If the --onto option is "
-"not specified, the starting point is <upstream>. May be any valid commit, "
-"and not just an existing branch name."
+msgid "Starting point at which to create the new commits. If the --onto option is not specified, the starting point is <upstream>. May be any valid commit, and not just an existing branch name."
msgstr ""
#. type: Plain text
#: 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."
+msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:241
-msgid ""
-"Upstream branch to compare against. May be any valid commit, not just an "
-"existing branch name. Defaults to the configured upstream for the current "
-"branch."
+msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
msgstr ""
#. type: Plain text
@@ -49246,36 +38291,29 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:254
-msgid ""
-"Abort the rebase operation and reset HEAD to the original branch. If "
-"<branch> was provided when the rebase operation was started, then HEAD will "
-"be reset to <branch>. Otherwise HEAD will be reset to where it was when the "
-"rebase operation was started."
+msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:255 en/sequencer.txt:6
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--quit"
msgstr "--quit"
#. type: Plain text
#: en/git-rebase.txt:259
-msgid ""
-"Abort the rebase operation but HEAD is not reset back to the original "
-"branch. The index and working tree are also left unchanged as a result."
+msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result."
msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:260
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
#: en/git-rebase.txt:263
-msgid ""
-"Keep the commits that do not change anything from its parents in the result."
+msgid "Keep the commits that do not change anything from its parents in the result."
msgstr ""
#. type: Plain text
@@ -49285,7 +38323,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:267
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--edit-todo"
msgstr "--edit-todo"
@@ -49296,35 +38334,22 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:275
-msgid ""
-"Use merging strategies to rebase. When the recursive (default) merge "
-"strategy is used, this allows rebase to be aware of renames on the upstream "
-"side."
+msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:281
-msgid ""
-"Note that a rebase merge works by replaying each commit from the working "
-"branch on top of the <upstream> branch. Because of this, when a merge "
-"conflict happens, the side reported as 'ours' is the so-far rebased series, "
-"starting with <upstream>, and 'theirs' is the working branch. In other "
-"words, the sides are swapped."
+msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:287
-msgid ""
-"Use the given merge strategy. If there is no `-s` option 'git merge-"
-"recursive' is used instead. This implies --merge."
+msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:292
-msgid ""
-"Because 'git rebase' replays each commit from the working branch on top of "
-"the <upstream> branch using the given strategy, using the 'ours' strategy "
-"simply discards all patches from the <branch>, which makes little sense."
+msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply discards all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
@@ -49342,10 +38367,7 @@ 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 "
-"reversal of 'ours' and 'theirs' as noted above for the `-m` option."
+msgid "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 ""
#. type: Plain text
@@ -49368,9 +38390,7 @@ 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."
+msgid "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
@@ -49386,8 +38406,7 @@ msgstr ""
#| "--no-verify::\n"
#| "\tThis option bypasses the pre-commit and commit-msg hooks.\n"
#| "\tSee also linkgit:githooks[5].\n"
-msgid ""
-"This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
+msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
"-n::\n"
"--no-verify::\n"
@@ -49397,121 +38416,86 @@ msgstr ""
#. 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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--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]."
+msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:336
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
#: en/git-rebase.txt:339
-msgid ""
-"Force a rebase even if the current branch is up-to-date and the command "
-"without `--force` would return without doing anything."
+msgid "Force a rebase even if the current branch is up-to-date and the command without `--force` would return without doing anything."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:345
-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)."
+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)."
msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:347
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
#: en/git-rebase.txt:351
-msgid ""
-"Use reflog to find a better common ancestor between <upstream> and <branch> "
-"when calculating which commits have been introduced by <branch>."
+msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
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."
+msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:360
-msgid ""
-"If either <upstream> or --root is given on the command line, then the "
-"default is `--no-fork-point`, otherwise the default is `--fork-point`."
+msgid "If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:366
-msgid ""
-"These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) "
-"that applies the patch. Incompatible with the --interactive option."
+msgid "These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Incompatible with the --interactive option."
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."
+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."
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)."
+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)."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:382
-msgid ""
-"The commit list format can be changed by setting the configuration option "
-"rebase.instructionFormat. A customized instruction format will "
-"automatically have the long commit hash prepended to the format."
+msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:384 en/git-svn.txt:642
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
#: en/git-rebase.txt:388
-msgid ""
-"Recreate merge commits instead of flattening the history by replaying "
-"commits a merge commit introduces. Merge conflict resolutions or manual "
-"amendments to merge commits are not preserved."
+msgid "Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:392
-msgid ""
-"This uses the `--interactive` machinery internally, but combining it with "
-"the `--interactive` option explicitly is generally not a good idea unless "
-"you know what you are doing (see BUGS below)."
+msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
@@ -49528,16 +38512,12 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:398
-msgid ""
-"Append \"exec <cmd>\" after each line creating a commit in the final "
-"history. <cmd> will be interpreted as one or more shell commands."
+msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:401
-msgid ""
-"You may execute several commands by either using one instance of `--exec` "
-"with several commands:"
+msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
@@ -49559,52 +38539,34 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:411
-msgid ""
-"If `--autosquash` is used, \"exec\" lines will not be appended for the "
-"intermediate commits, and will only appear at the end of each squash/fixup "
-"series."
+msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:414
-msgid ""
-"This uses the `--interactive` machinery internally, but it can be run "
-"without an explicit `--interactive`."
+msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
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> "
-"(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."
+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> (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."
msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:425
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
#: en/git-rebase.txt:426
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-autosquash"
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 "
-"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 "
-"\"fixup! \" or \"squash! \" after the first, in case you referred to an "
-"earlier fixup/squash with `git commit --fixup/--squash`."
+msgid "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 \"fixup! \" or \"squash! \" after the first, in case you referred to an earlier fixup/squash with `git commit --fixup/--squash`."
msgstr ""
#. type: Plain text
@@ -49614,33 +38576,23 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:441
-msgid ""
-"If the `--autosquash` option is enabled by default using the configuration "
-"variable `rebase.autoSquash`, this option can be used to override and "
-"disable this setting."
+msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:449
-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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:450 en/merge-options.txt:35
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-ff"
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."
+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."
msgstr ""
#. type: Plain text
@@ -49650,12 +38602,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:461
-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)."
+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)."
msgstr ""
#. type: Title -
@@ -49667,25 +38614,13 @@ msgstr ""
#. type: Plain text
#: 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].)"
-msgid ""
-"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])."
+#| 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].)"
+msgid "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])."
#. 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."
+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."
msgstr ""
#. type: Plain text
@@ -49701,10 +38636,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:484
-msgid ""
-"Rebasing interactively means that you have a chance to edit the commits "
-"which are rebased. You can reorder the commits, and you can remove them "
-"(weeding out bad or otherwise unwanted patches)."
+msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
@@ -49778,12 +38710,7 @@ 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."
+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."
msgstr ""
#. type: Plain text
@@ -49799,11 +38726,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:519
-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:"
+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:"
msgstr ""
#. type: delimited block -
@@ -49817,60 +38740,37 @@ 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 "
-"example), so do not delete or edit the names."
+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 example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:534
-msgid ""
-"By replacing the command \"pick\" with the command \"edit\", you can tell "
-"'git rebase' to stop after applying that commit, so that you can edit the "
-"files and/or the commit message, amend the commit, and continue rebasing."
+msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:537
-msgid ""
-"If you just want to edit the commit message for a commit, replace the "
-"command \"pick\" with the command \"reword\"."
+msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
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."
+msgid "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."
+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."
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 "
-"resolving conflicts you can continue with `git rebase --continue`."
+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 resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:556
-msgid ""
-"For example, if you want to reorder the last 5 commits, such that what was "
-"HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' "
-"like this:"
+msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
@@ -49902,9 +38802,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:575
-msgid ""
-"Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make "
-"sure that the current HEAD is \"B\", and call"
+msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
@@ -49915,12 +38813,7 @@ 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 "
-"todo list like this one:"
+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 todo list like this one:"
msgstr ""
#. type: delimited block -
@@ -49938,19 +38831,12 @@ 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`."
+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`."
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 "
-"of the working tree."
+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 of the working tree."
msgstr ""
#. type: delimited block -
@@ -49961,9 +38847,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:611
-msgid ""
-"This command lets you check that intermediate commits are compilable. The "
-"todo list becomes like that:"
+msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
@@ -49988,19 +38872,12 @@ msgstr ""
#. type: Plain text
#: 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:"
+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:"
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."
+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."
msgstr ""
#. type: Plain text
@@ -50010,25 +38887,17 @@ 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, "
-"the working tree stays the same."
+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, 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:647
-msgid ""
-"Commit the now-current index with whatever commit message is appropriate "
-"now."
+msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
@@ -50043,11 +38912,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:656
-msgid ""
-"If you are not absolutely sure that the intermediate revisions are "
-"consistent (they compile, pass the testsuite, etc.) you should use 'git "
-"stash' to stash away the not-yet-committed changes after each commit, test, "
-"and amend the commit if fixes are necessary."
+msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
@@ -50058,20 +38923,12 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:666
-msgid ""
-"Rebasing (or any other form of rewriting) a branch that others have based "
-"work on is a bad idea: anyone downstream of it is forced to manually fix "
-"their history. This section explains how to do the fix from the "
-"downstream's point of view. The real fix, however, would be to avoid "
-"rebasing the upstream in the first place."
+msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:671
-msgid ""
-"To illustrate, suppose you are in a situation where someone develops a "
-"'subsystem' branch, and you are working on a 'topic' that is dependent on "
-"this 'subsystem'. You might end up with a history like the following:"
+msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
@@ -50103,9 +38960,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:692
-msgid ""
-"If you now continue development as usual, and eventually merge 'topic' to "
-"'subsystem', the commits from 'subsystem' will remain duplicated forever:"
+msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
@@ -50121,12 +38976,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:706
-msgid ""
-"Such duplicates are generally frowned upon because they clutter up history, "
-"making it harder to follow. To clean things up, you need to transplant the "
-"commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This "
-"becomes a ripple effect: anyone downstream from 'topic' is forced to rebase "
-"too, and so on!"
+msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
@@ -50142,9 +38992,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:713
-msgid ""
-"This happens if the 'subsystem' rebase was a simple rebase and had no "
-"conflicts."
+msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
@@ -50155,10 +39003,7 @@ 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 "
-"used one of `commit --amend`, `reset`, or `filter-branch`."
+msgid "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 ""
#. type: Title ~
@@ -50169,18 +39014,12 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:728
-msgid ""
-"Only works if the changes (patch IDs based on the diff contents) on "
-"'subsystem' are literally the same before and after the rebase 'subsystem' "
-"did."
+msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:732
-msgid ""
-"In that case, the fix is easy because 'git rebase' knows to skip changes "
-"that are already present in the new upstream. So if you say (assuming "
-"you're on 'topic')"
+msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream. So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
@@ -50213,9 +39052,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:750
-msgid ""
-"Things get more complicated if the 'subsystem' changes do not exactly "
-"correspond to the ones before the rebase."
+msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
@@ -50230,33 +39067,22 @@ msgstr ""
#. type: Plain text
#: 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 "
-"'subsystem', for example:"
+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 'subsystem', for example:"
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:764
-msgid ""
-"With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' "
-"is at `subsystem@{1}`. Subsequent fetches will increase the number. (See "
-"linkgit:git-reflog[1].)"
+msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. 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`."
+msgid "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
#: en/git-rebase.txt:770
-msgid ""
-"You can then transplant the old `subsystem..topic` to the new tip by saying "
-"(for the reflog case, and assuming you are on 'topic' already):"
+msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
@@ -50267,19 +39093,12 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:777
-msgid ""
-"The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' "
-"downstream from 'topic' will now have to perform a \"hard case\" recovery "
-"too!"
+msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
@@ -50315,7 +39134,7 @@ msgstr ""
#. type: Title =
#: en/git-receive-pack.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-receive-pack(1)"
msgstr "git-receive-pack(1)"
@@ -50334,49 +39153,32 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:18
-msgid ""
-"Invoked by 'git send-pack' and updates the repository with the information "
-"fed from the remote end."
+msgid "Invoked by 'git send-pack' and updates the repository with the information fed from the remote end."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:23
-msgid ""
-"This command is usually not invoked directly by the end user. The UI for "
-"the protocol is on the 'git send-pack' side, and the program pair is meant "
-"to be used to push updates to remote repository. For pull operations, see "
-"linkgit:git-fetch-pack[1]."
+msgid "This command is usually not invoked directly by the end user. The UI for the protocol is on the 'git send-pack' side, and the program pair is meant to be used to push updates to remote repository. For pull operations, see linkgit:git-fetch-pack[1]."
msgstr ""
#. 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?)"
+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?)"
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:31
-msgid ""
-"There are other real-world examples of using update and post-update hooks "
-"found in the Documentation/howto directory."
+msgid "There are other real-world examples of using update and post-update hooks found in the Documentation/howto directory."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:35
-msgid ""
-"'git-receive-pack' honours the receive.denyNonFastForwards config option, "
-"which tells it if updates to a ref should be denied if they are not fast-"
-"forwards."
+msgid "'git-receive-pack' honours the receive.denyNonFastForwards config option, which tells it if updates to a ref should be denied if they are not fast-forwards."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:38
-msgid ""
-"A number of other receive.* config options are available to tweak its "
-"behavior, see linkgit:git-config[1]."
+msgid "A number of other receive.* config options are available to tweak its behavior, see linkgit:git-config[1]."
msgstr ""
#. type: Plain text
@@ -50392,10 +39194,7 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:49
-msgid ""
-"Before any ref is updated, if $GIT_DIR/hooks/pre-receive file exists and is "
-"executable, it will be invoked once with no parameters. The standard input "
-"of the hook will be one line per ref to be updated:"
+msgid "Before any ref is updated, if $GIT_DIR/hooks/pre-receive file exists and is executable, it will be invoked once with no parameters. The standard input of the hook will be one line per ref to be updated:"
msgstr ""
#. type: Plain text
@@ -50406,41 +39205,28 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:58
-msgid ""
-"The refname value is relative to $GIT_DIR; e.g. for the master head this is "
-"\"refs/heads/master\". The two sha1 values before each refname are the "
-"object names for the refname before and after the update. Refs to be "
-"created will have sha1-old equal to 0\\{40}, while refs to be deleted will "
-"have sha1-new equal to 0\\{40}, otherwise sha1-old and sha1-new should be "
-"valid objects in the repository."
+msgid "The refname value is relative to $GIT_DIR; e.g. for the master head this is \"refs/heads/master\". The two sha1 values before each refname are the object names for the refname before and after the update. Refs to be created will have sha1-old equal to 0\\{40}, while refs to be deleted will have sha1-new equal to 0\\{40}, otherwise sha1-old and sha1-new should be valid objects in the repository."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:65
-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:"
+msgid "When accepting a signed push (see linkgit:git-push[1]), the signed push certificate is stored in a blob and an environment variable `GIT_PUSH_CERT` can be consulted for its object name. See the description of `post-receive` hook for an example. In addition, the certificate is verified using GPG and the result is exported with the following environment variables:"
msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:66
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_PUSH_CERT_SIGNER`"
msgstr "`GIT_PUSH_CERT_SIGNER`"
#. 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."
+msgid "The name and the e-mail address of the owner of the key that signed the push certificate."
msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:70
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_PUSH_CERT_KEY`"
msgstr "`GIT_PUSH_CERT_KEY`"
@@ -50451,42 +39237,35 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:73
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_PUSH_CERT_STATUS`"
msgstr "`GIT_PUSH_CERT_STATUS`"
#. type: Plain text
#: en/git-receive-pack.txt:77
-msgid ""
-"The status of GPG verification of the push certificate, using the same "
-"mnemonic as used in `%G?` format of `git log` family of commands (see "
-"linkgit:git-log[1])."
+msgid "The status of GPG verification of the push certificate, using the same mnemonic as used in `%G?` format of `git log` family of commands (see linkgit:git-log[1])."
msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:78
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_PUSH_CERT_NONCE`"
msgstr "`GIT_PUSH_CERT_NONCE`"
#. type: Plain text
#: en/git-receive-pack.txt:84
-msgid ""
-"The nonce string the process asked the signer to include in the push "
-"certificate. If this does not match the value recorded on the \"nonce\" "
-"header in the push certificate, it may indicate that the certificate is a "
-"valid one that is being replayed from a separate \"git push\" session."
+msgid "The nonce string the process asked the signer to include in the push certificate. If this does not match the value recorded on the \"nonce\" header in the push certificate, it may indicate that the certificate is a valid one that is being replayed from a separate \"git push\" session."
msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:85
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_PUSH_CERT_NONCE_STATUS`"
msgstr "`GIT_PUSH_CERT_NONCE_STATUS`"
#. type: Labeled list
#: en/git-receive-pack.txt:86
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`UNSOLICITED`"
msgstr "`UNSOLICITED`"
@@ -50497,7 +39276,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:89
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`MISSING`"
msgstr "`MISSING`"
@@ -50508,7 +39287,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:91
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`BAD`"
msgstr "`BAD`"
@@ -50519,7 +39298,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:93
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`OK`"
msgstr "`OK`"
@@ -50530,48 +39309,34 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:95
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`SLOP`"
msgstr "`SLOP`"
#. type: Plain text
#: en/git-receive-pack.txt:99
-msgid ""
-"\"git push --signed\" sent a nonce different from what we asked it to send "
-"now, but in a previous session. See `GIT_PUSH_CERT_NONCE_SLOP` environment "
-"variable."
+msgid "\"git push --signed\" sent a nonce different from what we asked it to send now, but in a previous session. See `GIT_PUSH_CERT_NONCE_SLOP` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:100
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_PUSH_CERT_NONCE_SLOP`"
msgstr "`GIT_PUSH_CERT_NONCE_SLOP`"
#. type: Plain text
#: en/git-receive-pack.txt:108
-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]."
+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]."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:111
-msgid ""
-"This hook is called before any refname is updated and before any fast-"
-"forward checks are performed."
+msgid "This hook is called before any refname is updated and before any fast-forward checks are performed."
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."
+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."
msgstr ""
#. type: Title -
@@ -50583,9 +39348,7 @@ msgstr "update"
#. type: Plain text
#: en/git-receive-pack.txt:121
-msgid ""
-"Before each ref is updated, if $GIT_DIR/hooks/update file exists and is "
-"executable, it is invoked once per ref, with three parameters:"
+msgid "Before each ref is updated, if $GIT_DIR/hooks/update file exists and is executable, it is invoked once per ref, with three parameters:"
msgstr ""
#. type: Plain text
@@ -50596,28 +39359,17 @@ 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 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."
+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 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."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:133
-msgid ""
-"The hook should exit with non-zero status if it wants to disallow updating "
-"the named ref. Otherwise it should exit with zero."
+msgid "The hook should exit with non-zero status if it wants to disallow updating the named ref. Otherwise it should exit with zero."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:138
-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."
+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."
msgstr ""
#. type: Title -
@@ -50628,38 +39380,22 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:146
-msgid ""
-"After all refs were updated (or attempted to be updated), if any ref update "
-"was successful, and if $GIT_DIR/hooks/post-receive file exists and is "
-"executable, it will be invoked once with no parameters. The standard input "
-"of the hook will be one line for each successfully updated ref:"
+msgid "After all refs were updated (or attempted to be updated), if any ref update was successful, and if $GIT_DIR/hooks/post-receive file exists and is executable, it will be invoked once with no parameters. The standard input of the hook will be one line for each successfully updated ref:"
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:156
-msgid ""
-"The refname value is relative to $GIT_DIR; e.g. for the master head this is "
-"\"refs/heads/master\". The two sha1 values before each refname are the "
-"object names for the refname before and after the update. Refs that were "
-"created will have sha1-old equal to 0\\{40}, while refs that were deleted "
-"will have sha1-new equal to 0\\{40}, otherwise sha1-old and sha1-new should "
-"be valid objects in the repository."
+msgid "The refname value is relative to $GIT_DIR; e.g. for the master head this is \"refs/heads/master\". The two sha1 values before each refname are the object names for the refname before and after the update. Refs that were created will have sha1-old equal to 0\\{40}, while refs that were deleted will have sha1-new equal to 0\\{40}, otherwise sha1-old and sha1-new should be valid objects in the repository."
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."
+msgid "The `GIT_PUSH_CERT*` environment variables can be inspected, just as in `pre-receive` hook, after accepting a signed push."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:165
-msgid ""
-"Using this hook, it is easy to generate mails describing the updates to the "
-"repository. This example script sends one mail message per ref listing the "
-"commits pushed to the repository, and logs the push certificates of signed "
-"pushes with good signatures to a logger service:"
+msgid "Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per ref listing the commits pushed to the repository, and logs the push certificates of signed pushes with good signatures to a logger service:"
msgstr ""
#. type: Plain text
@@ -50693,19 +39429,12 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:192
-msgid ""
-"The exit code from this hook invocation is ignored, however a non-zero exit "
-"code will generate an error message."
+msgid "The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:198
-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."
+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."
msgstr ""
#. type: Title -
@@ -50717,25 +39446,17 @@ 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:209
-msgid ""
-"The exit code from this hook invocation is ignored; the only thing left for "
-"'git-receive-pack' to do at that point is to exit itself anyway."
+msgid "The exit code from this hook invocation is ignored; the only thing left for 'git-receive-pack' to do at that point is to exit itself anyway."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:212
-msgid ""
-"This hook can be used, for example, to run `git update-server-info` if the "
-"repository is packed and is served via a dumb transport."
+msgid "This hook can be used, for example, to run `git update-server-info` if the repository is packed and is served via a dumb transport."
msgstr ""
#. type: Plain text
@@ -50753,7 +39474,7 @@ msgstr ""
#. type: Title =
#: en/git-reflog.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-reflog(1)"
msgstr "git-reflog(1)"
@@ -50783,14 +39504,7 @@ msgstr ""
#. type: Plain text
#: en/git-reflog.txt:35
-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."
+msgid "Reference logs, or \"reflogs\", record when the tips of branches and other references were updated in the local repository. Reflogs are useful in various Git commands, to specify the old value of a reference. For example, `HEAD@{2}` means \"where HEAD used to be two moves ago\", `master@{one.week.ago}` means \"where master used to point to one week ago in this local repository\", and so on. See linkgit:gitrevisions[7] for more details."
msgstr ""
#. type: Plain text
@@ -50800,37 +39514,22 @@ msgstr ""
#. type: Plain text
#: 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 "
-"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."
+msgid "The \"show\" subcommand (which is also the default, in the absence of any subcommands) shows the log of the reference provided in the command-line (or `HEAD`, by default). The reflog covers all recent actions, and in addition the `HEAD` reflog records branch switching. `git reflog show` is an alias for `git log -g --abbrev-commit --pretty=oneline`; see linkgit:git-log[1] for more information."
msgstr ""
#. type: Plain text
#: en/git-reflog.txt:50
-msgid ""
-"The \"expire\" subcommand prunes older reflog entries. Entries older than "
-"`expire` time, or entries older than `expire-unreachable` time and not "
-"reachable from the current tip, are removed from the reflog. This is "
-"typically not used directly by end users -- instead, see linkgit:git-gc[1]."
+msgid "The \"expire\" subcommand prunes older reflog entries. Entries older than `expire` time, or entries older than `expire-unreachable` time and not reachable from the current tip, are removed from the reflog. This is typically not used directly by end users -- instead, see linkgit:git-gc[1]."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-reflog.txt:59
-msgid ""
-"The \"exists\" subcommand checks whether a ref has a reflog. It exits with "
-"zero status if the reflog exists, and non-zero status if it does not."
+msgid "The \"exists\" subcommand checks whether a ref has a reflog. It exits with zero status if the reflog exists, and non-zero status if it does not."
msgstr ""
#. type: Title ~
@@ -50863,12 +39562,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"entries regardless of their age; `--expire=never` turns off pruning of "
-"reachable entries (but see `--expire-unreachable`)."
+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 entries regardless of their age; `--expire=never` turns off pruning of reachable entries (but see `--expire-unreachable`)."
msgstr ""
#. type: Labeled list
@@ -50879,63 +39573,45 @@ msgstr ""
#. type: Plain text
#: en/git-reflog.txt:92
-msgid ""
-"Prune entries older than `<time>` that are not reachable from the current "
-"tip of the branch. If this option is not specified, the expiration time is "
-"taken from the configuration setting `gc.reflogExpireUnreachable`, which in "
-"turn defaults to 30 days. `--expire-unreachable=all` prunes unreachable "
-"entries regardless of their age; `--expire-unreachable=never` turns off "
-"early pruning of unreachable entries (but see `--expire`)."
+msgid "Prune entries older than `<time>` that are not reachable from the current tip of the branch. If this option is not specified, the expiration time is taken from the configuration setting `gc.reflogExpireUnreachable`, which in turn defaults to 30 days. `--expire-unreachable=all` prunes unreachable entries regardless of their age; `--expire-unreachable=never` turns off early pruning of unreachable entries (but see `--expire`)."
msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:93
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--updateref"
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.)"
+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.)"
msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:98
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--rewrite"
msgstr "--rewrite"
#. type: Plain text
#: en/git-reflog.txt:102
-msgid ""
-"If a reflog entry's predecessor is pruned, adjust its \"old\" SHA-1 to be "
-"equal to the \"new\" SHA-1 field of the entry that now precedes it."
+msgid "If a reflog entry's predecessor is pruned, adjust its \"old\" SHA-1 to be equal to the \"new\" SHA-1 field of the entry that now precedes it."
msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:103
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--stale-fix"
msgstr "--stale-fix"
#. type: Plain text
#: en/git-reflog.txt:108
-msgid ""
-"Prune any reflog entries that point to \"broken commits\". A broken commit "
-"is a commit that is not reachable from any of the reference tips and that "
-"refers, directly or indirectly, to a missing commit, tree, or blob object."
+msgid "Prune any reflog entries that point to \"broken commits\". A broken commit is a commit that is not reachable from any of the reference tips and that refers, directly or indirectly, to a missing commit, tree, or blob object."
msgstr ""
#. type: Plain text
#: en/git-reflog.txt:113
-msgid ""
-"This computation involves traversing all the reachable objects, i.e. it has "
-"the same cost as 'git prune'. It is primarily intended to fix corruption "
-"caused by garbage collecting using older versions of Git, which didn't "
-"protect objects referred to by reflogs."
+msgid "This computation involves traversing all the reachable objects, i.e. it has the same cost as 'git prune'. It is primarily intended to fix corruption caused by garbage collecting using older versions of Git, which didn't protect objects referred to by reflogs."
msgstr ""
#. type: Plain text
@@ -50946,8 +39622,7 @@ msgstr ""
#| "--dry-run::\n"
#| "\tDon't actually add the file(s), just show if they exist and/or will\n"
#| "\tbe ignored.\n"
-msgid ""
-"Do not actually prune any entries; just show what would have been pruned."
+msgid "Do not actually prune any entries; just show what would have been pruned."
msgstr ""
"-n::\n"
"--dry-run::\n"
@@ -50967,15 +39642,12 @@ 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`."
+msgid "`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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-remote-ext(1)"
msgstr "git-remote-ext(1)"
@@ -50992,18 +39664,12 @@ 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."
+msgid "This remote helper uses the specified '<command>' to connect to a remote Git server."
msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:23
-msgid ""
-"Data written to stdin of the specified '<command>' is assumed to be sent to "
-"a git:// server, git-upload-pack, git-receive-pack or git-upload-archive "
-"(depending on situation), and data read from stdout of <command> is assumed "
-"to be received from the same service."
+msgid "Data written to stdin of the specified '<command>' is assumed to be sent to a git:// server, git-upload-pack, git-receive-pack or git-upload-archive (depending on situation), and data read from stdout of <command> is assumed to be received from the same service."
msgstr ""
#. type: Plain text
@@ -51046,9 +39712,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:37
-msgid ""
-"Replaced with name (receive-pack, upload-pack, or upload-archive) of the "
-"service Git wants to invoke."
+msgid "Replaced with name (receive-pack, upload-pack, or upload-archive) of the service Git wants to invoke."
msgstr ""
#. type: Labeled list
@@ -51059,9 +39723,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:42
-msgid ""
-"Replaced with long name (git-receive-pack, git-upload-pack, or git-upload-"
-"archive) of the service Git wants to invoke."
+msgid "Replaced with long name (git-receive-pack, git-upload-pack, or git-upload-archive) of the service Git wants to invoke."
msgstr ""
#. type: Labeled list
@@ -51072,17 +39734,12 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:49
-msgid ""
-"This argument will not be passed to '<command>'. Instead, it will cause the "
-"helper to start by sending git:// service requests to the remote side with "
-"the service field set to an appropriate value and the repository field set "
-"to rest of the argument. Default is not to send such a request."
+msgid "This argument will not be passed to '<command>'. Instead, it will cause the helper to start by sending git:// service requests to the remote side with the service field set to an appropriate value and the repository field set to rest of the argument. Default is not to send such a request."
msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:52
-msgid ""
-"This is useful if remote side is git:// server accessed over some tunnel."
+msgid "This is useful if remote side is git:// server accessed over some tunnel."
msgstr ""
#. type: Labeled list
@@ -51093,10 +39750,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:57
-msgid ""
-"This argument will not be passed to '<command>'. Instead it sets the vhost "
-"field in the git:// service request (to rest of the argument). Default is "
-"not to send vhost in such request (if sent)."
+msgid "This argument will not be passed to '<command>'. Instead it sets the vhost field in the git:// service request (to rest of the argument). Default is not to send vhost in such request (if sent)."
msgstr ""
#. type: Title -
@@ -51131,9 +39785,7 @@ 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."
+msgid "Set to long name (git-upload-pack, etc...) of service helper needs to invoke."
msgstr ""
#. type: Labeled list
@@ -51144,8 +39796,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:74
-msgid ""
-"Set to long name (upload-pack, etc...) of service helper needs to invoke."
+msgid "Set to long name (upload-pack, etc...) of service helper needs to invoke."
msgstr ""
#. type: Title -
@@ -51157,10 +39808,7 @@ msgstr "EXEMPLES"
#. type: Plain text
#: en/git-remote-ext.txt:82
-msgid ""
-"This remote helper is transparently used by Git when you use commands such "
-"as \"git fetch <URL>\", \"git clone <URL>\", , \"git push <URL>\" or \"git "
-"remote add <nick> <URL>\", where <URL> begins with `ext::`. Examples:"
+msgid "This remote helper is transparently used by Git when you use commands such as \"git fetch <URL>\", \"git clone <URL>\", , \"git push <URL>\" or \"git remote add <nick> <URL>\", where <URL> begins with `ext::`. Examples:"
msgstr ""
#. type: Labeled list
@@ -51171,9 +39819,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:87
-msgid ""
-"Like host.example:foo/repo, but use /home/foo/.ssh/somekey as keypair and "
-"user as user on remote side. This avoids needing to edit .ssh/config."
+msgid "Like host.example:foo/repo, but use /home/foo/.ssh/somekey as keypair and user as user on remote side. This avoids needing to edit .ssh/config."
msgstr ""
#. type: Labeled list
@@ -51184,9 +39830,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:91
-msgid ""
-"Represents repository with path /somerepo accessible over git protocol at "
-"abstract namespace address /git-server."
+msgid "Represents repository with path /somerepo accessible over git protocol at abstract namespace address /git-server."
msgstr ""
#. type: Labeled list
@@ -51197,11 +39841,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:98
-msgid ""
-"Represents a repository with path /repo accessed using the helper program "
-"\"git-server-alias foo\". The path to the repository and type of request "
-"are not passed on the command line but as part of the protocol stream, as "
-"usual with git:// protocol."
+msgid "Represents a repository with path /repo accessed using the helper program \"git-server-alias foo\". The path to the repository and type of request are not passed on the command line but as part of the protocol stream, as usual with git:// protocol."
msgstr ""
#. type: Labeled list
@@ -51212,11 +39852,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:105
-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)."
+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)."
msgstr ""
#. type: Labeled list
@@ -51227,11 +39863,7 @@ msgstr ""
#. type: Plain text
#: 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)."
+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)."
msgstr ""
#. type: Labeled list
@@ -51242,10 +39874,7 @@ 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)."
+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)."
msgstr ""
#. type: Plain text
@@ -51256,7 +39885,7 @@ msgstr ""
#. type: Title =
#: en/git-remote-fd.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-remote-fd(1)"
msgstr "git-remote-fd(1)"
@@ -51272,35 +39901,22 @@ msgstr ""
#. type: Plain text
#: en/git-remote-fd.txt:17
-msgid ""
-"This helper uses specified file descriptors to connect to a remote Git "
-"server. This is not meant for end users but for programs and scripts "
-"calling git fetch, push or archive."
+msgid "This helper uses specified file descriptors to connect to a remote Git server. This is not meant for end users but for programs and scripts calling git fetch, push or archive."
msgstr ""
#. type: Plain text
#: en/git-remote-fd.txt:23
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-remote-fd.txt:26
-msgid ""
-"It is assumed that any handshaking procedures have already been completed "
-"(such as sending service request for git://) before this helper is started."
+msgid "It is assumed that any handshaking procedures have already been completed (such as sending service request for git://) before this helper is started."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Title -
@@ -51318,8 +39934,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote-fd.txt:41
-msgid ""
-"Fetch master, using file descriptor #17 to communicate with git-upload-pack."
+msgid "Fetch master, using file descriptor #17 to communicate with git-upload-pack."
msgstr ""
#. type: Labeled list
@@ -51336,9 +39951,7 @@ 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."
+msgid "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
@@ -51349,7 +39962,7 @@ msgstr ""
#. type: Title =
#: en/git-remote-testgit.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-remote-testgit(1)"
msgstr "git-remote-testgit(1)"
@@ -51366,22 +39979,17 @@ msgstr ""
#. type: Plain text
#: en/git-remote-testgit.txt:20
-msgid ""
-"This command is a simple remote-helper, that is used both as a testcase for "
-"the remote-helper functionality, and as an example to show remote-helper "
-"authors one possible implementation."
+msgid "This command is a simple remote-helper, that is used both as a testcase for the remote-helper functionality, and as an example to show remote-helper authors one possible implementation."
msgstr ""
#. type: Plain text
#: en/git-remote-testgit.txt:23
-msgid ""
-"The best way to learn more is to read the comments and source code in 'git-"
-"remote-testgit'."
+msgid "The best way to learn more is to read the comments and source code in 'git-remote-testgit'."
msgstr ""
#. type: Title =
#: en/git-remote.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-remote(1)"
msgstr "git-remote(1)"
@@ -51418,16 +40026,12 @@ 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`."
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:46
-msgid ""
-"With no arguments, shows a list of existing remotes. Several subcommands "
-"are available to perform operations on the remotes."
+msgid "With no arguments, shows a list of existing remotes. Several subcommands are available to perform operations on the remotes."
msgstr ""
#. type: Labeled list
@@ -51438,71 +40042,47 @@ msgstr ""
#. 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>."
+msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:55
-msgid ""
-"With `-f` option, `git fetch <name>` is run immediately after the remote "
-"information is set up."
+msgid "With `-f` option, `git fetch <name>` is run immediately after the remote information is set up."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:58
-msgid ""
-"With `--tags` option, `git fetch <name>` imports every tag from the remote "
-"repository."
+msgid "With `--tags` option, `git fetch <name>` imports every tag from the remote repository."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:61
-msgid ""
-"With `--no-tags` option, `git fetch <name>` does not import tags from the "
-"remote repository."
+msgid "With `--no-tags` option, `git fetch <name>` does not import tags from the remote repository."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:64
-msgid ""
-"By default, only tags on fetched branches are imported (see linkgit:git-"
-"fetch[1])."
+msgid "By default, only tags on fetched branches are imported (see linkgit:git-fetch[1])."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:70
-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."
+msgid "With `-t <branch>` option, instead of the default glob refspec for the remote to track all branches under the `refs/remotes/<name>/` namespace, a refspec to track only `<branch>` is created. You can give more than one `-t <branch>` to track multiple branches without grabbing all branches."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:73
-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."
+msgid "With `-m <master>` option, a symbolic-ref `refs/remotes/<name>/HEAD` is set up to point at remote's `<master>` branch. See also the set-head command."
msgstr ""
#. type: Plain text
#: 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. "
-"This option only makes sense in bare repositories, because a fetch would "
-"overwrite any local commits."
+msgid "When a fetch mirror is created with `--mirror=fetch`, the refs will not be stored in the 'refs/remotes/' namespace, but rather everything in 'refs/' on the remote will be directly mirrored into 'refs/' in the local repository. This option only makes sense in bare repositories, because a fetch would overwrite any local commits."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:82
-msgid ""
-"When a push mirror is created with `--mirror=push`, then `git push` will "
-"always behave as if `--mirror` was passed."
+msgid "When a push mirror is created with `--mirror=push`, then `git push` will always behave as if `--mirror` was passed."
msgstr ""
#. type: Labeled list
@@ -51513,17 +40093,12 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:87
-msgid ""
-"Rename the remote named <old> to <new>. All remote-tracking branches and "
-"configuration settings for the remote are updated."
+msgid "Rename the remote named <old> to <new>. All remote-tracking branches and configuration settings for the remote are updated."
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 "
-"configuration file format."
+msgid "In case <old> and <new> are the same, and <old> is a file under `$GIT_DIR/remotes` or `$GIT_DIR/branches`, the remote is converted to the configuration file format."
msgstr ""
#. type: Labeled list
@@ -51540,9 +40115,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:97
-msgid ""
-"Remove the remote named <name>. All remote-tracking branches and "
-"configuration settings for the remote are removed."
+msgid "Remove the remote named <name>. All remote-tracking branches and configuration settings for the remote are removed."
msgstr ""
#. type: Labeled list
@@ -51553,41 +40126,22 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:107
-msgid ""
-"Sets or deletes the default branch (i.e. the target of the symbolic-ref "
-"`refs/remotes/<name>/HEAD`) for the named remote. Having a default branch "
-"for a remote is not required, but allows the name of the remote to be "
-"specified in lieu of a specific branch. For example, if the default branch "
-"for `origin` is set to `master`, then `origin` may be specified wherever you"
-" would normally specify `origin/master`."
+msgid "Sets or deletes the default branch (i.e. the target of the symbolic-ref `refs/remotes/<name>/HEAD`) for the named remote. Having a default branch for a remote is not required, but allows the name of the remote to be specified in lieu of a specific branch. For example, if the default branch for `origin` is set to `master`, then `origin` may be specified wherever you would normally specify `origin/master`."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:109
-msgid ""
-"With `-d` or `--delete`, the symbolic ref `refs/remotes/<name>/HEAD` is "
-"deleted."
+msgid "With `-d` or `--delete`, the symbolic ref `refs/remotes/<name>/HEAD` is deleted."
msgstr ""
#. type: Plain text
#: 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."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:121
-msgid ""
-"Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` "
-"explicitly. e.g., \"git remote set-head origin master\" will set the "
-"symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. "
-"This will only work if `refs/remotes/origin/master` already exists; if not "
-"it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
msgstr ""
#. type: Labeled list
@@ -51598,24 +40152,17 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:128
-msgid ""
-"Changes the list of branches tracked by the named remote. This can be used "
-"to track a subset of the available remote branches after the initial setup "
-"for a remote."
+msgid "Changes the list of branches tracked by the named remote. This can be used to track a subset of the available remote branches after the initial setup for a remote."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:131
-msgid ""
-"The named branches will be interpreted as if specified with the `-t` option "
-"on the 'git remote add' command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:134
-msgid ""
-"With `--add`, instead of replacing the list of currently tracked branches, "
-"adds to that list."
+msgid "With `--add`, instead of replacing the list of currently tracked branches, adds to that list."
msgstr ""
#. type: Labeled list
@@ -51626,9 +40173,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:139
-msgid ""
-"Retrieves the URLs for a remote. Configurations for `insteadOf` and "
-"`pushInsteadOf` are expanded here. By default, only the first URL is listed."
+msgid "Retrieves the URLs for a remote. Configurations for `insteadOf` and `pushInsteadOf` are expanded here. By default, only the first URL is listed."
msgstr ""
#. type: Plain text
@@ -51649,10 +40194,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:149
-msgid ""
-"Changes URLs for the remote. Sets first URL for remote <name> that matches "
-"regex <oldurl> (first URL if no <oldurl> is given) to <newurl>. If <oldurl> "
-"doesn't match any URL, an error occurs and nothing is changed."
+msgid "Changes URLs for the remote. Sets first URL for remote <name> that matches regex <oldurl> (first URL if no <oldurl> is given) to <newurl>. If <oldurl> doesn't match any URL, an error occurs and nothing is changed."
msgstr ""
#. type: Plain text
@@ -51667,21 +40209,12 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:157
-msgid ""
-"With `--delete`, instead of changing existing URLs, all URLs matching regex "
-"<url> are deleted for remote <name>. Trying to delete all non-push URLs is "
-"an error."
+msgid "With `--delete`, instead of changing existing URLs, all URLs matching regex <url> are deleted for remote <name>. Trying to delete all non-push URLs is an error."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:164
-msgid ""
-"Note that the push URL and the fetch URL, even though they can be set "
-"differently, must still refer to the same place. What you pushed to the "
-"push URL should be what you would see if you immediately fetched from the "
-"fetch URL. If you are trying to fetch from one place (e.g. your upstream) "
-"and push to another (e.g. your publishing repository), use two separate "
-"remotes."
+msgid "Note that the push URL and the fetch URL, even though they can be set differently, must still refer to the same place. What you pushed to the push URL should be what you would see if you immediately fetched from the fetch URL. If you are trying to fetch from one place (e.g. your upstream) and push to another (e.g. your publishing repository), use two separate remotes."
msgstr ""
#. type: Labeled list
@@ -51699,9 +40232,7 @@ 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."
+msgid "With `-n` option, the remote heads are not queried first with `git ls-remote <name>`; cached information is used instead."
msgstr ""
#. type: Labeled list
@@ -51712,17 +40243,12 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:179
-msgid ""
-"Deletes all stale remote-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 <name>, but are still locally available in \"remotes/<name>\"."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:182
-msgid ""
-"With `--dry-run` option, report what branches will be pruned, but do not "
-"actually prune them."
+msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
msgstr ""
#. type: Labeled list
@@ -51734,13 +40260,7 @@ msgstr "update"
#. type: Plain text
#: 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])."
+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])."
msgstr ""
#. type: Plain text
@@ -51751,15 +40271,9 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:201
#, fuzzy
-#| msgid ""
-#| "The default can be changed by the `commit.cleanup` configuration variable "
-#| "(see linkgit:git-config[1])."
-msgid ""
-"The remote configuration is achieved using the `remote.origin.url` and "
-"`remote.origin.fetch` configuration variables. (See linkgit:git-config[1])."
-msgstr ""
-"La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration "
-"`commit.cleanup` (voir linkgit:git-config[1])."
+#| msgid "The default can be changed by the `commit.cleanup` configuration variable (see linkgit:git-config[1])."
+msgid "The remote configuration is achieved using the `remote.origin.url` and `remote.origin.fetch` configuration variables. (See linkgit:git-config[1])."
+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-remote.txt:206
@@ -51813,13 +40327,12 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:249
-#, ignore-translated
msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-repack.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-repack(1)"
msgstr "git-repack(1)"
@@ -51833,163 +40346,93 @@ 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
#: en/git-repack.txt:20
-msgid ""
-"This command is used to combine all objects that do not currently reside in "
-"a \"pack\", into a pack. It can also be used to re-organize existing packs "
-"into a single, more efficient pack."
+msgid "This command is used to combine all objects that do not currently reside in a \"pack\", into a pack. It can also be used to re-organize existing packs into a single, more efficient pack."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:39
-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` "
-"shows as dangling."
+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` shows as dangling."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:43
-msgid ""
-"Note that users fetching over dumb protocols will have to fetch the whole "
-"new pack in order to get any contained object, no matter how many other "
-"objects in that pack they already have locally."
+msgid "Note that users fetching over dumb protocols will have to fetch the whole new pack in order to get any contained object, no matter how many other objects in that pack they already have locally."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:54
-msgid ""
-"Same as `-a`, unless `-d` is used. Then any unreachable objects in a "
-"previous pack become loose, unpacked objects, instead of being left in the "
-"old pack. Unreachable objects are never intentionally added to a pack, even"
-" when repacking. This option prevents unreachable objects from being "
-"immediately deleted by way of being left in the old pack and then removed. "
-"Instead, the loose unreachable objects will be pruned according to normal "
-"expiry rules with the next 'git gc' invocation. See linkgit:git-gc[1]."
+msgid "Same as `-a`, unless `-d` is used. Then any unreachable objects in a previous pack become loose, unpacked objects, instead of being left in the old pack. Unreachable objects are never intentionally added to a pack, even when repacking. This option prevents unreachable objects from being immediately deleted by way of being left in the old pack and then removed. Instead, the loose unreachable objects will be pruned according to normal expiry rules with the next 'git gc' invocation. See linkgit:git-gc[1]."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:60
-msgid ""
-"After packing, if the newly created packs make some existing packs "
-"redundant, remove the redundant packs. Also run 'git prune-packed' to "
-"remove redundant loose object files."
+msgid "After packing, if the newly created packs make some existing packs redundant, remove the redundant packs. Also run 'git prune-packed' to remove redundant loose object files."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:64
#, fuzzy
-#| msgid ""
-#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-#| "merge[1], linkgit:git-commit-tree[1]"
-msgid ""
-"Pass the `--local` option to 'git pack-objects'. See linkgit:git-pack-"
-"objects[1]."
-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-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
+msgid "Pass the `--local` option to 'git pack-objects'. See linkgit:git-pack-objects[1]."
+msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
#. type: Plain text
#: en/git-repack.txt:68
-msgid ""
-"Pass the `--no-reuse-delta` option to `git-pack-objects`, see linkgit:git-"
-"pack-objects[1]."
+msgid "Pass the `--no-reuse-delta` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:72
-msgid ""
-"Pass the `--no-reuse-object` option to `git-pack-objects`, see linkgit:git-"
-"pack-objects[1]."
+msgid "Pass the `--no-reuse-object` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:76
#, fuzzy
-#| msgid ""
-#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-#| "merge[1], linkgit:git-commit-tree[1]"
-msgid ""
-"Pass the `-q` option to 'git pack-objects'. See linkgit:git-pack-objects[1]."
-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-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
+msgid "Pass the `-q` option to 'git pack-objects'. See linkgit:git-pack-objects[1]."
+msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
#. type: Plain text
#: en/git-repack.txt:83
-msgid ""
-"Do not update the server information with 'git update-server-info'. This "
-"option skips updating local catalog files needed to publish this repository "
-"(or a direct copy of it) over HTTP or FTP. See linkgit:git-update-server-"
-"info[1]."
+msgid "Do not update the server information with 'git update-server-info'. This option skips updating local catalog files needed to publish this repository (or a direct copy of it) over HTTP or FTP. See linkgit:git-update-server-info[1]."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:94
-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 "
-"is 50."
+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 is 50."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:107
-msgid ""
-"This option provides an additional limit on top of `--window`; the window "
-"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 "
-"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]."
+msgid "This option provides an additional limit on top of `--window`; the window 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 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]."
msgstr ""
#. type: Labeled list
#: en/git-repack.txt:117
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--write-bitmap-index"
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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-repack.txt:124
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--pack-kept-objects"
msgstr "--pack-kept-objects"
#. type: Plain text
#: en/git-repack.txt:132
-msgid ""
-"Include objects in `.keep` files when repacking. Note that we still do not "
-"delete `.keep` packs after `pack-objects` finishes. This means that we may "
-"duplicate objects, but this makes the option safe to use when there are "
-"concurrent pushes or fetches. This option is generally only useful if you "
-"are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that "
-"the bitmapped packfile has the necessary objects."
+msgid "Include objects in `.keep` files when repacking. Note that we still do not delete `.keep` packs after `pack-objects` finishes. This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches. This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
msgstr ""
#. type: Labeled list
@@ -52000,49 +40443,33 @@ msgstr ""
#. type: Plain text
#: en/git-repack.txt:138
-msgid ""
-"When loosening unreachable objects, do not bother loosening any objects "
-"older than `<when>`. This can be used to optimize out the write of any "
-"objects that would be immediately pruned by a follow-up `git prune`."
+msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
msgstr ""
#. type: Labeled list
#: en/git-repack.txt:140
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--keep-unreachable"
msgstr "--keep-unreachable"
#. type: Plain text
#: en/git-repack.txt:145
-msgid ""
-"When used with `-ad`, any unreachable objects from existing packs will be "
-"appended to the end of the packfile instead of being removed. In addition, "
-"any unreachable loose objects will be packed (and their loose counterparts "
-"removed)."
+msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:158
-msgid ""
-"By default, the command passes `--delta-base-offset` option to 'git pack-"
-"objects'; this typically results in slightly smaller packs, but the "
-"generated packs are incompatible with versions of Git older than version "
-"1.4.4. If you need to share your repository with such ancient Git versions, "
-"either directly or via the dumb http protocol, then you need to set the "
-"configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. "
-"Access from old Git versions over the native protocol is unaffected by this "
-"option as the conversion is performed on the fly as needed in that case."
+msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
msgstr ""
#. type: Plain text
#: en/git-repack.txt:163
-#, ignore-translated
msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
#. type: Title =
#: en/git-replace.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-replace(1)"
msgstr "git-replace(1)"
@@ -52069,17 +40496,12 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:24
-msgid ""
-"The name of the 'replace' reference is the SHA-1 of the object that is "
-"replaced. The content of the 'replace' reference is the SHA-1 of the "
-"replacement object."
+msgid "The name of the 'replace' reference is the SHA-1 of the object that is replaced. The content of the 'replace' reference is the SHA-1 of the replacement object."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:27
-msgid ""
-"The replaced object and the replacement object must be of the same type. "
-"This restriction can be bypassed using `-f`."
+msgid "The replaced object and the replacement object must be of the same type. This restriction can be bypassed using `-f`."
msgstr ""
#. type: Plain text
@@ -52089,23 +40511,17 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:32
-msgid ""
-"There is no other restriction on the replaced and replacement objects. "
-"Merge commits can be replaced by non-merge commits and vice versa."
+msgid "There is no other restriction on the replaced and replacement objects. Merge commits can be replaced by non-merge commits and vice versa."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:36
-msgid ""
-"Replacement references will be used by default by all Git commands except "
-"those doing reachability traversal (prune, pack transfer and fsck)."
+msgid "Replacement references will be used by default by all Git commands except those doing reachability traversal (prune, pack transfer and fsck)."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:39
-msgid ""
-"It is possible to disable use of replacement references for any command "
-"using the `--no-replace-objects` option just after 'git'."
+msgid "It is possible to disable use of replacement references for any command using the `--no-replace-objects` option just after 'git'."
msgstr ""
#. type: Plain text
@@ -52139,16 +40555,12 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:56
-msgid ""
-"The `GIT_NO_REPLACE_OBJECTS` environment variable can be set to achieve the "
-"same effect as the `--no-replace-objects` option."
+msgid "The `GIT_NO_REPLACE_OBJECTS` environment variable can be set to achieve the same effect as the `--no-replace-objects` option."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:63
-msgid ""
-"If an existing replace ref for the same object exists, it will be "
-"overwritten (instead of failing)."
+msgid "If an existing replace ref for the same object exists, it will be overwritten (instead of failing)."
msgstr ""
#. type: Plain text
@@ -52164,23 +40576,12 @@ 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."
+msgid "Edit an object's content interactively. The existing content for <object> is pretty-printed into a temporary file, an editor is launched on the file, and the result is parsed to create a new object of the same type as <object>. A replacement ref is then created to replace <object> with the newly created object. See linkgit:git-var[1] for details about how the editor will be chosen."
msgstr ""
#. 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 "
-"is so corrupted it cannot be pretty-printed. Note that you may need to "
-"configure your editor to cleanly read and write binary data."
+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 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 ""
#. type: Labeled list
@@ -52191,12 +40592,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"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."
+msgid "Create a graft commit. A new commit is created with the same content as <commit> except that its parents will be [<parent>...] instead of <commit>'s parents. A replacement ref is then created to replace <commit> with the newly created commit. See contrib/convert-grafts-to-replace-refs.sh for an example script based on this option that can convert grafts to replace refs."
msgstr ""
#. type: Labeled list
@@ -52213,10 +40609,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -52228,9 +40621,7 @@ msgstr "Configuration"
#. type: Plain text
#: en/git-replace.txt:105
-msgid ""
-"When listing, use the specified <format>, which can be one of 'short', "
-"'medium' and 'long'. When omitted, the format defaults to 'short'."
+msgid "When listing, use the specified <format>, which can be one of 'short', 'medium' and 'long'. When omitted, the format defaults to 'short'."
msgstr ""
#. type: Title -
@@ -52272,8 +40663,7 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:117
-msgid ""
-"<replaced sha1> (<replaced type>) -> <replacement sha1> (<replacement type>)"
+msgid "<replaced sha1> (<replaced type>) -> <replacement sha1> (<replacement type>)"
msgstr ""
#. type: Title -
@@ -52284,55 +40674,34 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:126
-msgid ""
-"linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and linkgit:git-"
-"rebase[1], among other git commands, can be used to create replacement "
-"objects from existing objects. The `--edit` option can also be used with "
-"'git replace' to create a replacement object by editing an existing object."
+msgid "linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and linkgit:git-rebase[1], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:132
-msgid ""
-"If you want to replace many blobs, trees or commits that are part of a "
-"string of commits, you may just want to create a replacement string of "
-"commits and then only replace the commit at the tip of the target string of "
-"commits with the commit at the tip of the replacement string of commits."
+msgid "If you want to replace many blobs, trees or commits that are part of a string of commits, you may just want to create a replacement string of commits and then only replace the commit at the tip of the target string of commits with the commit at the tip of the replacement string of commits."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:139
-msgid ""
-"Comparing blobs or trees that have been replaced with those that replace "
-"them will not work properly. And using `git reset --hard` to go back to a "
-"replaced commit will move the branch to the replacement commit instead of "
-"the replaced commit."
+msgid "Comparing blobs or trees that have been replaced with those that replace them will not work properly. And using `git reset --hard` to go back to a replaced commit will move the branch to the replacement commit instead of the replaced commit."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:142
-msgid ""
-"There may be other problems when using 'git rev-list' related to pending "
-"objects."
+msgid "There may be other problems when using 'git rev-list' related to pending objects."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:153
#, fuzzy
-#| msgid ""
-#| "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-"
-#| "mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
-msgid ""
-"linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-"
-"rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] "
-"linkgit:git-var[1] linkgit:git[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]"
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[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-request-pull.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-request-pull(1)"
msgstr "git-request-pull(1)"
@@ -52349,19 +40718,12 @@ msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:20
-msgid ""
-"Generate a request asking your upstream project to pull changes into their "
-"tree. The request, printed to the standard output, begins with the branch "
-"description, summarizes the changes and indicates from where they can be "
-"pulled."
+msgid "Generate a request asking your upstream project to pull changes into their tree. The request, printed to the standard output, begins with the branch description, summarizes the changes and indicates from where they can be pulled."
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:25
-msgid ""
-"The upstream project is expected to have the commit named by `<start>` and "
-"the output asks it to integrate the changes you made since that commit, up "
-"to the commit named by `<end>`, by visiting the repository named by `<url>`."
+msgid "The upstream project is expected to have the commit named by `<start>` and the output asks it to integrate the changes you made since that commit, up to the commit named by `<end>`, by visiting the repository named by `<url>`."
msgstr ""
#. type: Plain text
@@ -52377,9 +40739,7 @@ msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:35
-msgid ""
-"Commit to start at. This names a commit that is already in the upstream "
-"history."
+msgid "Commit to start at. This names a commit that is already in the upstream history."
msgstr ""
#. type: Labeled list
@@ -52401,26 +40761,17 @@ msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:42
-msgid ""
-"Commit to end at (defaults to HEAD). This names the commit at the tip of "
-"the history you are asking to be pulled."
+msgid "Commit to end at (defaults to HEAD). This names the commit at the tip of the history you are asking to be pulled."
msgstr ""
#. type: Plain text
#: 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."
+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."
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:"
+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:"
msgstr ""
#. type: Plain text
@@ -52442,17 +40793,12 @@ msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:66
-msgid ""
-"which will produce a request to the upstream, summarizing the changes "
-"between the `v1.0` release and your `master`, to pull it from your public "
-"repository."
+msgid "which will produce a request to the upstream, summarizing the changes between the `v1.0` release and your `master`, to pull it from your public repository."
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:69
-msgid ""
-"If you pushed your change to a branch whose name is different from the one "
-"you have locally, e.g."
+msgid "If you pushed your change to a branch whose name is different from the one you have locally, e.g."
msgstr ""
#. type: Plain text
@@ -52474,7 +40820,7 @@ msgstr ""
#. type: Title =
#: en/git-rerere.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-rerere(1)"
msgstr "git-rerere(1)"
@@ -52486,42 +40832,27 @@ 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
#: en/git-rerere.txt:20
-msgid ""
-"In a workflow employing relatively long lived topic branches, the developer "
-"sometimes needs to resolve the same conflicts over and over again until the "
-"topic branches are done (either merged to the \"release\" branch, or sent "
-"out and accepted upstream)."
+msgid "In a workflow employing relatively long lived topic branches, the developer sometimes needs to resolve the same conflicts over and over again until the topic branches are done (either merged to the \"release\" branch, or sent out and accepted upstream)."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:25
-msgid ""
-"This command assists the developer in this process by recording conflicted "
-"automerge results and corresponding hand resolve results on the initial "
-"manual merge, and applying previously recorded hand resolutions to their "
-"corresponding automerge results."
+msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
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."
+msgid "You need to set the configuration variable rerere.enabled in order to enable this command."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:37
-msgid ""
-"Normally, 'git rerere' is run without arguments or user-intervention. "
-"However, it has several commands that allow it to interact with its working "
-"state."
+msgid "Normally, 'git rerere' is run without arguments or user-intervention. However, it has several commands that allow it to interact with its working state."
msgstr ""
#. type: Labeled list
@@ -52532,10 +40863,7 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:43
-msgid ""
-"Reset the metadata used by rerere if a merge resolution is to be aborted. "
-"Calling 'git am [--skip|--abort]' or 'git rebase [--skip|--abort]' will "
-"automatically invoke this command."
+msgid "Reset the metadata used by rerere if a merge resolution is to be aborted. Calling 'git am [--skip|--abort]' or 'git rebase [--skip|--abort]' will automatically invoke this command."
msgstr ""
#. type: Labeled list
@@ -52546,9 +40874,7 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:48
-msgid ""
-"Reset the conflict resolutions which rerere has recorded for the current "
-"conflict in <pathspec>."
+msgid "Reset the conflict resolutions which rerere has recorded for the current conflict in <pathspec>."
msgstr ""
#. type: Labeled list
@@ -52560,11 +40886,7 @@ msgstr "diff"
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -52587,10 +40909,7 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:65
-msgid ""
-"Print paths with conflicts that have not been autoresolved by rerere. This "
-"includes paths whose resolutions cannot be tracked by rerere, such as "
-"conflicting submodules."
+msgid "Print paths with conflicts that have not been autoresolved by rerere. This includes paths whose resolutions cannot be tracked by rerere, such as conflicting submodules."
msgstr ""
#. type: Labeled list
@@ -52601,21 +40920,12 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:74
-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 "
-"respectively."
+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 respectively."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:83
-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:"
+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:"
msgstr ""
#. type: delimited block -
@@ -52629,9 +40939,7 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:92
-msgid ""
-"For such a test, you need to merge master and topic somehow. One way to do "
-"it is to pull master into the topic branch:"
+msgid "For such a test, you need to merge master and topic somehow. One way to do it is to pull master into the topic branch:"
msgstr ""
#. type: delimited block -
@@ -52653,22 +40961,12 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:114
-msgid ""
-"After this test merge, there are two ways to continue your work on the "
-"topic. The easiest is to build on top of the test merge commit `+`, and "
-"when your work in the topic branch is finally ready, pull the topic branch "
-"into master, and/or ask the upstream to pull from you. By that time, "
-"however, the master or the upstream might have been advanced since the test "
-"merge `+`, in which case the final commit graph would look like this:"
+msgid "After this test merge, there are two ways to continue your work on the topic. The easiest is to build on top of the test merge commit `+`, and when your work in the topic branch is finally ready, pull the topic branch into master, and/or ask the upstream to pull from you. By that time, however, the master or the upstream might have been advanced since the test merge `+`, in which case the final commit graph would look like this:"
msgstr ""
#. type: delimited block -
@@ -52693,21 +40991,12 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:133
-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 "
-"\"useless merges\"."
+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 \"useless merges\"."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:137
-msgid ""
-"As an alternative, to keep the topic branch clean of test merges, you could "
-"blow away the test merge, and keep building on top of the tip before the "
-"test merge:"
+msgid "As an alternative, to keep the topic branch clean of test merges, you could blow away the test merge, and keep building on top of the tip before the test merge:"
msgstr ""
#. type: delimited block -
@@ -52733,65 +41022,32 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:159
-msgid ""
-"This would leave only one merge commit when your topic branch is finally "
-"ready and merged into the master branch. This merge would require you to "
-"resolve the conflict, introduced by the commits marked with `*`. However, "
-"this conflict is often the same conflict you resolved when you created the "
-"test merge you blew away. 'git rerere' helps you resolve this final "
-"conflicted merge using the information from your earlier hand resolve."
+msgid "This would leave only one merge commit when your topic branch is finally ready and merged into the master branch. This merge would require you to resolve the conflict, introduced by the commits marked with `*`. However, this conflict is often the same conflict you resolved when you created the test merge you blew away. 'git rerere' helps you resolve this final conflicted merge using the information from your earlier hand resolve."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:167
-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."
+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."
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 "
-"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 "
-"sanity checks with `git diff` (or `git diff -c`) and 'git add' when you are "
-"satisfied."
+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 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 sanity checks with `git diff` (or `git diff -c`) and 'git add' when you are satisfied."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:185
-msgid ""
-"As a convenience measure, 'git merge' automatically invokes 'git rerere' "
-"upon exiting with a failed automerge and 'git rerere' records the hand "
-"resolve when it is a new conflict, or reuses the earlier hand resolve when "
-"it is not. 'git commit' also invokes 'git rerere' when committing a merge "
-"result. What this means is that you do not have to do anything special "
-"yourself (besides enabling the rerere.enabled config variable)."
+msgid "As a convenience measure, 'git merge' automatically invokes 'git rerere' upon exiting with a failed automerge and 'git rerere' records the hand resolve when it is a new conflict, or reuses the earlier hand resolve when it is not. 'git commit' also invokes 'git rerere' when committing a merge result. What this means is that you do not have to do anything special yourself (besides enabling the rerere.enabled config variable)."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:190
-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."
+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."
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:"
+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:"
msgstr ""
#. type: delimited block -
@@ -52820,17 +41076,12 @@ 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 resolved earlier. 'git rerere' will be run by 'git rebase' to help you "
-"resolve this conflict."
+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 resolved earlier. 'git rerere' will be run by 'git rebase' to help you resolve this conflict."
msgstr ""
#. type: Title =
#: en/git-reset.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-reset(1)"
msgstr "git-reset(1)"
@@ -52850,11 +41101,7 @@ 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."
+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."
msgstr ""
#. type: Labeled list
@@ -52865,25 +41112,17 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:26
-msgid ""
-"This form resets the index entries for all <paths> to their state at <tree-"
-"ish>. (It does not affect the working tree or the current branch.)"
+msgid "This form resets the index entries for all <paths> to their state at <tree-ish>. (It does not affect the working tree or the current branch.)"
msgstr ""
#. type: Plain text
#: en/git-reset.txt:29
-msgid ""
-"This means that `git reset <paths>` is the opposite of `git add <paths>`."
+msgid "This means that `git reset <paths>` is the opposite of `git add <paths>`."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:36
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -52894,31 +41133,15 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:41
-msgid ""
-"Interactively select hunks in the difference between the index and <tree-"
-"ish> (defaults to HEAD). The chosen hunks are applied in reverse to the "
-"index."
+msgid "Interactively select hunks in the difference between the index and <tree-ish> (defaults to HEAD). The chosen hunks are applied in reverse to the index."
msgstr ""
#. type: Plain text
#: 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."
-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 "
-"of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-"en utilisant les options --interactive ou --patch avec la commande 'commit' "
-"pour choisir quels fichiers ou sections de fichier doivent 챗tre inclus dans "
-"le commit en plus de l'index, avant finalisation de l'op챕ration. R챕f챕rez-"
-"vous 횪 la section 짬혻Mode interactif혻쨩 de linkgit:git-add[1] pour la "
-"description de ces modes."
+#| 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."
+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 of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+msgstr "en utilisant les options --interactive ou --patch avec la commande 'commit' pour choisir quels fichiers ou sections de fichier doivent 챗tre inclus dans le commit en plus de l'index, avant finalisation de l'op챕ration. R챕f챕rez-vous 횪 la section 짬혻Mode interactif혻쨩 de linkgit:git-add[1] pour la description de ces modes."
#. type: Labeled list
#: en/git-reset.txt:46
@@ -52929,91 +41152,65 @@ msgstr "$ git commit\n"
#. type: Plain text
#: en/git-reset.txt:51
-msgid ""
-"This form resets the current branch head to <commit> and possibly updates "
-"the index (resetting it to the tree of <commit>) and the working tree "
-"depending on <mode>. If <mode> is omitted, defaults to \"--mixed\". The "
-"<mode> must be one of the following:"
+msgid "This form resets the current branch head to <commit> and possibly updates the index (resetting it to the tree of <commit>) and the working tree depending on <mode>. If <mode> is omitted, defaults to \"--mixed\". The <mode> must be one of the following:"
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:53
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--soft"
msgstr "--soft"
#. type: Plain text
#: en/git-reset.txt:58
-msgid ""
-"Does not touch the index file or the working tree at all (but resets the "
-"head to <commit>, just like all modes do). This leaves all your changed "
-"files \"Changes to be committed\", as 'git status' would put it."
+msgid "Does not touch the index file or the working tree at all (but resets the head to <commit>, just like all modes do). This leaves all your changed files \"Changes to be committed\", as 'git status' would put it."
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:59
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--mixed"
msgstr "--mixed"
#. type: Plain text
#: en/git-reset.txt:63
-msgid ""
-"Resets the index but not the working tree (i.e., the changed files are "
-"preserved but not marked for commit) and reports what has not been updated. "
-"This is the default action."
+msgid "Resets the index but not the working tree (i.e., the changed files are preserved but not marked for commit) and reports what has not been updated. This is the default action."
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])."
+msgid "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, ignore-translated
+#, no-wrap
msgid "--hard"
msgstr "--hard"
#. type: Plain text
#: en/git-reset.txt:70
-msgid ""
-"Resets the index and working tree. Any changes to tracked files in the "
-"working tree since <commit> are discarded."
+msgid "Resets the index and working tree. Any changes to tracked files in the working tree since <commit> are discarded."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:78
-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."
+msgid "Resets the index and updates the files in the working tree that are different between <commit> and HEAD, but keeps those which are different between the index and working tree (i.e. which have changes which have not been added). If a file that is different between <commit> and the index has unstaged changes, reset is aborted."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:81
-msgid ""
-"In other words, --merge does something like a 'git read-tree -u -m "
-"<commit>', but carries forward unmerged index entries."
+msgid "In other words, --merge does something like a 'git read-tree -u -m <commit>', but carries forward unmerged index entries."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:87
-msgid ""
-"Resets index entries and updates files in the working tree that are "
-"different between <commit> and HEAD. If a file that is different between "
-"<commit> and HEAD has local changes, reset is aborted."
+msgid "Resets index entries and updates files in the working tree that are different between <commit> and HEAD. If a file that is different between <commit> and HEAD has local changes, reset is aborted."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:91
-msgid ""
-"If you want to undo a commit other than the latest on a branch, linkgit:git-"
-"revert[1] is your friend."
+msgid "If you want to undo a commit other than the latest on a branch, linkgit:git-revert[1] is your friend."
msgstr ""
#. type: Plain text
@@ -53040,11 +41237,7 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:118
-msgid ""
-"You are happily working on something, and find the changes in these files "
-"are in good order. You do not want to see them when you run \"git diff\", "
-"because you plan to work on other files and changes with these files are "
-"distracting."
+msgid "You are happily working on something, and find the changes in these files are in good order. You do not want to see them when you run \"git diff\", because you plan to work on other files and changes with these files are distracting."
msgstr ""
#. type: Plain text
@@ -53054,18 +41247,12 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:124
-msgid ""
-"However, you already dirtied the index (i.e. your index does not match the "
-"HEAD commit). But you know the pull you are going to make does not affect "
-"frotz.c or filfre.c, so you revert the index changes for these two files. "
-"Your changes in working tree remain there."
+msgid "However, you already dirtied the index (i.e. your index does not match the HEAD commit). But you know the pull you are going to make does not affect frotz.c or filfre.c, so you revert the index changes for these two files. Your changes in working tree remain there."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:126
-msgid ""
-"Then you can pull and merge, leaving frotz.c and filfre.c changes still in "
-"the working tree."
+msgid "Then you can pull and merge, leaving frotz.c and filfre.c changes still in the working tree."
msgstr ""
#. type: Labeled list
@@ -53086,29 +41273,19 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:139
-msgid ""
-"This is most often done when you remembered what you just committed is "
-"incomplete, or you misspelled your commit message, or both. Leaves working "
-"tree as it was before \"reset\"."
+msgid "This is most often done when you remembered what you just committed is incomplete, or you misspelled your commit message, or both. Leaves working tree as it was before \"reset\"."
msgstr ""
#. type: Plain text
#: 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;"
+#| msgid "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 "
-"de l'index, encore une fois, avant d'utiliser la commande 'commit',"
+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',"
#. 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 "
-"can give -C option instead."
+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 can give -C option instead."
msgstr ""
#. type: Plain text
@@ -53133,10 +41310,7 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:158
-msgid ""
-"You have made some commits, but realize they were premature to be in the "
-"\"master\" branch. You want to continue polishing them in a topic branch, "
-"so create \"topic/wip\" branch off of the current HEAD."
+msgid "You have made some commits, but realize they were premature to be in the \"master\" branch. You want to continue polishing them in a topic branch, so create \"topic/wip\" branch off of the current HEAD."
msgstr ""
#. type: Plain text
@@ -53165,11 +41339,7 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:173
-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.)"
+msgid "The last three commits (HEAD, HEAD^, and HEAD~2) were bad and you do not want to ever see them again. Do *not* do this if you have already given these commits to somebody else. (See the \"RECOVERING FROM UPSTREAM REBASE\" section in linkgit:git-rebase[1] for the implications of doing so.)"
msgstr ""
#. type: Labeled list
@@ -53195,35 +41365,22 @@ 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 "
-"later."
+msgid "Try to update from the upstream resulted in a lot of conflicts; you were not ready to spend a lot of time merging right now, so you decide to do that later."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:194
-msgid ""
-"\"pull\" has not made merge commit, so \"git reset --hard\" which is a "
-"synonym for \"git reset --hard HEAD\" clears the mess from the index file "
-"and the working tree."
+msgid "\"pull\" has not made merge commit, so \"git reset --hard\" which is a synonym for \"git reset --hard HEAD\" clears the mess from the index file and the working tree."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:196
-msgid ""
-"Merge a topic branch into the current branch, which resulted in a fast-"
-"forward."
+msgid "Merge a topic branch into the current branch, which resulted in a fast-forward."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:201
-msgid ""
-"But you decided that the topic branch is not ready for public consumption "
-"yet. \"pull\" or \"merge\" always leaves the original tip of the current "
-"branch in ORIG_HEAD, so resetting hard to it brings your index file and the "
-"working tree back to that state, and resets the tip of the branch to that "
-"commit."
+msgid "But you decided that the topic branch is not ready for public consumption yet. \"pull\" or \"merge\" always leaves the original tip of the current branch in ORIG_HEAD, so resetting hard to it brings your index file and the working tree back to that state, and resets the tip of the branch to that commit."
msgstr ""
#. type: Labeled list
@@ -53246,20 +41403,12 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:217
-msgid ""
-"Even if you may have local modifications in your working tree, you can "
-"safely say \"git pull\" when you know that the change in the other branch "
-"does not overlap with them."
+msgid "Even if you may have local modifications in your working tree, you can safely say \"git pull\" when you know that the change in the other branch does not overlap with them."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:222
-msgid ""
-"After inspecting the result of the merge, you may find that the change in "
-"the other branch is unsatisfactory. Running \"git reset --hard ORIG_HEAD\" "
-"will let you go back to where you were, but it will discard your local "
-"changes, which you do not want. \"git reset --merge\" keeps your local "
-"changes."
+msgid "After inspecting the result of the merge, you may find that the change in the other branch is unsatisfactory. Running \"git reset --hard ORIG_HEAD\" will let you go back to where you were, but it will discard your local changes, which you do not want. \"git reset --merge\" keeps your local changes."
msgstr ""
#. type: Labeled list
@@ -53270,11 +41419,7 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:230
-msgid ""
-"Suppose you are interrupted by an urgent fix request while you are in the "
-"middle of a large change. The files in your working tree are not in any "
-"shape to be committed yet, but you need to get to the other branch for a "
-"quick bugfix."
+msgid "Suppose you are interrupted by an urgent fix request while you are in the middle of a large change. The files in your working tree are not in any shape to be committed yet, but you need to get to the other branch for a quick bugfix."
msgstr ""
#. type: delimited block -
@@ -53299,17 +41444,12 @@ 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."
+msgid "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
#: en/git-reset.txt:249
-msgid ""
-"At this point the index file still has all the WIP changes you committed as "
-"'snapshot WIP'. This updates the index to show your WIP files as "
-"uncommitted."
+msgid "At this point the index file still has all the WIP changes you committed as 'snapshot WIP'. This updates the index to show your WIP files as uncommitted."
msgstr ""
#. type: Plain text
@@ -53328,10 +41468,7 @@ msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index"
#. type: Plain text
#: en/git-reset.txt:257
-msgid ""
-"Suppose you have added a file to your index, but later decide you do not "
-"want to add it to your commit. You can remove the file from the index while "
-"keeping your changes with git reset."
+msgid "Suppose you have added a file to your index, but later decide you do not want to add it to your commit. You can remove the file from the index while keeping your changes with git reset."
msgstr ""
#. type: delimited block -
@@ -53346,15 +41483,9 @@ msgstr ""
#. type: Plain text
#: 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;"
-msgid ""
-"This removes the file from the index while keeping it in the working "
-"directory."
-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',"
+#| msgid "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."
+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',"
#. type: Plain text
#: en/git-reset.txt:267
@@ -53376,12 +41507,7 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:276
-msgid ""
-"Suppose you are working on something and you commit it, and then you "
-"continue working a bit more, but now you think that what you have in your "
-"working tree should be in another branch that has nothing to do with what "
-"you committed previously. You can start a new branch and reset it while "
-"keeping the changes in your working tree."
+msgid "Suppose you are working on something and you commit it, and then you continue working a bit more, but now you think that what you have in your working tree should be in another branch that has nothing to do with what you committed previously. You can start a new branch and reset it while keeping the changes in your working tree."
msgstr ""
#. type: delimited block -
@@ -53404,17 +41530,12 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:294
-msgid ""
-"But you can use \"reset --keep\" to remove the unwanted commit after you "
-"switched to \"branch2\"."
+msgid "But you can use \"reset --keep\" to remove the unwanted commit after you switched to \"branch2\"."
msgstr ""
#. type: Labeled list
@@ -53425,14 +41546,7 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:303
-msgid ""
-"Suppose that you have created lots of logically separate changes and "
-"commited them together. Then, later you decide that it might be better to "
-"have each logical chunk associated with its own commit. You can use git "
-"reset to rewind history without changing the contents of your local files, "
-"and then successively use `git add -p` to interactively select which hunks "
-"to include into each commit, using `git commit -c` to pre-populate the "
-"commit message."
+msgid "Suppose that you have created lots of logically separate changes and commited them together. Then, later you decide that it might be better to have each logical chunk associated with its own commit. You can use git reset to rewind history without changing the contents of your local files, and then successively use `git add -p` to interactively select which hunks to include into each commit, using `git commit -c` to pre-populate the commit message."
msgstr ""
#. type: delimited block -
@@ -53451,63 +41565,37 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
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."
+msgid "Next, we interactively select diff hunks to add using the git add -p facility. This will ask you about each diff hunk in sequence and you can use simple commands such as \"yes, include this\", \"No don't include this\" or even the very powerful \"edit\" facility."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:327
-msgid ""
-"Once satisfied with the hunks you want to include, you should verify what "
-"has been prepared for the first commit by using git diff --cached. This "
-"shows all the changes that have been moved into the index and are about to "
-"be committed."
+msgid "Once satisfied with the hunks you want to include, you should verify what has been prepared for the first commit by using git diff --cached. This shows all the changes that have been moved into the index and are about to be committed."
msgstr ""
#. 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 "
-"original reset commit (1 change ago). See linkgit:git-reflog[1] for more "
-"details. You may also use any other valid commit reference."
+msgid "Next, commit the changes stored in the index. The -c option specifies to pre-populate the commit message from the original message that you started with in the first commit. This is helpful to avoid retyping it. The HEAD@{1} is a special notation for the commit that HEAD used to be at prior to the original reset commit (1 change ago). See linkgit:git-reflog[1] for more details. You may also use any other valid commit reference."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:335
-msgid ""
-"You can repeat steps 2-4 multiple times to break the original code into any "
-"number of commits."
+msgid "You can repeat steps 2-4 multiple times to break the original code into any number of commits."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:338
-msgid ""
-"Now you've split out many of the changes into their own commits, and might "
-"no longer use the patch mode of git add, in order to select all remaining "
-"uncommitted changes."
+msgid "Now you've split out many of the changes into their own commits, and might no longer use the patch mode of git add, in order to select all remaining uncommitted changes."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:341
-msgid ""
-"Once again, check to verify that you've included what you want to. You may "
-"also wish to verify that git diff doesn't show any remaining changes to be "
-"committed later."
+msgid "Once again, check to verify that you've included what you want to. You may also wish to verify that git diff doesn't show any remaining changes to be committed later."
msgstr ""
#. type: Plain text
@@ -53528,21 +41616,12 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:355
-msgid ""
-"to reset the HEAD to another commit (`target`) with the different reset "
-"options depending on the state of the files."
+msgid "to reset the HEAD to another commit (`target`) with the different reset options depending on the state of the files."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:364
-msgid ""
-"In these tables, A, B, C and D are some different states of a file. For "
-"example, the first line of the first table means that if a file is in state "
-"A in the working tree, in state B in the index, in state C in HEAD and in "
-"state D in the target, then \"git reset --soft target\" will leave the file "
-"in the working tree in state A and in the index in state B. It resets (i.e."
-" moves) the HEAD (i.e. the tip of the current branch, if you are on one) to "
-"\"target\" (which has the file in state D)."
+msgid "In these tables, A, B, C and D are some different states of a file. For example, the first line of the first table means that if a file is in state A in the working tree, in state B in the index, in state C in HEAD and in state D in the target, then \"git reset --soft target\" will leave the file in the working tree in state A and in the index in state B. It resets (i.e. moves) the HEAD (i.e. the tip of the current branch, if you are on one) to \"target\" (which has the file in state D)."
msgstr ""
#. type: Plain text
@@ -53625,33 +41704,17 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:421
-msgid ""
-"\"reset --merge\" is meant to be used when resetting out of a conflicted "
-"merge. Any mergy operation guarantees that the working tree file that is "
-"involved in the merge does not have local change wrt the index before it "
-"starts, and that it writes the result out to the working tree. So if we see "
-"some difference between the index and the target and also between the index "
-"and the working tree, then it means that we are not resetting out from a "
-"state that a mergy operation left after failing with a conflict. That is why"
-" we disallow --merge option in this case."
+msgid "\"reset --merge\" is meant to be used when resetting out of a conflicted merge. Any mergy operation guarantees that the working tree file that is involved in the merge does not have local change wrt the index before it starts, and that it writes the result out to the working tree. So if we see some difference between the index and the target and also between the index and the working tree, then it means that we are not resetting out from a state that a mergy operation left after failing with a conflict. That is why we disallow --merge option in this case."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:430
-msgid ""
-"\"reset --keep\" is meant to be used when removing some of the last commits "
-"in the current branch while keeping changes in the working tree. If there "
-"could be conflicts between the changes in the commit we want to remove and "
-"the changes in the working tree we want to keep, the reset is disallowed. "
-"That's why it is disallowed if there are both changes between the working "
-"tree and HEAD, and between HEAD and the target. To be safe, it is also "
-"disallowed when there are unmerged entries."
+msgid "\"reset --keep\" is meant to be used when removing some of the last commits in the current branch while keeping changes in the working tree. If there could be conflicts between the changes in the commit we want to remove and the changes in the working tree we want to keep, the reset is disallowed. That's why it is disallowed if there are both changes between the working tree and HEAD, and between HEAD and the target. To be safe, it is also disallowed when there are unmerged entries."
msgstr ""
#. 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
@@ -53687,7 +41750,7 @@ msgstr ""
#. type: Title =
#: en/git-revert.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-revert(1)"
msgstr "git-revert(1)"
@@ -53708,90 +41771,52 @@ msgstr ""
#. type: Plain text
#: en/git-revert.txt:23
-msgid ""
-"Given one or more existing commits, revert the changes that the related "
-"patches introduce, and record some new commits that record them. This "
-"requires your working tree to be clean (no modifications from the HEAD "
-"commit)."
+msgid "Given one or more existing commits, revert the changes that the related patches introduce, and record some new commits that record them. This requires your working tree to be clean (no modifications from the HEAD commit)."
msgstr ""
#. type: Plain text
#: en/git-revert.txt:32
-msgid ""
-"Note: 'git revert' is used to record some new commits to reverse the effect "
-"of some earlier commits (often only a faulty one). If you want to throw "
-"away all uncommitted changes in your working directory, you should see "
-"linkgit:git-reset[1], particularly the `--hard` option. If you want to "
-"extract specific files as they were in another commit, you should see "
-"linkgit:git-checkout[1], specifically the `git checkout <commit> -- "
-"<filename>` syntax. Take care with these alternatives as both will discard "
-"uncommitted changes in your working directory."
+msgid "Note: 'git revert' is used to record some new commits to reverse the effect of some earlier commits (often only a faulty one). If you want to throw away all uncommitted changes in your working directory, you should see linkgit:git-reset[1], particularly the `--hard` option. If you want to extract specific files as they were in another commit, you should see linkgit:git-checkout[1], specifically the `git checkout <commit> -- <filename>` syntax. Take care with these alternatives as both will discard uncommitted changes in your working directory."
msgstr ""
#. type: Plain text
#: en/git-revert.txt:42
-msgid ""
-"Commits to revert. For a more complete list of ways to spell commit names, "
-"see linkgit:gitrevisions[7]. Sets of commits can also be given but no "
-"traversal is done by default, see linkgit:git-rev-list[1] and its `--no-"
-"walk` option."
+msgid "Commits to revert. For a more complete list of ways to spell commit names, see linkgit:gitrevisions[7]. Sets of commits can also be given but no traversal is done by default, see linkgit:git-rev-list[1] and its `--no-walk` option."
msgstr ""
#. 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 "
-"terminal."
+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 terminal."
msgstr ""
#. type: Plain text
#: en/git-revert.txt:56
-msgid ""
-"Usually you cannot revert 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 revert to reverse the "
-"change relative to the specified parent."
+msgid "Usually you cannot revert 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 revert to reverse the change relative to the specified parent."
msgstr ""
#. type: Plain text
#: en/git-revert.txt:61
-msgid ""
-"Reverting a merge commit declares that you will never want the tree changes "
-"brought in by the merge. As a result, later merges will only bring in tree "
-"changes introduced by commits that are not ancestors of the previously "
-"reverted merge. This may or may not be what you want."
+msgid "Reverting a merge commit declares that you will never want the tree changes brought in by the merge. As a result, later merges will only bring in tree changes introduced by commits that are not ancestors of the previously reverted merge. This may or may not be what you want."
msgstr ""
#. type: Plain text
#: en/git-revert.txt:64
-msgid ""
-"See the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] "
-"for more details."
+msgid "See the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for more details."
msgstr ""
#. type: Plain text
#: en/git-revert.txt:68
-msgid ""
-"With this option, 'git revert' will not start the commit message editor."
+msgid "With this option, 'git revert' will not start the commit message editor."
msgstr ""
#. type: Plain text
#: 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, "
-"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."
+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, 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."
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."
+msgid "This is useful when reverting more than one commits' effect to your index in a row."
msgstr ""
#. type: Labeled list
@@ -53802,9 +41827,7 @@ msgstr ""
#. type: Plain text
#: en/git-revert.txt:114
-msgid ""
-"Revert the changes specified by the fourth last commit in HEAD and create a "
-"new commit with the reverted changes."
+msgid "Revert the changes specified by the fourth last commit in HEAD and create a new commit with the reverted changes."
msgstr ""
#. type: Labeled list
@@ -53815,16 +41838,12 @@ msgstr ""
#. type: Plain text
#: en/git-revert.txt:122
-msgid ""
-"Revert the changes done by commits from the fifth last commit in master "
-"(included) to the third last commit in master (included), but do not create "
-"any commit with the reverted changes. The revert only modifies the working "
-"tree and the index."
+msgid "Revert the changes done by commits from the fifth last commit in master (included) to the third last commit in master (included), but do not create any commit with the reverted changes. The revert only modifies the working tree and the index."
msgstr ""
#. type: Title =
#: en/git-rev-list.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-rev-list(1)"
msgstr "git-rev-list(1)"
@@ -53891,22 +41910,12 @@ msgstr ""
#. type: Plain text
#: en/git-rev-list.txt:70
-msgid ""
-"List commits that are reachable by following the `parent` links from the "
-"given commit(s), but exclude commits that are reachable from the one(s) "
-"given with a '{caret}' in front of them. The output is given in reverse "
-"chronological order by default."
+msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default."
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 "
-"output. Various other options and paths parameters can be used to further "
-"limit the result."
+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 output. Various other options and paths parameters can be used to further limit the result."
msgstr ""
#. type: Plain text
@@ -53924,17 +41933,12 @@ msgstr ""
#. type: Plain text
#: en/git-rev-list.txt:86
-msgid ""
-"means \"list all the commits which are reachable from 'foo' or 'bar', but "
-"not from 'baz'\"."
+msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: 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:"
+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:"
msgstr ""
#. type: delimited block -
@@ -53947,10 +41951,7 @@ msgstr ""
#. type: Plain text
#: en/git-rev-list.txt:99
-msgid ""
-"Another special notation is \"'<commit1>'...'<commit2>'\" which is useful "
-"for merges. The resulting set of commits is the symmetric difference "
-"between the two operands. The following two commands are equivalent:"
+msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
msgstr ""
#. type: delimited block -
@@ -53963,16 +41964,12 @@ 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 "
-"'git bisect' and 'git repack'."
+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 'git bisect' and 'git repack'."
msgstr ""
#. type: Title =
#: en/git-rev-parse.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-rev-parse(1)"
msgstr "git-rev-parse(1)"
@@ -53989,12 +41986,7 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:23
-msgid ""
-"Many Git porcelainish commands take mixture of flags (i.e. parameters that "
-"begin with a dash '-') and parameters meant for the underlying 'git rev-"
-"list' command they use internally and flags and parameters for the other "
-"commands they use downstream of 'git rev-list'. This command is used to "
-"distinguish between them."
+msgid "Many Git porcelainish commands take mixture of flags (i.e. parameters that begin with a dash '-') and parameters meant for the underlying 'git rev-list' command they use internally and flags and parameters for the other commands they use downstream of 'git rev-list'. This command is used to distinguish between them."
msgstr ""
#. type: Title ~
@@ -54010,28 +42002,24 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:33
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--parseopt"
msgstr "--parseopt"
#. type: Plain text
#: en/git-rev-parse.txt:35
-msgid ""
-"Use 'git rev-parse' in option parsing mode (see PARSEOPT section below)."
+msgid "Use 'git rev-parse' in option parsing mode (see PARSEOPT section below)."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:36
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--sq-quote"
msgstr "--sq-quote"
#. type: Plain text
#: en/git-rev-parse.txt:40
-msgid ""
-"Use 'git rev-parse' in shell quoting mode (see SQ-QUOTE section below). In "
-"contrast to the `--sq` option below, this mode does only quoting. Nothing "
-"else is done to command input."
+msgid "Use 'git rev-parse' in shell quoting mode (see SQ-QUOTE section below). In contrast to the `--sq` option below, this mode does only quoting. Nothing else is done to command input."
msgstr ""
#. type: Title ~
@@ -54042,42 +42030,35 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:44
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--keep-dashdash"
msgstr "--keep-dashdash"
#. type: Plain text
#: en/git-rev-parse.txt:47
-msgid ""
-"Only meaningful in `--parseopt` mode. Tells the option parser to echo out "
-"the first `--` met instead of skipping it."
+msgid "Only meaningful in `--parseopt` mode. Tells the option parser to echo out the first `--` met instead of skipping it."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:48
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--stop-at-non-option"
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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:53
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--stuck-long"
msgstr "--stuck-long"
#. type: Plain text
#: en/git-rev-parse.txt:56
-msgid ""
-"Only meaningful in `--parseopt` mode. Output the options in their long form "
-"if available, and with their arguments stuck."
+msgid "Only meaningful in `--parseopt` mode. Output the options in their long form if available, and with their arguments stuck."
msgstr ""
#. type: Title ~
@@ -54088,19 +42069,18 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:60
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--revs-only"
msgstr "--revs-only"
#. type: Plain text
#: en/git-rev-parse.txt:63
-msgid ""
-"Do not output flags and parameters not meant for 'git rev-list' command."
+msgid "Do not output flags and parameters not meant for 'git rev-list' command."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:64
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-revs"
msgstr "--no-revs"
@@ -54111,7 +42091,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:68
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--flags"
msgstr "--flags"
@@ -54122,7 +42102,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:71
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-flags"
msgstr "--no-flags"
@@ -54157,18 +42137,12 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:86
-msgid ""
-"Behave as if 'git rev-parse' was invoked from the `<arg>` subdirectory of "
-"the working tree. Any relative filenames are resolved as if they are "
-"prefixed by `<arg>` and will be printed in that form."
+msgid "Behave as if 'git rev-parse' was invoked from the `<arg>` subdirectory of the working tree. Any relative filenames are resolved as if they are prefixed by `<arg>` and will be printed in that form."
msgstr ""
#. type: Plain text
#: 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:"
+msgid "This can be used to convert arguments to a command run in a subdirectory so that they can still be used after moving to the top-level of the repository. For example:"
msgstr ""
#. type: delimited block -
@@ -54183,53 +42157,33 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:103
-msgid ""
-"Verify that exactly one parameter is provided, and that it can be turned "
-"into a raw 20-byte SHA-1 that can be used to access the object database. If "
-"so, emit it to the standard output; otherwise, error out."
+msgid "Verify that exactly one parameter is provided, and that it can be turned into a raw 20-byte SHA-1 that can be used to access the object database. If so, emit it to the standard output; otherwise, error out."
msgstr ""
#. type: Plain text
#: 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, "
-"`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 "
-"type, `git rev-parse \"$VAR^{object}\"` can be used."
+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, `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 type, `git rev-parse \"$VAR^{object}\"` can be used."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:120
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--sq"
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."
+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."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:133
-msgid ""
-"When showing object names, prefix them with '{caret}' and strip '{caret}' "
-"prefix from the object names that already have one."
+msgid "When showing object names, prefix them with '{caret}' and strip '{caret}' prefix from the object names that already have one."
msgstr ""
#. type: Labeled list
@@ -54240,9 +42194,7 @@ 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."
+msgid "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
@@ -54254,40 +42206,29 @@ msgstr "Configuration"
#. type: Plain text
#: en/git-rev-parse.txt:144
-msgid ""
-"Instead of outputting the full SHA-1 values of object names try to "
-"abbreviate them to a shorter unique name. When no length is specified 7 is "
-"used. The minimum length is 4."
+msgid "Instead of outputting the full SHA-1 values of object names try to abbreviate them to a shorter unique name. When no length is specified 7 is used. The minimum length is 4."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:145
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--symbolic"
msgstr "--symbolic"
#. type: Plain text
#: en/git-rev-parse.txt:149
-msgid ""
-"Usually the object names are output in SHA-1 form (with possible '{caret}' "
-"prefix); this option makes them output in a form as close to the original "
-"input as possible."
+msgid "Usually the object names are output in SHA-1 form (with possible '{caret}' prefix); this option makes them output in a form as close to the original input as possible."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:150
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--symbolic-full-name"
msgstr "--symbolic-full-name"
#. type: Plain text
#: en/git-rev-parse.txt:157
-msgid ""
-"This is similar to --symbolic, but it omits input that are not refs (i.e. "
-"branch or tag names; or more explicitly disambiguating \"heads/master\" "
-"form, when you want to name the \"master\" branch when there is an "
-"unfortunately named tag \"master\"), and show them as full refnames (e.g. "
-"\"refs/heads/master\")."
+msgid "This is similar to --symbolic, but it omits input that are not refs (i.e. branch or tag names; or more explicitly disambiguating \"heads/master\" form, when you want to name the \"master\" branch when there is an unfortunately named tag \"master\"), and show them as full refnames (e.g. \"refs/heads/master\")."
msgstr ""
#. type: Title ~
@@ -54321,17 +42262,12 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:170
-msgid ""
-"Show all branches, tags, or remote-tracking branches, respectively (i.e., "
-"refs found in `refs/heads`, `refs/tags`, or `refs/remotes`, respectively)."
+msgid "Show all branches, tags, or remote-tracking branches, respectively (i.e., refs found in `refs/heads`, `refs/tags`, or `refs/remotes`, respectively)."
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 `/*`."
+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 `/*`."
msgstr ""
#. type: Labeled list
@@ -54342,11 +42278,7 @@ 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 "
-"does not contain a globbing character (`?`, `*`, or `[`), it is turned into "
-"a prefix match by appending `/*`."
+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 does not contain a globbing character (`?`, `*`, or `[`), it is turned into a prefix match by appending `/*`."
msgstr ""
#. type: Labeled list
@@ -54357,22 +42289,12 @@ 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)."
+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)."
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`, "
-"respectively, and they must begin with `refs/` when applied to `--glob` or "
-"`--all`. If a trailing '/{asterisk}' is intended, it must be given "
-"explicitly."
+msgid "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."
msgstr ""
#. type: Labeled list
@@ -54383,10 +42305,7 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:201
-msgid ""
-"Show every object whose name begins with the given prefix. The <prefix> "
-"must be at least 4 hexadecimal digits long to avoid listing each and every "
-"object in the repository by mistake."
+msgid "Show every object whose name begins with the given prefix. The <prefix> must be at least 4 hexadecimal digits long to avoid listing each and every object in the repository by mistake."
msgstr ""
#. type: Title ~
@@ -54397,54 +42316,45 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:205
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--local-env-vars"
msgstr "--local-env-vars"
#. type: Plain text
#: en/git-rev-parse.txt:210
-msgid ""
-"List the GIT_* environment variables that are local to the repository (e.g. "
-"GIT_DIR or GIT_WORK_TREE, but not GIT_EDITOR). Only the names of the "
-"variables are listed, not their value, even if they are set."
+msgid "List the GIT_* environment variables that are local to the repository (e.g. GIT_DIR or GIT_WORK_TREE, but not GIT_EDITOR). Only the names of the variables are listed, not their value, even if they are set."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:211
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--git-dir"
msgstr "--git-dir"
#. type: Plain text
#: en/git-rev-parse.txt:215
-msgid ""
-"Show `$GIT_DIR` if defined. Otherwise show the path to the .git directory. "
-"The path shown, when relative, is relative to the current working directory."
+msgid "Show `$GIT_DIR` if defined. Otherwise show the path to the .git directory. The path shown, when relative, is relative to the current working directory."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:220
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--absolute-git-dir"
msgstr "--absolute-git-dir"
#. type: Plain text
#: en/git-rev-parse.txt:223
-msgid ""
-"Like `--git-dir`, but its output is always the canonicalized absolute path."
+msgid "Like `--git-dir`, but its output is always the canonicalized absolute path."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:224
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--git-common-dir"
msgstr "--git-common-dir"
@@ -54455,33 +42365,29 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:227
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--is-inside-git-dir"
msgstr "--is-inside-git-dir"
#. type: Plain text
#: en/git-rev-parse.txt:230
-msgid ""
-"When the current working directory is below the repository directory print "
-"\"true\", otherwise \"false\"."
+msgid "When the current working directory is below the repository directory print \"true\", otherwise \"false\"."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:231
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--is-inside-work-tree"
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\"."
+msgid "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, ignore-translated
+#, no-wrap
msgid "--is-bare-repository"
msgstr "--is-bare-repository"
@@ -54498,10 +42404,7 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:243
-msgid ""
-"Check if <path> is a valid repository or a gitfile that points at a valid "
-"repository, and print the location of the repository. If <path> is a "
-"gitfile then the resolved path to the real repository is printed."
+msgid "Check if <path> is a valid repository or a gitfile that points at a valid repository, and print the location of the repository. If <path> is a gitfile then the resolved path to the real repository is printed."
msgstr ""
#. type: Labeled list
@@ -54512,43 +42415,34 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:250
-msgid ""
-"Resolve \"$GIT_DIR/<path>\" and takes other path relocation variables such "
-"as $GIT_OBJECT_DIRECTORY, $GIT_INDEX_FILE... into account. For example, if "
-"$GIT_OBJECT_DIRECTORY is set to /foo/bar then \"git rev-parse --git-path "
-"objects/abc\" returns /foo/bar/abc."
+msgid "Resolve \"$GIT_DIR/<path>\" and takes other path relocation variables such as $GIT_OBJECT_DIRECTORY, $GIT_INDEX_FILE... into account. For example, if $GIT_OBJECT_DIRECTORY is set to /foo/bar then \"git rev-parse --git-path objects/abc\" returns /foo/bar/abc."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:251
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--show-cdup"
msgstr "--show-cdup"
#. type: Plain text
#: en/git-rev-parse.txt:255
-msgid ""
-"When the command is invoked from a subdirectory, show the path of the top-"
-"level directory relative to the current directory (typically a sequence of "
-"\"../\", or an empty string)."
+msgid "When the command is invoked from a subdirectory, show the path of the top-level directory relative to the current directory (typically a sequence of \"../\", or an empty string)."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:256
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--show-prefix"
msgstr "--show-prefix"
#. type: Plain text
#: en/git-rev-parse.txt:260
-msgid ""
-"When the command is invoked from a subdirectory, show the path of the "
-"current directory relative to the top-level directory."
+msgid "When the command is invoked from a subdirectory, show the path of the current directory relative to the top-level directory."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:261
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--show-toplevel"
msgstr "--show-toplevel"
@@ -54570,15 +42464,13 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:270
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--shared-index-path"
msgstr "--shared-index-path"
#. type: Plain text
#: en/git-rev-parse.txt:273
-msgid ""
-"Show the path to the shared index file in split index mode, or empty if not "
-"in split-index mode."
+msgid "Show the path to the shared index file in split index mode, or empty if not in split-index mode."
msgstr ""
#. type: Title ~
@@ -54601,9 +42493,7 @@ 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'."
+msgid "Parse the date string, and output the corresponding --max-age= parameter for 'git rev-list'."
msgstr ""
#. type: Labeled list
@@ -54621,9 +42511,7 @@ 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'."
+msgid "Parse the date string, and output the corresponding --min-age= parameter for 'git rev-list'."
msgstr ""
#. type: Labeled list
@@ -54645,36 +42533,22 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:299
-msgid ""
-"In `--parseopt` mode, 'git rev-parse' helps massaging options to bring to "
-"shell scripts the same facilities C builtins have. It works as an option "
-"normalizer (e.g. splits single switches aggregate values), a bit like "
-"`getopt(1)` does."
+msgid "In `--parseopt` mode, 'git rev-parse' helps massaging options to bring to shell scripts the same facilities C builtins have. It works as an option normalizer (e.g. splits single switches aggregate values), a bit like `getopt(1)` does."
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."
+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."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:307
-msgid ""
-"Note: Make sure you quote the result when passing it to `eval`. See below "
-"for an example."
+msgid "Note: Make sure you quote the result when passing it to `eval`. See below for an example."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:315
-msgid ""
-"'git rev-parse --parseopt' input format is fully text based. It has two "
-"parts, separated by a line that contains only `--`. The lines before the "
-"separator (should be one or more) are used for the usage. The lines after "
-"the separator describe the options."
+msgid "'git rev-parse --parseopt' input format is fully text based. It has two parts, separated by a line that contains only `--`. The lines before the separator (should be one or more) are used for the usage. The lines after the separator describe the options."
msgstr ""
#. type: Plain text
@@ -54696,11 +42570,7 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:327
-msgid ""
-"its format is the short option character, then the long option name "
-"separated by a comma. Both parts are not required, though at least one is "
-"necessary. May not contain any of the `<flags>` characters. `h,help`, `dry-"
-"run` and `f` are examples of correct `<opt-spec>`."
+msgid "its format is the short option character, then the long option name separated by a comma. Both parts are not required, though at least one is necessary. May not contain any of the `<flags>` characters. `h,help`, `dry-run` and `f` are examples of correct `<opt-spec>`."
msgstr ""
#. type: Labeled list
@@ -54721,18 +42591,12 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:335
-msgid ""
-"Use `?` to mean that the option takes an optional argument. You probably "
-"want to use the `--stuck-long` mode to be able to unambiguously parse the "
-"optional argument."
+msgid "Use `?` to mean that the option takes an optional argument. You probably want to use the `--stuck-long` mode to be able to unambiguously parse the optional argument."
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]."
+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]."
msgstr ""
#. type: Plain text
@@ -54748,26 +42612,17 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:347
-msgid ""
-"`<arg-hint>`, if specified, is used as a name of the argument in the help "
-"output, for options that take arguments. `<arg-hint>` is terminated by the "
-"first whitespace. It is customary to use a dash to separate words in a "
-"multi-word argument hint."
+msgid "`<arg-hint>`, if specified, is used as a name of the argument in the help output, for options that take arguments. `<arg-hint>` is terminated by the first whitespace. It is customary to use a dash to separate words in a multi-word argument hint."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:350
-msgid ""
-"The remainder of the line, after stripping the spaces, is used as the help "
-"associated to the option."
+msgid "The remainder of the line, after stripping the spaces, is used as the help associated to the option."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:354
-msgid ""
-"Blank lines are ignored, and lines that don't match this specification are "
-"used as option group headers (start the line with a space to create such "
-"lines on purpose)."
+msgid "Blank lines are ignored, and lines that don't match this specification are used as option group headers (start the line with a space to create such lines on purpose)."
msgstr ""
#. type: delimited block -
@@ -54813,9 +42668,7 @@ 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 ~
@@ -54826,9 +42679,7 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:383
-msgid ""
-"When `\"$@\"` is `-h` or `--help` in the above example, the following usage "
-"text would be shown:"
+msgid "When `\"$@\"` is `-h` or `--help` in the above example, the following usage text would be shown:"
msgstr ""
#. type: delimited block -
@@ -54870,18 +42721,12 @@ 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 "
-"arguments following `--sq-quote`. Nothing other than quoting the arguments "
-"is done."
+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 arguments following `--sq-quote`. Nothing other than quoting the arguments is done."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:410
-msgid ""
-"If you want command input to still be interpreted as usual by 'git rev-"
-"parse' before the output is shell quoted, see the `--sq` option."
+msgid "If you want command input to still be interpreted as usual by 'git rev-parse' before the output is shell quoted, see the `--sq` option."
msgstr ""
#. type: delimited block -
@@ -54916,8 +42761,7 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:436
-msgid ""
-"Print the commit object name from the revision in the $REV shell variable:"
+msgid "Print the commit object name from the revision in the $REV shell variable:"
msgstr ""
#. type: delimited block -
@@ -54944,58 +42788,36 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:450
-msgid ""
-"but if $REV is empty, the commit object name from master will be printed."
+msgid "but if $REV is empty, the commit object name from master will be printed."
msgstr ""
#. type: Title =
#: en/git-rm.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-rm(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;"
+#| msgid "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 "
-"de l'index, encore une fois, avant d'utiliser la commande 'commit',"
+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',"
#. 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
#: en/git-rm.txt:25
-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 working tree and yet keep it in the "
-"index; use `/bin/rm` if you want to do that.) The files being removed have "
-"to be identical to the tip of the branch, and no updates to their contents "
-"can be staged in the index, though that default behavior can be overridden "
-"with the `-f` option. When `--cached` is given, the staged content has to "
-"match either the tip of the branch or the file on disk, allowing the file to"
-" be removed from just the index."
+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 working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
msgstr ""
#. 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."
+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 ""
#. type: Plain text
@@ -55017,9 +42839,7 @@ msgstr ""
#| "--dry-run::\n"
#| "\tDon't actually add the file(s), just show if they exist and/or will\n"
#| "\tbe ignored.\n"
-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."
+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."
msgstr ""
"-n::\n"
"--dry-run::\n"
@@ -55033,14 +42853,12 @@ msgstr ""
#. type: Plain text
#: en/git-rm.txt:62
-msgid ""
-"Use this option to unstage and remove paths only from the index. Working "
-"tree files, whether modified or not, will be left alone."
+msgid "Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone."
msgstr ""
#. type: Labeled list
#: en/git-rm.txt:63
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
@@ -55051,26 +42869,17 @@ msgstr ""
#. type: Plain text
#: en/git-rm.txt:70
-msgid ""
-"`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."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:79
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:84
-msgid ""
-"File globbing matches across directory boundaries. Thus, given two "
-"directories `d` and `d2`, there is a difference between using `git rm 'd*'` "
-"and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
+msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
msgstr ""
#. type: Title -
@@ -55081,10 +42890,7 @@ 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 are several ways that can be done."
+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 are several ways that can be done."
msgstr ""
#. type: Title ~
@@ -55096,12 +42902,7 @@ msgstr "$ git commit\n"
#. type: Plain text
#: 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 "
-"`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`."
+msgid "If you intend that your next commit should record all modifications of tracked files in the working tree and record all removals of files that have been removed from the working tree with `rm` (as opposed to `git rm`), use `git commit -a`, as it will automatically notice and record all removals. You can also have a similar effect without committing by using `git add -u`."
msgstr ""
#. type: Title ~
@@ -55113,17 +42914,12 @@ msgstr "$ git commit\n"
#. type: Plain text
#: en/git-rm.txt:106
-msgid ""
-"When accepting a new code drop for a vendor branch, you probably want to "
-"record both the removal of paths and additions of new paths as well as "
-"modifications of existing paths."
+msgid "When accepting a new code drop for a vendor branch, you probably want to record both the removal of paths and additions of new paths as well as modifications of existing paths."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:109
-msgid ""
-"Typically you would first remove all tracked files from the working tree "
-"using this command:"
+msgid "Typically you would first remove all tracked files from the working tree using this command:"
msgstr ""
#. type: delimited block -
@@ -55134,16 +42930,12 @@ msgstr ""
#. type: Plain text
#: en/git-rm.txt:116
-msgid ""
-"and then untar the new code in the working tree. Alternately you could "
-"'rsync' the changes into the working tree."
+msgid "and then untar the new code in the working tree. Alternately you could 'rsync' the changes into the working tree."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:119
-msgid ""
-"After that, the easiest way to record all removals, additions, and "
-"modifications in the working tree is:"
+msgid "After that, the easiest way to record all removals, additions, and modifications in the working tree is:"
msgstr ""
#. type: delimited block -
@@ -55166,10 +42958,7 @@ msgstr ""
#. type: Plain text
#: en/git-rm.txt:132
-msgid ""
-"If all you really want to do is to remove from the index the files that are "
-"no longer present in the working tree (perhaps because your working tree is "
-"dirty so that you cannot use `git commit -a`), use the following command:"
+msgid "If all you really want to do is to remove from the index the files that are no longer present in the working tree (perhaps because your working tree is dirty so that you cannot use `git commit -a`), use the following command:"
msgstr ""
#. type: delimited block -
@@ -55180,32 +42969,17 @@ msgstr ""
#. type: Plain text
#: en/git-rm.txt:147
-msgid ""
-"Only submodules using a gitfile (which means they were cloned with a Git "
-"version 1.7.8 or newer) will be removed from the work tree, as their "
-"repository lives inside the .git directory of the superproject. If a "
-"submodule (or one of those nested inside it) still uses a .git directory, "
-"`git rm` will 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)."
+msgid "Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will 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
#: en/git-rm.txt:153
-msgid ""
-"A submodule is considered up-to-date when the HEAD is the same as recorded "
-"in the index, no tracked files are modified and no untracked files that "
-"aren't ignored are present in the submodules work tree. Ignored files are "
-"deemed expendable and won't stop a submodule's work tree from being removed."
+msgid "A submodule is considered up-to-date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren't ignored are present in the submodules work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:157
-msgid ""
-"If you only want to remove the local checkout of a submodule from your work "
-"tree without committing the removal, use linkgit:git-submodule[1] `deinit` "
-"instead."
+msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead."
msgstr ""
#. type: Labeled list
@@ -55218,31 +42992,16 @@ 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:"
-msgid ""
-"Removes all `*.txt` files from the index that are under the `Documentation` "
-"directory and any of its subdirectories."
-msgstr ""
-"Ajouter le contenu de tous le fichiers `*.txt` sous le r챕pertoire "
-"`Documentation` et ses sous r챕pertoires."
+#| msgid "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."
+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."
-msgid ""
-"Note that the asterisk `*` is quoted from the shell in this example; this "
-"lets Git, and not the shell, expand the pathnames of files and "
-"subdirectories under the `Documentation/` directory."
-msgstr ""
-"Remarquez que l'ast챕risque `*` est 챕chapp챕 du shell dans cet exemple혻; cela "
-"permet d'inclure les fichiers dans les sous-r챕pertoires du R챕pertoire "
-"`Documentation/`."
+#| 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."
+msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
+msgstr "Remarquez que l'ast챕risque `*` est 챕chapp챕 du shell dans cet exemple혻; cela permet d'inclure les fichiers dans les sous-r챕pertoires du R챕pertoire `Documentation/`."
#. type: Labeled list
#: en/git-rm.txt:168
@@ -55254,31 +43013,18 @@ msgstr "$ git add git-*.sh\n"
#. type: Plain text
#: en/git-rm.txt:172
#, fuzzy
-#| msgid ""
-#| "Because this example lets the shell expand the asterisk (i.e. you are "
-#| "listing the files explicitly), it does not consider `subdir/git-foo.sh`."
-msgid ""
-"Because this example lets the shell expand the asterisk (i.e. you are "
-"listing the files explicitly), it does not remove `subdir/git-foo.sh`."
-msgstr ""
-"Comme cet exemple laisse le shell r챕aliser l'expansion de l'ast챕risque "
-"(c'est-횪-dire que vous listez explicitement les fichiers du r챕pertoire), il "
-"ne traite pas `subdir/git-foo.sh`."
+#| msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not consider `subdir/git-foo.sh`."
+msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not remove `subdir/git-foo.sh`."
+msgstr "Comme cet exemple laisse le shell r챕aliser l'expansion de l'ast챕risque (c'est-횪-dire que vous listez explicitement les fichiers du r챕pertoire), il ne traite pas `subdir/git-foo.sh`."
#. type: Plain text
#: en/git-rm.txt:181
-msgid ""
-"Each time a superproject update removes a populated submodule (e.g. when "
-"switching between commits before and after the removal) a stale submodule "
-"checkout will remain in the old location. Removing the old directory is only"
-" safe when it uses a gitfile, as otherwise the history of the submodule will"
-" be deleted too. This step will be obsolete when recursive submodule update "
-"has been implemented."
+msgid "Each time a superproject update removes a populated submodule (e.g. when switching between commits before and after the removal) a stale submodule checkout will remain in the old location. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. This step will be obsolete when recursive submodule update has been implemented."
msgstr ""
#. type: Title =
#: en/git-send-email.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-send-email(1)"
msgstr "git-send-email(1)"
@@ -55297,19 +43043,12 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:23
-msgid ""
-"Takes the patches given on the command line and emails them out. Patches "
-"can be specified as files, directories (which will send all files in the "
-"directory), or directly as a revision list. In the last case, any format "
-"accepted by linkgit:git-format-patch[1] can be passed to git send-email."
+msgid "Takes the patches given on the command line and emails them out. Patches can be specified as files, directories (which will send all files in the directory), or directly as a revision list. In the last case, any format accepted by linkgit:git-format-patch[1] can be passed to git send-email."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:27
-msgid ""
-"The header of the email is configurable via command-line options. If not "
-"specified on the command line, the user will be prompted with a ReadLine "
-"enabled interface to provide the necessary information."
+msgid "The header of the email is configurable via command-line options. If not specified on the command line, the user will be prompted with a ReadLine enabled interface to provide the necessary information."
msgstr ""
#. type: Plain text
@@ -55324,23 +43063,17 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:34
-msgid ""
-"This is what linkgit:git-format-patch[1] generates. Most headers and MIME "
-"formatting are ignored."
+msgid "This is what linkgit:git-format-patch[1] generates. Most headers and MIME formatting are ignored."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:37
-msgid ""
-"The original format used by Greg Kroah-Hartman's 'send_lots_of_email.pl' "
-"script"
+msgid "The original format used by Greg Kroah-Hartman's 'send_lots_of_email.pl' script"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:40
-msgid ""
-"This format expects the first line of the file to contain the \"Cc:\" value "
-"and the \"Subject:\" of the message as the second line."
+msgid "This format expects the first line of the file to contain the \"Cc:\" value and the \"Subject:\" of the message as the second line."
msgstr ""
#. type: Title ~
@@ -55351,16 +43084,13 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:48 en/git-tag.txt:60
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--annotate"
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`."
+msgid "Review and edit each patch you're about to send. Default is the value of `sendemail.annotate`. See the CONFIGURATION section for `sendemail.multiEdit`."
msgstr ""
#. type: Labeled list
@@ -55371,9 +43101,7 @@ 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`."
+msgid "Specify a \"Bcc:\" value for each email. Default is the value of `sendemail.bcc`."
msgstr ""
#. type: Plain text
@@ -55389,32 +43117,23 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:62
-msgid ""
-"Specify a starting \"Cc:\" value for each email. Default is the value of "
-"`sendemail.cc`."
+msgid "Specify a starting \"Cc:\" value for each email. Default is the value of `sendemail.cc`."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:65
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--compose"
msgstr "--compose"
#. type: Plain text
#: en/git-send-email.txt:68
-msgid ""
-"Invoke a text editor (see GIT_EDITOR in linkgit:git-var[1]) to edit an "
-"introductory message for the patch series."
+msgid "Invoke a text editor (see GIT_EDITOR in linkgit:git-var[1]) to edit an introductory message for the patch series."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:74
-msgid ""
-"When `--compose` is used, git send-email will use the From, Subject, and In-"
-"Reply-To headers specified in the message. If the body of the message (what "
-"you type after the headers and a blank line) only contains blank (or Git: "
-"prefixed) lines, the summary won't be sent, but From, Subject, and In-Reply-"
-"To headers will be used unless they are removed."
+msgid "When `--compose` is used, git send-email will use the From, Subject, and In-Reply-To headers specified in the message. If the body of the message (what you type after the headers and a blank line) only contains blank (or Git: prefixed) lines, the summary won't be sent, but From, Subject, and In-Reply-To headers will be used unless they are removed."
msgstr ""
#. type: Plain text
@@ -55435,13 +43154,7 @@ 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 "
-"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\"."
+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 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\"."
msgstr ""
#. type: Labeled list
@@ -55452,19 +43165,12 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:93
-msgid ""
-"Make the first mail (or all the mails with `--no-thread`) appear as a reply "
-"to the given Message-Id, which avoids breaking threads to provide a new "
-"patch series. The second and subsequent emails will be sent as replies "
-"according to the `--[no-]chain-reply-to` setting."
+msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to provide a new patch series. The second and subsequent emails will be sent as replies according to the `--[no-]chain-reply-to` setting."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:97
-msgid ""
-"So for example when `--thread` and `--no-chain-reply-to` are specified, the "
-"second and subsequent patches will be replies to the first one like in the "
-"illustration below where `[PATCH v2 0/3]` is in reply to `[PATCH 0/2]`:"
+msgid "So for example when `--thread` and `--no-chain-reply-to` are specified, the second and subsequent patches will be replies to the first one like in the illustration below where `[PATCH v2 0/3]` is in reply to `[PATCH 0/2]`:"
msgstr ""
#. type: Plain text
@@ -55482,9 +43188,7 @@ 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."
+msgid "Only necessary if --compose is also set. If --compose is not set, this will be prompted for."
msgstr ""
#. type: Labeled list
@@ -55495,9 +43199,7 @@ 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."
+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."
msgstr ""
#. type: Labeled list
@@ -55508,11 +43210,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:119
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -55523,12 +43221,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:128
-msgid ""
-"When encountering a non-ASCII message or subject that does not declare its "
-"encoding, add headers/quoting to indicate it is encoded in <encoding>. "
-"Default is the value of the 'sendemail.assume8bitEncoding'; if that is "
-"unspecified, this will be prompted for if any non-ASCII files are "
-"encountered."
+msgid "When encountering a non-ASCII message or subject that does not declare its encoding, add headers/quoting to indicate it is encoded in <encoding>. Default is the value of the 'sendemail.assume8bitEncoding'; if that is unspecified, this will be prompted for if any non-ASCII files are encountered."
msgstr ""
#. type: Plain text
@@ -55544,9 +43237,7 @@ 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."
+msgid "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
@@ -55557,35 +43248,24 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:144
-msgid ""
-"Specify the transfer encoding to be used to send the message over SMTP. "
-"7bit will fail upon encountering a non-ASCII message. quoted-printable can "
-"be useful when the repository contains files that contain carriage returns, "
-"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."
+msgid "Specify the transfer encoding to be used to send the message over SMTP. 7bit will fail upon encountering a non-ASCII message. quoted-printable can be useful when the repository contains files that contain carriage returns, 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."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:145
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--xmailer"
msgstr "--xmailer"
#. type: Labeled list
#: en/git-send-email.txt:146
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-xmailer"
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` "
-"configuration variable to `false`."
+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` configuration variable to `false`."
msgstr ""
#. type: Title ~
@@ -55602,14 +43282,7 @@ 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."
+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."
msgstr ""
#. type: Labeled list
@@ -55620,9 +43293,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:167
-msgid ""
-"Specify the encryption to use, either 'ssl' or 'tls'. Any other value "
-"reverts to plain SMTP. Default is the value of `sendemail.smtpEncryption`."
+msgid "Specify the encryption to use, either 'ssl' or 'tls'. Any other value reverts to plain SMTP. Default is the value of `sendemail.smtpEncryption`."
msgstr ""
#. type: Labeled list
@@ -55633,11 +43304,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:174
-msgid ""
-"Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO "
-"command to the SMTP server. Some servers require the FQDN to match your IP "
-"address. If not set, git send-email attempts to determine your FQDN "
-"automatically. Default is the value of `sendemail.smtpDomain`."
+msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server. Some servers require the FQDN to match your IP address. If not set, git send-email attempts to determine your FQDN automatically. Default is the value of `sendemail.smtpDomain`."
msgstr ""
#. type: Labeled list
@@ -55648,9 +43315,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:178
-msgid ""
-"Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting "
-"forces using only the listed mechanisms. Example:"
+msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
msgstr ""
#. type: delimited block -
@@ -55661,12 +43326,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:187
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -55677,21 +43337,12 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:193
-msgid ""
-"Password for SMTP-AUTH. The argument is optional: If no argument is "
-"specified, then the empty string is used as the password. Default is the "
-"value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this "
-"value."
+msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:199
-msgid ""
-"Furthermore, passwords need not be specified in configuration files or on "
-"the command line. If a username has been specified (with `--smtp-user` or a "
-"`sendemail.smtpUser`), but no password has been specified (with `--smtp-"
-"pass` or `sendemail.smtpPass`), then a password is obtained using 'git-"
-"credential'."
+msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
msgstr ""
#. type: Labeled list
@@ -55702,13 +43353,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:209
-msgid ""
-"If set, specifies the outgoing SMTP server to use (e.g. `smtp.example.com` "
-"or a raw IP address). Alternatively it can specify a full pathname of a "
-"sendmail-like program instead; the program must support the `-i` option. "
-"Default value can be specified by the `sendemail.smtpServer` configuration "
-"option; the built-in default is `/usr/sbin/sendmail` or `/usr/lib/sendmail` "
-"if such program is available, or `localhost` otherwise."
+msgid "If set, specifies the outgoing SMTP server to use (e.g. `smtp.example.com` or a raw IP address). Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option. Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is `/usr/sbin/sendmail` or `/usr/lib/sendmail` if such program is available, or `localhost` otherwise."
msgstr ""
#. type: Labeled list
@@ -55719,12 +43364,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:217
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -55735,22 +43375,17 @@ 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."
+msgid "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 "
-"must be used for each option."
+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 must be used for each option."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:227
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--smtp-ssl"
msgstr "--smtp-ssl"
@@ -55761,21 +43396,13 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:230
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--smtp-ssl-cert-path"
msgstr "--smtp-ssl-cert-path"
#. type: Plain text
#: en/git-send-email.txt:240
-msgid ""
-"Path to a store of trusted CA certificates for SMTP SSL/TLS certificate "
-"validation (either a directory that has been processed by 'c_rehash', or a "
-"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)."
+msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a 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)."
msgstr ""
#. type: Labeled list
@@ -55786,10 +43413,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -55800,10 +43424,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:250
-msgid ""
-"Enable (1) or disable (0) debug output. If enabled, SMTP commands and "
-"replies will be printed. Useful to debug TLS connection and authentication "
-"problems."
+msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
msgstr ""
#. type: Title ~
@@ -55820,11 +43441,7 @@ 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 "
-"value."
+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 value."
msgstr ""
#. type: Labeled list
@@ -55835,28 +43452,18 @@ 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 "
-"value."
+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 value."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:266
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]chain-reply-to"
msgstr "--[no-]chain-reply-to"
#. type: Plain text
#: en/git-send-email.txt:273
-msgid ""
-"If this is set, each email will be sent as a reply to the previous email "
-"sent. If disabled with \"--no-chain-reply-to\", all emails after the first "
-"will be sent as replies to the first email sent. When using this, it is "
-"recommended that the first file given be an overview of the entire patch "
-"series. Disabled by default, but the `sendemail.chainReplyTo` configuration "
-"variable can be used to enable it."
+msgid "If this is set, each email will be sent as a reply to the previous email sent. If disabled with \"--no-chain-reply-to\", all emails after the first will be sent as replies to the first email sent. When using this, it is recommended that the first file given be an overview of the entire patch series. Disabled by default, but the `sendemail.chainReplyTo` configuration variable can be used to enable it."
msgstr ""
#. type: Labeled list
@@ -55868,46 +43475,35 @@ msgstr "git-commit(1)"
#. type: Labeled list
#: en/git-send-email.txt:280
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]signed-off-by-cc"
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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:285
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]cc-cover"
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. "
-"Default is the value of 'sendemail.cccover' configuration value; if that is "
-"unspecified, default to --no-cc-cover."
+msgid "If this is set, emails found in Cc: headers in the first patch of the series (typically the cover letter) are added to the cc list for each email set. Default is the value of 'sendemail.cccover' configuration value; if that is unspecified, default to --no-cc-cover."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:291
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]to-cover"
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. "
-"Default is the value of 'sendemail.tocover' configuration value; if that is "
-"unspecified, default to --no-to-cover."
+msgid "If this is set, emails found in To: headers in the first patch of the series (typically the cover letter) are added to the to list for each email set. Default is the value of 'sendemail.tocover' configuration value; if that is unspecified, default to --no-to-cover."
msgstr ""
#. type: Labeled list
@@ -55918,8 +43514,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:300
-msgid ""
-"Specify an additional category of recipients to suppress the auto-cc of:"
+msgid "Specify an additional category of recipients to suppress the auto-cc of:"
msgstr ""
#. type: Plain text
@@ -55934,22 +43529,17 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:306
-msgid ""
-"'cc' will avoid including anyone mentioned in Cc lines in the patch header "
-"except for self (use 'self' for that)."
+msgid "'cc' will avoid including anyone mentioned in Cc lines in the patch header except for self (use 'self' for that)."
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)."
+msgid "'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
#: en/git-send-email.txt:309
-msgid ""
-"'sob' will avoid including anyone mentioned in Signed-off-by lines except"
+msgid "'sob' will avoid including anyone mentioned in Signed-off-by lines except"
msgstr ""
#. type: Plain text
@@ -55974,57 +43564,39 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:318
-msgid ""
-"Default is the value of `sendemail.suppresscc` configuration value; if that "
-"is unspecified, default to 'self' if --suppress-from is specified, as well "
-"as 'body' if --no-signed-off-cc is specified."
+msgid "Default is the value of `sendemail.suppresscc` configuration value; if that is unspecified, default to 'self' if --suppress-from is specified, as well as 'body' if --no-signed-off-cc is specified."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:319
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]suppress-from"
msgstr "--[no-]suppress-from"
#. type: Plain text
#: en/git-send-email.txt:323
-msgid ""
-"If this is set, do not add the From: address to the cc: list. Default is "
-"the value of `sendemail.suppressFrom` configuration value; if that is "
-"unspecified, default to --no-suppress-from."
+msgid "If this is set, do not add the From: address to the cc: list. Default is the value of `sendemail.suppressFrom` configuration value; if that is unspecified, default to --no-suppress-from."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:324
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]thread"
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` "
-"threading per 'git format-patch' wording) or to the first email (`shallow` "
-"threading) is governed by \"--[no-]chain-reply-to\"."
+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` threading per 'git format-patch' wording) or to the first email (`shallow` threading) is governed by \"--[no-]chain-reply-to\"."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:341
-msgid ""
-"It is up to the user to ensure that no In-Reply-To header already exists "
-"when 'git send-email' is asked to add it (especially note that 'git format-"
-"patch' can be configured to do the threading itself). Failure to do so may "
-"not produce the expected result in the recipient's MUA."
+msgid "It is up to the user to ensure that no In-Reply-To header already exists when 'git send-email' is asked to add it (especially note that 'git format-patch' can be configured to do the threading itself). Failure to do so may not produce the expected result in the recipient's MUA."
msgstr ""
#. type: Title ~
@@ -56056,16 +43628,12 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:354
-msgid ""
-"'cc' will confirm before sending when send-email has automatically added "
-"addresses from the patch to the Cc list"
+msgid "'cc' will confirm before sending when send-email has automatically added addresses from the patch to the Cc list"
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:355
-msgid ""
-"'compose' will confirm before sending the first message when using "
-"--compose."
+msgid "'compose' will confirm before sending the first message when using --compose."
msgstr ""
#. type: Plain text
@@ -56075,10 +43643,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:361
-msgid ""
-"Default is the value of `sendemail.confirm` configuration value; if that is "
-"unspecified, default to 'auto' unless any of the suppress options have been "
-"specified, in which case default to 'compose'."
+msgid "Default is the value of `sendemail.confirm` configuration value; if that is unspecified, default to 'auto' unless any of the suppress options have been specified, in which case default to 'compose'."
msgstr ""
#. type: Plain text
@@ -56088,37 +43653,29 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:365
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]format-patch"
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."
+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."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:374
-msgid ""
-"Make git-send-email less verbose. One line per email should be all that is "
-"output."
+msgid "Make git-send-email less verbose. One line per email should be all that is output."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:375
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]validate"
msgstr "--[no-]validate"
#. type: Plain text
#: en/git-send-email.txt:378
-msgid ""
-"Perform sanity checks on patches. Currently, validation means the "
-"following:"
+msgid "Perform sanity checks on patches. Currently, validation means the following:"
msgstr ""
#. type: Plain text
@@ -56129,15 +43686,12 @@ 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`."
+msgid "Default is the value of `sendemail.validate`; if this is not set, default to `--validate`."
msgstr ""
#. type: Plain text
@@ -56154,39 +43708,28 @@ msgstr "Configuration"
#. type: Labeled list
#: en/git-send-email.txt:394
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--dump-aliases"
msgstr "--dump-aliases"
#. type: Plain text
#: en/git-send-email.txt:399
-msgid ""
-"Instead of the normal operation, dump the shorthand alias names from the "
-"configured alias file(s), one per line in alphabetical order. Note, this "
-"only includes the alias name and not its expanded email addresses. See "
-"'sendemail.aliasesfile' for more information about aliases."
+msgid "Instead of the normal operation, dump the shorthand alias names from the configured alias file(s), one per line in alphabetical order. Note, this only includes the alias name and not its expanded email addresses. See 'sendemail.aliasesfile' for more information about aliases."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:407
-msgid ""
-"To avoid typing long email addresses, point this to one or more email "
-"aliases files. You must also supply `sendemail.aliasFileType`."
+msgid "To avoid typing long email addresses, point this to one or more email aliases files. You must also supply `sendemail.aliasFileType`."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:411
-msgid ""
-"Format of the file(s) specified in sendemail.aliasesFile. Must be one of "
-"'mutt', 'mailrc', 'pine', 'elm', or 'gnus', or 'sendmail'."
+msgid "Format of the file(s) specified in sendemail.aliasesFile. Must be one of 'mutt', 'mailrc', 'pine', 'elm', or 'gnus', or 'sendmail'."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:416
-msgid ""
-"What an alias file in each format looks like can be found in the "
-"documentation of the email program of the same name. The differences and "
-"limitations from the standard formats are described below:"
+msgid "What an alias file in each format looks like can be found in the documentation of the email program of the same name. The differences and limitations from the standard formats are described below:"
msgstr ""
#. type: Labeled list
@@ -56228,26 +43771,17 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:427
-msgid ""
-"explicitly unsupported constructs, and any other lines that are not "
-"recognized by the parser."
+msgid "explicitly unsupported constructs, and any other lines that are not recognized by the parser."
msgstr ""
#. type: Plain text
#: 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, "
-"spawning a new editor each time."
+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, spawning a new editor each time."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:439
-msgid ""
-"Sets the default for whether to confirm before sending. Must be one of "
-"'always', 'never', 'cc', 'compose', or 'auto'. See `--confirm` in the "
-"previous section for the meaning of these values."
+msgid "Sets the default for whether to confirm before sending. Must be one of 'always', 'never', 'cc', 'compose', or 'auto'. See `--confirm` in the previous section for the meaning of these values."
msgstr ""
#. type: Title ~
@@ -56258,9 +43792,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:446
-msgid ""
-"To use 'git send-email' to send your patches through the GMail SMTP server, "
-"edit ~/.gitconfig to specify your account settings:"
+msgid "To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings:"
msgstr ""
#. type: Plain text
@@ -56276,12 +43808,7 @@ 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 "
-"helper:"
+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 helper:"
msgstr ""
#. type: Plain text
@@ -56297,9 +43824,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:468
-msgid ""
-"Once your commits are ready to be sent to the mailing list, run the "
-"following commands:"
+msgid "Once your commits are ready to be sent to the mailing list, run the following commands:"
msgstr ""
#. type: Plain text
@@ -56322,17 +43847,13 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:479
#, fuzzy
-#| msgid ""
-#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-#| "merge[1], linkgit:git-commit-tree[1]"
+#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
-msgstr ""
-"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-"merge[1], linkgit:git-commit-tree[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-send-pack.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-send-pack(1)"
msgstr "git-send-pack(1)"
@@ -56355,16 +43876,12 @@ 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]."
+msgid "Usually you would want to use 'git push', which is a higher-level wrapper of this command, instead. See linkgit:git-push[1]."
msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:24
-msgid ""
-"Invokes 'git-receive-pack' on a possibly remote repository, and updates it "
-"from the current repository, sending named refs."
+msgid "Invokes 'git-receive-pack' on a possibly remote repository, and updates it from the current repository, sending named refs."
msgstr ""
#. type: Plain text
@@ -56374,29 +43891,23 @@ 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."
+msgid "Instead of explicitly specifying which refs to update, update all heads that locally exist."
msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:67
-msgid ""
-"Send a \"thin\" pack, which records objects in deltified form based on "
-"objects not included in the pack to reduce network traffic."
+msgid "Send a \"thin\" pack, which records objects in deltified form based on objects not included in the pack to reduce network traffic."
msgstr ""
#. type: Labeled list
#: en/git-send-pack.txt:68
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--atomic"
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."
+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."
msgstr ""
#. type: Labeled list
@@ -56407,9 +43918,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:88
-msgid ""
-"A remote host to house the repository. When this part is specified, 'git-"
-"receive-pack' is invoked via ssh."
+msgid "A remote host to house the repository. When this part is specified, 'git-receive-pack' is invoked via ssh."
msgstr ""
#. type: Plain text
@@ -56419,43 +43928,27 @@ 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:108
-msgid ""
-"Without `--all` and without any '<ref>', the heads that exist both on the "
-"local side and on the remote side are updated."
+msgid "Without `--all` and without any '<ref>', the heads that exist both on the local side and on the remote side are updated."
msgstr ""
#. type: Plain text
#: 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>'."
+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>'."
msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:122
-msgid ""
-"Each pattern pair consists of the source side (before the colon) and the "
-"destination side (after the colon). The ref to be pushed is determined by "
-"finding a match that matches the source side, and where it is pushed is "
-"determined by using the destination side. The rules used to match a ref are "
-"the same rules used by 'git rev-parse' to resolve a symbolic ref name. See "
-"linkgit:git-rev-parse[1]."
+msgid "Each pattern pair consists of the source side (before the colon) and the destination side (after the colon). The ref to be pushed is determined by finding a match that matches the source side, and where it is pushed is determined by using the destination side. The rules used to match a ref are the same rules used by 'git rev-parse' to resolve a symbolic ref name. See linkgit:git-rev-parse[1]."
msgstr ""
#. type: Plain text
@@ -56465,7 +43958,7 @@ msgstr ""
#. type: Title =
#: en/git-shell.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-shell(1)"
msgstr "git-shell(1)"
@@ -56485,11 +43978,7 @@ 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."
+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."
msgstr ""
#. type: Plain text
@@ -56517,9 +44006,7 @@ msgstr ""
#. type: Plain text
#: en/git-shell.txt:35
-msgid ""
-"Call the corresponding server-side command to support the client's 'git "
-"push', 'git fetch', or 'git archive --remote' request."
+msgid "Call the corresponding server-side command to support the client's 'git push', 'git fetch', or 'git archive --remote' request."
msgstr ""
#. type: Labeled list
@@ -56535,10 +44022,7 @@ msgstr ""
#. type: Plain text
#: en/git-shell.txt:42
-msgid ""
-"If a `~/git-shell-commands` directory is present, 'git shell' will also "
-"handle other, custom commands by running \"`git-shell-commands/<command> "
-"<arguments>`\" from the user's home directory."
+msgid "If a `~/git-shell-commands` directory is present, 'git shell' will also handle other, custom commands by running \"`git-shell-commands/<command> <arguments>`\" from the user's home directory."
msgstr ""
#. type: Title -
@@ -56549,35 +44033,22 @@ msgstr ""
#. type: Plain text
#: en/git-shell.txt:48
-msgid ""
-"By default, the commands above can be executed only with the `-c` option; "
-"the shell is not interactive."
+msgid "By default, the commands above can be executed only with the `-c` option; the shell is not interactive."
msgstr ""
#. type: Plain text
#: en/git-shell.txt:56
-msgid ""
-"If a `~/git-shell-commands` directory is present, 'git shell' can also be "
-"run interactively (with no arguments). If a `help` command is present in "
-"the `git-shell-commands` directory, it is run to provide the user with an "
-"overview of allowed actions. Then a \"git> \" prompt is presented at which "
-"one can enter any of the commands from the `git-shell-commands` directory, "
-"or `exit` to close the connection."
+msgid "If a `~/git-shell-commands` directory is present, 'git shell' can also be run interactively (with no arguments). If a `help` command is present in the `git-shell-commands` directory, it is run to provide the user with an overview of allowed actions. Then a \"git> \" prompt is presented at which one can enter any of the commands from the `git-shell-commands` directory, or `exit` to close the connection."
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 "
-"repositories, or change repository descriptions and permissions."
+msgid "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 ""
#. type: Plain text
#: en/git-shell.txt:64
-msgid ""
-"If a `no-interactive-login` command exists, then it is run and the "
-"interactive shell is aborted."
+msgid "If a `no-interactive-login` command exists, then it is run and the interactive shell is aborted."
msgstr ""
#. type: Plain text
@@ -56630,31 +44101,22 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-sh-i18n--envsubst.txt:29
-msgid ""
-"'git sh-i18n{litdd}envsubst' is Git's stripped-down copy of the GNU "
-"`envsubst(1)` program that comes with the GNU gettext package. It's used "
-"internally by linkgit:git-sh-i18n[1] to interpolate the variables passed to "
-"the `eval_gettext` function."
+msgid "'git sh-i18n{litdd}envsubst' is Git's stripped-down copy of the GNU `envsubst(1)` program that comes with the GNU gettext package. It's used internally by linkgit:git-sh-i18n[1] to interpolate the variables passed to the `eval_gettext` function."
msgstr ""
#. type: Plain text
#: en/git-sh-i18n--envsubst.txt:33
-msgid ""
-"No promises are made about the interface, or that this program won't "
-"disappear without warning in the next version of Git. Don't use it."
+msgid "No promises are made about the interface, or that this program won't disappear without warning in the next version of Git. Don't use it."
msgstr ""
#. type: Title =
#: en/git-sh-i18n.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-sh-i18n(1)"
msgstr "git-sh-i18n(1)"
@@ -56671,12 +44133,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -56687,10 +44144,7 @@ msgstr ""
#. type: Plain text
#: en/git-sh-i18n.txt:34
-msgid ""
-"Currently a dummy fall-through function implemented as a wrapper around "
-"`printf(1)`. Will be replaced by a real gettext implementation in a later "
-"version."
+msgid "Currently a dummy fall-through function implemented as a wrapper around `printf(1)`. Will be replaced by a real gettext implementation in a later version."
msgstr ""
#. type: Labeled list
@@ -56701,16 +44155,12 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Title =
#: en/git-shortlog.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-shortlog(1)"
msgstr "git-shortlog(1)"
@@ -56729,9 +44179,7 @@ msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:18
-msgid ""
-"Summarizes 'git log' output in a format suitable for inclusion in release "
-"announcements. Each commit will be grouped by author and title."
+msgid "Summarizes 'git log' output in a format suitable for inclusion in release announcements. Each commit will be grouped by author and title."
msgstr ""
#. type: Plain text
@@ -56741,18 +44189,12 @@ msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:25
-msgid ""
-"If no revisions are passed on the command line and either standard input is "
-"not a terminal or there is no current branch, 'git shortlog' will output a "
-"summary of the log read from standard input, without reference to the "
-"current repository."
+msgid "If no revisions are passed on the command line and either standard input is not a terminal or there is no current branch, 'git shortlog' will output a summary of the log read from standard input, without reference to the current repository."
msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:33
-msgid ""
-"Sort output according to the number of commits per author instead of author "
-"alphabetic order."
+msgid "Sort output according to the number of commits per author instead of author alphabetic order."
msgstr ""
#. type: Plain text
@@ -56762,7 +44204,7 @@ msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:39
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--email"
msgstr "--email"
@@ -56780,11 +44222,7 @@ msgstr "Configuration"
#. type: Plain text
#: en/git-shortlog.txt:47
-msgid ""
-"Instead of the commit subject, use some other information to describe each "
-"commit. '<format>' can be any string accepted by the `--format` option of "
-"'git log', such as '* [%h] %s'. (See the \"PRETTY FORMATS\" section of "
-"linkgit:git-log[1].)"
+msgid "Instead of the commit subject, use some other information to describe each commit. '<format>' can be any string accepted by the `--format` option of 'git log', such as '* [%h] %s'. (See the \"PRETTY FORMATS\" section of linkgit:git-log[1].)"
msgstr ""
#. type: Plain text
@@ -56794,7 +44232,7 @@ msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:51
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--committer"
msgstr "--committer"
@@ -56811,56 +44249,37 @@ msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:59
-msgid ""
-"Linewrap the output by wrapping each line at `width`. The first line of "
-"each entry is indented by `indent1` spaces, and the second and subsequent "
-"lines are indented by `indent2` spaces. `width`, `indent1`, and `indent2` "
-"default to 76, 6 and 9 respectively."
+msgid "Linewrap the output by wrapping each line at `width`. The first line of each entry is indented by `indent1` spaces, and the second and subsequent lines are indented by `indent2` spaces. `width`, `indent1`, and `indent2` default to 76, 6 and 9 respectively."
msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:62
-msgid ""
-"If width is `0` (zero) then indent the lines of the output without wrapping "
-"them."
+msgid "If width is `0` (zero) then indent the lines of the output without wrapping them."
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 "
-"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]."
+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 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]."
msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:75
-msgid ""
-"Consider only commits that are enough to explain how the files that match "
-"the specified paths came to be."
+msgid "Consider only commits that are enough to explain how the files that match the specified paths came to be."
msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:78
-msgid ""
-"Paths may need to be prefixed with \"\\-- \" to separate them from options "
-"or the revision range, when confusion arises."
+msgid "Paths may need to be prefixed with \"\\-- \" to separate them from options or the revision range, when confusion arises."
msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:85
-msgid ""
-"The `.mailmap` feature is used to coalesce together commits by the same "
-"person in the shortlog, where their name and/or email address was spelled "
-"differently."
+msgid "The `.mailmap` feature is used to coalesce together commits by the same person in the shortlog, where their name and/or email address was spelled differently."
msgstr ""
#. type: Title =
#: en/git-show-branch.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-show-branch(1)"
msgstr "git-show-branch(1)"
@@ -56883,9 +44302,7 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:24
-msgid ""
-"Shows the commit ancestry graph starting from the commits named with <rev>s "
-"or <globs>s (or all refs under refs/heads and/or refs/tags) semi-visually."
+msgid "Shows the commit ancestry graph starting from the commits named with <rev>s or <globs>s (or all refs under refs/heads and/or refs/tags) semi-visually."
msgstr ""
#. type: Plain text
@@ -56895,9 +44312,7 @@ 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."
+msgid "It uses `showbranch.default` multi-valued configuration items if no <rev> or <glob> is given on the command line."
msgstr ""
#. type: Labeled list
@@ -56908,9 +44323,7 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:36
-msgid ""
-"Arbitrary extended SHA-1 expression (see linkgit:gitrevisions[7]) that "
-"typically names a branch head or a tag."
+msgid "Arbitrary extended SHA-1 expression (see linkgit:gitrevisions[7]) that typically names a branch head or a tag."
msgstr ""
#. type: Labeled list
@@ -56921,10 +44334,7 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:42
-msgid ""
-"A glob pattern that matches branch or tag names under refs/. For example, "
-"if you have many topic branches under refs/heads/topic, giving `topic/*` "
-"would show all of them."
+msgid "A glob pattern that matches branch or tag names under refs/. For example, if you have many topic branches under refs/heads/topic, giving `topic/*` would show all of them."
msgstr ""
#. type: Plain text
@@ -56939,57 +44349,47 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:51
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--current"
msgstr "--current"
#. type: Plain text
#: en/git-show-branch.txt:55
-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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:56 en/rev-list-options.txt:635
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--topo-order"
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)."
+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)."
msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:62 en/rev-list-options.txt:627
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--date-order"
msgstr "--date-order"
#. type: Plain text
#: en/git-show-branch.txt:66
-msgid ""
-"This option is similar to `--topo-order` in the sense that no parent comes "
-"before all of its children, but otherwise commits are ordered according to "
-"their commit date."
+msgid "This option is similar to `--topo-order` in the sense that no parent comes before all of its children, but otherwise commits are ordered according to their commit date."
msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:67 en/rev-list-options.txt:333
#: en/rev-list-options.txt:466
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--sparse"
msgstr "--sparse"
#. type: Plain text
#: en/git-show-branch.txt:71
-msgid ""
-"By default, the output omits merges that are reachable from only one tip "
-"being shown. This option makes them visible."
+msgid "By default, the output omits merges that are reachable from only one tip being shown. This option makes them visible."
msgstr ""
#. type: Labeled list
@@ -57000,11 +44400,7 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:79
-msgid ""
-"Usually the command stops output upon showing the commit that is the common "
-"ancestor of all the branches. This flag tells the command to go <n> more "
-"common commits beyond that. When <n> is negative, display only the "
-"<reference>s given, without showing the commit ancestry tree."
+msgid "Usually the command stops output upon showing the commit that is the common ancestor of all the branches. This flag tells the command to go <n> more common commits beyond that. When <n> is negative, display only the <reference>s given, without showing the commit ancestry tree."
msgstr ""
#. type: Plain text
@@ -57014,29 +44410,23 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:83
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--merge-base"
msgstr "--merge-base"
#. type: Plain text
#: en/git-show-branch.txt:89
-msgid ""
-"Instead of showing the commit list, determine possible merge bases for the "
-"specified commits. All merge bases will be contained in all specified "
-"commits. This is different from how linkgit:git-merge-base[1] handles the "
-"case of three or more commits."
+msgid "Instead of showing the commit list, determine possible merge bases for the specified commits. All merge bases will be contained in all specified commits. This is different from how linkgit:git-merge-base[1] handles the case of three or more commits."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:93
-msgid ""
-"Among the <reference>s given, display only the ones that cannot be reached "
-"from any other <reference>."
+msgid "Among the <reference>s given, display only the ones that cannot be reached from any other <reference>."
msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:94
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-name"
msgstr "--no-name"
@@ -57047,32 +44437,24 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:97
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--sha1-name"
msgstr "--sha1-name"
#. type: Plain text
#: en/git-show-branch.txt:102
-msgid ""
-"Instead of naming the commits using the path to reach them from heads (e.g. "
-"\"master~2\" to mean the grandparent of \"master\"), name them with the "
-"unique prefix of their object names."
+msgid "Instead of naming the commits using the path to reach them from heads (e.g. \"master~2\" to mean the grandparent of \"master\"), name them with the unique prefix of their object names."
msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:103
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--topics"
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 "
-"development. When given \"git show-branch --topics master topic1 topic2\", "
-"this will show the revisions given by \"git rev-list {caret}master topic1 "
-"topic2\""
+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 development. When given \"git show-branch --topics master topic1 topic2\", this will show the revisions given by \"git rev-list {caret}master topic1 topic2\""
msgstr ""
#. type: Labeled list
@@ -57083,52 +44465,32 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:118
-msgid ""
-"Shows <n> most recent ref-log entries for the given ref. If <base> is "
-"given, <n> entries going back from that entry. <base> can be specified as "
-"count or date. When no explicit <ref> parameter is given, it defaults to "
-"the current branch (or `HEAD` if it is detached)."
+msgid "Shows <n> most recent ref-log entries for the given ref. If <base> is given, <n> entries going back from that entry. <base> can be specified as count or date. When no explicit <ref> parameter is given, it defaults to the current branch (or `HEAD` if it is detached)."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:123
-msgid ""
-"Color the status sign (one of these: `*` `!` `+` `-`) of each commit "
-"corresponding to the branch it's in. The value must be always (the "
-"default), never, or auto."
+msgid "Color the status sign (one of these: `*` `!` `+` `-`) of each commit corresponding to the branch it's in. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:128
-msgid ""
-"Turn off colored output, even when the configuration file gives the default "
-"to color output. Same as `--color=never`."
+msgid "Turn off colored output, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:131
-msgid ""
-"Note that --more, --list, --independent and --merge-base options are "
-"mutually exclusive."
+msgid "Note that --more, --list, --independent and --merge-base options are mutually exclusive."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:139
-msgid ""
-"Given N <references>, the first N lines are the one-line description from "
-"their commit message. The branch head that is pointed at by $GIT_DIR/HEAD "
-"is prefixed with an asterisk `*` character while other heads are prefixed "
-"with a `!` character."
+msgid "Given N <references>, the first N lines are the one-line description from their commit message. The branch head that is pointed at by $GIT_DIR/HEAD is prefixed with an asterisk `*` character while other heads are prefixed with a `!` character."
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."
+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."
msgstr ""
#. type: Plain text
@@ -57166,20 +44528,12 @@ 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\" "
-"branch adds one commit \"Introduce \"reset type\" flag to \"git reset\"\". "
-"The \"mhf\" branch adds many other commits. The current branch is "
-"\"master\"."
+msgid "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\"."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:182
-msgid ""
-"If you keep your primary branches immediately under `refs/heads`, and topic "
-"branches in subdirectories of it, having the following in the configuration "
-"file may help:"
+msgid "If you keep your primary branches immediately under `refs/heads`, and topic branches in subdirectories of it, having the following in the configuration file may help:"
msgstr ""
#. type: delimited block -
@@ -57193,10 +44547,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: delimited block -
@@ -57207,15 +44558,12 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:201
-msgid ""
-"shows 10 reflog entries going back from the tip as of 1 hour ago. Without "
-"`--list`, the output also shows how these tips are topologically related "
-"with each other."
+msgid "shows 10 reflog entries going back from the tip as of 1 hour ago. Without `--list`, the output also shows how these tips are topologically related with each other."
msgstr ""
#. type: Title =
#: en/git-show-index.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-show-index(1)"
msgstr "git-show-index(1)"
@@ -57232,22 +44580,17 @@ 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."
+msgid "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
#: en/git-show-index.txt:24
-msgid ""
-"The information it outputs is subset of what you can get from 'git verify-"
-"pack -v'; this command only shows the packfile offset and SHA-1 of each "
-"object."
+msgid "The information it outputs is subset of what you can get from 'git verify-pack -v'; this command only shows the packfile offset and SHA-1 of each object."
msgstr ""
#. type: Title =
#: en/git-show-ref.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-show-ref(1)"
msgstr "git-show-ref(1)"
@@ -57268,11 +44611,7 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:23
-msgid ""
-"Displays references available in a local repository along with the "
-"associated commit IDs. Results can be filtered using a pattern and tags can "
-"be dereferenced into object IDs. Additionally, it can be used to test "
-"whether a particular ref exists."
+msgid "Displays references available in a local repository along with the associated commit IDs. Results can be filtered using a pattern and tags can be dereferenced into object IDs. Additionally, it can be used to test whether a particular ref exists."
msgstr ""
#. type: Plain text
@@ -57282,22 +44621,17 @@ 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."
+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."
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."
+msgid "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, ignore-translated
+#, no-wrap
msgid "--head"
msgstr "--head"
@@ -57308,23 +44642,18 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:48
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--dereference"
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."
+msgid "Dereference tags into object IDs as well. They will be shown with \"{caret}{}\" appended."
msgstr ""
#. type: Labeled list
@@ -57335,31 +44664,22 @@ 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."
+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."
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."
+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."
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."
+msgid "Abbreviate the object name. When using `--hash`, you do not have to say `--hash --abbrev`; `--hash=n` would do."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:75
-msgid ""
-"Do not print any results to stdout. When combined with `--verify` this can "
-"be used to silently check if a reference exists."
+msgid "Do not print any results to stdout. When combined with `--verify` this can be used to silently check if a reference exists."
msgstr ""
#. type: Labeled list
@@ -57370,10 +44690,7 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:81
-msgid ""
-"Make 'git show-ref' act as a filter that reads refs from stdin of the form "
-"\"`^(?:<anything>\\s)?<refname>(?:\\^{})?$`\" and performs the following "
-"actions on each:"
+msgid "Make 'git show-ref' act as a filter that reads refs from stdin of the form \"`^(?:<anything>\\s)?<refname>(?:\\^{})?$`\" and performs the following actions on each:"
msgstr ""
#. type: Plain text
@@ -57403,18 +44720,12 @@ 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'."
+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'."
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 -
@@ -57434,8 +44745,7 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:114
-msgid ""
-"When using --hash (and not --dereference) the output format is: '<SHA-1 ID>'"
+msgid "When using --hash (and not --dereference) the output format is: '<SHA-1 ID>'"
msgstr ""
#. type: delimited block -
@@ -57451,10 +44761,7 @@ msgstr ""
#. type: Plain text
#: 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:"
+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:"
msgstr ""
#. type: delimited block -
@@ -57465,9 +44772,7 @@ 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."
+msgid "This will show \"refs/heads/master\" but also \"refs/remote/other-repo/master\", if such references exists."
msgstr ""
#. type: Plain text
@@ -57488,16 +44793,12 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:147
-msgid ""
-"If nothing matches, 'git show-ref' will return an error code of 1, and in "
-"the case of verification, it will show an error message."
+msgid "If nothing matches, 'git show-ref' will return an error code of 1, and in the case of verification, it will show an error message."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:150
-msgid ""
-"For scripting, you can ask it to be quiet with the \"--quiet\" flag, which "
-"allows you to do things like"
+msgid "For scripting, you can ask it to be quiet with the \"--quiet\" flag, which allows you to do things like"
msgstr ""
#. type: delimited block -
@@ -57510,25 +44811,17 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:159
-msgid ""
-"to check whether a particular branch exists or not (notice how we don't "
-"actually want to show any results, and we want to use the full refname for "
-"it in order to not trigger the problem with ambiguous partial matches)."
+msgid "to check whether a particular branch exists or not (notice how we don't actually want to show any results, and we want to use the full refname for it in order to not trigger the problem with ambiguous partial matches)."
msgstr ""
#. type: Plain text
#: 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)."
+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)."
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"
+msgid "To do automatic tag object dereferencing, use the \"-d\" or \"--dereference\" flag, so you can do"
msgstr ""
#. type: delimited block -
@@ -57550,19 +44843,13 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:183
#, fuzzy
-#| msgid ""
-#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-#| "merge[1], linkgit:git-commit-tree[1]"
-msgid ""
-"linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-update-"
-"ref[1], linkgit:gitrepository-layout[5]"
-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-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
+msgid "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-update-ref[1], linkgit:gitrepository-layout[5]"
+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-show.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-show(1)"
msgstr "git-show(1)"
@@ -57584,9 +44871,7 @@ msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-msgid ""
-"For commits it shows the log message and textual diff. It also presents the "
-"merge commit in a special format as produced by 'git diff-tree --cc'."
+msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
#. type: Plain text
@@ -57596,9 +44881,7 @@ msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-msgid ""
-"For trees, it shows the names (equivalent to 'git ls-tree' with --name-"
-"only)."
+msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
@@ -57608,9 +44891,7 @@ msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-msgid ""
-"The command takes options applicable to the 'git diff-tree' command to "
-"control how the changes the commit introduces are shown."
+msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr ""
#. type: Plain text
@@ -57626,10 +44907,7 @@ msgstr ""
#. type: Plain text
#: 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]."
+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]."
msgstr ""
#. type: Labeled list
@@ -57673,9 +44951,7 @@ msgstr ""
#. type: Plain text
#: en/git-show.txt:75
-msgid ""
-"Shows the contents of the file `Documentation/README` as they were current "
-"in the 10th last commit of the branch `next`."
+msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
#. type: Labeled list
@@ -57686,14 +44962,12 @@ msgstr ""
#. type: Plain text
#: en/git-show.txt:79
-msgid ""
-"Concatenates the contents of said Makefiles in the head of the branch "
-"`master`."
+msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
#. type: Title =
#: en/git-sh-setup.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-sh-setup(1)"
msgstr "git-sh-setup(1)"
@@ -57710,26 +44984,17 @@ msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:23
-msgid ""
-"The 'git sh-setup' scriptlet is designed to be sourced (using `.`) by other "
-"shell scripts to set up some variables pointing at the normal Git "
-"directories and a few helper shell functions."
+msgid "The 'git sh-setup' scriptlet is designed to be sourced (using `.`) by other shell scripts to set up some variables pointing at the normal Git directories and a few helper shell functions."
msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:29
-msgid ""
-"Before sourcing it, your script should set up a few variables; `USAGE` (and "
-"`LONG_USAGE`, if any) is used to define message given by `usage()` shell "
-"function. `SUBDIRECTORY_OK` can be set if the script can run from a "
-"subdirectory of the working tree (some commands do not)."
+msgid "Before sourcing it, your script should set up a few variables; `USAGE` (and `LONG_USAGE`, if any) is used to define message given by `usage()` shell function. `SUBDIRECTORY_OK` can be set if the script can run from a subdirectory of the working tree (some commands do not)."
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."
+msgid "The scriptlet sets `GIT_DIR` and `GIT_OBJECT_DIRECTORY` shell variables, but does *not* export them to the environment."
msgstr ""
#. type: Labeled list
@@ -57740,8 +45005,7 @@ msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:39
-msgid ""
-"exit after emitting the supplied error message to the standard error stream."
+msgid "exit after emitting the supplied error message to the standard error stream."
msgstr ""
#. type: Labeled list
@@ -57763,11 +45027,7 @@ 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."
+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."
msgstr ""
#. type: Labeled list
@@ -57778,10 +45038,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -57792,9 +45049,7 @@ msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:59
-msgid ""
-"outputs `true` or `false` to the standard output stream to indicate if the "
-"repository is a bare repository (i.e. without an associated working tree)."
+msgid "outputs `true` or `false` to the standard output stream to indicate if the repository is a bare repository (i.e. without an associated working tree)."
msgstr ""
#. type: Labeled list
@@ -57816,9 +45071,7 @@ msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:66
-msgid ""
-"checks if the current directory is within the working tree of the "
-"repository, and otherwise dies."
+msgid "checks if the current directory is within the working tree of the repository, and otherwise dies."
msgstr ""
#. type: Labeled list
@@ -57829,10 +45082,7 @@ msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:72
-msgid ""
-"checks if the working tree associated with the repository exists, and "
-"otherwise dies. Often done before calling cd_to_toplevel, which is "
-"impossible to do if there is no working tree."
+msgid "checks if the working tree associated with the repository exists, and otherwise dies. Often done before calling cd_to_toplevel, which is impossible to do if there is no working tree."
msgstr ""
#. type: Labeled list
@@ -57843,10 +45093,7 @@ msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:78
-msgid ""
-"checks that the working tree and index associated with the repository have "
-"no uncommitted changes to tracked files. Otherwise it emits an error "
-"message of the form `Cannot <action>: <reason>. <hint>`, and dies. Example:"
+msgid "checks that the working tree and index associated with the repository have no uncommitted changes to tracked files. Otherwise it emits an error message of the form `Cannot <action>: <reason>. <hint>`, and dies. Example:"
msgstr ""
#. type: delimited block -
@@ -57863,9 +45110,7 @@ msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:86
-msgid ""
-"outputs code for use with eval to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL "
-"and GIT_AUTHOR_DATE variables for a given commit."
+msgid "outputs code for use with eval to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL and GIT_AUTHOR_DATE variables for a given commit."
msgstr ""
#. type: Labeled list
@@ -57876,15 +45121,12 @@ 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."
+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."
msgstr ""
#. type: Title =
#: en/git-stage.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-stage(1)"
msgstr "git-stage(1)"
@@ -57904,19 +45146,13 @@ msgstr ""
#. type: Plain text
#: en/git-stage.txt:20
#, fuzzy
-#| msgid ""
-#| "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."
-msgstr ""
-"Ceci est un synonyme pour linkgit:git-fsck[1]. Veuillez vous r챕f챕rer 횪 la "
-"documentation de cette commande."
+#| msgid "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."
+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
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-stash(1)"
msgstr "git-stash(1)"
@@ -57946,112 +45182,64 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:32
-msgid ""
-"Use `git stash` when you want to record the current state of the working "
-"directory and the index, but want to go back to a clean working directory. "
-"The command saves your local modifications away and reverts the working "
-"directory to match the `HEAD` commit."
+msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
msgstr ""
#. 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-stash.txt:47
-msgid ""
-"The latest stash you created is stored in `refs/stash`; older stashes are "
-"found in the reflog of this reference and can be named using the usual "
-"reflog syntax (e.g. `stash@{0}` is the most recently created stash, "
-"`stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). "
-"Stashes may also be referenced by specifying just the stash index (e.g. the "
-"integer `n` is equivalent to `stash@{n}`)."
+msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
msgstr ""
#. 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
#: en/git-stash.txt:58
-msgid ""
-"Save your local modifications to a new 'stash' and roll them back to HEAD "
-"(in the working tree and in the index). The <message> part is optional and "
-"gives the description along with the stashed state."
+msgid "Save your local modifications to a new 'stash' and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state."
msgstr ""
#. type: Plain text
#: en/git-stash.txt:64
-msgid ""
-"For quickly making a snapshot, you can omit \"push\". In this mode, non-"
-"option arguments are not allowed to prevent a misspelled subcommand from "
-"making an unwanted stash. The two exceptions to this are `stash -p` which "
-"acts as alias for `stash push -p` and pathspecs, which are allowed after a "
-"double hyphen `--` for disambiguation."
+msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspecs, which are allowed after a double hyphen `--` for disambiguation."
msgstr ""
#. type: Plain text
#: en/git-stash.txt:70
-msgid ""
-"When pathspec is given to 'git stash push', the new stash records the "
-"modified states only for the files that match the pathspec. The index "
-"entries and working tree files are then rolled back to the state in HEAD "
-"only for these files, too, leaving files that do not match the pathspec "
-"intact."
+msgid "When pathspec is given to 'git stash push', the new stash records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
msgstr ""
#. 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."
+msgid "If the `--keep-index` option is used, all changes already added to the index are left intact."
msgstr ""
#. type: Plain text
#: en/git-stash.txt:78
-msgid ""
-"If the `--include-untracked` option is used, all untracked files are also "
-"stashed and then cleaned up with `git clean`, leaving the working directory "
-"in a very clean state. If the `--all` option is used instead then the "
-"ignored files are stashed and cleaned in addition to the untracked files."
+msgid "If the `--include-untracked` option is used, all untracked files are also stashed and then cleaned up with `git clean`, leaving the working directory in a very clean state. If the `--all` option is used instead then the ignored files are stashed and cleaned in addition to the untracked files."
msgstr ""
#. type: Plain text
#: en/git-stash.txt:86
-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 "
-"``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate "
-"the `--patch` mode."
+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 ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-stash.txt:89
-msgid ""
-"The `--patch` option implies `--keep-index`. You can use `--no-keep-index` "
-"to override this."
+msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
msgstr ""
#. type: Labeled list
@@ -58062,11 +45250,7 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:97
-msgid ""
-"List the stashes that you currently have. Each 'stash' is listed with its "
-"name (e.g. `stash@{0}` is the latest stash, `stash@{1}` is the one before, "
-"etc.), the name of the branch that was current when the stash was made, and "
-"a short description of the commit the stash was based on."
+msgid "List the stashes that you currently have. Each 'stash' is listed with its name (e.g. `stash@{0}` is the latest stash, `stash@{1}` is the one before, etc.), the name of the branch that was current when the stash was made, and a short description of the commit the stash was based on."
msgstr ""
#. type: delimited block -
@@ -58079,9 +45263,7 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:105
-msgid ""
-"The command takes options applicable to the 'git log' command to control "
-"what is shown and how. See linkgit:git-log[1]."
+msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
@@ -58092,13 +45274,7 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:115
-msgid ""
-"Show the changes recorded in the stash as a diff between the stashed state "
-"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."
+msgid "Show the changes recorded in the stash as a diff between the stashed state 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."
msgstr ""
#. type: Labeled list
@@ -58109,34 +45285,22 @@ 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 "
-"save`. The working directory must match the index."
+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 save`. The working directory must match the index."
msgstr ""
#. type: Plain text
#: 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."
+msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
#. type: Plain text
#: en/git-stash.txt:131
-msgid ""
-"If the `--index` option is used, then tries to reinstate not only the "
-"working tree's changes, but also the index's ones. However, this can fail, "
-"when you have conflicts (which are stored in the index, where you therefore "
-"can no longer apply the changes as they were originally)."
+msgid "If the `--index` option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
msgstr ""
#. 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>}`."
+msgid "When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must be a reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
@@ -58147,10 +45311,7 @@ msgstr ""
#. type: Plain text
#: 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`."
+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`."
msgstr ""
#. type: Labeled list
@@ -58161,21 +45322,12 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:149
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-stash.txt:155
-msgid ""
-"This is useful if the branch on which you ran `git stash save` has changed "
-"enough that `git stash apply` fails due to conflicts. Since the stash is "
-"applied on top of the commit that was HEAD at the time `git stash` was run, "
-"it restores the originally stashed state with no conflicts."
+msgid "This is useful if the branch on which you ran `git stash save` has changed enough that `git stash apply` fails due to conflicts. Since the stash is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
#. type: Labeled list
@@ -58186,10 +45338,7 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:160
-msgid ""
-"Remove all the stashed states. Note that those states will then be subject "
-"to pruning, and may be impossible to recover (see 'Examples' below for a "
-"possible strategy)."
+msgid "Remove all the stashed states. Note that those states will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
#. type: Labeled list
@@ -58200,10 +45349,7 @@ msgstr ""
#. type: Plain text
#: 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>}`."
+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>}`."
msgstr ""
#. type: Labeled list
@@ -58214,11 +45360,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -58229,21 +45371,12 @@ msgstr ""
#. type: Plain text
#: 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; "
-"see \"save\" above."
+msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"save\" above."
msgstr ""
#. type: Plain text
#: en/git-stash.txt:190
-msgid ""
-"A stash is represented as a commit whose tree records the state of the "
-"working directory, and its first parent is the commit at `HEAD` when the "
-"stash was created. The tree of the second parent records the state of the "
-"index when the stash is made, and it is made a child of the `HEAD` commit. "
-"The ancestry graph looks like this:"
+msgid "A stash is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the stash was created. The tree of the second parent records the state of the index when the stash is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
#. type: Plain text
@@ -58257,9 +45390,7 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:198
-msgid ""
-"where `H` is the `HEAD` commit, `I` is a commit that records the state of "
-"the index, and `W` is a commit that records the state of the working tree."
+msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
#. type: Labeled list
@@ -58270,20 +45401,12 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:209
-msgid ""
-"When you are in the middle of something, you learn that there are upstream "
-"changes that are possibly relevant to what you are doing. When your local "
-"changes do not conflict with the changes in the upstream, a simple `git "
-"pull` will let you move forward."
+msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
#. type: Plain text
#: 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, "
-"like this:"
+msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
#. type: delimited block -
@@ -58300,11 +45423,7 @@ 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 "
-"branch to make the emergency fix, like this:"
+msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
#. type: delimited block -
@@ -58347,10 +45466,7 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:259
-msgid ""
-"You can use `git stash save --keep-index` when you want to make two or more "
-"commits out of the changes in the work tree, and you want to test each "
-"change before committing:"
+msgid "You can use `git stash save --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
#. type: delimited block -
@@ -58376,11 +45492,7 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:278
-msgid ""
-"If you mistakenly drop or clear stashes, they cannot be recovered through "
-"the normal safety mechanisms. However, you can try the following "
-"incantation to get a list of stashes that are still in your repository, but "
-"not reachable any more:"
+msgid "If you mistakenly drop or clear stashes, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stashes that are still in your repository, but not reachable any more:"
msgstr ""
#. type: delimited block -
@@ -58395,19 +45507,13 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:292
#, fuzzy
-#| msgid ""
-#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-#| "merge[1], linkgit:git-commit-tree[1]"
-msgid ""
-"linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], "
-"linkgit:git-reset[1]"
-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-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
+msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[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-status.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-status(1)"
msgstr "git-status(1)"
@@ -58424,13 +45530,7 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:23
-msgid ""
-"Displays paths that have differences between the index file and the current "
-"HEAD commit, paths that have differences between the working tree and the "
-"index file, and paths in the working tree that are not tracked by Git (and "
-"are not ignored by linkgit:gitignore[5]). The first are what you _would_ "
-"commit by running `git commit`; the second and third are what you _could_ "
-"commit by running 'git add' before running `git commit`."
+msgid "Displays paths that have differences between the index file and the current HEAD commit, paths that have differences between the working tree and the index file, and paths in the working tree that are not tracked by Git (and are not ignored by linkgit:gitignore[5]). The first are what you _would_ commit by running `git commit`; the second and third are what you _could_ commit by running 'git add' before running `git commit`."
msgstr ""
#. type: Plain text
@@ -58454,17 +45554,12 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:40
-msgid ""
-"Give the output in an easy-to-parse format for scripts. This is similar to "
-"the short output, but will remain stable across Git versions and regardless "
-"of user configuration. See below for details."
+msgid "Give the output in an easy-to-parse format for scripts. This is similar to the short output, but will remain stable across Git versions and regardless of user configuration. See below for details."
msgstr ""
#. type: Plain text
#: en/git-status.txt:43
-msgid ""
-"The version parameter is used to specify the format version. This is "
-"optional and defaults to the original version 'v1' format."
+msgid "The version parameter is used to specify the format version. This is optional and defaults to the original version 'v1' format."
msgstr ""
#. type: Plain text
@@ -58482,20 +45577,12 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:54
-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`)."
+msgid "In addition to the names of files that have been changed, also show the textual changes that are staged to be committed (i.e., like the output of `git diff --cached`). If `-v` is specified twice, then also show the changes in the working tree that have not yet been staged (i.e., like the output of `git diff`)."
msgstr ""
#. 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`)."
+msgid "The mode parameter is used to specify the handling of untracked files. It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`)."
msgstr ""
#. type: Plain text
@@ -58514,33 +45601,12 @@ 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. "
-"Consider enabling untracked cache and split index if supported (see `git "
-"update-index --untracked-cache` and `git update-index --split-index`), "
-"Otherwise you can use `no` to have `git status` return more quickly without "
-"showing untracked files."
+msgid "When `-u` option is not used, untracked files and directories are shown (i.e. the same as specifying `normal`), to help you avoid forgetting to add newly created files. Because it takes extra work to find untracked files in the filesystem, this mode may take some time in a large working tree. Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files."
msgstr ""
#. type: Plain text
#: en/git-status.txt:96
-msgid ""
-"Ignore changes to submodules when looking for changes. <when> can be either "
-"\"none\", \"untracked\", \"dirty\" or \"all\", which is the default. Using "
-"\"none\" will consider the submodule modified when it either contains "
-"untracked or modified files or its HEAD differs from the commit recorded in "
-"the superproject and can be used to override any settings of the 'ignore' "
-"option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\""
-" is used submodules are not considered dirty when they only contain "
-"untracked content (but they are still scanned for modified content). Using "
-"\"dirty\" ignores all changes to the work tree of submodules, only changes "
-"to the commits stored in the superproject are shown (this was the behavior "
-"before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses"
-" the output of submodule summaries when the config option "
-"`status.submoduleSummary` is set)."
+msgid "Ignore changes to submodules when looking for changes. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default. Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set)."
msgstr ""
#. type: Plain text
@@ -58558,35 +45624,22 @@ 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."
+msgid "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 "
-"equivalent to 'always' and 'never' respectively."
+msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-status.txt:119
-msgid ""
-"The output from this command is designed to be used as a commit template "
-"comment. The default, long format, is designed to be human readable, "
-"verbose and descriptive. Its contents and format are subject to change at "
-"any time."
+msgid "The output from this command is designed to be used as a commit template comment. The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time."
msgstr ""
#. type: Plain text
#: 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 "
-"config option below."
+msgid "The paths mentioned in the output, unlike many other Git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below."
msgstr ""
#. type: Title ~
@@ -58609,31 +45662,17 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-status.txt:142
-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 "
-"backslash-escaped."
+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 backslash-escaped."
msgstr ""
#. type: Plain text
#: en/git-status.txt:148
-msgid ""
-"For paths with merge conflicts, `X` and `Y` show the modification states of "
-"each side of the merge. For paths that do not have merge conflicts, `X` "
-"shows the status of the index, and `Y` shows the status of the work tree. "
-"For untracked paths, `XY` are `??`. Other status codes can be interpreted "
-"as follows:"
+msgid "For paths with merge conflicts, `X` and `Y` show the modification states of each side of the merge. For paths that do not have merge conflicts, `X` shows the status of the index, and `Y` shows the status of the work tree. For untracked paths, `XY` are `??`. Other status codes can be interpreted as follows:"
msgstr ""
#. type: Plain text
@@ -58673,9 +45712,7 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:159
-msgid ""
-"Ignored files are not listed, unless `--ignored` option is in effect, in "
-"which case `XY` are `!!`."
+msgid "Ignored files are not listed, unless `--ignored` option is in effect, in which case `XY` are `!!`."
msgstr ""
#. type: Plain text
@@ -58726,39 +45763,22 @@ 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 "
-"description of the short format above also describes the porcelain format, "
-"with a few exceptions:"
+msgid "Version 1 porcelain format is similar to the short format, but is guaranteed not to change in a backwards-incompatible way between Git versions or based on user configuration. This makes it ideal for parsing by scripts. The description of the short format above also describes the porcelain format, with a few exceptions:"
msgstr ""
#. type: Plain text
#: en/git-status.txt:199
-msgid ""
-"The user's color.status configuration is not respected; color will always be"
-" off."
+msgid "The user's color.status configuration is not respected; color will always be off."
msgstr ""
#. type: Plain text
#: en/git-status.txt:202
-msgid ""
-"The user's status.relativePaths configuration is not respected; paths shown "
-"will always be relative to the repository root."
+msgid "The user's status.relativePaths configuration is not respected; paths shown will always be relative to the repository root."
msgstr ""
#. type: Plain text
#: en/git-status.txt:212
-msgid ""
-"There is also an alternate -z format recommended for machine parsing. In "
-"that format, the status field is the same, but some other things change. "
-"First, the '\\->' is omitted from rename entries and the field order is "
-"reversed (e.g 'from \\-> to' becomes 'to from'). Second, a NUL (ASCII 0) "
-"follows each filename, replacing space as a field separator and the "
-"terminating newline (but a space still separates the status field from the "
-"first filename). Third, filenames containing special characters are not "
-"specially formatted; no quoting or backslash-escaping is performed."
+msgid "There is also an alternate -z format recommended for machine parsing. In that format, the status field is the same, but some other things change. First, the '\\->' is omitted from rename entries and the field order is reversed (e.g 'from \\-> to' becomes 'to from'). Second, a NUL (ASCII 0) follows each filename, replacing space as a field separator and the terminating newline (but a space still separates the status field from the first filename). Third, filenames containing special characters are not specially formatted; no quoting or backslash-escaping is performed."
msgstr ""
#. type: Title ~
@@ -58769,17 +45789,12 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:219
-msgid ""
-"Version 2 format adds more detailed information about the state of the "
-"worktree and changed items. Version 2 also defines an extensible set of "
-"easy to parse optional headers."
+msgid "Version 2 format adds more detailed information about the state of the worktree and changed items. Version 2 also defines an extensible set of easy to parse optional headers."
msgstr ""
#. type: Plain text
#: en/git-status.txt:223
-msgid ""
-"Header lines start with \"#\" and are added in response to specific command "
-"line arguments. Parsers should ignore headers they don't recognize."
+msgid "Header lines start with \"#\" and are added in response to specific command line arguments. Parsers should ignore headers they don't recognize."
msgstr ""
#. type: Plain text
@@ -58789,9 +45804,7 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:228
-msgid ""
-"If `--branch` is given, a series of header lines are printed with "
-"information about the current branch."
+msgid "If `--branch` is given, a series of header lines are printed with information about the current branch."
msgstr ""
#. type: Plain text
@@ -58815,12 +45828,7 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:245
-msgid ""
-"Following the headers, a series of lines are printed for tracked entries. "
-"One of three different line formats may be used to describe an entry "
-"depending on the type of change. Tracked entries are printed in an "
-"undefined order; parsers should allow for a mixture of the 3 line types in "
-"any order."
+msgid "Following the headers, a series of lines are printed for tracked entries. One of three different line formats may be used to describe an entry depending on the type of change. Tracked entries are printed in an undefined order; parsers should allow for a mixture of the 3 line types in any order."
msgstr ""
#. type: Plain text
@@ -58846,8 +45854,7 @@ 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
@@ -58887,9 +45894,7 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:286
-msgid ""
-"Unmerged entries have the following format; the first character is a \"u\" "
-"to distinguish from ordinary changed entries."
+msgid "Unmerged entries have the following format; the first character is a \"u\" to distinguish from ordinary changed entries."
msgstr ""
#. type: Plain text
@@ -58926,9 +45931,7 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:310
-msgid ""
-"Following the tracked entries (and if requested), a series of lines will be "
-"printed for untracked and then ignored items found in the worktree."
+msgid "Following the tracked entries (and if requested), a series of lines will be printed for untracked and then ignored items found in the worktree."
msgstr ""
#. type: Plain text
@@ -58964,59 +45967,34 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:324
-msgid ""
-"When the `-z` option is given, pathnames are printed as is and without any "
-"quoting and lines are terminated with a NUL (ASCII 0x00) byte."
+msgid "When the `-z` option is given, pathnames are printed as is and without any quoting and lines are terminated with a NUL (ASCII 0x00) byte."
msgstr ""
#. type: Plain text
#: en/git-status.txt:328
#, 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 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 "
-"`commit.cleanup` (voir linkgit:git-config[1])."
+#| 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 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 `commit.cleanup` (voir linkgit:git-config[1])."
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-status.txt:341
-msgid ""
-"If the config variable `status.relativePaths` is set to false, then all "
-"paths shown are relative to the repository root, not to the current "
-"directory."
+msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
msgstr ""
#. type: Plain text
#: 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 "
-"(see --summary-limit option of linkgit:git-submodule[1]). Please note that "
-"the summary output from the status command will be suppressed for all "
-"submodules when `diff.ignoreSubmodules` is set to 'all' or only for those "
-"submodules where `submodule.<name>.ignore=all`. To also view the summary for"
-" ignored submodules you can either use the --ignore-submodules=dirty command"
-" line option or the 'git submodule summary' command, which shows a similar "
-"output but does not honor these settings."
+msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
msgstr ""
#. type: Title =
#: en/git-stripspace.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-stripspace(1)"
msgstr "git-stripspace(1)"
@@ -59035,9 +46013,7 @@ msgstr ""
#. type: Plain text
#: en/git-stripspace.txt:21
-msgid ""
-"Read text, such as commit messages, notes, tags and branch descriptions, "
-"from the standard input and clean it in the manner used by Git."
+msgid "Read text, such as commit messages, notes, tags and branch descriptions, from the standard input and clean it in the manner used by Git."
msgstr ""
#. type: Plain text
@@ -59058,13 +46034,9 @@ msgstr ""
#. type: Plain text
#: 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;"
+#| msgid "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 "
-"de l'index, encore une fois, avant d'utiliser la commande 'commit',"
+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',"
#. type: Plain text
#: en/git-stripspace.txt:28
@@ -59073,9 +46045,7 @@ msgstr ""
#. type: Plain text
#: en/git-stripspace.txt:31
-msgid ""
-"In the case where the input consists entirely of whitespace characters, no "
-"output will be produced."
+msgid "In the case where the input consists entirely of whitespace characters, no output will be produced."
msgstr ""
#. type: Plain text
@@ -59089,28 +46059,24 @@ msgstr ""
#. type: Labeled list
#: en/git-stripspace.txt:39
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--strip-comments"
msgstr "--strip-comments"
#. type: Plain text
#: en/git-stripspace.txt:41
-msgid ""
-"Skip and remove all lines starting with comment character (default '#')."
+msgid "Skip and remove all lines starting with comment character (default '#')."
msgstr ""
#. type: Labeled list
#: en/git-stripspace.txt:43
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--comment-lines"
msgstr "--comment-lines"
#. type: Plain text
#: en/git-stripspace.txt:47
-msgid ""
-"Prepend comment character and blank to each line. Lines will automatically "
-"be terminated with a newline. On empty lines, only the comment character "
-"will be prepended."
+msgid "Prepend comment character and blank to each line. Lines will automatically be terminated with a newline. On empty lines, only the comment character will be prepended."
msgstr ""
#. type: Plain text
@@ -59174,7 +46140,7 @@ msgstr ""
#. type: Title =
#: en/git-submodule.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-submodule(1)"
msgstr "git-submodule(1)"
@@ -59205,121 +46171,58 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:31
-msgid ""
-"A submodule allows you to keep another Git repository in a subdirectory of "
-"your repository. The other repository has its own history, which does not "
-"interfere with the history of the current repository. This can be used to "
-"have external dependencies such as third party libraries for example."
+msgid "A submodule allows you to keep another Git repository in a subdirectory of your repository. The other repository has its own history, which does not interfere with the history of the current repository. This can be used to have external dependencies such as third party libraries for example."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:45
-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 "
-"cloned from. The logical name can be used for overriding this URL within "
-"your local repository configuration (see 'submodule init')."
+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 cloned from. The logical name can be used for overriding this URL within your local repository configuration (see 'submodule init')."
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 "
-"submodule. Directories that come from both projects can be cloned and "
-"checked out as a whole if you choose to go that route."
+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 submodule. Directories that come from both projects can be cloned and checked out as a whole if you choose to go that route."
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
#: en/git-submodule.txt:65
-msgid ""
-"Add the given repository as a submodule at the given path to the changeset "
-"to be committed next to the current project: the current project is termed "
-"the \"superproject\"."
+msgid "Add the given repository as a submodule at the given path to the changeset to be committed next to the current project: the current project is termed the \"superproject\"."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:73
-msgid ""
-"This requires at least one argument: <repository>. The optional argument "
-"<path> is the relative location for the cloned submodule to exist in the "
-"superproject. If <path> is not given, the \"humanish\" part of the source "
-"repository is used (\"repo\" for \"/path/to/repo.git\" and \"foo\" for "
-"\"host.xz:foo/.git\"). The <path> is also used as the submodule's logical "
-"name in its configuration entries unless `--name` is used to specify a "
-"logical name."
+msgid "This requires at least one argument: <repository>. The optional argument <path> is the relative location for the cloned submodule to exist in the superproject. If <path> is not given, the \"humanish\" part of the source repository is used (\"repo\" for \"/path/to/repo.git\" and \"foo\" for \"host.xz:foo/.git\"). The <path> is also used as the submodule's logical name in its configuration entries unless `--name` is used to specify a logical name."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:82
-msgid ""
-"<repository> is the URL of the new submodule's origin repository. This may "
-"be either an absolute URL, or (if it begins with ./ or ../), the location "
-"relative to the superproject's default remote repository (Please note that "
-"to specify a repository 'foo.git' which is located right next to a "
-"superproject 'bar.git', you'll have to use '../foo.git' instead of "
-"'./foo.git' - as one might expect when following the rules for relative URLs"
-" - because the evaluation of relative URLs in Git is identical to that of "
-"relative directories)."
+msgid "<repository> is the URL of the new submodule's origin repository. This may be either an absolute URL, or (if it begins with ./ or ../), the location relative to the superproject's default remote repository (Please note that to specify a repository 'foo.git' which is located right next to a superproject 'bar.git', you'll have to use '../foo.git' instead of './foo.git' - as one might expect when following the rules for relative URLs - because the evaluation of relative URLs in Git is identical to that of relative directories)."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:89
-msgid ""
-"The default remote is the remote of the remote tracking branch of the "
-"current branch. If no such remote tracking branch exists or the HEAD is "
-"detached, \"origin\" is assumed to be the default remote. If the "
-"superproject doesn't have a default remote configured the superproject is "
-"its own authoritative upstream and the current working directory is used "
-"instead."
+msgid "The default remote is the remote of the remote tracking branch of the current branch. If no such remote tracking branch exists or the HEAD is detached, \"origin\" is assumed to be the default remote. If the superproject doesn't have a default remote configured the superproject is its own authoritative upstream and the current working directory is used instead."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:97
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:105
-msgid ""
-"In either case, the given URL is recorded into .gitmodules for use by "
-"subsequent users cloning the superproject. If the URL is given relative to "
-"the superproject's repository, the presumption is the superproject and "
-"submodule repositories will be kept together in the same relative location, "
-"and only the superproject's URL needs to be provided: git-submodule will "
-"correctly locate the submodule using the relative URL in .gitmodules."
+msgid "In either case, the given URL is recorded into .gitmodules for use by subsequent users cloning the superproject. If the URL is given relative to the superproject's repository, the presumption is the superproject and submodule repositories will be kept together in the same relative location, and only the superproject's URL needs to be provided: git-submodule will correctly locate the submodule using the relative URL in .gitmodules."
msgstr ""
#. type: Labeled list
@@ -59330,29 +46233,17 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:114
-msgid ""
-"Show the status of the submodules. This will print the SHA-1 of the "
-"currently checked out commit for each submodule, along with the submodule "
-"path and the output of 'git describe' for the SHA-1. Each SHA-1 will be "
-"prefixed with `-` if the submodule is not initialized, `+` if the currently "
-"checked out submodule commit does not match the SHA-1 found in the index of "
-"the containing repository and `U` if the submodule has merge conflicts."
+msgid "Show the status of the submodules. This will print the SHA-1 of the currently checked out commit for each submodule, along with the submodule path and the output of 'git describe' for the SHA-1. Each SHA-1 will be prefixed with `-` if the submodule is not initialized, `+` if the currently checked out submodule commit does not match the SHA-1 found in the index of the containing repository and `U` if the submodule has merge conflicts."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:117
-msgid ""
-"If `--recursive` is specified, this command will recurse into nested "
-"submodules, and show their status as well."
+msgid "If `--recursive` is specified, this command will recurse into nested submodules, and show their status as well."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:122
-msgid ""
-"If you are only interested in changes of the currently initialized "
-"submodules with respect to the commit recorded in the index or the HEAD, "
-"linkgit:git-status[1] and linkgit:git-diff[1] will provide that information "
-"too (and can also report changes to a submodule's work tree)."
+msgid "If you are only interested in changes of the currently initialized submodules with respect to the commit recorded in the index or the HEAD, linkgit:git-status[1] and linkgit:git-diff[1] will provide that information too (and can also report changes to a submodule's work tree)."
msgstr ""
#. type: Labeled list
@@ -59363,30 +46254,17 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:130
-msgid ""
-"Initialize the submodules recorded in the index (which were added and "
-"committed elsewhere) by setting `submodule.$name.url` in .git/config. It "
-"uses the same setting from .gitmodules as a template. If the URL is "
-"relative, it will be resolved using the default remote. If there is no "
-"default remote, the current repository will be assumed to be upstream."
+msgid "Initialize the submodules recorded in the index (which were added and committed elsewhere) by setting `submodule.$name.url` in .git/config. It uses the same setting from .gitmodules as a template. If the URL is relative, it will be resolved using the default remote. If there is no default remote, the current repository will be assumed to be upstream."
msgstr ""
#. 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."
+msgid "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 "
-"customize the submodule clone URLs in .git/config for your local setup and "
-"proceed to `git submodule update`; you can also just use `git submodule "
-"update --init` without the explicit 'init' step if you do not intend to "
-"customize any submodule locations."
+msgid "When present, it will also copy the value of `submodule.$name.update`. This command does not alter existing information in .git/config. You can then customize the submodule clone URLs in .git/config for your local setup and proceed to `git submodule update`; you can also just use `git submodule update --init` without the explicit 'init' step if you do not intend to customize any submodule locations."
msgstr ""
#. type: Plain text
@@ -59402,49 +46280,28 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:153
-msgid ""
-"Unregister the given submodules, i.e. remove the whole `submodule.$name` "
-"section from .git/config together with their work tree. Further calls to "
-"`git submodule update`, `git submodule foreach` and `git submodule sync` "
-"will skip any unregistered submodules until they are initialized again, so "
-"use this command if you don't want to have a local checkout of the submodule"
-" in your working tree anymore. If you really want to remove a submodule from"
-" the repository and commit that use linkgit:git-rm[1] instead."
+msgid "Unregister the given submodules, i.e. remove the whole `submodule.$name` section from .git/config together with their work tree. Further calls to `git submodule update`, `git submodule foreach` and `git submodule sync` will skip any unregistered submodules until they are initialized again, so use this command if you don't want to have a local checkout of the submodule in your working tree anymore. If you really want to remove a submodule from the repository and commit that use linkgit:git-rm[1] instead."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:156
-msgid ""
-"When the command is run without pathspec, it errors out, instead of deinit-"
-"ing everything, to prevent mistakes."
+msgid "When the command is run without pathspec, it errors out, instead of deinit-ing everything, to prevent mistakes."
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."
+msgid "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
#: en/git-submodule.txt:171
-msgid ""
-"Update the registered submodules to match what the superproject expects by "
-"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`:"
+msgid "Update the registered submodules to match what the superproject expects by 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`:"
msgstr ""
#. type: Labeled list
@@ -59466,11 +46323,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"submodule."
+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 submodule."
msgstr ""
#. type: Labeled list
@@ -59503,9 +46356,7 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:188
-msgid ""
-"The following procedures are only available via the "
-"`submodule.<name>.update` configuration variable:"
+msgid "The following procedures are only available via the `submodule.<name>.update` configuration variable:"
msgstr ""
#. type: Labeled list
@@ -59536,44 +46387,28 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:200
-msgid ""
-"If the submodule is not yet initialized, and you just want to use the "
-"setting as stored in .gitmodules, you can automatically initialize the "
-"submodule with the `--init` option."
+msgid "If the submodule is not yet initialized, and you just want to use the setting as stored in .gitmodules, you can automatically initialize the submodule with the `--init` option."
msgstr ""
#. 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."
+msgid "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
#: en/git-submodule.txt:213
-msgid ""
-"Show commit summary between the given commit (defaults to HEAD) and working "
-"tree/index. For a submodule in question, a series of commits in the "
-"submodule between the given super project commit and the index or working "
-"tree (switched by `--cached`) are shown. If the option `--files` is given, "
-"show the series of commits in the submodule between the index of the super "
-"project and the working tree of the submodule (this option doesn't allow to "
-"use the `--cached` option or to provide an explicit commit)."
+msgid "Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the index or working tree (switched by `--cached`) are shown. If the option `--files` is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule (this option doesn't allow to use the `--cached` option or to provide an explicit commit)."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:216
-msgid ""
-"Using the `--submodule=log` option with linkgit:git-diff[1] will provide "
-"that information too."
+msgid "Using the `--submodule=log` option with linkgit:git-diff[1] will provide that information too."
msgstr ""
#. type: Labeled list
@@ -59584,27 +46419,12 @@ msgstr ""
#. type: Plain text
#: 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 "
-"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."
+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 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."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:236
-msgid ""
-"As an example, the command below will show the path and currently checked "
-"out commit for each submodule:"
+msgid "As an example, the command below will show the path and currently checked out commit for each submodule:"
msgstr ""
#. type: delimited block -
@@ -59621,26 +46441,17 @@ msgstr ""
#. type: Plain text
#: 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 "
-"you need to update your local repositories accordingly."
+msgid "Synchronizes submodules' remote URL configuration setting to the value specified in .gitmodules. It will only affect those submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:251
-msgid ""
-"\"git submodule sync\" synchronizes all submodules while \"git submodule "
-"sync \\-- A\" synchronizes submodule \"A\" only."
+msgid "\"git submodule sync\" synchronizes all submodules while \"git submodule sync \\-- A\" synchronizes submodule \"A\" only."
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."
+msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
@@ -59651,20 +46462,12 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:262
-msgid ""
-"If a git directory of a submodule is inside the submodule, move the git "
-"directory of the submodule into its superprojects `$GIT_DIR/modules` path "
-"and then connect the git directory and its working directory by setting the "
-"`core.worktree` and adding a .git file pointing to the git directory "
-"embedded in the superprojects git directory."
+msgid "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superprojects `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the superprojects git directory."
msgstr ""
#. 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."
+msgid "A repository that was cloned independently and later added as a submodule or old setups have the submodules git directory inside the submodule instead of embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
@@ -59687,208 +46490,130 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:278
-msgid ""
-"This option is only valid for the deinit command. Unregister all submodules "
-"in the working tree."
+msgid "This option is only valid for the deinit command. Unregister all submodules in the working tree."
msgstr ""
#. type: Plain text
#: 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."
+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."
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 "
-"changes. When running update (only effective with the checkout procedure), "
-"throw away local changes in submodules when switching to a different commit;"
-" and always run a checkout operation in the submodule, even if the commit "
-"listed in the index of the containing repository matches the commit checked "
-"out in the submodule."
+msgid "This option is only valid for add, deinit and update commands. When running add, allow adding an otherwise ignored submodule path. When running deinit the submodule working trees will be removed even if they contain local changes. When running update (only effective with the checkout procedure), throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:304
-msgid ""
-"This option is only valid for status and summary commands. These commands "
-"typically use the commit found in the submodule HEAD, but with this option, "
-"the commit stored in the index is used instead."
+msgid "This option is only valid for status and summary commands. These commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:305
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--files"
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."
+msgid "This option is only valid for the summary command. This command compares the commit in the index with that in the submodule HEAD when this option is used."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:311
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--summary-limit"
msgstr "--summary-limit"
#. type: Plain text
#: en/git-submodule.txt:317
-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."
+msgid "This option is only valid for the summary command. Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:318
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--remote"
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 "
-"(`branch.<name>.remote`), defaulting to `origin`. The remote branch used "
-"defaults to `master`, but the branch name may be overridden by setting the "
-"`submodule.<name>.branch` option in either `.gitmodules` or `.git/config` "
-"(with `.git/config` taking precedence)."
+msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
msgstr ""
#. 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 "
-"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."
+msgid "This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. For example, `submodule update --remote --merge` will merge upstream submodule changes into the submodules, while `submodule update --merge` will merge superproject gitlink changes into the submodules."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:338
-msgid ""
-"In order to ensure a current tracking branch state, `update --remote` "
-"fetches the submodule's remote repository before calculating the SHA-1. If "
-"you don't want to fetch, you should use `submodule update --remote --no-"
-"fetch`."
+msgid "In order to ensure a current tracking branch state, `update --remote` fetches the submodule's remote repository before calculating the SHA-1. If you don't want to fetch, you should use `submodule update --remote --no-fetch`."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:348
-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."
+msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD. Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:350
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-fetch"
msgstr "--no-fetch"
#. type: Plain text
#: en/git-submodule.txt:353
-msgid ""
-"This option is only valid for the update command. Don't fetch new objects "
-"from the remote site."
+msgid "This option is only valid for the update command. Don't fetch new objects from the remote site."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:354
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--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."
+msgid "This option is only valid for the update command. Checkout the commit recorded in the superproject on a detached HEAD in the submodule. This is the default behavior, the main use of this option is to override `submodule.$name.update` when set to a value other than `checkout`. If the key `submodule.$name.update` is either not explicitly set or set to `checkout`, this option is implicit."
msgstr ""
#. 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."
+msgid "This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch of the submodule. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. If the key `submodule.$name.update` is set to `merge`, this option is implicit."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:373
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--rebase"
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 "
-"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."
+msgid "This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:382
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--init"
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."
+msgid "This option is only valid for the update command. Initialize all submodules for which \"git submodule init\" has not been called so far before updating."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:387
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--name"
msgstr "--name"
#. type: Plain text
#: en/git-submodule.txt:391
-msgid ""
-"This option is only valid for the add command. It sets the submodule's name "
-"to the given string instead of defaulting to its path. The name must be "
-"valid as a directory name and may not end with a '/'."
+msgid "This option is only valid for the add command. It sets the submodule's name to the given string instead of defaulting to its path. The name must be valid as a directory name and may not end with a '/'."
msgstr ""
#. type: Labeled list
@@ -59899,10 +46624,7 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:396
-msgid ""
-"This option is only valid for add and update commands. These commands "
-"sometimes need to clone a remote repository. In this case, this option will "
-"be passed to the linkgit:git-clone[1] command."
+msgid "This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, this option will be passed to the linkgit:git-clone[1] command."
msgstr ""
#. type: Plain text
@@ -59915,77 +46637,55 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:405
-msgid ""
-"This option is only valid for foreach, update, status and sync commands. "
-"Traverse submodules recursively. The operation is performed not only in the "
-"submodules of the current repo, but also in any nested submodules inside "
-"those submodules (and so on)."
+msgid "This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on)."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:406
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--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]"
+msgid "This option is valid for add and update commands. Create a 'shallow' clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1]"
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:411
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]recommend-shallow"
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-"
-"recommend-shallow`."
+msgid "This option is only valid for the update command. The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the .gitmodules file by default. To ignore the suggestions use `--no-recommend-shallow`."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:422
-msgid ""
-"This option is only valid for the update command. Clone new submodules in "
-"parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
+msgid "This option is only valid for the update command. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
msgstr ""
#. 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 "
-"required with add)."
+msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:435
-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."
+msgid "When initializing submodules, a .gitmodules file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
#. type: Title =
#: en/git-svn.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-svn(1)"
msgstr "git-svn(1)"
#. type: Plain text
#: en/git-svn.txt:7
-msgid ""
-"git-svn - Bidirectional operation between a Subversion repository and Git"
+msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
msgstr ""
#. type: Plain text
@@ -59996,27 +46696,17 @@ 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 "
-"repository."
+msgid "'git svn' is a simple conduit for changesets between Subversion and Git. It provides a bidirectional flow of changes between a Subversion and a Git repository."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:23
-msgid ""
-"'git svn' can track a standard Subversion repository, following the common "
-"\"trunk/branches/tags\" layout, with the --stdlayout option. It can also "
-"follow branches and tags in any layout with the -T/-t/-b options (see "
-"options to 'init' below, and also the 'clone' command)."
+msgid "'git svn' can track a standard Subversion repository, following the common \"trunk/branches/tags\" layout, with the --stdlayout option. It can also follow branches and tags in any layout with the -T/-t/-b options (see options to 'init' below, and also the 'clone' command)."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:27
-msgid ""
-"Once tracking a Subversion repository (with any of the above methods), the "
-"Git repository can be updated from Subversion by the 'fetch' command and "
-"Subversion updated from Git by the 'dcommit' command."
+msgid "Once tracking a Subversion repository (with any of the above methods), the Git repository can be updated from Subversion by the 'fetch' command and Subversion updated from Git by the 'dcommit' command."
msgstr ""
#. type: Labeled list
@@ -60027,12 +46717,7 @@ 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 "
-"operate on can be specified as a second argument. Normally this command "
-"initializes the current directory."
+msgid "Initializes an empty Git repository with additional metadata directories for 'git svn'. The Subversion URL may be specified as a command-line argument, or as full URL arguments to -T/-t/-b. Optionally, the target directory to operate on can be specified as a second argument. Normally this command initializes the current directory."
msgstr ""
#. type: Labeled list
@@ -60073,40 +46758,29 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:47
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--stdlayout"
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."
+msgid "These are optional command-line options for init. Each of these flags can point to a relative repository path (--tags=project/tags) or a full url (--tags=https://foo.org/project/tags). You can specify more than one --tags and/or --branches options, in case your Subversion repository places tags or branches under multiple paths. The option --stdlayout is a shorthand way of setting trunk,tags,branches as the relative paths, which is the Subversion default. If any of the other options are given as well, they take precedence."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:58
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-metadata"
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."
+msgid "Set the 'noMetadata' option in the [svn-remote] config. This option is not recommended, please read the 'svn.noMetadata' section of this manpage before using this option."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:62
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--use-svm-props"
msgstr "--use-svm-props"
@@ -60117,7 +46791,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:64
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--use-svnsync-props"
msgstr "--use-svnsync-props"
@@ -60156,11 +46830,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:75
-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`"
+msgid "For transports that SVN handles authentication for (http, https, and plain svn), specify the username. For other transports (e.g. `svn+ssh://`), you must include the username in the URL, e.g. `svn+ssh://foo@svn.bar.com/project`"
msgstr ""
#. type: Labeled list
@@ -60171,27 +46841,12 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:90
-msgid ""
-"This allows one to specify a prefix which is prepended to the names of "
-"remotes if trunk/branches/tags are specified. The prefix does not "
-"automatically include a trailing slash, so be sure you include one in the "
-"argument if that is what you want. If --branches/-b is specified, the "
-"prefix must include a trailing slash. Setting a prefix (with a trailing "
-"slash) is strongly encouraged in any case, as your SVN-tracking refs will "
-"then be located at \"refs/remotes/$prefix/*\", which is compatible with "
-"Git's own remote-tracking ref layout (refs/remotes/$remote/*). Setting a "
-"prefix is also useful if you wish to track multiple projects that share a "
-"common repository. By default, the prefix is set to 'origin/'."
+msgid "This allows one to specify a prefix which is prepended to the names of remotes if trunk/branches/tags are specified. The prefix does not automatically include a trailing slash, so be sure you include one in the argument if that is what you want. If --branches/-b is specified, the prefix must include a trailing slash. Setting a prefix (with a trailing slash) is strongly encouraged in any case, as your SVN-tracking refs will then be located at \"refs/remotes/$prefix/*\", which is compatible with Git's own remote-tracking ref layout (refs/remotes/$remote/*). Setting a prefix is also useful if you wish to track multiple projects that share a common repository. By default, the prefix is set to 'origin/'."
msgstr ""
#. type: Plain text
#: 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)."
+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)."
msgstr ""
#. type: Labeled list
@@ -60202,9 +46857,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:102
-msgid ""
-"When passed to 'init' or 'clone' this regular expression will be preserved "
-"as a config key. See 'fetch' for a description of `--ignore-paths`."
+msgid "When passed to 'init' or 'clone' this regular expression will be preserved as a config key. See 'fetch' for a description of `--ignore-paths`."
msgstr ""
#. type: Labeled list
@@ -60215,28 +46868,18 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:106
-msgid ""
-"When passed to 'init' or 'clone' this regular expression will be preserved "
-"as a config key. See 'fetch' for a description of `--include-paths`."
+msgid "When passed to 'init' or 'clone' this regular expression will be preserved as a config key. See 'fetch' for a description of `--include-paths`."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:106
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-minimize-url"
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 "
-"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)."
+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 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 ""
#. type: Labeled list
@@ -60247,45 +46890,33 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:123
-msgid ""
-"Fetch unfetched revisions from the Subversion remote we are tracking. The "
-"name of the [svn-remote \"...\"] section in the $GIT_DIR/config file may be "
-"specified as an optional command-line argument."
+msgid "Fetch unfetched revisions from the Subversion remote we are tracking. The name of the [svn-remote \"...\"] section in the $GIT_DIR/config file may be specified as an optional command-line argument."
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)."
+msgid "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, ignore-translated
+#, no-wrap
msgid "--localtime"
msgstr "--localtime"
#. type: Plain text
#: en/git-svn.txt:131
-msgid ""
-"Store Git commit times in the local time zone instead of UTC. This makes "
-"'git log' (even without --date=local) show the same times that `svn log` "
-"would in the local time zone."
+msgid "Store Git commit times in the local time zone instead of UTC. This makes 'git log' (even without --date=local) show the same times that `svn log` would in the local time zone."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:138 en/git-svn.txt:505
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--parent"
msgstr "--parent"
@@ -60296,11 +46927,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"'clone', 'dcommit', 'rebase', etc) on a given repository."
+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 'clone', 'dcommit', 'rebase', etc) on a given repository."
msgstr ""
#. type: Plain text
@@ -60311,9 +46938,7 @@ 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."
+msgid "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
@@ -60342,12 +46967,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:177
-msgid ""
-"This allows one to specify a Perl regular expression that will cause the "
-"inclusion of only matching paths from checkout from SVN. The `--include-"
-"paths` option should match for every 'fetch' (including automatic fetches "
-"due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-"
-"paths` takes precedence over `--include-paths`."
+msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
msgstr ""
#. type: Plain text
@@ -60364,11 +46984,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -60379,31 +46995,18 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:198
-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 "
-"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."
+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 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."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:199
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--preserve-empty-dirs"
msgstr "--preserve-empty-dirs"
#. type: Plain text
#: en/git-svn.txt:205
-msgid ""
-"Create a placeholder file in the local Git repository for each empty "
-"directory fetched from Subversion. This includes directories that become "
-"empty by removing all entries in the Subversion repository (but not the "
-"directory itself). The placeholder files are also tracked and removed when "
-"no longer necessary."
+msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
msgstr ""
#. type: Labeled list
@@ -60414,9 +47017,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:209
-msgid ""
-"Set the name of placeholder files created by --preserve-empty-dirs. "
-"Default: \".gitignore\""
+msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
msgstr ""
#. type: Labeled list
@@ -60427,39 +47028,27 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:213
-msgid ""
-"This fetches revisions from the SVN parent of the current HEAD and rebases "
-"the current (uncommitted to SVN) work against it."
+msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:217
-msgid ""
-"This works similarly to `svn update` or 'git pull' except that it preserves "
-"linear history with 'git rebase' instead of 'git merge' for ease of "
-"dcommitting with 'git svn'."
+msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:221
-msgid ""
-"This accepts all options that 'git svn fetch' and 'git rebase' accept. "
-"However, `--fetch-all` only fetches from the current [svn-remote], and not "
-"all [svn-remote] definitions."
+msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:224
-msgid ""
-"Like 'git rebase'; this requires that the working tree be clean and have no "
-"uncommitted changes."
+msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
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."
+msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
msgstr ""
#. type: Labeled list
@@ -60470,18 +47059,12 @@ 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 "
-"SVN and head). This will create a revision in SVN for each commit in Git."
+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 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 "
-"current branch."
+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 current branch."
msgstr ""
#. type: Plain text
@@ -60502,12 +47085,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:253
-msgid ""
-"Commit to this SVN URL (the full path). This is intended to allow existing "
-"'git svn' repositories created with one transport method (e.g. `svn://` or "
-"`http://` for anonymous read) to be reused if a user is later given access "
-"to an alternate transport method (e.g. `svn+ssh://` or `https://`) for "
-"commit."
+msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
msgstr ""
#. type: Plain text
@@ -60520,17 +47098,12 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:261
-msgid ""
-"Note that the SVN URL of the commiturl config key includes the SVN branch. "
-"If you rather want to set the commit URL for an entire SVN repository use "
-"svn-remote.<name>.pushurl instead."
+msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:264
-msgid ""
-"Using this option for any other purpose (don't ask) is very strongly "
-"discouraged."
+msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
msgstr ""
#. type: Labeled list
@@ -60541,13 +47114,7 @@ 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\"`)"
+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\"`)"
msgstr ""
#. type: Plain text
@@ -60558,26 +47125,17 @@ 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:285
-msgid ""
-"Ask the user to confirm that a patch set should actually be sent to SVN. "
-"For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard "
-"this patch), \"all\" (accept all patches), or \"quit\"."
+msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:288
-msgid ""
-"'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", "
-"without committing anything to SVN."
+msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
msgstr ""
#. type: Labeled list
@@ -60593,7 +47151,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:293
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--message"
msgstr "--message"
@@ -60604,15 +47162,13 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:297
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--tag"
msgstr "--tag"
#. type: Plain text
#: en/git-svn.txt:300
-msgid ""
-"Create a tag by using the tags_subdir instead of the branches_subdir "
-"specified during git svn init."
+msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
msgstr ""
#. type: Labeled list
@@ -60630,54 +47186,39 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:310
-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 "
-"refspecs with the commands"
+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 refspecs with the commands"
msgstr ""
#. type: Plain text
#: en/git-svn.txt:313
-msgid ""
-"git config --get-all svn-remote.<name>.branches git config --get-all svn-"
-"remote.<name>.tags"
+msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
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)."
+msgid "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, ignore-translated
+#, no-wrap
msgid "--username"
msgstr "--username"
#. type: Plain text
#: en/git-svn.txt:320
-msgid ""
-"Specify the SVN username to perform the commit as. This option overrides "
-"the 'username' configuration property."
+msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:321
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--commit-url"
msgstr "--commit-url"
#. type: Plain text
#: en/git-svn.txt:326
-msgid ""
-"Use the specified URL to connect to the destination Subversion repository. "
-"This is useful in cases where the source SVN repository is read-only. This "
-"option overrides configuration property 'commiturl'."
+msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
msgstr ""
#. type: Plain text
@@ -60687,16 +47228,13 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:330 en/rev-list-options.txt:786
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--parents"
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."
+msgid "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
@@ -60707,8 +47245,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:338
-msgid ""
-"Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
+msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
msgstr ""
#. type: Labeled list
@@ -60719,9 +47256,7 @@ 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."
+msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
msgstr ""
#. type: Plain text
@@ -60743,15 +47278,12 @@ 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
#: en/git-svn.txt:354
-msgid ""
-"it's not completely compatible with the --verbose output in svn log, but "
-"reasonably close."
+msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
msgstr ""
#. type: Labeled list
@@ -60777,7 +47309,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:364
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--show-commit"
msgstr "--show-commit"
@@ -60788,7 +47320,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:366 en/pretty-options.txt:31
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--oneline"
msgstr "--oneline"
@@ -60799,10 +47331,7 @@ 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). "
-"This command has the same behaviour."
+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). This command has the same behaviour."
msgstr ""
#. type: Plain text
@@ -60818,27 +47347,18 @@ msgstr ""
#. type: Plain text
#: 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 "
-"are ignored; the version of the file in the HEAD revision is annotated. "
-"Unknown arguments are passed directly to 'git blame'."
+msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:384
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--git-format"
msgstr "--git-format"
#. type: Plain text
#: en/git-svn.txt:389
-msgid ""
-"Produce output in the same format as 'git blame', but with SVN revision "
-"numbers instead of Git commit hashes. In this mode, changes that haven't "
-"been committed to SVN (including local working-copy edits) are shown as "
-"revision 0."
+msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
msgstr ""
#. type: Labeled list
@@ -60849,11 +47369,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -60864,29 +47380,24 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:397
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--before"
msgstr "--before"
#. type: Plain text
#: en/git-svn.txt:401
-msgid ""
-"Don't require an exact match if given an SVN revision, instead find the "
-"commit corresponding to the state of the SVN repository (on the current "
-"branch) at the specified revision."
+msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:403
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--after"
msgstr "--after"
#. type: Plain text
#: en/git-svn.txt:407
-msgid ""
-"Don't require an exact match if given an SVN revision; if there is not an "
-"exact match return the closest match searching forward in the history."
+msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
msgstr ""
#. type: Labeled list
@@ -60897,13 +47408,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"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."
+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 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."
msgstr ""
#. type: Labeled list
@@ -60914,10 +47419,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:422
-msgid ""
-"Recursively finds the svn:ignore property on directories and creates "
-"matching .gitignore files. The resulting files are staged to be committed, "
-"but are not committed. Use -r/--revision to refer to a specific revision."
+msgid "Recursively finds the svn:ignore property on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
msgstr ""
#. type: Labeled list
@@ -60928,9 +47430,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:427
-msgid ""
-"Recursively finds and lists the svn:ignore property on directories. The "
-"output is suitable for appending to the $GIT_DIR/info/exclude file."
+msgid "Recursively finds and lists the svn:ignore property on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
msgstr ""
#. type: Labeled list
@@ -60941,13 +47441,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:436
-msgid ""
-"Attempts to recreate empty directories that core Git cannot track based on "
-"information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty "
-"directories are automatically recreated when using \"git svn clone\" and "
-"\"git svn rebase\", so \"mkdirs\" is intended for use after commands like "
-"\"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs "
-"config file option for more information.)"
+msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
msgstr ""
#. type: Labeled list
@@ -60958,14 +47452,7 @@ msgstr ""
#. type: Plain text
#: 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) "
-"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."
+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) 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."
msgstr ""
#. type: Labeled list
@@ -60976,10 +47463,7 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
@@ -60990,9 +47474,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:457
-msgid ""
-"Lists the properties stored in the Subversion repository about a given file "
-"or directory. Use -r/--revision to refer to a specific Subversion revision."
+msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
msgstr ""
#. type: Labeled list
@@ -61003,9 +47485,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:461
-msgid ""
-"Gets the Subversion property given as the first argument, for a file. A "
-"specific revision can be specified with -r/--revision."
+msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
msgstr ""
#. type: Labeled list
@@ -61016,9 +47496,7 @@ 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."
+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."
msgstr ""
#. type: delimited block -
@@ -61029,9 +47507,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:475
-msgid ""
-"This will set the property 'svn:keywords' to 'FreeBSD=%H' for the file "
-"'devel/py-tipper/Makefile'."
+msgid "This will set the property 'svn:keywords' to 'FreeBSD=%H' for the file 'devel/py-tipper/Makefile'."
msgstr ""
#. type: Labeled list
@@ -61042,16 +47518,12 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:479
-msgid ""
-"Shows the Subversion externals. Use -r/--revision to specify a specific "
-"revision."
+msgid "Shows the Subversion externals. Use -r/--revision to specify a specific revision."
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."
+msgid "Compress $GIT_DIR/svn/<refname>/unhandled.log files and remove $GIT_DIR/svn/<refname>/index files."
msgstr ""
#. type: Labeled list
@@ -61062,24 +47534,12 @@ msgstr ""
#. type: Plain text
#: 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 "
-"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 "
-"be ignored forever (with --ignore-paths) the only way to repair the repo is "
-"to use 'reset'."
+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 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 be ignored forever (with --ignore-paths) the only way to repair the repo is to use 'reset'."
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."
+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."
msgstr ""
#. type: Labeled list
@@ -61096,15 +47556,12 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:504
-msgid ""
-"Specify the most recent revision to keep. All later revisions are "
-"discarded."
+msgid "Specify the most recent revision to keep. All later revisions are discarded."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:508
-msgid ""
-"Discard the specified revision as well, keeping the nearest parent instead."
+msgid "Discard the specified revision as well, keeping the nearest parent instead."
msgstr ""
#. type: Plain text
@@ -61123,9 +47580,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:519
-msgid ""
-"Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be "
-"incomplete in the first place. Then:"
+msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
msgstr ""
#. type: Plain text
@@ -61147,9 +47602,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:533
-msgid ""
-"Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your "
-"history will not be compatible with a future 'dcommit'!"
+msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
msgstr ""
#. type: Plain text
@@ -61175,8 +47628,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:550
-msgid ""
-"Only used with the 'init' command. These are passed directly to 'git init'."
+msgid "Only used with the 'init' command. These are passed directly to 'git init'."
msgstr ""
#. type: Labeled list
@@ -61198,17 +47650,12 @@ 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:562
-msgid ""
-"This can allow you to make partial mirrors when running fetch; but is "
-"generally not recommended because history will be skipped and lost."
+msgid "This can allow you to make partial mirrors when running fetch; but is generally not recommended because history will be skipped and lost."
msgstr ""
#. type: Labeled list
@@ -61224,15 +47671,12 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:570
-msgid ""
-"Read a list of commits from stdin and commit them in reverse order. Only "
-"the leading sha1 is read from each line, so 'git rev-list --pretty=oneline' "
-"output can be used."
+msgid "Read a list of commits from stdin and commit them in reverse order. Only the leading sha1 is read from each line, so 'git rev-list --pretty=oneline' output can be used."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:571
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--rmdir"
msgstr "--rmdir"
@@ -61243,11 +47687,7 @@ 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."
+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."
msgstr ""
#. type: Plain text
@@ -61258,9 +47698,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:590
-msgid ""
-"Edit the commit message before committing to SVN. This is off by default "
-"for objects that are commits, and forced on when committing tree objects."
+msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
msgstr ""
#. type: Plain text
@@ -61271,9 +47709,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:600
-msgid ""
-"They are both passed directly to 'git diff-tree'; see linkgit:git-diff-"
-"tree[1] for more information."
+msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
msgstr ""
#. type: Plain text
@@ -61309,12 +47745,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"'git svn' command after the authors-file is modified should continue "
-"operation."
+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 'git svn' command after the authors-file is modified should continue operation."
msgstr ""
#. type: Plain text
@@ -61331,12 +47762,7 @@ 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 "
-"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."
+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 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."
msgstr ""
#. type: Plain text
@@ -61347,9 +47773,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:636
-msgid ""
-"Make 'git svn' less verbose. Specify a second time to make it even less "
-"verbose."
+msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
msgstr ""
#. type: Labeled list
@@ -61365,51 +47789,38 @@ 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')."
+msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:652
-msgid ""
-"This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
+msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:655
-msgid ""
-"For 'dcommit', print out the series of Git arguments that would show which "
-"diffs would be committed to SVN."
+msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:659
-msgid ""
-"For 'rebase', display the local branch associated with the upstream svn "
-"repository associated with the current branch and the URL of svn repository "
-"that will be fetched from."
+msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:662
-msgid ""
-"For 'branch' and 'tag', display the urls that will be used for copying when "
-"creating the branch or tag."
+msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:663
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--use-log-author"
msgstr "--use-log-author"
#. type: Plain text
#: en/git-svn.txt:667
-msgid ""
-"When retrieving svn commits into Git (as part of 'fetch', 'rebase', or "
-"'dcommit' operations), look for the first `From:` or `Signed-off-by:` line "
-"in the log message and use that as the author string."
+msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` or `Signed-off-by:` line in the log message and use that as the author string."
msgstr ""
#. type: Plain text
@@ -61420,18 +47831,13 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:671
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--add-author-from"
msgstr "--add-author-from"
#. type: Plain text
#: en/git-svn.txt:677
-msgid ""
-"When committing to svn from Git (as part of 'commit-diff', 'set-tree' or "
-"'dcommit' operations), if the existing log message doesn't already have a "
-"`From:` or `Signed-off-by:` line, append a `From:` line based on the Git "
-"commit's author string. If you use this, then `--use-log-author` will "
-"retrieve a valid author string for all commits."
+msgid "When committing to svn from Git (as part of 'commit-diff', 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by:` line, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
msgstr ""
#. type: Plain text
@@ -61461,11 +47867,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:690
-msgid ""
-"This sets GIT_SVN_ID (instead of using the environment). This allows the "
-"user to override the default refname to fetch from when tracking a single "
-"URL. The 'log' and 'dcommit' commands no longer require this switch as an "
-"argument."
+msgid "This sets GIT_SVN_ID (instead of using the environment). This allows the user to override the default refname to fetch from when tracking a single URL. The 'log' and 'dcommit' commands no longer require this switch as an argument."
msgstr ""
#. type: Labeled list
@@ -61483,31 +47885,18 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:696
-msgid ""
-"Specify the [svn-remote \"<remote name>\"] section to use, this allows SVN "
-"multiple repositories to be tracked. Default: \"svn\""
+msgid "Specify the [svn-remote \"<remote name>\"] section to use, this allows SVN multiple repositories to be tracked. Default: \"svn\""
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:697
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--follow-parent"
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 "
-"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 "
-"that there will be no information on where branches were branched off or "
-"merged. However, following long/convoluted histories can take a long time, "
-"so disabling this feature may speed up the cloning process. This feature is "
-"enabled by default, use --no-follow-parent to disable it."
+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 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 that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
msgstr ""
#. type: Plain text
@@ -61541,30 +47930,17 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:727
-msgid ""
-"This option can only be used for one-shot imports as 'git svn' will not be "
-"able to fetch again without metadata. Additionally, if you lose your "
-"'$GIT_DIR/svn/\\*\\*/.rev_map.*' files, 'git svn' will not be able to "
-"rebuild them."
+msgid "This option can only be used for one-shot imports as 'git svn' will not be able to fetch again without metadata. Additionally, if you lose your '$GIT_DIR/svn/\\*\\*/.rev_map.*' files, 'git svn' will not be able to rebuild them."
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."
+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."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:739
-msgid ""
-"This option is NOT recommended as it makes it difficult to track down old "
-"references to SVN revision numbers in existing documentation, bug reports "
-"and archives. If you plan to eventually migrate from SVN to Git and are "
-"certain about dropping SVN history, consider linkgit:git-filter-branch[1] "
-"instead. filter-branch also allows reformatting of metadata for ease-of-"
-"reading and rewriting authorship info for non-\"svn.authorsFile\" users."
+msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider linkgit:git-filter-branch[1] instead. filter-branch also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
msgstr ""
#. type: Labeled list
@@ -61581,20 +47957,12 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:744
-msgid ""
-"This allows 'git svn' to re-map repository URLs and UUIDs from mirrors "
-"created using SVN::Mirror (or svk) for metadata."
+msgid "This allows 'git svn' to re-map repository URLs and UUIDs from mirrors created using SVN::Mirror (or svk) for metadata."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:752
-msgid ""
-"If an SVN revision has a property, \"svm:headrev\", it is likely that the "
-"revision was created by SVN::Mirror (also used by SVK). The property "
-"contains a repository UUID and a revision. We want to make it look like we "
-"are mirroring the original URL, so introduce a helper function that returns "
-"the original identity URL and UUID, and use it when generating metadata in "
-"commit messages."
+msgid "If an SVN revision has a property, \"svm:headrev\", it is likely that the revision was created by SVN::Mirror (also used by SVK). The property contains a repository UUID and a revision. We want to make it look like we are mirroring the original URL, so introduce a helper function that returns the original identity URL and UUID, and use it when generating metadata in commit messages."
msgstr ""
#. type: Labeled list
@@ -61611,9 +47979,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:758
-msgid ""
-"Similar to the useSvmProps option; this is for users of the svnsync(1) "
-"command distributed with SVN 1.4.x and later."
+msgid "Similar to the useSvmProps option; this is for users of the svnsync(1) command distributed with SVN 1.4.x and later."
msgstr ""
#. type: Labeled list
@@ -61624,11 +47990,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:765
-msgid ""
-"This allows users to create repositories from alternate URLs. For example, "
-"an administrator could run 'git svn' on the server locally (accessing via "
-"file://) but wish to distribute the repository with a public http:// or "
-"svn:// URL in the metadata so users of it will see the public URL."
+msgid "This allows users to create repositories from alternate URLs. For example, an administrator could run 'git svn' on the server locally (accessing via file://) but wish to distribute the repository with a public http:// or svn:// URL in the metadata so users of it will see the public URL."
msgstr ""
#. type: Labeled list
@@ -61639,10 +48001,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:771
-msgid ""
-"Similar to the useSvmProps option; this is for users who need to remap the "
-"UUID manually. This may be useful in situations where the original UUID is "
-"not available via either useSvmProps or useSvnsyncProps."
+msgid "Similar to the useSvmProps option; this is for users who need to remap the UUID manually. This may be useful in situations where the original UUID is not available via either useSvmProps or useSvnsyncProps."
msgstr ""
#. type: Labeled list
@@ -61653,13 +48012,7 @@ 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 "
-"point to the same repository. Unlike 'commiturl', 'pushurl' is a base path. "
-"If either 'commiturl' or 'pushurl' could be used, 'commiturl' takes "
-"precedence."
+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 point to the same repository. Unlike 'commiturl', 'pushurl' is a base path. If either 'commiturl' or 'pushurl' could be used, 'commiturl' takes precedence."
msgstr ""
#. type: Labeled list
@@ -61670,12 +48023,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:790
-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\"."
+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\"."
msgstr ""
#. type: Labeled list
@@ -61686,11 +48034,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:796
-msgid ""
-"This instructs git svn to recode pathnames to a given encoding. It can be "
-"used by windows users and by those who work in non-utf8 locales to avoid "
-"corrupted file names with non-ASCII characters. Valid encodings are the "
-"ones supported by Perl's Encode module."
+msgid "This instructs git svn to recode pathnames to a given encoding. It can be used by windows users and by those who work in non-utf8 locales to avoid corrupted file names with non-ASCII characters. Valid encodings are the ones supported by Perl's Encode module."
msgstr ""
#. type: Labeled list
@@ -61701,29 +48045,17 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:804
-msgid ""
-"Normally, the \"git svn clone\" and \"git svn rebase\" commands attempt to "
-"recreate empty directories that are in the Subversion repository. If this "
-"option is set to \"false\", then empty directories will only be created if "
-"the \"git svn mkdirs\" command is run explicitly. If unset, 'git svn' "
-"assumes this option to be \"true\"."
+msgid "Normally, the \"git svn clone\" and \"git svn rebase\" commands attempt to recreate empty directories that are in the Subversion repository. If this option is set to \"false\", then empty directories will only be created if the \"git svn mkdirs\" command is run explicitly. If unset, 'git svn' assumes this option to be \"true\"."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:813
-msgid ""
-"Additionally, only one of these options can be used per svn-remote section "
-"because they affect the 'git-svn-id:' metadata line, except for rewriteRoot "
-"and rewriteUUID which can be used together."
+msgid "Additionally, only one of these options can be used per svn-remote section because they affect the 'git-svn-id:' metadata line, except for rewriteRoot and rewriteUUID which can be used together."
msgstr ""
#. type: Title -
@@ -61735,9 +48067,7 @@ msgstr "EXEMPLES"
#. type: Plain text
#: en/git-svn.txt:820
-msgid ""
-"Tracking and contributing to the trunk of a Subversion-managed project "
-"(ignoring tags and branches):"
+msgid "Tracking and contributing to the trunk of a Subversion-managed project (ignoring tags and branches):"
msgstr ""
#. type: delimited block -
@@ -61764,9 +48094,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:842
-msgid ""
-"Tracking and contributing to an entire Subversion-managed project (complete "
-"with a trunk, tags and branches):"
+msgid "Tracking and contributing to an entire Subversion-managed project (complete with a trunk, tags and branches):"
msgstr ""
#. type: delimited block -
@@ -61790,13 +48118,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:865
-msgid ""
-"The initial 'git svn clone' can be quite time-consuming (especially for "
-"large Subversion repositories). If multiple people (or one person with "
-"multiple machines) want to use 'git svn' to interact with the same "
-"Subversion repository, you can do the initial 'git svn clone' to a "
-"repository on a server and have each person clone that repository with 'git "
-"clone':"
+msgid "The initial 'git svn clone' can be quite time-consuming (especially for large Subversion repositories). If multiple people (or one person with multiple machines) want to use 'git svn' to interact with the same Subversion repository, you can do the initial 'git svn clone' to a repository on a server and have each person clone that repository with 'git clone':"
msgstr ""
#. type: delimited block -
@@ -61832,24 +48154,12 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:895
-msgid ""
-"Prefer to use 'git svn rebase' or 'git rebase', rather than 'git pull' or "
-"'git merge' to synchronize unintegrated commits with a 'git svn' branch. "
-"Doing so will keep the history of unintegrated commits linear with respect "
-"to the upstream SVN repository and allow the use of the preferred 'git svn "
-"dcommit' subcommand to push unintegrated commits back into SVN."
+msgid "Prefer to use 'git svn rebase' or 'git rebase', rather than 'git pull' or 'git merge' to synchronize unintegrated commits with a 'git svn' branch. Doing so will keep the history of unintegrated commits linear with respect to the upstream SVN repository and allow the use of the preferred 'git svn dcommit' subcommand to push unintegrated commits back into SVN."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:903
-msgid ""
-"Originally, 'git svn' recommended that developers pulled or merged from the "
-"'git svn' branch. This was because the author favored `git svn set-tree B` "
-"to commit a single head rather than the `git svn set-tree A..B` notation to "
-"commit multiple commits. Use of 'git pull' or 'git merge' with `git svn set-"
-"tree A..B` will cause non-linear history to be flattened when committing "
-"into SVN and this can lead to merge commits unexpectedly reversing previous "
-"commits in SVN."
+msgid "Originally, 'git svn' recommended that developers pulled or merged from the 'git svn' branch. This was because the author favored `git svn set-tree B` to commit a single head rather than the `git svn set-tree A..B` notation to commit multiple commits. Use of 'git pull' or 'git merge' with `git svn set-tree A..B` will cause non-linear history to be flattened when committing into SVN and this can lead to merge commits unexpectedly reversing previous commits in SVN."
msgstr ""
#. type: Title -
@@ -61860,12 +48170,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:912
-msgid ""
-"While 'git svn' can track copy history (including branches and tags) for "
-"repositories adopting a standard layout, it cannot yet represent merge "
-"history that happened inside git back upstream to SVN users. Therefore it "
-"is advised that users keep history as linear as possible inside Git to ease "
-"compatibility with SVN (see the CAVEATS section below)."
+msgid "While 'git svn' can track copy history (including branches and tags) for repositories adopting a standard layout, it cannot yet represent merge history that happened inside git back upstream to SVN users. Therefore it is advised that users keep history as linear as possible inside Git to ease compatibility with SVN (see the CAVEATS section below)."
msgstr ""
#. type: Title -
@@ -61876,89 +48181,42 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:922
-msgid ""
-"If 'git svn' is configured to fetch branches (and --follow-branches is in "
-"effect), it sometimes creates multiple Git branches for one SVN branch, "
-"where the additional branches have names of the form 'branchname@nnn' (with "
-"nnn an SVN revision number). These additional branches are created if 'git "
-"svn' cannot find a parent commit for the first commit in an SVN branch, to "
-"connect the branch to the history of the other branches."
+msgid "If 'git svn' is configured to fetch branches (and --follow-branches is in effect), it sometimes creates multiple Git branches for one SVN branch, where the additional branches have names of the form 'branchname@nnn' (with nnn an SVN revision number). These additional branches are created if 'git svn' cannot find a parent commit for the first commit in an SVN branch, to connect the branch to the history of the other branches."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:938
-msgid ""
-"Normally, the first commit in an SVN branch consists of a copy operation. "
-"'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 "
-"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 "
-"create a Git branch, but instead of using an existing Git commit as the "
-"parent of the branch, it will read the SVN history of the directory the "
-"branch was copied from and create appropriate Git commits. This is "
-"indicated by the message \"Initializing parent: <branchname>\"."
+msgid "Normally, the first commit in an SVN branch consists of a copy operation. '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 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 create a Git branch, but instead of using an existing Git commit as the parent of the branch, it will read the SVN history of the directory the branch was copied from and create appropriate Git commits. This is indicated by the message \"Initializing parent: <branchname>\"."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:945
-msgid ""
-"Additionally, it will create a special branch named '<branchname>@<SVN-"
-"Revision>', where <SVN-Revision> is the SVN revision number the branch was "
-"copied from. This branch will point to the newly created parent commit of "
-"the branch. If in SVN the branch was deleted and later recreated from a "
-"different version, there will be multiple such branches with an '@'."
+msgid "Additionally, it will create a special branch named '<branchname>@<SVN-Revision>', where <SVN-Revision> is the SVN revision number the branch was copied from. This branch will point to the newly created parent commit of the branch. If in SVN the branch was deleted and later recreated from a different version, there will be multiple such branches with an '@'."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:948
-msgid ""
-"Note that this may mean that multiple Git commits are created for a single "
-"SVN revision."
+msgid "Note that this may mean that multiple Git commits are created for a single SVN revision."
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 "
-"'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 "
-"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/)."
+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 '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 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 ""
#. type: Plain text
#: en/git-svn.txt:968
-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 "
-"just 'dcommit'ing to the SVN repository."
+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 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:977
-msgid ""
-"If you do merge, note the following rule: 'git svn dcommit' will attempt to "
-"commit on top of the SVN commit named in"
+msgid "If you do merge, note the following rule: 'git svn dcommit' will attempt to commit on top of the SVN commit named in"
msgstr ""
#. type: delimited block -
@@ -61969,67 +48227,32 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:984
-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."
+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."
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 "
-"using 'git svn' should use 'rsync' for cloning, if cloning is to be done at "
-"all."
+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 using 'git svn' should use 'rsync' for cloning, if cloning is to be done at all."
msgstr ""
#. type: Plain text
#: 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 "
-"linkgit:git-push[1] documentation for details."
+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 linkgit:git-push[1] documentation for details."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1014
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1021
-msgid ""
-"When using multiple --branches or --tags, 'git svn' does not automatically "
-"handle name collisions (for example, if two branches from different paths "
-"have the same name, or if a branch and a tag have the same name). In these "
-"cases, use 'init' to set up your Git repository then, before your first "
-"'fetch', edit the $GIT_DIR/config file so that the branches and tags are "
-"associated with different name spaces. For example:"
+msgid "When using multiple --branches or --tags, 'git svn' does not automatically handle name collisions (for example, if two branches from different paths have the same name, or if a branch and a tag have the same name). In these cases, use 'init' to set up your Git repository then, before your first 'fetch', edit the $GIT_DIR/config file so that the branches and tags are associated with different name spaces. For example:"
msgstr ""
#. type: Plain text
@@ -62042,40 +48265,22 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:1030
-msgid ""
-"We ignore all SVN properties except svn:executable. Any unhandled "
-"properties are logged to $GIT_DIR/svn/<refname>/unhandled.log"
+msgid "We ignore all SVN properties except svn:executable. Any unhandled properties are logged to $GIT_DIR/svn/<refname>/unhandled.log"
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 "
-"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."
+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 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."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1043
-msgid ""
-"In SVN, it is possible (though discouraged) to commit changes to a tag "
-"(because a tag is just a directory copy, thus technically the same as a "
-"branch). When cloning an SVN repository, 'git svn' cannot know if such a "
-"commit to a tag will happen in the future. Thus it acts conservatively and "
-"imports all SVN tags as branches, prefixing the tag name with 'tags/'."
+msgid "In SVN, it is possible (though discouraged) to commit changes to a tag (because a tag is just a directory copy, thus technically the same as a branch). When cloning an SVN repository, 'git svn' cannot know if such a commit to a tag will happen in the future. Thus it acts conservatively and imports all SVN tags as branches, prefixing the tag name with 'tags/'."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1054
-msgid ""
-"'git svn' stores [svn-remote] configuration information in the repository "
-"$GIT_DIR/config file. It is similar the core Git [remote] sections except "
-"'fetch' keys do not accept glob arguments; but they are instead handled by "
-"the 'branches' and 'tags' keys. Since some SVN repositories are oddly "
-"configured with multiple projects glob expansions such those listed below "
-"are allowed:"
+msgid "'git svn' stores [svn-remote] configuration information in the repository $GIT_DIR/config file. It is similar the core Git [remote] sections except 'fetch' keys do not accept glob arguments; but they are instead handled by the 'branches' and 'tags' keys. Since some SVN repositories are oddly configured with multiple projects glob expansions such those listed below are allowed:"
msgstr ""
#. type: delimited block -
@@ -62132,9 +48337,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:1084
-msgid ""
-"It is also possible to fetch a subset of branches or tags by using a comma-"
-"separated list of names within braces. For example:"
+msgid "It is also possible to fetch a subset of branches or tags by using a comma-separated list of names within braces. For example:"
msgstr ""
#. type: delimited block -
@@ -62168,9 +48371,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:1107
-msgid ""
-"Creating a branch in such a configuration requires disambiguating which "
-"location to use using the -d or --destination flag:"
+msgid "Creating a branch in such a configuration requires disambiguating which location to use using the -d or --destination flag:"
msgstr ""
#. type: delimited block -
@@ -62181,11 +48382,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:1116
-msgid ""
-"Note that git-svn keeps track of the highest revision in which a branch or "
-"tag has appeared. If the subset of branches or tags is changed after "
-"fetching, then $GIT_DIR/svn/.metadata must be manually edited to remove (or "
-"reset) branches-maxRev and/or tags-maxRev as appropriate."
+msgid "Note that git-svn keeps track of the highest revision in which a branch or tag has appeared. If the subset of branches or tags is changed after fetching, then $GIT_DIR/svn/.metadata must be manually edited to remove (or reset) branches-maxRev and/or tags-maxRev as appropriate."
msgstr ""
#. type: Labeled list
@@ -62196,23 +48393,17 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:1125
-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)."
+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)."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1129
-msgid ""
-"'git svn fetch' and 'git svn rebase' automatically update the rev_map if it "
-"is missing or not up to date. 'git svn reset' automatically rewinds it."
+msgid "'git svn fetch' and 'git svn rebase' automatically update the rev_map if it is missing or not up to date. 'git svn reset' automatically rewinds it."
msgstr ""
#. type: Title =
#: en/git-symbolic-ref.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-symbolic-ref(1)"
msgstr "git-symbolic-ref(1)"
@@ -62232,32 +48423,22 @@ 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 "
-"would give `HEAD` as the <name> argument to see which branch your working "
-"tree is on."
+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 would give `HEAD` as the <name> argument to see which branch your working tree is on."
msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:24
-msgid ""
-"Given two arguments, creates or updates a symbolic ref <name> to point at "
-"the given branch <ref>."
+msgid "Given two arguments, creates or updates a symbolic ref <name> to point at the given branch <ref>."
msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:27
-msgid ""
-"Given `--delete` and an additional argument, deletes the given symbolic ref."
+msgid "Given `--delete` and an additional argument, deletes the given symbolic ref."
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 "
-"`ref: refs/heads/master`."
+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 `ref: refs/heads/master`."
msgstr ""
#. type: Plain text
@@ -62267,47 +48448,32 @@ msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:44
-msgid ""
-"Do not issue an error message if the <name> is not a symbolic ref but a "
-"detached HEAD; instead exit with non-zero status silently."
+msgid "Do not issue an error message if the <name> is not a symbolic ref but a detached HEAD; instead exit with non-zero status silently."
msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:48
-msgid ""
-"When showing the value of <name> as a symbolic ref, try to shorten the "
-"value, e.g. from `refs/heads/master` to `master`."
+msgid "When showing the value of <name> as a symbolic ref, try to shorten the value, e.g. from `refs/heads/master` to `master`."
msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:52
-msgid ""
-"Update the reflog for <name> with <reason>. This is valid only when "
-"creating or updating a symbolic ref."
+msgid "Update the reflog for <name> with <reason>. This is valid only when creating or updating a symbolic ref."
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."
+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."
msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:66
-msgid ""
-"'git symbolic-ref' will exit with status 0 if the contents of the symbolic "
-"ref were printed correctly, with status 1 if the requested name is not a "
-"symbolic ref, or 128 if another error occurs."
+msgid "'git symbolic-ref' will exit with status 0 if the contents of the symbolic ref were printed correctly, with status 1 if the requested name is not a symbolic ref, or 128 if another error occurs."
msgstr ""
#. type: Title =
#: en/git-tag.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-tag(1)"
msgstr "git-tag(1)"
@@ -62331,9 +48497,7 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:25
-msgid ""
-"Add a tag reference in `refs/tags/`, unless `-d/-l/-v` is given to delete, "
-"list or verify tags."
+msgid "Add a tag reference in `refs/tags/`, unless `-d/-l/-v` is given to delete, list or verify tags."
msgstr ""
#. type: Plain text
@@ -62343,51 +48507,32 @@ 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 "
-"given, an editor is started for the user to type in the tag message."
+msgid "If one of `-a`, `-s`, or `-u <keyid>` is passed, the command creates a 'tag' object, and requires a tag message. Unless `-m <msg>` or `-F <file>` is given, an editor is started for the user to type in the tag message."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:35
-msgid ""
-"If `-m <msg>` or `-F <file>` is given and `-a`, `-s`, and `-u <keyid>` are "
-"absent, `-a` is implied."
+msgid "If `-m <msg>` or `-F <file>` is given and `-a`, `-s`, and `-u <keyid>` are absent, `-a` is implied."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:38
-msgid ""
-"Otherwise just a tag reference for the SHA-1 object name of the commit "
-"object is created (i.e. a lightweight tag)."
+msgid "Otherwise just a tag reference for the SHA-1 object name of the commit object is created (i.e. a lightweight tag)."
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 "
-"`gpg.program` is used to specify custom GnuPG binary."
+msgid "A GnuPG signed tag object will be created when `-s` or `-u <keyid>` is used. When `-u <keyid>` is not used, the committer identity for the current user is used to find the GnuPG key for signing. \tThe configuration variable `gpg.program` is used to specify custom GnuPG binary."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:50
-msgid ""
-"Tag objects (created with `-a`, `-s`, or `-u`) are called \"annotated\" "
-"tags; they contain a creation date, the tagger name and e-mail, a tagging "
-"message, and an optional GnuPG signature. Whereas a \"lightweight\" tag is "
-"simply a name for an object (usually a commit object)."
+msgid "Tag objects (created with `-a`, `-s`, or `-u`) are called \"annotated\" tags; they contain a creation date, the tagger name and e-mail, a tagging message, and an optional GnuPG signature. Whereas a \"lightweight\" tag is simply a name for an object (usually a commit object)."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:55
-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."
+msgid "Annotated tags are meant for release while lightweight tags are meant for private or temporary object labels. For this reason, some git commands for naming objects (like `git describe`) will ignore lightweight tags by default."
msgstr ""
#. type: Plain text
@@ -62397,7 +48542,7 @@ msgstr ""
#. type: Labeled list
#: en/git-tag.txt:64
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--sign"
msgstr "--sign"
@@ -62446,33 +48591,17 @@ 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 "
-"is given to `-n`, only the first line is printed. If the tag is not "
-"annotated, the commit message is displayed instead."
+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 is given to `-n`, only the first line is printed. If the tag is not annotated, the commit message is displayed instead."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:97
-msgid ""
-"List tags with names that match the given pattern (or all if no pattern is "
-"given). Running \"git tag\" without arguments also lists all tags. The "
-"pattern is a shell wildcard (i.e., matched using fnmatch(3)). Multiple "
-"patterns may be given; if any of them matches, the tag is shown."
+msgid "List tags with names that match the given pattern (or all if no pattern is given). Running \"git tag\" without arguments also lists all tags. The pattern is a shell wildcard (i.e., matched using fnmatch(3)). Multiple patterns may be given; if any of them matches, the tag is shown."
msgstr ""
#. type: Plain text
#: 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 "
-"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]."
+msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key. Also supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. The keys supported are the same as those in `git for-each-ref`. Sort order defaults to the value configured for the `tag.sort` variable if it exists, or lexicographic order otherwise. See linkgit:git-config[1]."
msgstr ""
#. type: Plain text
@@ -62482,22 +48611,17 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:122
-msgid ""
-"This option is only applicable when listing tags without annotation lines."
+msgid "This option is only applicable when listing tags without annotation lines."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:126
-msgid ""
-"Only list tags which contain the specified commit (HEAD if not specified)."
+msgid "Only list tags which contain the specified commit (HEAD if not specified)."
msgstr ""
#. type: Plain text
@@ -62514,10 +48638,7 @@ msgstr ""
#| "\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 ""
-"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."
+msgid "Use the given tag message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Implies `-a` if none of `-a`, `-s`, or `-u <keyid>` is given."
msgstr ""
"-m <msg>::\n"
"--message=<msg>::\n"
@@ -62533,10 +48654,7 @@ msgstr ""
#| "--file=<file>::\n"
#| "\tTake the commit message from the given file. Use '-' to\n"
#| "\tread the message from the standard input.\n"
-msgid ""
-"Take the tag message from the given file. Use '-' to read the message from "
-"the standard input. Implies `-a` if none of `-a`, `-s`, or `-u <keyid>` is "
-"given."
+msgid "Take the tag message from the given file. Use '-' to read the message from the standard input. Implies `-a` if none of `-a`, `-s`, or `-u <keyid>` is given."
msgstr ""
"-F <fichier>::\n"
"--file=<fichier>::\n"
@@ -62545,21 +48663,12 @@ 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 "
-"'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."
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`."
+msgid "Create a reflog for the tag. To globally enable reflogs for tags, see `core.logAllRefUpdates` in linkgit:git-config[1]. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logallrefupdates`."
msgstr ""
#. type: Labeled list
@@ -62570,10 +48679,7 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:164
-msgid ""
-"The name of the tag to create, delete, or describe. The new tag name must "
-"pass all checks defined by linkgit:git-check-ref-format[1]. Some of these "
-"checks may restrict the characters allowed in a tag name."
+msgid "The name of the tag to create, delete, or describe. The new tag name must pass all checks defined by linkgit:git-check-ref-format[1]. Some of these checks may restrict the characters allowed in a tag name."
msgstr ""
#. type: Labeled list
@@ -62585,17 +48691,12 @@ msgstr "git-commit(1)"
#. type: Plain text
#: en/git-tag.txt:169
-msgid ""
-"The object that the new tag will refer to, usually a commit. Defaults to "
-"HEAD."
+msgid "The object that the new tag will refer to, usually a commit. Defaults to HEAD."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:175
-msgid ""
-"A string that interpolates `%(fieldname)` from the object pointed at by a "
-"ref being shown. The format is the same as that of linkgit:git-for-each-"
-"ref[1]. When unspecified, defaults to `%(refname:strip=2)`."
+msgid "A string that interpolates `%(fieldname)` from the object pointed at by a ref being shown. The format is the same as that of linkgit:git-for-each-ref[1]. When unspecified, defaults to `%(refname:strip=2)`."
msgstr ""
#. type: Labeled list
@@ -62606,18 +48707,12 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:180
-msgid ""
-"Only list tags whose tips are reachable, or not reachable if `--no-merged` "
-"is used, from the specified commit (`HEAD` if not specified)."
+msgid "Only list tags whose tips are reachable, or not reachable if `--no-merged` is used, from the specified commit (`HEAD` if not specified)."
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 "
-"you want to use a different default key, you can specify it in the "
-"repository configuration as follows:"
+msgid "By default, 'git tag' in sign-with-default mode (-s) will use your committer identity (of the form `Your Name <your@email.address>`) to find a key. If you want to use a different default key, you can specify it in the repository configuration as follows:"
msgstr ""
#. type: delimited block -
@@ -62636,58 +48731,37 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:202
-msgid ""
-"What should you do when you tag a wrong commit and you would want to re-tag?"
+msgid "What should you do when you tag a wrong commit and you would want to re-tag?"
msgstr ""
#. type: Plain text
#: en/git-tag.txt:205
-msgid ""
-"If you never pushed anything out, just re-tag it. Use \"-f\" to replace the "
-"old one. And you're done."
+msgid "If you never pushed anything out, just re-tag it. Use \"-f\" to replace the old one. And you're done."
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:"
+msgid "But if you have pushed things out (or others could just read your repository directly), then others will have already seen the old tag. In that case you can do one of two things:"
msgstr ""
#. 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 "
-"have 'different' \"X\"'s. So just call it \"X.1\" and be done with it."
+msgid "The sane thing. Just admit you screwed up, and use a different name. Others have already seen one tag-name, and if you keep the same name, you may be in the situation that two people both have \"version X\", but they actually have 'different' \"X\"'s. So just call it \"X.1\" and be done with it."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:221
-msgid ""
-"The insane thing. You really want to call the new version \"X\" too, 'even "
-"though' others have already seen the old one. So just use 'git tag -f' "
-"again, as if you hadn't already published the old one."
+msgid "The insane thing. You really want to call the new version \"X\" too, 'even though' others have already seen the old one. So just use 'git tag -f' again, as if you hadn't already published the old one."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:226
-msgid ""
-"However, Git does *not* (and it should not) change tags behind users back. "
-"So if somebody already got the old tag, doing a 'git pull' on your tree "
-"shouldn't just make them overwrite the old one."
+msgid "However, Git does *not* (and it should not) change tags behind users back. So if somebody already got the old tag, doing a 'git pull' on your tree shouldn't just make them overwrite the old one."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:233
-msgid ""
-"If somebody got a release tag from you, you cannot just change the tag for "
-"them by updating your own one. This is a big security issue, in that people "
-"MUST be able to trust their tag-names. If you really want to do the insane "
-"thing, you need to just fess up to it, and tell people that you messed up. "
-"You can do that by making a very public announcement saying:"
+msgid "If somebody got a release tag from you, you cannot just change the tag for them by updating your own one. This is a big security issue, in that people MUST be able to trust their tag-names. If you really want to do the insane thing, you need to just fess up to it, and tell people that you messed up. You can do that by making a very public announcement saying:"
msgstr ""
#. type: delimited block -
@@ -62748,10 +48822,7 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "Does this seem a bit complicated? It *should* be. There is no way that it would be correct to just \"fix\" it automatically. People need to know that their tags might have been changed."
msgstr ""
#. type: Title ~
@@ -62762,28 +48833,17 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:266
-msgid ""
-"If you are following somebody else's tree, you are most likely using remote-"
-"tracking branches (eg. `refs/remotes/origin/master`). You usually want the "
-"tags from the other end."
+msgid "If you are following somebody else's tree, you are most likely using remote-tracking branches (eg. `refs/remotes/origin/master`). You usually want the tags from the other end."
msgstr ""
#. type: Plain text
#: 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 "
-"them. Mere mortals when pulling from each other do not necessarily want to "
-"automatically get private anchor point tags from the other person."
+msgid "On the other hand, if you are fetching because you would want a one-shot merge from somebody else, you typically do not want to get tags from there. This happens more often for people near the toplevel but not limited to them. Mere mortals when pulling from each other do not necessarily want to automatically get private anchor point tags from the other person."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:278
-msgid ""
-"Often, \"please pull\" messages on the mailing list just provide two pieces "
-"of information: a repo URL and a branch name; this is designed to be easily "
-"cut&pasted at the end of a 'git fetch' command line:"
+msgid "Often, \"please pull\" messages on the mailing list just provide two pieces of information: a repo URL and a branch name; this is designed to be easily cut&pasted at the end of a 'git fetch' command line:"
msgstr ""
#. type: delimited block -
@@ -62818,43 +48878,22 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:295
-msgid ""
-"In such a case, you do not want to automatically follow the other person's "
-"tags."
+msgid "In such a case, you do not want to automatically follow the other person's tags."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:303
-msgid ""
-"One important aspect of Git is its distributed nature, which largely means "
-"there is no inherent \"upstream\" or \"downstream\" in the system. On the "
-"face of it, the above example might seem to indicate that the tag namespace "
-"is owned by the upper echelon of people and that tags only flow downwards, "
-"but that is not the case. It only shows that the usage pattern determines "
-"who are interested in whose tags."
+msgid "One important aspect of Git is its distributed nature, which largely means there is no inherent \"upstream\" or \"downstream\" in the system. On the face of it, the above example might seem to indicate that the tag namespace is owned by the upper echelon of people and that tags only flow downwards, but that is not the case. It only shows that the usage pattern determines who are interested in whose tags."
msgstr ""
#. 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 "
-"the former group (that is what \"internal\" means). That is why it is "
-"desirable not to follow tags automatically in this case."
+msgid "A one-shot pull is a sign that a commit history is now crossing the boundary between one circle of people (e.g. \"people who are primarily interested in the networking part of the kernel\") who may have their own set of tags (e.g. \"this is the third release candidate from the networking group to be proposed for general consumption with 2.6.21 release\") to another circle of people (e.g. \"people who integrate various subsystem improvements\"). The latter are usually not interested in the detailed tags used internally in the former group (that is what \"internal\" means). That is why it is desirable not to follow tags automatically in this case."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:321
-msgid ""
-"It may well be that among networking people, they may want to exchange the "
-"tags internal to their group, but in that workflow they are most likely "
-"tracking each other's progress by having remote-tracking branches. Again, "
-"the heuristic to automatically follow such tags is a good thing."
+msgid "It may well be that among networking people, they may want to exchange the tags internal to their group, but in that workflow they are most likely tracking each other's progress by having remote-tracking branches. Again, the heuristic to automatically follow such tags is a good thing."
msgstr ""
#. type: Title ~
@@ -62865,19 +48904,12 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "If you have imported some changes from another VCS and would like to add tags for major releases of your work, it is useful to be able to specify the date to embed inside of the tag object; such data in the tag object affects, for example, the ordering of tags in the gitweb interface."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:335
-msgid ""
-"To set the date used in future tag objects, set the environment variable "
-"GIT_COMMITTER_DATE (see the later discussion of possible values; the most "
-"common form is \"YYYY-MM-DD HH:MM\")."
+msgid "To set the date used in future tag objects, set the environment variable GIT_COMMITTER_DATE (see the later discussion of possible values; the most common form is \"YYYY-MM-DD HH:MM\")."
msgstr ""
#. type: delimited block -
@@ -62889,13 +48921,9 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:348
#, fuzzy
-#| msgid ""
-#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-#| "merge[1], linkgit:git-commit-tree[1]"
+#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgid "linkgit:git-check-ref-format[1]. linkgit:git-config[1]."
-msgstr ""
-"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-"merge[1], linkgit:git-commit-tree[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.txt:2
@@ -62922,42 +48950,27 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git.txt:29
-msgid ""
-"See linkgit:gittutorial[7] to get started, then see linkgit:giteveryday[7] "
-"for a useful minimum set of commands. The link:user-manual.html[Git User's "
-"Manual] has a more in-depth introduction."
+msgid "See linkgit:gittutorial[7] to get started, then see linkgit:giteveryday[7] for a useful minimum set of commands. The link:user-manual.html[Git User's Manual] has a more in-depth introduction."
msgstr ""
#. type: Plain text
#: en/git.txt:34
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git.txt:37
-msgid ""
-"A formatted and hyperlinked copy of the latest Git documentation can be "
-"viewed at `https://git.github.io/htmldocs/git.html`."
+msgid "A formatted and hyperlinked copy of the latest Git documentation can be viewed at `https://git.github.io/htmldocs/git.html`."
msgstr ""
#. type: delimited block =
#: en/git.txt:46
-msgid ""
-"You are reading the documentation for the latest (possibly unreleased) "
-"version of Git, that is available from the 'master' branch of the `git.git` "
-"repository. Documentation for older releases are available here:"
+msgid "You are reading the documentation for the latest (possibly unreleased) version of Git, that is available from the 'master' branch of the `git.git` repository. Documentation for older releases are available here:"
msgstr ""
#. type: delimited block =
@@ -62967,9 +48980,7 @@ 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]."
+msgid "release notes for link:RelNotes/2.12.1.txt[2.12.1]. link:RelNotes/2.12.0.txt[2.12]."
msgstr ""
#. type: delimited block =
@@ -62979,9 +48990,7 @@ 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]."
+msgid "release notes for link:RelNotes/2.11.1.txt[2.11.1], link:RelNotes/2.11.0.txt[2.11]."
msgstr ""
#. type: delimited block =
@@ -62991,9 +49000,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63003,10 +49010,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63016,10 +49020,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63029,10 +49030,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63042,11 +49040,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63056,11 +49050,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63070,14 +49060,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63087,13 +49070,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63103,10 +49080,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63116,10 +49090,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63129,11 +49100,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63143,11 +49110,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63157,11 +49120,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63171,11 +49130,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63185,10 +49140,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63198,10 +49150,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63211,11 +49160,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63225,10 +49170,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63238,10 +49180,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63251,12 +49190,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63266,11 +49200,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63280,12 +49210,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63295,11 +49220,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63309,12 +49230,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63324,11 +49240,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63338,10 +49250,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63351,11 +49260,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63365,11 +49270,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63379,11 +49280,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63393,10 +49290,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63406,13 +49300,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63422,10 +49310,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63435,13 +49320,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63451,11 +49330,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63465,19 +49340,12 @@ 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]."
+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]."
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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63487,10 +49355,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63500,11 +49365,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63514,11 +49375,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63528,11 +49385,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63542,12 +49395,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63557,12 +49405,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63572,11 +49415,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63586,11 +49425,7 @@ 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]."
+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]."
msgstr ""
#. type: delimited block =
@@ -63600,19 +49435,12 @@ 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]."
+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]."
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]."
+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]."
msgstr ""
#. type: Plain text
@@ -63622,19 +49450,12 @@ msgstr ""
#. type: Plain text
#: en/git.txt:542
-msgid ""
-"Prints the synopsis and a list of the most commonly used commands. If the "
-"option `--all` or `-a` is given then all available commands are printed. If "
-"a Git command is named this option will bring up the manual page for that "
-"command."
+msgid "Prints the synopsis and a list of the most commonly used commands. If the option `--all` or `-a` is given then all available commands are printed. If a Git command is named this option will bring up the manual page for that command."
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 "
-"converted internally into `git help ...`."
+msgid "Other options are available to control how the manual page is displayed. See linkgit:git-help[1] for more information, because `git --help ...` is converted internally into `git help ...`."
msgstr ""
#. type: Labeled list
@@ -63646,19 +49467,12 @@ msgstr "patch"
#. type: Plain text
#: en/git.txt:553
-msgid ""
-"Run as if git was started in '<path>' instead of the current working "
-"directory. When multiple `-C` options are given, each subsequent non-"
-"absolute `-C <path>` is interpreted relative to the preceding `-C <path>`."
+msgid "Run as if git was started in '<path>' instead of the current working directory. When multiple `-C` options are given, each subsequent non-absolute `-C <path>` is interpreted relative to the preceding `-C <path>`."
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:"
+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:"
msgstr ""
#. type: Plain text
@@ -63677,19 +49491,12 @@ 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)."
+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)."
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."
+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."
msgstr ""
#. type: Labeled list
@@ -63700,68 +49507,56 @@ msgstr ""
#. type: Plain text
#: en/git.txt:578
-msgid ""
-"Path to wherever your core Git programs are installed. This can also be "
-"controlled by setting the GIT_EXEC_PATH environment variable. If no path is "
-"given, 'git' will print the current setting and then exit."
+msgid "Path to wherever your core Git programs are installed. This can also be controlled by setting the GIT_EXEC_PATH environment variable. If no path is given, 'git' will print the current setting and then exit."
msgstr ""
#. type: Labeled list
#: en/git.txt:579
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--html-path"
msgstr "--html-path"
#. type: Plain text
#: en/git.txt:582
-msgid ""
-"Print the path, without trailing slash, where Git's HTML documentation is "
-"installed and exit."
+msgid "Print the path, without trailing slash, where Git's HTML documentation is installed and exit."
msgstr ""
#. type: Labeled list
#: en/git.txt:583
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--man-path"
msgstr "--man-path"
#. type: Plain text
#: en/git.txt:586
-msgid ""
-"Print the manpath (see `man(1)`) for the man pages for this version of Git "
-"and exit."
+msgid "Print the manpath (see `man(1)`) for the man pages for this version of Git and exit."
msgstr ""
#. type: Labeled list
#: en/git.txt:587
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--info-path"
msgstr "--info-path"
#. type: Plain text
#: en/git.txt:590
-msgid ""
-"Print the path where the Info files documenting this version of Git are "
-"installed and exit."
+msgid "Print the path where the Info files documenting this version of Git are installed and exit."
msgstr ""
#. type: Labeled list
#: en/git.txt:592
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--paginate"
msgstr "--paginate"
#. type: Plain text
#: en/git.txt:597
-msgid ""
-"Pipe all output into 'less' (or if set, $PAGER) if standard output is a "
-"terminal. This overrides the `pager.<cmd>` configuration options (see the "
-"\"Configuration Mechanism\" section below)."
+msgid "Pipe all output into 'less' (or if set, $PAGER) if standard output is a terminal. This overrides the `pager.<cmd>` configuration options (see the \"Configuration Mechanism\" section below)."
msgstr ""
#. type: Labeled list
#: en/git.txt:598
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-pager"
msgstr "--no-pager"
@@ -63778,10 +49573,7 @@ msgstr ""
#. type: Plain text
#: en/git.txt:605
-msgid ""
-"Set the path to the repository. This can also be controlled by setting the "
-"`GIT_DIR` environment variable. It can be an absolute path or relative path "
-"to current working directory."
+msgid "Set the path to the repository. This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
msgstr ""
#. type: Labeled list
@@ -63793,12 +49585,7 @@ msgstr "whitespace"
#. type: Plain text
#: en/git.txt:613
-msgid ""
-"Set the path to the working tree. It can be an absolute path or a path "
-"relative to the current working directory. This can also be controlled by "
-"setting the GIT_WORK_TREE environment variable and the core.worktree "
-"configuration variable (see core.worktree in linkgit:git-config[1] for a "
-"more detailed discussion)."
+msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory. This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
msgstr ""
#. type: Labeled list
@@ -63809,9 +49596,7 @@ msgstr ""
#. type: Plain text
#: en/git.txt:618
-msgid ""
-"Set the Git namespace. See linkgit:gitnamespaces[7] for more details. "
-"Equivalent to setting the `GIT_NAMESPACE` environment variable."
+msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr ""
#. type: Labeled list
@@ -63822,85 +49607,67 @@ 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."
+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."
msgstr ""
#. type: Plain text
#: en/git.txt:628
-msgid ""
-"Treat the repository as a bare repository. If GIT_DIR environment is not "
-"set, it is set to the current working directory."
+msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr ""
#. type: Labeled list
#: en/git.txt:629
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
#. type: Plain text
#: en/git.txt:632
-msgid ""
-"Do not use replacement refs to replace Git objects. See linkgit:git-"
-"replace[1] for more information."
+msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr ""
#. type: Labeled list
#: en/git.txt:633
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
#. type: Plain text
#: en/git.txt:637
-msgid ""
-"Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is "
-"equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to "
-"`1`."
+msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Labeled list
#: en/git.txt:638
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
#. type: Plain text
#: en/git.txt:643
-msgid ""
-"Add \"glob\" magic to all pathspec. This is equivalent to setting the "
-"`GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on "
-"individual pathspecs can be done using pathspec magic \":(literal)\""
+msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
msgstr ""
#. type: Labeled list
#: en/git.txt:644
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
#. type: Plain text
#: en/git.txt:649
-msgid ""
-"Add \"literal\" magic to all pathspec. This is equivalent to setting the "
-"`GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on "
-"individual pathspecs can be done using pathspec magic \":(glob)\""
+msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
msgstr ""
#. type: Labeled list
#: en/git.txt:650
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
#. type: Plain text
#: en/git.txt:653
-msgid ""
-"Add \"icase\" magic to all pathspec. This is equivalent to setting the "
-"`GIT_ICASE_PATHSPECS` environment variable to `1`."
+msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
msgstr ""
#. type: Title -
@@ -63911,9 +49678,7 @@ msgstr ""
#. type: Plain text
#: en/git.txt:659
-msgid ""
-"We divide Git into high level (\"porcelain\") commands and low level "
-"(\"plumbing\") commands."
+msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
msgstr ""
#. type: Title -
@@ -63924,9 +49689,7 @@ msgstr ""
#. type: Plain text
#: en/git.txt:665
-msgid ""
-"We separate the porcelain commands into the main commands and some ancillary"
-" user utilities."
+msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
msgstr ""
#. type: Title ~
@@ -63959,9 +49722,7 @@ msgstr ""
#. type: Plain text
#: en/git.txt:687
-msgid ""
-"These commands are to interact with foreign SCM and with other people via "
-"patch over e-mail."
+msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
msgstr ""
#. type: Title -
@@ -63972,30 +49733,17 @@ msgstr ""
#. type: Plain text
#: en/git.txt:699
-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]."
+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]."
msgstr ""
#. type: Plain text
#: en/git.txt:706
-msgid ""
-"The interface (input, output, set of options and the semantics) to these "
-"low-level commands are meant to be a lot more stable than Porcelain level "
-"commands, because these commands are primarily for scripted use. The "
-"interface to Porcelain commands on the other hand are subject to change in "
-"order to improve the end user experience."
+msgid "The interface (input, output, set of options and the semantics) to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use. The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
msgstr ""
#. type: Plain text
#: en/git.txt:712
-msgid ""
-"The following description divides the low-level commands into commands that "
-"manipulate objects (in the repository, index, and working tree), commands "
-"that interrogate and compare objects, and commands that move objects and "
-"references between repositories."
+msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
msgstr ""
#. type: Title ~
@@ -64012,9 +49760,7 @@ msgstr ""
#. type: Plain text
#: en/git.txt:727
-msgid ""
-"In general, the interrogate commands do not touch the files in the working "
-"tree."
+msgid "In general, the interrogate commands do not touch the files in the working tree."
msgstr ""
#. type: Title ~
@@ -64025,9 +49771,7 @@ msgstr ""
#. type: Plain text
#: en/git.txt:736
-msgid ""
-"The following are helper commands used by the above; end users typically do "
-"not use them directly."
+msgid "The following are helper commands used by the above; end users typically do not use them directly."
msgstr ""
#. type: Title ~
@@ -64038,9 +49782,7 @@ msgstr ""
#. type: Plain text
#: en/git.txt:745
-msgid ""
-"These are internal helper commands used by other commands; end users "
-"typically do not use them directly."
+msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
msgstr ""
#. type: Title -
@@ -64052,9 +49794,7 @@ msgstr "Configuration"
#. type: Plain text
#: en/git.txt:755
-msgid ""
-"Git uses a simple text format to store customizations that are per "
-"repository and are per user. Such a configuration file may look like this:"
+msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
@@ -64088,10 +49828,7 @@ 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 "
-"the configuration mechanism."
+msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
@@ -64128,11 +49865,7 @@ msgstr ""
#. type: Plain text
#: en/git.txt:797
-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>."
+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>."
msgstr ""
#. type: Labeled list
@@ -64144,24 +49877,17 @@ msgstr "git-commit(1)"
#. type: Plain text
#: en/git.txt:803
-msgid ""
-"Indicates a commit or tag object name. A command that takes a <commit-ish> "
-"argument ultimately wants to operate on a <commit> object but automatically "
-"dereferences <tag> objects that point at a <commit>."
+msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
#: en/git.txt:807
-msgid ""
-"Indicates that an object type is required. Currently one of: `blob`, "
-"`tree`, `commit`, or `tag`."
+msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
#: en/git.txt:811
-msgid ""
-"Indicates a filename - almost always relative to the root of the tree "
-"structure `GIT_INDEX_FILE` describes."
+msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
@@ -64172,9 +49898,7 @@ msgstr ""
#. type: Plain text
#: en/git.txt:816
-msgid ""
-"Any Git command accepting any <object> can also use the following symbolic "
-"notation:"
+msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
@@ -64200,9 +49924,7 @@ msgstr ""
#. type: Plain text
#: en/git.txt:830
-msgid ""
-"For a more complete list of ways to spell object names, see \"SPECIFYING "
-"REVISIONS\" section in linkgit:gitrevisions[7]."
+msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
@@ -64223,9 +49945,7 @@ msgstr ""
#. type: Plain text
#: en/git.txt:841
-msgid ""
-"Higher level SCMs may provide and manage additional information in the "
-"`$GIT_DIR`."
+msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
@@ -64252,174 +49972,122 @@ msgstr ""
#. type: Plain text
#: en/git.txt:857
-msgid ""
-"These environment variables apply to 'all' core Git commands. Nb: it is "
-"worth noting that they may be used/overridden by SCMS sitting above Git so "
-"take care if using a foreign front-end."
+msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
#: en/git.txt:858
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. 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."
+msgid "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
#: en/git.txt:863
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
#: en/git.txt:868
-msgid ""
-"This environment variable allows the specification of an index version for "
-"new repositories. It won't affect existing index files. By default index "
-"file version 2 or 3 is used. See linkgit:git-update-index[1] for more "
-"information."
+msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
#: en/git.txt:869
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
#: en/git.txt:875
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. 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."
+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."
msgstr ""
#. type: Plain text
#: en/git.txt:887
-msgid ""
-"Entries that begin with `\"` (double-quote) will be interpreted as C-style "
-"quoted paths, removing leading and trailing double-quotes and respecting "
-"backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-"
-"path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
+msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
#: en/git.txt:888
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. 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-"
-"dir` command-line option also sets this value."
+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-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
#: en/git.txt:894
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
#: en/git.txt:899
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. 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."
+msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
#: en/git.txt:903
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
#: en/git.txt:917
-msgid ""
-"This should be a colon-separated list of absolute paths. If set, it is a "
-"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_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
+msgid "This should be a colon-separated list of absolute paths. If set, it is a 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_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
#: en/git.txt:918
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
#: 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 "
-"not affect an explicit repository directory set via `GIT_DIR` or on the "
-"command line."
+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 not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
#: en/git.txt:928
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
#: en/git.txt:936
-msgid ""
-"If this variable is set to a path, non-worktree files that are normally in "
-"$GIT_DIR will be taken from this path instead. Worktree-specific files such "
-"as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-"
-"layout[5] and linkgit:git-worktree[1] for details. This variable has lower "
-"precedence than other path variables such as GIT_INDEX_FILE, "
-"GIT_OBJECT_DIRECTORY..."
+msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Title ~
@@ -64431,37 +50099,37 @@ msgstr "$ git commit\n"
#. type: Labeled list
#: en/git.txt:939
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
#. type: Labeled list
#: en/git.txt:940
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
#. type: Labeled list
#: en/git.txt:941
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
#. type: Labeled list
#: en/git.txt:942
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
#. type: Labeled list
#: en/git.txt:943
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
#. type: Labeled list
#: en/git.txt:944
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
@@ -64487,32 +50155,24 @@ msgstr "$ git commit\n"
#. type: Labeled list
#: en/git.txt:950
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
#: en/git.txt:955
-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."
+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."
msgstr ""
#. type: Labeled list
#: en/git.txt:956
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
#: 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 "
-"parameters:"
+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 parameters:"
msgstr ""
#. type: Plain text
@@ -64566,31 +50226,22 @@ 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."
+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."
msgstr ""
#. type: Plain text
#: en/git.txt:979
-msgid ""
-"For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter,"
-" <path>."
+msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
#: en/git.txt:982
-msgid ""
-"For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, "
-"`GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
+msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
#: en/git.txt:983
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
@@ -64601,7 +50252,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:986
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
@@ -64612,151 +50263,111 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:991
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
#: en/git.txt:995
-msgid ""
-"A number controlling the amount of output shown by the recursive merge "
-"strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
+msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
#: en/git.txt:996
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
#: en/git.txt:1001
-msgid ""
-"This environment variable overrides `$PAGER`. If it is set to an empty "
-"string or to the value \"cat\", Git will not launch a pager. See also the "
-"`core.pager` option in linkgit:git-config[1]."
+msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
#: en/git.txt:1002
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
#: 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-"
-"config[1]."
+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-config[1]."
msgstr ""
#. type: Labeled list
#: en/git.txt:1008
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
#: en/git.txt:1009
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
#: en/git.txt:1018
-msgid ""
-"If either of these environment variables is set then 'git fetch' and 'git "
-"push' will use the specified command instead of 'ssh' when they need to "
-"connect to a remote system. The command will be given exactly two or four "
-"arguments: the 'username@host' (or just 'host') from the URL and the shell "
-"command to execute on that remote system, optionally preceded by `-p` "
-"(literally) and the 'port' from the URL when it specifies something other "
-"than the default SSH port."
+msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command will be given exactly two or four arguments: the 'username@host' (or just 'host') from the URL and the shell command to execute on that remote system, optionally preceded by `-p` (literally) and the 'port' from the URL when it specifies something other than the default SSH port."
msgstr ""
#. type: Plain text
#: en/git.txt:1024
-msgid ""
-"`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by "
-"the shell, which allows additional arguments to be included. `$GIT_SSH` on "
-"the other hand must be just the path to a program (which can be a wrapper "
-"shell script, if additional arguments are needed)."
+msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
#: en/git.txt:1028
-msgid ""
-"Usually it is easier to configure any desired options through your personal "
-"`.ssh/config` file. Please consult your ssh documentation for further "
-"details."
+msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
#: en/git.txt:1029
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
#: en/git.txt:1034
-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."
+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."
msgstr ""
#. type: Labeled list
#: en/git.txt:1035
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. 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 "
-"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]."
+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 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]."
msgstr ""
#. type: Labeled list
#: en/git.txt:1042
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
#: en/git.txt:1045
-msgid ""
-"If this environment variable is set to `0`, git will not prompt on the "
-"terminal (e.g., when asking for HTTP authentication)."
+msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
#: en/git.txt:1046
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. 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."
+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."
msgstr ""
#. type: Labeled list
#: en/git.txt:1054
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
@@ -64777,281 +50388,203 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1065
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
#: en/git.txt:1068
-msgid ""
-"Enables general trace messages, e.g. alias expansion, built-in command "
-"execution and external command execution."
+msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
#: en/git.txt:1072
-msgid ""
-"If this variable is set to \"1\", \"2\" or \"true\" (comparison is case "
-"insensitive), trace messages will be printed to stderr."
+msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
#: 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."
+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."
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."
+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."
msgstr ""
#. type: Plain text
#: en/git.txt:1085
-msgid ""
-"Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case "
-"insensitive) disables trace messages."
+msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
#: en/git.txt:1086
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
#: en/git.txt:1092
-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."
+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."
msgstr ""
#. type: Labeled list
#: en/git.txt:1093
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
#: en/git.txt:1099
-msgid ""
-"Enables trace messages for all packets coming in or out of a given program. "
-"This can help with debugging object negotiation or other protocol issues. "
-"Tracing is turned off at a packet starting with \"PACK\" (but see "
-"`GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output "
-"options."
+msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
#: en/git.txt:1100
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
#: en/git.txt:1107
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git.txt:1110
-msgid ""
-"Note that this is currently only implemented for the client side of clones "
-"and fetches."
+msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
#: en/git.txt:1111
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
#: en/git.txt:1115
-msgid ""
-"Enables performance related trace messages, e.g. total execution time of "
-"each Git command. See `GIT_TRACE` for available trace output options."
+msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
#: en/git.txt:1116
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
#: en/git.txt:1120
-msgid ""
-"Enables trace messages printing the .git, working tree and current working "
-"directory after Git has completed its setup phase. See `GIT_TRACE` for "
-"available trace output options."
+msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
#: en/git.txt:1121
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. 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."
+msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
#: en/git.txt:1126
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
#: en/git.txt:1133
-msgid ""
-"Enables a curl full trace dump of all incoming and outgoing data, including "
-"descriptive information, of the git transport protocol. This is similar to "
-"doing curl `--trace-ascii` on the command line. This option overrides "
-"setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for "
-"available trace output options."
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
#: en/git.txt:1134
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
#: en/git.txt:1142
-msgid ""
-"Setting this variable to `1` will cause Git to treat all pathspecs "
-"literally, rather than as glob patterns. For example, running "
-"`GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that "
-"touch the path `*.c`, not any paths that the glob `*.c` matches. You might "
-"want this if you are feeding literal paths to Git (e.g., paths previously "
-"given to you by `git ls-tree`, `--raw` diff output, etc)."
+msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
#: en/git.txt:1143
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
#: en/git.txt:1146
-msgid ""
-"Setting this variable to `1` will cause Git to treat all pathspecs as glob "
-"patterns (aka \"glob\" magic)."
+msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
#: en/git.txt:1147
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
#: en/git.txt:1150
-msgid ""
-"Setting this variable to `1` will cause Git to treat all pathspecs as "
-"literal (aka \"literal\" magic)."
+msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
#: en/git.txt:1151
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
#: en/git.txt:1154
-msgid ""
-"Setting this variable to `1` will cause Git to treat all pathspecs as case-"
-"insensitive."
+msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
#: en/git.txt:1155
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
#: en/git.txt:1164
-msgid ""
-"When a ref is updated, reflog entries are created to keep track of the "
-"reason why the ref was updated (which is typically the name of the high-"
-"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."
+msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-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."
msgstr ""
#. type: Labeled list
#: en/git.txt:1165
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
#: en/git.txt:1175
-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 "
-"has touched every ref (e.g., because you are cloning a repository to make a "
-"backup)."
+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 has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
#: en/git.txt:1176
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. 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."
+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."
msgstr ""
#. type: Labeled list
#: en/git.txt:1185
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
#: en/git.txt:1191
-msgid ""
-"Set to 0 to prevent protocols used by fetch/push/clone which are configured "
-"to the `user` state. This is useful to restrict recursive submodule "
-"initialization from an untrusted repository or for programs which feed "
-"potentially-untrusted URLS to git commands. See linkgit:git-config[1] for "
-"more details."
+msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Title -
@@ -65062,86 +50595,47 @@ 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]."
+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]."
msgstr ""
#. type: Plain text
#: en/git.txt:1205
-msgid ""
-"A Git project normally consists of a working directory with a \".git\" "
-"subdirectory at the top level. The .git directory contains, among other "
-"things, a compressed object database representing the complete history of "
-"the project, an \"index\" file which links that history to the current "
-"contents of the working tree, and named pointers into that history such as "
-"tags and branch heads."
+msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git.txt:1215
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git.txt:1221
-msgid ""
-"All objects are named by the SHA-1 hash of their contents, normally written "
-"as a string of 40 hex digits. Such names are globally unique. The entire "
-"history leading up to a commit can be vouched for by signing just that "
-"commit. A fourth object type, the tag, is provided for this purpose."
+msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
#: en/git.txt:1224
-msgid ""
-"When first created, objects are stored in individual files, but for "
-"efficiency may later be compressed together into \"pack files\"."
+msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
#: en/git.txt:1231
-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 "
-"interest are stored under `ref/tags/`. A special ref named `HEAD` contains "
-"the name of the currently checked-out branch."
+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 interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
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 "
-"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 "
-"comparing these attributes. The index may be updated with new content, and "
-"new commits may be created from the content stored in the index."
+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 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 comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
#: en/git.txt:1244
-msgid ""
-"The index is also capable of storing multiple entries (called \"stages\") "
-"for a given pathname. These stages are used to hold the various unmerged "
-"version of a file when a merge is in progress."
+msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
@@ -65152,18 +50646,12 @@ 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."
+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."
msgstr ""
#. type: Plain text
#: en/git.txt:1255
-msgid ""
-"The link:user-manual.html#git-concepts[Git concepts chapter of the user-"
-"manual] and linkgit:gitcore-tutorial[7] both provide introductions to the "
-"underlying Git architecture."
+msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
@@ -65173,22 +50661,17 @@ msgstr ""
#. type: Plain text
#: en/git.txt:1260
-msgid ""
-"See also the link:howto-index.html[howto] documents for some useful "
-"examples."
+msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
#: en/git.txt:1263
-msgid ""
-"The internals are documented in the link:technical/api-index.html[Git API "
-"documentation]."
+msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
#: en/git.txt:1266
-msgid ""
-"Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
+msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
@@ -65199,19 +50682,12 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
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."
+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."
msgstr ""
#. type: Title -
@@ -65222,30 +50698,19 @@ msgstr ""
#. type: Plain text
#: en/git.txt:1285
-msgid ""
-"Report bugs to the Git mailing list <git@vger.kernel.org> where the "
-"development and maintenance is primarily done. You do not have to be "
-"subscribed to the list to send a message there."
+msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there."
msgstr ""
#. type: Plain text
#: en/git.txt:1293
#, fuzzy
-#| msgid ""
-#| "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-"
-#| "mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
-msgid ""
-"linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], "
-"linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-"
-"tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's "
-"Manual], linkgit:gitworkflows[7]"
-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-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:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
+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-unpack-file.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-unpack-file(1)"
msgstr "git-unpack-file(1)"
@@ -65276,7 +50741,7 @@ msgstr ""
#. type: Title =
#: en/git-unpack-objects.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-unpack-objects(1)"
msgstr "git-unpack-objects(1)"
@@ -65293,25 +50758,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 "
-"object per file) format."
+msgid "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."
+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."
msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:27
-msgid ""
-"See linkgit:git-repack[1] for options to generate new packs and replace "
-"existing ones."
+msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
#. type: Plain text
@@ -65326,16 +50783,12 @@ msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:37
-msgid ""
-"The command usually shows percentage progress. This flag suppresses it."
+msgid "The command usually shows percentage progress. This flag suppresses it."
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."
+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."
msgstr ""
#. type: Plain text
@@ -65345,7 +50798,7 @@ msgstr ""
#. type: Title =
#: en/git-update-index.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-update-index(1)"
msgstr "git-update-index(1)"
@@ -65353,8 +50806,7 @@ msgstr "git-update-index(1)"
#: en/git-update-index.txt:7
#, fuzzy
#| msgid "git-add - Add file contents to the index"
-msgid ""
-"git-update-index - Register file contents in the working tree to the index"
+msgid "git-update-index - Register file contents in the working tree to the index"
msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index"
#. type: Plain text
@@ -65380,57 +50832,43 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:33
-msgid ""
-"Modifies the index or directory cache. Each file mentioned is updated into "
-"the index and any 'unmerged' or 'needs updating' state is cleared."
+msgid "Modifies the index or directory cache. Each file mentioned is updated into the index and any 'unmerged' or 'needs updating' state is cleared."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:36
-msgid ""
-"See also linkgit:git-add[1] for a more user-friendly way to do some of the "
-"most common operations on the index."
+msgid "See also linkgit:git-add[1] for a more user-friendly way to do some of the most common operations on the index."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:39
-msgid ""
-"The way 'git update-index' handles files it is told about can be modified "
-"using the various options:"
+msgid "The way 'git update-index' handles files it is told about can be modified using the various options:"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:46
-msgid ""
-"If a specified file isn't in the index already then it's added. Default "
-"behaviour is to ignore new files."
+msgid "If a specified file isn't in the index already then it's added. Default behaviour is to ignore new files."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:47
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--remove"
msgstr "--remove"
#. type: Plain text
#: en/git-update-index.txt:51
-msgid ""
-"If a specified file is in the index but is missing then it's removed. "
-"Default behavior is to ignore removed file."
+msgid "If a specified file is in the index but is missing then it's removed. Default behavior is to ignore removed file."
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."
+msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:59
-msgid ""
-"Quiet. If --refresh finds that the index needs an update, the default "
-"behavior is to error out. This option makes"
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
msgstr ""
#. type: Plain text
@@ -65440,15 +50878,13 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:61
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ignore-submodules"
msgstr "--ignore-submodules"
#. type: Plain text
#: en/git-update-index.txt:64
-msgid ""
-"Do not try to update submodules. This option is only respected when passed "
-"before --refresh."
+msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
#. type: Plain text
@@ -65486,15 +50922,12 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:79
-msgid ""
-"Directly insert the specified info into the index. For backward "
-"compatibility, you can also give these three arguments as three separate "
-"parameters, but new users are encouraged to use a single-parameter form."
+msgid "Directly insert the specified info into the index. For backward compatibility, you can also give these three arguments as three separate parameters, but new users are encouraged to use a single-parameter form."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:80
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--index-info"
msgstr "--index-info"
@@ -65512,131 +50945,97 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:86
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]assume-unchanged"
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 "
-"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)."
+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 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)."
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 "
-"changed upstream, you will need to handle the situation manually."
+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 changed upstream, you will need to handle the situation manually."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:104
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--really-refresh"
msgstr "--really-refresh"
#. type: Plain text
#: en/git-update-index.txt:107
-msgid ""
-"Like `--refresh`, but checks stat information unconditionally, without "
-"regard to the \"assume unchanged\" setting."
+msgid "Like `--refresh`, but checks stat information unconditionally, without regard to the \"assume unchanged\" setting."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:108
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]skip-worktree"
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 "
-"information."
+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 information."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:115
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--again"
msgstr "--again"
#. type: Plain text
#: en/git-update-index.txt:118
-msgid ""
-"Runs 'git update-index' itself on the paths whose index entries are "
-"different from those from the `HEAD` commit."
+msgid "Runs 'git update-index' itself on the paths whose index entries are different from those from the `HEAD` commit."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:119
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--unresolve"
msgstr "--unresolve"
#. type: Plain text
#: en/git-update-index.txt:122
-msgid ""
-"Restores the 'unmerged' or 'needs updating' state of a file during a merge "
-"if it was cleared by accident."
+msgid "Restores the 'unmerged' or 'needs updating' state of a file during a merge if it was cleared by accident."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:123
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--info-only"
msgstr "--info-only"
#. type: Plain text
#: en/git-update-index.txt:127
-msgid ""
-"Do not create objects in the object database for all <file> arguments that "
-"follow this flag; just insert their object IDs into the index."
+msgid "Do not create objects in the object database for all <file> arguments that follow this flag; just insert their object IDs into the index."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:128
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--force-remove"
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;"
-msgid ""
-"Remove the file from the index even when the working directory still has "
-"such a file. (Implies --remove.)"
-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',"
+#| msgid "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.)"
+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',"
#. type: Labeled list
#: en/git-update-index.txt:132
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--replace"
msgstr "--replace"
#. type: Plain text
#: en/git-update-index.txt:139
-msgid ""
-"By default, when a file `path` exists in the index, 'git update-index' "
-"refuses an attempt to add `path/file`. Similarly if a file `path/file` "
-"exists, a file `path` cannot be added. With --replace flag, existing "
-"entries that conflict with the entry being added are automatically removed "
-"with warning messages."
+msgid "By default, when a file `path` exists in the index, 'git update-index' refuses an attempt to add `path/file`. Similarly if a file `path/file` exists, a file `path` cannot be added. With --replace flag, existing entries that conflict with the entry being added are automatically removed with warning messages."
msgstr ""
#. type: Plain text
@@ -65652,124 +51051,88 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:153
-msgid ""
-"Write the resulting index out in the named on-disk format version. "
-"Supported versions are 2, 3 and 4. The current default version is 2 or 3, "
-"depending on whether extra features are used, such as `git add -N`."
+msgid "Write the resulting index out in the named on-disk format version. Supported versions are 2, 3 and 4. The current default version is 2 or 3, depending on whether extra features are used, such as `git add -N`."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:159
-msgid ""
-"Version 4 performs a simple pathname compression that reduces index size by "
-"30%-50% on large repositories, which results in faster load time. Version 4 "
-"is relatively young (first released in in 1.8.0 in October 2012). Other Git "
-"implementations such as JGit and libgit2 may not support it yet."
+msgid "Version 4 performs a simple pathname compression that reduces index size by 30%-50% on large repositories, which results in faster load time. Version 4 is relatively young (first released in in 1.8.0 in October 2012). Other Git implementations such as JGit and libgit2 may not support it yet."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:163
-msgid ""
-"Only meaningful with `--stdin` or `--index-info`; paths are separated with "
-"NUL character instead of LF."
+msgid "Only meaningful with `--stdin` or `--index-info`; paths are separated with NUL character instead of LF."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:164
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--split-index"
msgstr "--split-index"
#. type: Labeled list
#: en/git-update-index.txt:165
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-split-index"
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."
+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."
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 "
-"will take effect next time the index is read and this will remove the "
-"intended effect of the option."
+msgid "These options take effect whatever the value of the `core.splitIndex` configuration variable (see linkgit:git-config[1]). But a warning is emitted when the change goes against the configured value, as the configured value will take effect next time the index is read and this will remove the intended effect of the option."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:177
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--untracked-cache"
msgstr "--untracked-cache"
#. type: Labeled list
#: en/git-update-index.txt:178
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-untracked-cache"
msgstr "--no-untracked-cache"
#. type: Plain text
#: en/git-update-index.txt:181
-msgid ""
-"Enable or disable untracked cache feature. Please use `--test-untracked-"
-"cache` before enabling it."
+msgid "Enable or disable untracked cache feature. Please use `--test-untracked-cache` before enabling it."
msgstr ""
#. type: Plain text
#: 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 "
-"will take effect next time the index is read and this will remove the "
-"intended effect of the option."
+msgid "These options take effect whatever the value of the `core.untrackedCache` configuration variable (see linkgit:git-config[1]). But a warning is emitted when the change goes against the configured value, as the configured value will take effect next time the index is read and this will remove the intended effect of the option."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:188
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--test-untracked-cache"
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-"
-"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 "
-"needed, otherwise the exit code is 0 and OK is printed."
+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-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 needed, otherwise the exit code is 0 and OK is printed."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:198
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--force-untracked-cache"
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-"
-"cache` but this option would enable the extension unconditionally."
+msgid "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 ""
#. type: Plain text
#: 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 '//'"
+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 '//'"
msgstr ""
#. type: Title -
@@ -65780,18 +51143,12 @@ 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."
+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."
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."
+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."
msgstr ""
#. type: Title -
@@ -65802,9 +51159,7 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:230
-msgid ""
-"`--cacheinfo` is used to register a file that is not in the current working "
-"directory. This is useful for minimum-checkout merging."
+msgid "`--cacheinfo` is used to register a file that is not in the current working directory. This is useful for minimum-checkout merging."
msgstr ""
#. type: Plain text
@@ -65820,19 +51175,12 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:239
-msgid ""
-"`--info-only` is used to register files without placing them in the object "
-"database. This is useful for status-only repositories."
+msgid "`--info-only` is used to register files without placing them in the object database. This is useful for status-only repositories."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:245
-msgid ""
-"Both `--cacheinfo` and `--info-only` behave similarly: the index is updated "
-"but the object database isn't. `--cacheinfo` is useful when the object is "
-"in the database but the file isn't available locally. `--info-only` is "
-"useful when the file is available, but you do not wish to update the object "
-"database."
+msgid "Both `--cacheinfo` and `--info-only` behave similarly: the index is updated but the object database isn't. `--cacheinfo` is useful when the object is in the database but the file isn't available locally. `--info-only` is useful when the file is available, but you do not wish to update the object database."
msgstr ""
#. type: Title -
@@ -65843,10 +51191,7 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:253
-msgid ""
-"`--index-info` is a more powerful mechanism that lets you feed multiple "
-"entry definitions from the standard input, and designed specifically for "
-"scripts. It can take inputs of three formats:"
+msgid "`--index-info` is a more powerful mechanism that lets you feed multiple entry definitions from the standard input, and designed specifically for scripts. It can take inputs of three formats:"
msgstr ""
#. type: Plain text
@@ -65857,10 +51202,7 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:260
-msgid ""
-"The first format is what \"git-apply --index-info\" reports, and used to "
-"reconstruct a partial tree that is used for phony merge base tree when "
-"falling back on 3-way merge."
+msgid "The first format is what \"git-apply --index-info\" reports, and used to reconstruct a partial tree that is used for phony merge base tree when falling back on 3-way merge."
msgstr ""
#. type: Plain text
@@ -65871,8 +51213,7 @@ 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
@@ -65883,17 +51224,12 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:270
-msgid ""
-"This format is to put higher order stages into the index file and matches "
-"'git ls-files --stage' output."
+msgid "This format is to put higher order stages into the index file and matches 'git ls-files --stage' output."
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 "
-"lines in the third format."
+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 lines in the third format."
msgstr ""
#. type: Plain text
@@ -65926,11 +51262,7 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:295
-msgid ""
-"The first line of the input feeds 0 as the mode to remove the path; the "
-"SHA-1 does not matter as long as it is well formatted. Then the second and "
-"third line feeds stage 1 and stage 2 entries for that path. After the "
-"above, we would end up with this:"
+msgid "The first line of the input feeds 0 as the mode to remove the path; the SHA-1 does not matter as long as it is well formatted. Then the second and third line feeds stage 1 and stage 2 entries for that path. After the above, we would end up with this:"
msgstr ""
#. type: delimited block -
@@ -65950,39 +51282,17 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:319
-msgid ""
-"Many operations in Git depend on your filesystem to have an efficient "
-"`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 "
-"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 "
-"\"assume unchanged\" bit, either before or after you modify them."
+msgid "Many operations in Git depend on your filesystem to have an efficient `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 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 \"assume unchanged\" bit, either before or after you modify them."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:324
-msgid ""
-"In order to set \"assume unchanged\" bit, use `--assume-unchanged` option. "
-"To unset, use `--no-assume-unchanged`. To see which files have the \"assume "
-"unchanged\" bit set, use `git ls-files -v` (see linkgit:git-ls-files[1])."
+msgid "In order to set \"assume unchanged\" bit, use `--assume-unchanged` option. To unset, use `--no-assume-unchanged`. To see which files have the \"assume unchanged\" bit set, use `git ls-files -v` (see linkgit:git-ls-files[1])."
msgstr ""
#. 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\")."
+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\")."
msgstr ""
#. type: Plain text
@@ -66017,8 +51327,7 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:363
-msgid ""
-"forces lstat(2) to set \"assume unchanged\" bits for paths that match index."
+msgid "forces lstat(2) to set \"assume unchanged\" bits for paths that match index."
msgstr ""
#. type: Plain text
@@ -66070,30 +51379,17 @@ msgstr "git-commit(1)"
#. type: Plain text
#: en/git-update-index.txt:380
-msgid ""
-"Skip-worktree bit can be defined in one (long) sentence: When reading an "
-"entry, if it is marked as skip-worktree, then Git pretends its working "
-"directory version is up to date and read the index version instead."
+msgid "Skip-worktree bit can be defined in one (long) sentence: When reading an entry, if it is marked as skip-worktree, then Git pretends its working directory version is up to date and read the index version instead."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:388
-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-"
-"worktree, if it is safe to do so (i.e. working directory version matches "
-"index version)"
+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-worktree, if it is safe to do so (i.e. working directory version matches index version)"
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:392
-msgid ""
-"Although this bit looks similar to assume-unchanged bit, its goal is "
-"different from assume-unchanged bit's. Skip-worktree also takes precedence "
-"over assume-unchanged bit when both are set."
+msgid "Although this bit looks similar to assume-unchanged bit, its goal is different from assume-unchanged bit's. Skip-worktree also takes precedence over assume-unchanged bit when both are set."
msgstr ""
#. type: Title -
@@ -66104,42 +51400,27 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:398
-msgid ""
-"This mode is designed for repositories with very large indexes, and aims at "
-"reducing the time it takes to repeatedly write these indexes."
+msgid "This mode is designed for repositories with very large indexes, and aims at reducing the time it takes to repeatedly write these indexes."
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."
+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."
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 "
-"splitIndex.maxPercentChange config variable (see linkgit:git-config[1])."
+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 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 "
-"splitIndex.sharedIndexExpire config variable (see linkgit:git-config[1])."
+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 splitIndex.sharedIndexExpire config variable (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Title -
@@ -66150,48 +51431,27 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:423
-msgid ""
-"This cache is meant to speed up commands that involve determining untracked "
-"files such as `git status`."
+msgid "This cache is meant to speed up commands that involve determining untracked files such as `git status`."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:430
-msgid ""
-"This feature works by recording the mtime of the working tree directories "
-"and then omitting reading directories and stat calls against files in those "
-"directories whose mtime hasn't changed. For this to work the underlying "
-"operating system and file system must change the `st_mtime` field of "
-"directories if files in the directory are added, modified or deleted."
+msgid "This feature works by recording the mtime of the working tree directories and then omitting reading directories and stat calls against files in those directories whose mtime hasn't changed. For this to work the underlying operating system and file system must change the `st_mtime` field of directories if files in the directory are added, modified or deleted."
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."
+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."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:443
-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 "
-"your `$HOME/.gitconfig` just once and have it affect all repositories you "
-"touch."
+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 your `$HOME/.gitconfig` just once and have it affect all repositories you touch."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:449
-msgid ""
-"When the `core.untrackedCache` configuration variable is changed, the "
-"untracked cache is added to or removed from the index the next time a "
-"command reads the index; while when `--[no-|force-]untracked-cache` are "
-"used, the untracked cache is immediately added to or removed from the index."
+msgid "When the `core.untrackedCache` configuration variable is changed, the untracked cache is added to or removed from the index the next time a command reads the index; while when `--[no-|force-]untracked-cache` are used, the untracked cache is immediately added to or removed from the index."
msgstr ""
#. type: Plain text
@@ -66209,56 +51469,36 @@ 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."
+msgid "Quite similarly, if `core.symlinks` configuration variable is set to 'false' (see linkgit:git-config[1]), symbolic links are checked out as plain files, and this command does not modify a recorded file mode from symbolic link to regular file."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:468
-msgid ""
-"The command looks at `core.ignorestat` configuration variable. See 'Using "
-"\"assume unchanged\" bit' section above."
+msgid "The command looks at `core.ignorestat` configuration variable. See 'Using \"assume unchanged\" bit' section above."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:473
-msgid ""
-"The command also looks at `core.trustctime` configuration variable. It can "
-"be useful when the inode change time is regularly modified by something "
-"outside Git (file system crawlers and backup systems use ctime for marking "
-"files processed) (see linkgit:git-config[1])."
+msgid "The command also looks at `core.trustctime` configuration variable. It can be useful when the inode change time is regularly modified by something outside Git (file system crawlers and backup systems use ctime for marking files processed) (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:477
#, fuzzy
-#| msgid ""
-#| "The default can be changed by the `commit.cleanup` configuration variable "
-#| "(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 ""
-"La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration "
-"`commit.cleanup` (voir linkgit:git-config[1])."
+#| msgid "The default can be changed by the `commit.cleanup` configuration variable (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 "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
-#| msgid ""
-#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-#| "merge[1], linkgit:git-commit-tree[1]"
+#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
-msgstr ""
-"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-"merge[1], linkgit:git-commit-tree[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-update-ref.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-update-ref(1)"
msgstr "git-update-ref(1)"
@@ -66270,54 +51510,32 @@ 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
#: en/git-update-ref.txt:18
-msgid ""
-"Given two arguments, stores the <newvalue> in the <ref>, possibly "
-"dereferencing the symbolic refs. E.g. `git update-ref HEAD <newvalue>` "
-"updates the current branch head to the new object."
+msgid "Given two arguments, stores the <newvalue> in the <ref>, possibly dereferencing the symbolic refs. E.g. `git update-ref HEAD <newvalue>` updates the current branch head to the new object."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:27
-msgid ""
-"Given three arguments, stores the <newvalue> in the <ref>, possibly "
-"dereferencing the symbolic refs, after verifying that the current value of "
-"the <ref> matches <oldvalue>. E.g. `git update-ref refs/heads/master "
-"<newvalue> <oldvalue>` updates the master branch head to <newvalue> only if "
-"its current value is <oldvalue>. You can specify 40 \"0\" or an empty "
-"string as <oldvalue> to make sure that the ref you are creating does not "
-"exist."
+msgid "Given three arguments, stores the <newvalue> in the <ref>, possibly dereferencing the symbolic refs, after verifying that the current value of the <ref> matches <oldvalue>. E.g. `git update-ref refs/heads/master <newvalue> <oldvalue>` updates the master branch head to <newvalue> only if its current value is <oldvalue>. You can specify 40 \"0\" or an empty string as <oldvalue> to make sure that the ref you are creating does not exist."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:31
-msgid ""
-"It also allows a \"ref\" file to be a symbolic pointer to another ref file "
-"by starting with the four-byte header sequence of \"ref:\"."
+msgid "It also allows a \"ref\" file to be a symbolic pointer to another ref file by starting with the four-byte header sequence of \"ref:\"."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:39
-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)."
+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)."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:42
-msgid ""
-"If --no-deref is given, <ref> itself is overwritten, rather than the result "
-"of following the symbolic pointers."
+msgid "If --no-deref is given, <ref> itself is overwritten, rather than the result of following the symbolic pointers."
msgstr ""
#. type: Plain text
@@ -66344,26 +51562,17 @@ 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)."
+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)."
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>."
+msgid "With `-d` flag, it deletes the named <ref> after verifying it still contains <oldvalue>."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:63
-msgid ""
-"With `--stdin`, update-ref reads instructions from standard input and "
-"performs all modifications together. Specify commands of the form:"
+msgid "With `--stdin`, update-ref reads instructions from standard input and performs all modifications together. Specify commands of the form:"
msgstr ""
#. type: Plain text
@@ -66379,25 +51588,17 @@ 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."
+msgid "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 "
-"missing value, omit the value and its preceding SP entirely."
+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 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:"
+msgid "Alternatively, use `-z` to specify in NUL-terminated format, without quoting:"
msgstr ""
#. type: Plain text
@@ -66413,32 +51614,22 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:89
-msgid ""
-"In this format, use 40 \"0\" to specify a zero value, and use the empty "
-"string to specify a missing value."
+msgid "In this format, use 40 \"0\" to specify a zero value, and use the empty string to specify a missing value."
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:"
+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:"
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:99
-msgid ""
-"Set <ref> to <newvalue> after verifying <oldvalue>, if given. Specify a "
-"zero <newvalue> to ensure the ref does not exist after the update and/or a "
-"zero <oldvalue> to make sure the ref does not exist before the update."
+msgid "Set <ref> to <newvalue> after verifying <oldvalue>, if given. Specify a zero <newvalue> to ensure the ref does not exist after the update and/or a zero <oldvalue> to make sure the ref does not exist before the update."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:103
-msgid ""
-"Create <ref> with <newvalue> after verifying it does not exist. The given "
-"<newvalue> may not be zero."
+msgid "Create <ref> with <newvalue> after verifying it does not exist. The given <newvalue> may not be zero."
msgstr ""
#. type: Labeled list
@@ -66449,9 +51640,7 @@ 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."
+msgid "Delete <ref> after verifying it exists with <oldvalue>, if given. If given, <oldvalue> may not be zero."
msgstr ""
#. type: Labeled list
@@ -66462,9 +51651,7 @@ 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."
+msgid "Verify <ref> against <oldvalue> but do not change it. If <oldvalue> zero or missing, the ref must not exist."
msgstr ""
#. type: Labeled list
@@ -66476,18 +51663,12 @@ msgstr "status"
#. type: Plain text
#: en/git-update-ref.txt:116
-msgid ""
-"Modify behavior of the next command naming a <ref>. The only valid option "
-"is `no-deref` to avoid dereferencing a symbolic ref."
+msgid "Modify behavior of the next command naming a <ref>. The only valid option is `no-deref` to avoid dereferencing a symbolic ref."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:122
-msgid ""
-"If all <ref>s can be locked with matching <oldvalue>s simultaneously, all "
-"modifications are performed. Otherwise, no modifications are performed. "
-"Note that while each individual <ref> is updated or deleted atomically, a "
-"concurrent reader may still see a subset of the modifications."
+msgid "If all <ref>s can be locked with matching <oldvalue>s simultaneously, all modifications are performed. Otherwise, no modifications are performed. Note that while each individual <ref> is updated or deleted atomically, a concurrent reader may still see a subset of the modifications."
msgstr ""
#. type: Title -
@@ -66498,13 +51679,7 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:131
-msgid ""
-"If config parameter \"core.logAllRefUpdates\" is true and the ref is one "
-"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:"
+msgid "If config parameter \"core.logAllRefUpdates\" is true and the ref is one 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:"
msgstr ""
#. type: Plain text
@@ -66514,11 +51689,7 @@ 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 "
-"\"committer\" is the committer's name, email address and date in the "
-"standard Git committer ident format."
+msgid "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 ""
#. type: Plain text
@@ -66533,29 +51704,23 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:145
-msgid ""
-"Where all fields are as described above and \"message\" is the value "
-"supplied to the -m option."
+msgid "Where all fields are as described above and \"message\" is the value supplied to the -m option."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:149
-msgid ""
-"An update will fail (without changing <ref>) if the current user is unable "
-"to create a new log file, append to the existing log file or does not have "
-"committer information available."
+msgid "An update will fail (without changing <ref>) if the current user is unable to create a new log file, append to the existing log file or does not have committer information available."
msgstr ""
#. type: Title =
#: en/git-update-server-info.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-update-server-info(1)"
msgstr "git-update-server-info(1)"
#. type: Plain text
#: en/git-update-server-info.txt:7
-msgid ""
-"git-update-server-info - Update auxiliary info file to help dumb servers"
+msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
msgstr ""
#. type: Plain text
@@ -66566,11 +51731,7 @@ msgstr ""
#. type: Plain text
#: en/git-update-server-info.txt:21
-msgid ""
-"A dumb server that does not do on-the-fly pack generations must have some "
-"auxiliary information files in $GIT_DIR/info and $GIT_OBJECT_DIRECTORY/info "
-"directories to help clients discover what references and packs the server "
-"has. This command generates such auxiliary files."
+msgid "A dumb server that does not do on-the-fly pack generations must have some auxiliary information files in $GIT_DIR/info and $GIT_OBJECT_DIRECTORY/info directories to help clients discover what references and packs the server has. This command generates such auxiliary files."
msgstr ""
#. type: Plain text
@@ -66588,9 +51749,7 @@ 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:"
+msgid "Currently the command updates the following files. Please see linkgit:gitrepository-layout[5] for description of what they are for:"
msgstr ""
#. type: Plain text
@@ -66605,7 +51764,7 @@ msgstr ""
#. type: Title =
#: en/git-upload-archive.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-upload-archive(1)"
msgstr "git-upload-archive(1)"
@@ -66622,17 +51781,12 @@ 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."
+msgid "Invoked by 'git archive --remote' and sends a generated archive to the other end over the Git protocol."
msgstr ""
#. type: Plain text
#: en/git-upload-archive.txt:22
-msgid ""
-"This command is usually not invoked directly by the end user. The UI for "
-"the protocol is on the 'git archive' side, and the program pair is meant to "
-"be used to get an archive from a remote repository."
+msgid "This command is usually not invoked directly by the end user. The UI for the protocol is on the 'git archive' side, and the program pair is meant to be used to get an archive from a remote repository."
msgstr ""
#. type: Title -
@@ -66643,53 +51797,32 @@ msgstr ""
#. type: Plain text
#: en/git-upload-archive.txt:32
-msgid ""
-"In order to protect the privacy of objects that have been removed from "
-"history but may not yet have been pruned, `git-upload-archive` avoids "
-"serving archives for commits and trees that are not reachable from the "
-"repository's refs. However, because calculating object reachability is "
-"computationally expensive, `git-upload-archive` implements a stricter but "
-"easier-to-check set of rules:"
+msgid "In order to protect the privacy of objects that have been removed from history but may not yet have been pruned, `git-upload-archive` avoids serving archives for commits and trees that are not reachable from the repository's refs. However, because calculating object reachability is computationally expensive, `git-upload-archive` implements a stricter but easier-to-check set of rules:"
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`."
+msgid "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
#: en/git-upload-archive.txt:38
-msgid ""
-"Clients may request a sub-tree within a commit or tree using the `ref:path` "
-"syntax. E.g., `git archive --remote=origin v1.0:Documentation`."
+msgid "Clients may request a sub-tree within a commit or tree using the `ref:path` syntax. E.g., `git archive --remote=origin v1.0:Documentation`."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-upload-archive.txt:48
-msgid ""
-"Note that rule 3 disallows many cases that do not have any privacy "
-"implications. These rules are subject to change in future versions of git, "
-"and the server accessed by `git archive --remote` may or may not follow "
-"these exact rules."
+msgid "Note that rule 3 disallows many cases that do not have any privacy implications. These rules are subject to change in future versions of git, and the server accessed by `git archive --remote` may or may not follow these exact rules."
msgstr ""
#. type: Plain text
#: 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 "
-"object database is already publicly available for access via non-smart-http."
+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 object database is already publicly available for access via non-smart-http."
msgstr ""
#. type: Plain text
@@ -66699,7 +51832,7 @@ msgstr ""
#. type: Title =
#: en/git-upload-pack.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-upload-pack(1)"
msgstr "git-upload-pack(1)"
@@ -66744,7 +51877,7 @@ msgstr "OPTIONS"
#. type: Labeled list
#: en/git-upload-pack.txt:28
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]strict"
msgstr "--[no-]strict"
@@ -66760,30 +51893,24 @@ msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:34
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--stateless-rpc"
msgstr "--stateless-rpc"
#. type: Plain text
#: en/git-upload-pack.txt:38
-msgid ""
-"Perform only a single read-write cycle with stdin and stdout. This fits "
-"with the HTTP POST request processing model where a program may read the "
-"request, write a response, and must exit."
+msgid "Perform only a single read-write cycle with stdin and stdout. This fits with the HTTP POST request processing model where a program may read the request, write a response, and must exit."
msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:39
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--advertise-refs"
msgstr "--advertise-refs"
#. type: Plain text
#: en/git-upload-pack.txt:43
-msgid ""
-"Only the initial ref advertisement is output, and the program exits "
-"immediately. This fits with the HTTP GET request model, where no request "
-"content is received but a response must be produced."
+msgid "Only the initial ref advertisement is output, and the program exits immediately. This fits with the HTTP GET request model, where no request content is received but a response must be produced."
msgstr ""
#. type: Plain text
@@ -66800,7 +51927,7 @@ msgstr "git-commit(1)"
#. type: Title =
#: en/git-var.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-var(1)"
msgstr "git-var(1)"
@@ -66822,11 +51949,7 @@ msgstr ""
#. type: Plain text
#: en/git-var.txt:25
-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`.)"
+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`.)"
msgstr ""
#. type: delimited block -
@@ -66873,20 +51996,13 @@ msgstr ""
#. type: Plain text
#: 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'."
+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'."
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
@@ -66898,19 +52014,17 @@ 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
-#, ignore-translated
msgid "linkgit:git-commit-tree[1] linkgit:git-tag[1] linkgit:git-config[1]"
msgstr "linkgit:git-commit-tree[1] linkgit:git-tag[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-verify-commit.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-verify-commit(1)"
msgstr "git-verify-commit(1)"
@@ -66932,9 +52046,7 @@ msgstr ""
#. type: Plain text
#: en/git-verify-commit.txt:22 en/git-verify-tag.txt:22
-msgid ""
-"Print the raw gpg status output to standard error instead of the normal "
-"human-readable output."
+msgid "Print the raw gpg status output to standard error instead of the normal human-readable output."
msgstr ""
#. type: Plain text
@@ -66949,7 +52061,7 @@ msgstr ""
#. type: Title =
#: en/git-verify-pack.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-verify-pack(1)"
msgstr "git-verify-pack(1)"
@@ -66966,9 +52078,7 @@ msgstr ""
#. type: Plain text
#: en/git-verify-pack.txt:20
-msgid ""
-"Reads given idx file for packed Git archive created with the 'git pack-"
-"objects' command and verifies idx file and the corresponding pack file."
+msgid "Reads given idx file for packed Git archive created with the 'git pack-objects' command and verifies idx file and the corresponding pack file."
msgstr ""
#. type: Labeled list
@@ -66984,22 +52094,18 @@ msgstr ""
#. type: Plain text
#: en/git-verify-pack.txt:30
-msgid ""
-"After verifying the pack, show list of objects contained in the pack and a "
-"histogram of delta chain length."
+msgid "After verifying the pack, show list of objects contained in the pack and a histogram of delta chain length."
msgstr ""
#. type: Labeled list
#: en/git-verify-pack.txt:32
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--stat-only"
msgstr "--stat-only"
#. type: Plain text
#: en/git-verify-pack.txt:35
-msgid ""
-"Do not verify the pack contents; only show the histogram of delta chain "
-"length. With `--verbose`, list of objects is also shown."
+msgid "Do not verify the pack contents; only show the histogram of delta chain length. With `--verbose`, list of objects is also shown."
msgstr ""
#. type: Title -
@@ -67038,7 +52144,7 @@ msgstr ""
#. type: Title =
#: en/git-verify-tag.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-verify-tag(1)"
msgstr "git-verify-tag(1)"
@@ -67093,10 +52199,7 @@ msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:19
-msgid ""
-"This script tries, as much as possible, to display the URLs and FILEs that "
-"are passed as arguments, as HTML pages in new tabs on an already opened web "
-"browser."
+msgid "This script tries, as much as possible, to display the URLs and FILEs that are passed as arguments, as HTML pages in new tabs on an already opened web browser."
msgstr ""
#. type: Plain text
@@ -67136,8 +52239,7 @@ msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:29
-msgid ""
-"konqueror (this is the default under KDE, see 'Note about konqueror' below)"
+msgid "konqueror (this is the default under KDE, see 'Note about konqueror' below)"
msgstr ""
#. type: Plain text
@@ -67209,8 +52311,7 @@ msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:48
-msgid ""
-"Use the specified browser. It must be in the list of supported browsers."
+msgid "Use the specified browser. It must be in the list of supported browsers."
msgstr ""
#. type: Labeled list
@@ -67239,9 +52340,7 @@ msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:57
-msgid ""
-"CONF.VAR is looked up in the Git config files. If it's set, then its value "
-"specifies the browser that should be used."
+msgid "CONF.VAR is looked up in the Git config files. If it's set, then its value specifies the browser that should be used."
msgstr ""
#. type: Title ~
@@ -67252,45 +52351,27 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:76
-msgid ""
-"You can explicitly provide a full path to your preferred browser by setting "
-"the configuration variable `browser.<tool>.path`. For example, you can "
-"configure the absolute path to firefox by setting 'browser.firefox.path'. "
-"Otherwise, 'git web{litdd}browse' assumes the tool is available in PATH."
+msgid "You can explicitly provide a full path to your preferred browser by setting the configuration variable `browser.<tool>.path`. For example, you can configure the absolute path to firefox by setting 'browser.firefox.path'. Otherwise, 'git web{litdd}browse' assumes the tool is available in PATH."
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:86
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:93
-msgid ""
-"When 'konqueror' is specified by a command-line option or a configuration "
-"variable, we launch 'kfmclient' to try to open the HTML man page on an "
-"already opened konqueror in a new tab if possible."
+msgid "When 'konqueror' is specified by a command-line option or a configuration variable, we launch 'kfmclient' to try to open the HTML man page on an already opened konqueror in a new tab if possible."
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 "
-"'A_PATH_TO/kfmclient' instead."
+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 'A_PATH_TO/kfmclient' instead."
msgstr ""
#. type: delimited block -
@@ -67317,9 +52398,7 @@ 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:"
+msgid "Note that these configuration variables should probably be set using the `--global` flag, for example like this:"
msgstr ""
#. type: delimited block -
@@ -67330,7 +52409,7 @@ msgstr ""
#. type: Title =
#: en/git-whatchanged.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-whatchanged(1)"
msgstr "git-whatchanged(1)"
@@ -67352,18 +52431,12 @@ msgstr ""
#. type: Plain text
#: en/git-whatchanged.txt:22
-msgid ""
-"New users are encouraged to use linkgit:git-log[1] instead. The "
-"`whatchanged` command is essentially the same as linkgit:git-log[1] but "
-"defaults to show the raw format diff output and to skip merges."
+msgid "New users are encouraged to use linkgit:git-log[1] instead. The `whatchanged` command is essentially the same as linkgit:git-log[1] but defaults to show the raw format diff output and to skip merges."
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 "
-"mailing list are trained to type it."
+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 mailing list are trained to type it."
msgstr ""
#. type: Labeled list
@@ -67374,9 +52447,7 @@ 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"
+msgid "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
@@ -67387,14 +52458,12 @@ msgstr ""
#. type: Plain text
#: en/git-whatchanged.txt:40
-msgid ""
-"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'"
msgstr ""
#. type: Title =
#: en/git-worktree.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-worktree(1)"
msgstr "git-worktree(1)"
@@ -67421,41 +52490,22 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:29
-msgid ""
-"A git repository can support multiple working trees, allowing you to check "
-"out more than one branch at a time. With `git worktree add` a new working "
-"tree is associated with the repository. This new working tree is called a "
-"\"linked working tree\" as opposed to the \"main working tree\" prepared by "
-"\"git init\" or \"git clone\". A repository has one main working tree (if "
-"it's not a bare repository) and zero or more linked working trees."
+msgid "A git repository can support multiple working trees, allowing you to check out more than one branch at a time. With `git worktree add` a new working tree is associated with the repository. This new working tree is called a \"linked working tree\" as opposed to the \"main working tree\" prepared by \"git init\" or \"git clone\". A repository has one main working tree (if it's not a bare repository) and zero or more linked working trees."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:36
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:40
-msgid ""
-"If you move a linked working tree, you need to manually update the "
-"administrative files so that they do not get pruned automatically. See "
-"section \"DETAILS\" for more information."
+msgid "If you move a linked working tree, you need to manually update the administrative files so that they do not get pruned automatically. See section \"DETAILS\" for more information."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:45
-msgid ""
-"If a linked working tree is stored on a portable device or network share "
-"which is not always mounted, you can prevent its administrative files from "
-"being pruned by issuing the `git worktree lock` command, optionally "
-"specifying `--reason` to explain why the working tree is locked."
+msgid "If a linked working tree is stored on a portable device or network share which is not always mounted, you can prevent its administrative files from being pruned by issuing the `git worktree lock` command, optionally specifying `--reason` to explain why the working tree is locked."
msgstr ""
#. type: Labeled list
@@ -67466,28 +52516,17 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:54
-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}`."
+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}`."
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."
+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."
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 "
-"checked out (or 'detached HEAD' if none)."
+msgid "List details of each worktree. The main worktree is listed first, followed by each of the linked worktrees. The output details include if the worktree is bare, the revision currently checked out, and the branch currently checked out (or 'detached HEAD' if none)."
msgstr ""
#. type: Labeled list
@@ -67498,11 +52537,7 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:73
-msgid ""
-"If a working tree is on a portable device or network share which is not "
-"always mounted, lock it to prevent its administrative files from being "
-"pruned automatically. This also prevents it from being moved or deleted. "
-"Optionally, specify a reason for the lock with `--reason`."
+msgid "If a working tree is on a portable device or network share which is not always mounted, lock it to prevent its administrative files from being pruned automatically. This also prevents it from being moved or deleted. Optionally, specify a reason for the lock with `--reason`."
msgstr ""
#. type: Plain text
@@ -67523,10 +52558,7 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:90
-msgid ""
-"By default, `add` refuses to create a new working tree when `<branch>` is "
-"already checked out by another working tree. This option overrides that "
-"safeguard."
+msgid "By default, `add` refuses to create a new working tree when `<branch>` is already checked out by another working tree. This option overrides that safeguard."
msgstr ""
#. type: Labeled list
@@ -67545,48 +52577,33 @@ 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 "
-"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>`."
+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 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>`."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:103
-msgid ""
-"With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in "
-"linkgit:git-checkout[1]."
+msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:104
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]checkout"
msgstr "--[no-]checkout"
#. type: Plain text
#: en/git-worktree.txt:109
-msgid ""
-"By default, `add` checks out `<branch>`, however, `--no-checkout` can be "
-"used to suppress checkout in order to make customizations, such as "
-"configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-"
-"tree[1]."
+msgid "By default, `add` checks out `<branch>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
msgstr ""
#. 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."
+msgid "With `list`, output in an easy-to-parse format for scripts. This format will remain stable across Git versions and regardless of user configuration. See below for details."
msgstr ""
#. type: Plain text
@@ -67624,11 +52641,7 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
msgstr ""
#. type: Title -
@@ -67639,71 +52652,32 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:149
-msgid ""
-"Each linked working tree has a private sub-directory in the repository's "
-"$GIT_DIR/worktrees directory. The private sub-directory's name is usually "
-"the base name of the linked working tree's path, possibly appended with a "
-"number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the "
-"command `git worktree add /path/other/test-next next` creates the linked "
-"working tree in `/path/other/test-next` and also creates a "
-"`$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1`"
-" if `test-next` is already taken)."
+msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory. The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:155
-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."
+msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:164
-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."
+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."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:169
-msgid ""
-"See linkgit:gitrepository-layout[5] for more information. The rule of thumb "
-"is do not make any assumption about whether a path belongs to $GIT_DIR or "
-"$GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. "
-"Use `git rev-parse --git-path` to get the final path."
+msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
msgstr ""
#. type: Plain text
#: 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."
+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."
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 "
-"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."
+msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned. See linkgit:gitrepository-layout[5] for details."
msgstr ""
#. type: Title -
@@ -67714,9 +52688,7 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:192
-msgid ""
-"The worktree list command has two output formats. The default format shows "
-"the details on a single line with columns. For example:"
+msgid "The worktree list command has two output formats. The default format shows the details on a single line with columns. For example:"
msgstr ""
#. type: delimited block -
@@ -67737,12 +52709,7 @@ 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 "
-"'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:"
+msgid "The porcelain format has a line per attribute. Attributes are listed with a label and value separated by a single space. Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true. An empty line indicates the end of a worktree. For example:"
msgstr ""
#. type: delimited block -
@@ -67774,15 +52741,7 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
msgstr ""
#. type: delimited block -
@@ -67800,35 +52759,27 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:249
-msgid ""
-"Multiple checkout in general is still experimental, and the support for "
-"submodules is incomplete. It is NOT recommended to make multiple checkouts "
-"of a superproject."
+msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:252
-msgid ""
-"git-worktree could provide more automation for tasks currently performed "
-"manually, such as:"
+msgid "git-worktree could provide more automation for tasks currently performed manually, such as:"
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:255
-msgid ""
-"`remove` to remove a linked working tree and its administrative files (and "
-"warn if the working tree is dirty)"
+msgid "`remove` to remove a linked working tree and its administrative files (and warn if the working tree is dirty)"
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:256
-msgid ""
-"`mv` to move or rename a working tree and update its administrative files"
+msgid "`mv` to move or rename a working tree and update its administrative files"
msgstr ""
#. type: Title =
#: en/git-write-tree.txt:2
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "git-write-tree(1)"
msgstr "git-write-tree(1)"
@@ -67847,9 +52798,7 @@ msgstr ""
#. type: Plain text
#: en/git-write-tree.txt:18
-msgid ""
-"Creates a tree object using the current index. The name of the new tree "
-"object is printed to standard output."
+msgid "Creates a tree object using the current index. The name of the new tree object is printed to standard output."
msgstr ""
#. type: Plain text
@@ -67859,126 +52808,59 @@ 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'."
+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'."
msgstr ""
#. type: Labeled list
#: en/git-write-tree.txt:30
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--missing-ok"
msgstr "--missing-ok"
#. type: Plain text
#: en/git-write-tree.txt:34
-msgid ""
-"Normally 'git write-tree' ensures that the objects referenced by the "
-"directory exist in the object database. This option disables this check."
+msgid "Normally 'git write-tree' ensures that the objects referenced by the directory exist in the object database. This option disables this check."
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 "
-"subdirectory."
+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 subdirectory."
msgstr ""
#. type: Plain text
#: en/i18n.txt:2
msgid "Git is to some extent character encoding agnostic."
-msgstr ""
-"Git est dans une certaine mesure agnostique concernant l'encodage des "
-"caract챔res."
+msgstr "Git est dans une certaine mesure agnostique concernant l'encodage des caract챔res."
#. type: Plain text
#: en/i18n.txt:6
-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."
+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."
#. type: Plain text
#: en/i18n.txt:13
-msgid ""
-"Path names are encoded in UTF-8 normalization form C. This applies to tree "
-"objects, the index file, ref names, as well as path names in command line "
-"arguments, environment variables and config files (`.git/config` (see "
-"linkgit:git-config[1]), linkgit:gitignore[5], linkgit:gitattributes[5] and "
-"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 "
-"d'environnement et aux fichiers de configuration (`.git/config` (voir "
-"linkgit:git-config[1]), linkgit:gitignore[5], linkgit:gitattributes[5] and "
-"linkgit:gitmodules[5])."
+msgid "Path names are encoded in UTF-8 normalization form C. This applies to tree objects, the index file, ref names, as well as path names in command line arguments, environment variables and config files (`.git/config` (see linkgit:git-config[1]), linkgit:gitignore[5], linkgit:gitattributes[5] and 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 d'environnement et aux fichiers de configuration (`.git/config` (voir linkgit:git-config[1]), linkgit:gitignore[5], linkgit:gitattributes[5] and linkgit:gitmodules[5])."
#. 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. "
-"However, repositories created on such systems will not work properly on "
-"UTF-8-based systems (e.g. Linux, Mac, Windows) and vice versa. "
-"Additionally, many Git-based tools simply assume path names to be UTF-8 and "
-"will fail to display other encodings correctly."
-msgstr ""
-"Remarquez que Git traite les noms de chemins comme des s챕quences d'octets "
-"non-nuls au niveau de base, il n'y a pas de conversion d'encodage des noms "
-"de fichiers (sauf sur Mac et Windows). De ce fait, l'utilisation de noms de "
-"chemins non-ASCII fonctionnera pratiquement, m챗me sur les plateformes et "
-"syst챔mes de fichier utilisant d'anciens encodages d'ASCII 챕tendu."
+msgid "Note that Git at the core level treats path names simply as sequences of non-NUL bytes, there are no path name encoding conversions (except on Mac and Windows). Therefore, using non-ASCII path names will mostly work even on platforms and file systems that use legacy extended ASCII encodings. However, repositories created on such systems will not work properly on UTF-8-based systems (e.g. Linux, Mac, Windows) and vice versa. Additionally, many Git-based tools simply assume path names to be UTF-8 and will fail to display other encodings correctly."
+msgstr "Remarquez que Git traite les noms de chemins comme des s챕quences d'octets non-nuls au niveau de base, il n'y a pas de conversion d'encodage des noms de fichiers (sauf sur Mac et Windows). De ce fait, l'utilisation de noms de chemins non-ASCII fonctionnera pratiquement, m챗me sur les plateformes et syst챔mes de fichier utilisant d'anciens encodages d'ASCII 챕tendu."
#. 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.)."
-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.)."
+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.)."
+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.)."
#. 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 "
-"simple d'utiliser des encodages anciens, Git ne l'interdit pas. Cependant, "
-"il y a quelques d챕tails 횪 garder en t챗te."
+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 simple d'utiliser des encodages anciens, Git ne l'interdit pas. Cependant, il y a quelques d챕tails 횪 garder en t챗te."
#. type: Plain text
#: en/i18n.txt:42
-msgid ""
-"'git commit' and 'git commit-tree' issues a warning if the commit log "
-"message given to it does not look like a valid UTF-8 string, unless you "
-"explicitly say your project uses a legacy encoding. The way to say this is "
-"to have i18n.commitencoding in `.git/config` file, like this:"
-msgstr ""
-"`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혻:"
+msgid "'git commit' and 'git commit-tree' issues a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to have i18n.commitencoding in `.git/config` file, like this:"
+msgstr "`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혻:"
#. type: delimited block -
#: en/i18n.txt:46
@@ -67992,30 +52874,13 @@ 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."
-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 "
-"d'aider les personnes qui les liront plus tard. L'absence de cet ent챗te "
-"implique que les message de validation est encod챕 en UTF-8."
+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."
+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 d'aider les personnes qui les liront plus tard. L'absence de cet ent챗te implique que les message de validation est encod챕 en UTF-8."
#. 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:"
-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혻:"
+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:"
+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혻:"
#. type: delimited block -
#: en/i18n.txt:62
@@ -68029,24 +52894,13 @@ 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."
-msgstr ""
-"Si vous n'avez pas chang챕 cette variable de configuration, c'est la valeur "
-"de `i18n.commitencoding` qui est utilis챕e."
+msgid "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."
#. 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."
-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."
+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."
+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."
#. type: Plain text
#: en/line-range-format.txt:2
@@ -68060,9 +52914,7 @@ 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)."
+msgid "If <start> or <end> is a number, it specifies an absolute line number (lines count from 1)."
msgstr ""
#. type: Plain text
@@ -68072,12 +52924,7 @@ 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>."
+msgid "This form will use the first line matching the given POSIX regex. If <start> is a regex, it will search from the end of the previous `-L` range, if any, otherwise from the start of file. If <start> is ``^/regex/'', it will search from the start of file. If <end> is a regex, it will search starting at the line given by <start>."
msgstr ""
#. type: Plain text
@@ -68087,36 +52934,22 @@ msgstr ""
#. type: Plain text
#: en/line-range-format.txt:23
-msgid ""
-"This is only valid for <end> and will specify a number of lines before or "
-"after the line given by <start>."
+msgid "This is only valid for <end> and will specify a number of lines before or after the line given by <start>."
msgstr ""
#. type: Plain text
#: en/line-range-format.txt:30
-msgid ""
-"If ``:<funcname>'' is given in place of <start> and <end>, it is a regular "
-"expression that denotes the range from the first funcname line that matches "
-"<funcname>, up to the next funcname line. ``:<funcname>'' searches from the "
-"end of the previous `-L` range, if any, otherwise from the start of file. "
-"``^:<funcname>'' searches from the start of file."
+msgid "If ``:<funcname>'' is given in place of <start> and <end>, it is a regular expression that denotes the range from the first funcname line that matches <funcname>, up to the next funcname line. ``:<funcname>'' searches from the end of the previous `-L` range, if any, otherwise from the start of file. ``^:<funcname>'' searches from the start of file."
msgstr ""
#. type: Plain text
#: en/mailmap.txt:6
-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."
+msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses."
msgstr ""
#. type: Plain text
#: en/mailmap.txt:10
-msgid ""
-"In the simple form, each line in the file consists of the canonical real "
-"name of an author, whitespace, and an email address used in the commit "
-"(enclosed by '<' and '>') to map to the name. For example:"
+msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:"
msgstr ""
#. type: Plain text
@@ -68151,9 +52984,7 @@ msgstr ""
#. type: Plain text
#: en/mailmap.txt:24
-msgid ""
-"which allows mailmap to replace both the name and the email of a commit "
-"matching the specified commit email address, and:"
+msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:"
msgstr ""
#. type: Plain text
@@ -68164,16 +52995,12 @@ msgstr ""
#. type: Plain text
#: en/mailmap.txt:29
-msgid ""
-"which allows mailmap to replace both the name and the email of a commit "
-"matching both the specified commit name and email address."
+msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address."
msgstr ""
#. 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:"
+msgid "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 -
@@ -68189,9 +53016,7 @@ msgstr ""
#. type: Plain text
#: en/mailmap.txt:44
-msgid ""
-"Now suppose that Joe wants his middle name initial used, and Jane prefers "
-"her family name fully spelled out. A proper `.mailmap` file would look like:"
+msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:"
msgstr ""
#. type: delimited block -
@@ -68204,15 +53029,12 @@ msgstr ""
#. type: Plain text
#: en/mailmap.txt:52
-msgid ""
-"Note how there is no need for an entry for `<jane@laptop.(none)>`, because "
-"the real name of that author is already correct."
+msgid "Note how there is no need for an entry for `<jane@laptop.(none)>`, because the real name of that author is already correct."
msgstr ""
#. 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 -
@@ -68245,9 +53067,7 @@ msgstr ""
#. type: Plain text
#: en/mailmap.txt:75
-msgid ""
-"Use hash '#' for comments that are either on their own line, or after the "
-"email address."
+msgid "Use hash '#' for comments that are either on their own line, or after the email address."
msgstr ""
#. type: Labeled list
@@ -68258,13 +53078,7 @@ msgstr ""
#. type: Plain text
#: en/merge-config.txt:8
-msgid ""
-"Specify the style in which conflicted hunks are written out to working tree "
-"files upon merge. The default is \"merge\", which shows a `<<<<<<<` "
-"conflict marker, changes made by one side, a `=======` marker, changes made "
-"by the other side, and then a `>>>>>>>` marker. An alternate style, "
-"\"diff3\", adds a `|||||||` marker and the original text before the "
-"`=======` marker."
+msgid "Specify the style in which conflicted hunks are written out to working tree files upon merge. The default is \"merge\", which shows a `<<<<<<<` conflict marker, changes made by one side, a `=======` marker, changes made by the other side, and then a `>>>>>>>` marker. An alternate style, \"diff3\", adds a `|||||||` marker and the original text before the `=======` marker."
msgstr ""
#. type: Labeled list
@@ -68275,14 +53089,7 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "If merge is called without any commit argument, merge the upstream branches configured for the current branch by using their last observed values stored in their remote-tracking branches. The values of the `branch.<current branch>.merge` that name the branches at the remote named by `branch.<current branch>.remote` are consulted, and then they are mapped via `remote.<remote>.fetch` to their corresponding remote-tracking branches, and the tips of these tracking branches are merged."
msgstr ""
#. type: Labeled list
@@ -68293,14 +53100,7 @@ msgstr ""
#. type: Plain text
#: en/merge-config.txt:28
-msgid ""
-"By default, Git does not create an extra merge commit when merging a commit "
-"that is a descendant of the current commit. Instead, the tip of the current "
-"branch is fast-forwarded. When set to `false`, this variable tells Git to "
-"create an extra merge commit in such a case (equivalent to giving the `--no-"
-"ff` option from the command line). When set to `only`, only such fast-"
-"forward merges are allowed (equivalent to giving the `--ff-only` option from"
-" the command line)."
+msgid "By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Instead, the tip of the current branch is fast-forwarded. When set to `false`, this variable tells Git to create an extra merge commit in such a case (equivalent to giving the `--no-ff` option from the command line). When set to `only`, only such fast-forward merges are allowed (equivalent to giving the `--ff-only` option from the command line)."
msgstr ""
#. type: Labeled list
@@ -68311,9 +53111,7 @@ msgstr ""
#. type: Plain text
#: en/merge-config.txt:35
-msgid ""
-"The number of files to consider when performing rename detection during a "
-"merge; if not specified, defaults to the value of diff.renameLimit."
+msgid "The number of files to consider when performing rename detection during a merge; if not specified, defaults to the value of diff.renameLimit."
msgstr ""
#. type: Labeled list
@@ -68324,14 +53122,7 @@ msgstr ""
#. type: Plain text
#: en/merge-config.txt:45
-msgid ""
-"Tell Git that canonical representation of files in the repository has "
-"changed over time (e.g. earlier commits record text files with CRLF line "
-"endings, but recent ones use LF line endings). In such a repository, Git "
-"can convert the data recorded in commits to a canonical form before "
-"performing a merge to reduce unnecessary conflicts. For more information, "
-"see section \"Merging branches with differing checkin/checkout attributes\" "
-"in linkgit:gitattributes[5]."
+msgid "Tell Git that canonical representation of files in the repository has changed over time (e.g. earlier commits record text files with CRLF line endings, but recent ones use LF line endings). In such a repository, Git can convert the data recorded in commits to a canonical form before performing a merge to reduce unnecessary conflicts. For more information, see section \"Merging branches with differing checkin/checkout attributes\" in linkgit:gitattributes[5]."
msgstr ""
#. type: Labeled list
@@ -68342,9 +53133,7 @@ msgstr ""
#. type: Plain text
#: en/merge-config.txt:49
-msgid ""
-"Whether to print the diffstat between ORIG_HEAD and the merge result at the "
-"end of the merge. True by default."
+msgid "Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge. True by default."
msgstr ""
#. type: Labeled list
@@ -68356,11 +53145,7 @@ msgstr "git-commit(1)"
#. type: Plain text
#: en/merge-config.txt:55
-msgid ""
-"Controls which merge tool is used by linkgit:git-mergetool[1]. The list "
-"below shows the valid built-in values. Any other value is treated as a "
-"custom merge tool and requires that a corresponding mergetool.<tool>.cmd "
-"variable is defined."
+msgid "Controls which merge tool is used by linkgit:git-mergetool[1]. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<tool>.cmd variable is defined."
msgstr ""
#. type: Labeled list
@@ -68371,12 +53156,7 @@ msgstr ""
#. type: Plain text
#: en/merge-config.txt:65
-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."
+msgid "Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable."
msgstr ""
#. type: Labeled list
@@ -68387,9 +53167,7 @@ msgstr ""
#. type: Plain text
#: en/merge-config.txt:69
-msgid ""
-"Defines a human-readable name for a custom low-level merge driver. See "
-"linkgit:gitattributes[5] for details."
+msgid "Defines a human-readable name for a custom low-level merge driver. See linkgit:gitattributes[5] for details."
msgstr ""
#. type: Labeled list
@@ -68400,9 +53178,7 @@ msgstr ""
#. type: Plain text
#: en/merge-config.txt:73
-msgid ""
-"Defines the command that implements a custom low-level merge driver. See "
-"linkgit:gitattributes[5] for details."
+msgid "Defines the command that implements a custom low-level merge driver. See linkgit:gitattributes[5] for details."
msgstr ""
#. type: Labeled list
@@ -68413,101 +53189,68 @@ msgstr ""
#. type: Plain text
#: en/merge-config.txt:77
-msgid ""
-"Names a low-level merge driver to be used when performing an internal merge "
-"between common ancestors. See linkgit:gitattributes[5] for details."
+msgid "Names a low-level merge driver to be used when performing an internal merge between common ancestors. See linkgit:gitattributes[5] for details."
msgstr ""
#. 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."
+msgid "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."
+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."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:18
-msgid ""
-"Invoke an editor before committing successful mechanical merge to further "
-"edit the auto-generated merge message, so that the user can explain and "
-"justify the merge. The `--no-edit` option can be used to accept the auto-"
-"generated message (this is generally discouraged)."
+msgid "Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge. The `--no-edit` option can be used to accept the auto-generated message (this is generally discouraged)."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:22
-msgid ""
-"The `--edit` (or `-e`) option is still useful if you are giving a draft "
-"message with the `-m` option from the command line and want to edit it in "
-"the editor."
+msgid "The `--edit` (or `-e`) option is still useful if you are giving a draft message with the `-m` option from the command line and want to edit it in the editor."
msgstr ""
#. type: Plain text
#: 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 "
-"behaviour, the environment variable `GIT_MERGE_AUTOEDIT` can be set to `no` "
-"at the beginning of them."
+msgid "Older scripts may depend on the historical behaviour of not allowing the user to edit the merge log message. They will see an editor opened when they run `git merge`. To make it easier to adjust such scripts to the updated behaviour, the environment variable `GIT_MERGE_AUTOEDIT` can be set to `no` at the beginning of them."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:34
-msgid ""
-"When the merge resolves as a fast-forward, only update the branch pointer, "
-"without creating a merge commit. This is the default behavior."
+msgid "When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior."
msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Labeled list
#: en/merge-options.txt:40
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ff-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."
+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."
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]."
+msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:53
-msgid ""
-"With --no-log do not list one-line descriptions from the actual commits "
-"being merged."
+msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:60
-msgid ""
-"Show a diffstat at the end of the merge. The diffstat is also controlled by "
-"the configuration option merge.stat."
+msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
msgstr ""
#. type: Plain text
@@ -68517,41 +53260,29 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:64
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
#: en/merge-options.txt:65
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-squash"
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 "
-"`HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` "
-"command to create a merge commit). This allows you to create a single "
-"commit on top of the current branch whose effect is the same as merging "
-"another branch (or more in case of an octopus)."
+msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
msgstr ""
#. 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."
+msgid "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 "
-"list of strategies is used instead ('git merge-recursive' when merging a "
-"single head, 'git merge-octopus' otherwise)."
+msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
msgstr ""
#. type: Labeled list
@@ -68568,36 +53299,30 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:90
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
#: en/merge-options.txt:91
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-verify-signatures"
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 "
-"of the side branch is not signed with a valid key, the merge is aborted."
+msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
#: en/merge-options.txt:99
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-summary"
msgstr "--no-summary"
#. type: Plain text
#: en/merge-options.txt:102
-msgid ""
-"Synonyms to --stat and --no-stat; these are deprecated and will be removed "
-"in the future."
+msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
msgstr ""
#. type: Plain text
@@ -68615,26 +53340,18 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:118
-msgid ""
-"Turn progress on/off explicitly. If neither is specified, progress is shown "
-"if standard error is connected to a terminal. Note that not all merge "
-"strategies may support progress reporting."
+msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting."
msgstr ""
#. type: Labeled list
#: en/merge-options.txt:121
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--allow-unrelated-histories"
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 "
-"default exists and will not be added."
+msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
msgstr ""
#. type: Title -
@@ -68645,11 +53362,7 @@ 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`."
+msgid "The merge mechanism (`git merge` and `git pull` commands) allows the backend 'merge strategies' to be chosen with `-s` option. Some strategies can also take their own options, which can be passed by giving `-X<option>` arguments to `git merge` and/or `git pull`."
msgstr ""
#. type: Labeled list
@@ -68660,11 +53373,7 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:15
-msgid ""
-"This can only resolve two heads (i.e. the current branch and another branch "
-"you pulled from) using a 3-way merge algorithm. It tries to carefully "
-"detect criss-cross merge ambiguities and is considered generally safe and "
-"fast."
+msgid "This can only resolve two heads (i.e. the current branch and another branch you pulled from) using a 3-way merge algorithm. It tries to carefully detect criss-cross merge ambiguities and is considered generally safe and fast."
msgstr ""
#. type: Labeled list
@@ -68675,15 +53384,7 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:28
-msgid ""
-"This can only resolve two heads using a 3-way merge algorithm. When there "
-"is more than one common ancestor that can be used for 3-way merge, it "
-"creates a merged tree of the common ancestors and uses that as the reference"
-" tree for the 3-way merge. This has been reported to result in fewer merge "
-"conflicts without causing mismerges by tests done on actual merge commits "
-"taken from Linux 2.6 kernel development history. Additionally this can "
-"detect and handle merges involving renames. This is the default merge "
-"strategy when pulling or merging one branch."
+msgid "This can only resolve two heads using a 3-way merge algorithm. When there is more than one common ancestor that can be used for 3-way merge, it creates a merged tree of the common ancestors and uses that as the reference tree for the 3-way merge. This has been reported to result in fewer merge conflicts without causing mismerges by tests done on actual merge commits taken from Linux 2.6 kernel development history. Additionally this can detect and handle merges involving renames. This is the default merge strategy when pulling or merging one branch."
msgstr ""
#. type: Plain text
@@ -68699,20 +53400,12 @@ 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 "
-"side are reflected to the merge result. For a binary file, the entire "
-"contents are taken from our side."
+msgid "This option forces conflicting hunks to be auto-resolved cleanly by favoring 'our' version. Changes from the other tree that do not conflict with our side are reflected to the merge result. For a binary file, the entire contents are taken from our side."
msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:40
-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."
+msgid "This should not be confused with the 'ours' merge strategy, which does not even look at what the other tree contains at all. It discards everything the other tree did, declaring 'our' history contains all that happened in it."
msgstr ""
#. type: Labeled list
@@ -68734,11 +53427,7 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:50
-msgid ""
-"With this option, 'merge-recursive' spends a little extra time to avoid "
-"mismerges that sometimes occur due to unimportant matching lines (e.g., "
-"braces from distinct functions). Use this when the branches to be merged "
-"have diverged wildly. See also linkgit:git-diff[1] `--patience`."
+msgid "With this option, 'merge-recursive' spends a little extra time to avoid mismerges that sometimes occur due to unimportant matching lines (e.g., braces from distinct functions). Use this when the branches to be merged have diverged wildly. See also linkgit:git-diff[1] `--patience`."
msgstr ""
#. type: Labeled list
@@ -68749,10 +53438,7 @@ msgstr ""
#. type: Plain text
#: 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`."
+msgid "Tells 'merge-recursive' to use a different diff algorithm, which can help avoid mismerges that occur due to unimportant matching lines (such as braces from distinct functions). See also linkgit:git-diff[1] `--diff-algorithm`."
msgstr ""
#. type: Labeled list
@@ -68775,25 +53461,17 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:65
-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`."
+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`."
msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:68
-msgid ""
-"If 'their' version only introduces whitespace changes to a line, 'our' "
-"version is used;"
+msgid "If 'their' version only introduces whitespace changes to a line, 'our' version is used;"
msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:70
-msgid ""
-"If 'our' version introduces whitespace changes but 'their' version includes "
-"a substantial change, 'their' version is used;"
+msgid "If 'our' version introduces whitespace changes but 'their' version includes a substantial change, 'their' version is used;"
msgstr ""
#. type: Plain text
@@ -68809,12 +53487,7 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:79
-msgid ""
-"This runs a virtual check-out and check-in of all three stages of a file "
-"when resolving a three-way merge. This option is meant to be used when "
-"merging branches with different clean filters or end-of-line normalization "
-"rules. See \"Merging branches with differing checkin/checkout attributes\" "
-"in linkgit:gitattributes[5] for details."
+msgid "This runs a virtual check-out and check-in of all three stages of a file when resolving a three-way merge. This option is meant to be used when merging branches with different clean filters or end-of-line normalization rules. See \"Merging branches with differing checkin/checkout attributes\" in linkgit:gitattributes[5] for details."
msgstr ""
#. type: Labeled list
@@ -68825,9 +53498,7 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:83
-msgid ""
-"Disables the `renormalize` option. This overrides the `merge.renormalize` "
-"configuration variable."
+msgid "Disables the `renormalize` option. This overrides the `merge.renormalize` configuration variable."
msgstr ""
#. type: Labeled list
@@ -68838,8 +53509,7 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:87
-msgid ""
-"Turn off rename detection. See also linkgit:git-diff[1] `--no-renames`."
+msgid "Turn off rename detection. See also linkgit:git-diff[1] `--no-renames`."
msgstr ""
#. type: Labeled list
@@ -68850,9 +53520,7 @@ 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`."
+msgid "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
@@ -68874,11 +53542,7 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:102
-msgid ""
-"This option is a more advanced form of 'subtree' strategy, where the "
-"strategy makes a guess on how two trees must be shifted to match with each "
-"other when merging. Instead, the specified path is prefixed (or stripped "
-"from the beginning) to make the shape of two trees to match."
+msgid "This option is a more advanced form of 'subtree' strategy, where the strategy makes a guess on how two trees must be shifted to match with each other when merging. Instead, the specified path is prefixed (or stripped from the beginning) to make the shape of two trees to match."
msgstr ""
#. type: Labeled list
@@ -68889,21 +53553,12 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:109
-msgid ""
-"This resolves cases with more than two heads, but refuses to do a complex "
-"merge that needs manual resolution. It is primarily meant to be used for "
-"bundling topic branch heads together. This is the default merge strategy "
-"when pulling or merging more than one branch."
+msgid "This resolves cases with more than two heads, but refuses to do a complex merge that needs manual resolution. It is primarily meant to be used for bundling topic branch heads together. This is the default merge strategy when pulling or merging more than one branch."
msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:117
-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."
+msgid "This resolves any number of heads, but the resulting tree of the merge is always that of the current branch head, effectively ignoring all changes from all other branches. It is meant to be used to supersede old development history of side branches. Note that this is different from the -Xours option to the 'recursive' merge strategy."
msgstr ""
#. type: Labeled list
@@ -68914,23 +53569,12 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:124
-msgid ""
-"This is a modified recursive strategy. When merging trees A and B, if B "
-"corresponds to a subtree of A, B is first adjusted to match the tree "
-"structure of A, instead of reading the trees at the same level. This "
-"adjustment is also done to the common ancestor tree."
+msgid "This is a modified recursive strategy. When merging trees A and B, if B corresponds to a subtree of A, B is first adjusted to match the tree structure of A, instead of reading the trees at the same level. This adjustment is also done to the common ancestor tree."
msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:131
-msgid ""
-"With the strategies that use 3-way merge (including the default, "
-"'recursive'), if a change is made on both branches, but later reverted on "
-"one of the branches, that change will be present in the merged result; some "
-"people find this behavior confusing. It occurs because only the heads and "
-"the merge base are considered when performing a merge, not the individual "
-"commits. The merge algorithm therefore considers the reverted change as no "
-"change at all, and substitutes the changed version instead."
+msgid "With the strategies that use 3-way merge (including the default, 'recursive'), if a change is made on both branches, but later reverted on one of the branches, that change will be present in the merged result; some people find this behavior confusing. It occurs because only the heads and the merge base are considered when performing a merge, not the individual commits. The merge algorithm therefore considers the reverted change as no change at all, and substitutes the changed version instead."
msgstr ""
#. type: Plain text
@@ -69097,23 +53741,12 @@ 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 "
-"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."
+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 the list of the *direct* parent commits if you have limited your view of history: for example, if you are only interested in changes related to a certain directory or file."
msgstr ""
#. 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 "
-"'format:' string, as described below (see linkgit:git-config[1]). Here are "
-"the details of the built-in formats:"
+msgid "There are several built-in formats, and you can define additional formats by setting a pretty.<name> config option to either another format name, or a 'format:' string, as described below (see linkgit:git-config[1]). Here are the details of the built-in formats:"
msgstr ""
#. type: Plain text
@@ -69224,14 +53857,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"parent commits, without taking grafts or history simplification into "
-"account. Note that this format affects the way commits are displayed, but "
-"not the way the diff is shown e.g. with `git log --raw`. To get full object "
-"names in a raw diff format, use `--no-abbrev`."
+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 parent commits, without taking grafts or history simplification into account. Note that this format affects the way commits are displayed, but not the way the diff is shown e.g. with `git log --raw`. To get full object names in a raw diff format, use `--no-abbrev`."
msgstr ""
#. type: Plain text
@@ -69243,17 +53869,12 @@ msgstr "Configuration"
#. type: Plain text
#: en/pretty-formats.txt:93
-msgid ""
-"The 'format:<string>' format allows you to specify which information you "
-"want to show. It works a little bit like printf format, with the notable "
-"exception that you get a newline with '%n' instead of '\\n'."
+msgid "The 'format:<string>' format allows you to specify which information you want to show. It works a little bit like printf format, with the notable exception that you get a newline with '%n' instead of '\\n'."
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:96
-msgid ""
-"E.g, 'format:\"The author of %h was %an, %ar%nThe title was >>%s<<%n\"' "
-"would show something like this:"
+msgid "E.g, 'format:\"The author of %h was %an, %ar%nThe title was >>%s<<%n\"' would show something like this:"
msgstr ""
#. type: delimited block -
@@ -69308,9 +53929,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:114
-msgid ""
-"'%aN': author name (respecting .mailmap, see linkgit:git-shortlog[1] or "
-"linkgit:git-blame[1])"
+msgid "'%aN': author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Plain text
@@ -69320,9 +53939,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:117
-msgid ""
-"'%aE': author email (respecting .mailmap, see linkgit:git-shortlog[1] or "
-"linkgit:git-blame[1])"
+msgid "'%aE': author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Plain text
@@ -69362,9 +53979,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:126
-msgid ""
-"'%cN': committer name (respecting .mailmap, see linkgit:git-shortlog[1] or "
-"linkgit:git-blame[1])"
+msgid "'%cN': committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Plain text
@@ -69374,9 +53989,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:129
-msgid ""
-"'%cE': committer email (respecting .mailmap, see linkgit:git-shortlog[1] or "
-"linkgit:git-blame[1])"
+msgid "'%cE': committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Plain text
@@ -69456,12 +54069,7 @@ msgstr ""
#. type: Plain text
#: 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"
+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"
msgstr ""
#. type: Plain text
@@ -69476,19 +54084,12 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid ""
-"'%gD': reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes "
-"ago`}; the format follows the rules described for the `-g` option. The "
-"portion before the `@` is the refname as given on the command line (so `git "
-"log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "'%gD': reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago`}; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:164
-msgid ""
-"'%gd': shortened reflog selector; same as `%gD`, but the refname portion is "
-"shortened for human readability (so `refs/heads/master` becomes just "
-"`master`)."
+msgid "'%gd': shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Plain text
@@ -69498,9 +54099,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:167
-msgid ""
-"'%gN': reflog identity name (respecting .mailmap, see linkgit:git-"
-"shortlog[1] or linkgit:git-blame[1])"
+msgid "'%gN': reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Plain text
@@ -69510,9 +54109,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:170
-msgid ""
-"'%gE': reflog identity email (respecting .mailmap, see linkgit:git-"
-"shortlog[1] or linkgit:git-blame[1])"
+msgid "'%gE': reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Plain text
@@ -69542,14 +54139,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:182
-msgid ""
-"'%C(...)': color specification, as described under Values in the "
-"\"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 "
-"color is switched again."
+msgid "'%C(...)': color specification, as described under Values in the \"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 color is switched again."
msgstr ""
#. type: Plain text
@@ -69574,83 +54164,52 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:188
-msgid ""
-"'%w([<w>[,<i1>[,<i2>]]])': switch line wrapping, like the -w option of "
-"linkgit:git-shortlog[1]."
+msgid "'%w([<w>[,<i1>[,<i2>]]])': switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:193
-msgid ""
-"'%<(<N>[,trunc|ltrunc|mtrunc])': make the next placeholder take at least N "
-"columns, padding spaces on the right if necessary. Optionally truncate at "
-"the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the "
-"output is longer than N columns. Note that truncating only works correctly "
-"with N >= 2."
+msgid "'%<(<N>[,trunc|ltrunc|mtrunc])': make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:195
-msgid ""
-"'%<|(<N>)': make the next placeholder take at least until Nth columns, "
-"padding spaces on the right if necessary"
+msgid "'%<|(<N>)': make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:197
-msgid ""
-"'%>(<N>)', '%>|(<N>)': similar to '%<(<N>)', '%<|(<N>)' respectively, but "
-"padding spaces on the left"
+msgid "'%>(<N>)', '%>|(<N>)': similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:200
-msgid ""
-"'%>>(<N>)', '%>>|(<N>)': similar to '%>(<N>)', '%>|(<N>)' respectively, "
-"except that if the next placeholder takes more spaces than given and there "
-"are spaces on its left, use those spaces"
+msgid "'%>>(<N>)', '%>>|(<N>)': similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: 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 "
-"trailers of the body as interpreted by linkgit:git-interpret-trailers[1]"
+msgid "'%><(<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 ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:215
-msgid ""
-"If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is "
-"inserted immediately before the expansion if and only if the placeholder "
-"expands to a non-empty string."
+msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
msgstr ""
#. type: Plain text
#: 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."
+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."
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."
+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."
msgstr ""
#. type: Plain text
@@ -69662,13 +54221,7 @@ msgstr "Configuration"
#. type: Plain text
#: 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) "
-"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:"
+msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
msgstr ""
#. type: delimited block -
@@ -69693,9 +54246,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:249
-msgid ""
-"In addition, any unrecognized string that has a `%` in it is interpreted as "
-"if it has `tformat:` in front of it. For example, these two are equivalent:"
+msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:"
msgstr ""
#. type: delimited block -
@@ -69714,85 +54265,56 @@ msgstr ""
#. type: Plain text
#: en/pretty-options.txt:10
-msgid ""
-"Pretty-print the contents of the commit logs in a given format, where "
-"'<format>' can be one of 'oneline', 'short', 'medium', 'full', 'fuller', "
-"'email', 'raw', 'format:<string>' and 'tformat:<string>'. When '<format>' "
-"is none of the above, and has '%placeholder' in it, it acts as if '--"
-"pretty=tformat:<format>' were given."
+msgid "Pretty-print the contents of the commit logs in a given format, where '<format>' can be one of 'oneline', 'short', 'medium', 'full', 'fuller', 'email', 'raw', 'format:<string>' and 'tformat:<string>'. When '<format>' is none of the above, and has '%placeholder' in it, it acts as if '--pretty=tformat:<format>' were given."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:13
-msgid ""
-"See the \"PRETTY FORMATS\" section for some additional details for each "
-"format. When '=<format>' part is omitted, it defaults to 'medium'."
+msgid "See the \"PRETTY FORMATS\" section for some additional details for each format. When '=<format>' part is omitted, it defaults to 'medium'."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:16
#, fuzzy
-#| msgid ""
-#| "The default can be changed by the `commit.cleanup` configuration variable "
-#| "(see linkgit:git-config[1])."
-msgid ""
-"Note: you can specify the default pretty format in the repository "
-"configuration (see linkgit:git-config[1])."
-msgstr ""
-"La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration "
-"`commit.cleanup` (voir linkgit:git-config[1])."
+#| msgid "The default can be changed by the `commit.cleanup` configuration variable (see linkgit:git-config[1])."
+msgid "Note: you can specify the default pretty format in the repository configuration (see linkgit:git-config[1])."
+msgstr "La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration `commit.cleanup` (voir linkgit:git-config[1])."
#. type: Labeled list
#: en/pretty-options.txt:17
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--abbrev-commit"
msgstr "--abbrev-commit"
#. type: Plain text
#: en/pretty-options.txt:22
-msgid ""
-"Instead of showing the full 40-byte hexadecimal commit object name, show "
-"only a partial prefix. Non default number of digits can be specified with "
-"\"--abbrev=<n>\" (which also modifies diff output, if it is displayed)."
+msgid "Instead of showing the full 40-byte hexadecimal commit object name, show only a partial prefix. Non default number of digits can be specified with \"--abbrev=<n>\" (which also modifies diff output, if it is displayed)."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:25
-msgid ""
-"This should make \"--pretty=oneline\" a whole lot more readable for people "
-"using 80-column terminals."
+msgid "This should make \"--pretty=oneline\" a whole lot more readable for people using 80-column terminals."
msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:26
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-abbrev-commit"
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."
+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."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:34
-msgid ""
-"This is a shorthand for \"--pretty=oneline --abbrev-commit\" used together."
+msgid "This is a shorthand for \"--pretty=oneline --abbrev-commit\" used together."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:44
-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; "
-"this means that invalid sequences in the original commit may be copied to "
-"the output."
+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; this means that invalid sequences in the original commit may be copied to the output."
msgstr ""
#. type: Labeled list
@@ -69803,31 +54325,24 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:46
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--expand-tabs"
msgstr "--expand-tabs"
#. type: Labeled list
#: en/pretty-options.txt:47
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-expand-tabs"
msgstr "--no-expand-tabs"
#. type: Plain text
#: en/pretty-options.txt:54
-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."
+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."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:58
-msgid ""
-"By default, tabs are expanded in pretty formats that indent the log message "
-"by 4 spaces (i.e. 'medium', which is the default, 'full', and 'fuller')."
+msgid "By default, tabs are expanded in pretty formats that indent the log message by 4 spaces (i.e. 'medium', which is the default, 'full', and 'fuller')."
msgstr ""
#. type: Labeled list
@@ -69838,52 +54353,33 @@ msgstr ""
#. type: Plain text
#: en/pretty-options.txt:66
-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."
+msgid "Show the notes (see linkgit:git-notes[1]) that annotate the commit, when showing the commit log message. This is the default for `git log`, `git show` and `git whatchanged` commands when there is no `--pretty`, `--format`, or `--oneline` option given on the command line."
msgstr ""
#. 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."
+msgid "By default, the notes shown are from the notes refs listed in the `core.notesRef` and `notes.displayRef` variables (or corresponding environment overrides). See linkgit:git-config[1] for more details."
msgstr ""
#. 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."
+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."
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)."
+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)."
msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:81
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-notes"
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\"."
+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\"."
msgstr ""
#. type: Labeled list
@@ -69894,36 +54390,29 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:89
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--[no-]standard-notes"
msgstr "--[no-]standard-notes"
#. type: Plain text
#: en/pretty-options.txt:92
-msgid ""
-"These options are deprecated. Use the above --notes/--no-notes options "
-"instead."
+msgid "These options are deprecated. Use the above --notes/--no-notes options instead."
msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:94
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--show-signature"
msgstr "--show-signature"
#. type: Plain text
#: en/pretty-options.txt:96
-msgid ""
-"Check the validity of a signed commit object by passing the signature to "
-"`gpg --verify` and show the output."
+msgid "Check the validity of a signed commit object by passing the signature to `gpg --verify` and show the output."
msgstr ""
#. type: Plain text
#: 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)."
+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)."
msgstr ""
#. type: Labeled list
@@ -69935,15 +54424,9 @@ msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:12
#, fuzzy
-#| msgid ""
-#| "The default can be changed by the `commit.cleanup` configuration variable "
-#| "(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 ""
-"La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration "
-"`commit.cleanup` (voir linkgit:git-config[1])."
+#| msgid "The default can be changed by the `commit.cleanup` configuration variable (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 "La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration `commit.cleanup` (voir linkgit:git-config[1])."
#. type: Labeled list
#: en/pull-fetch-param.txt:14
@@ -69953,10 +54436,7 @@ msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:18
-msgid ""
-"Specifies which refs to fetch and which local refs to update. When no "
-"<refspec>s appear on the command line, the refs to fetch are read from "
-"`remote.<repository>.fetch` variables instead"
+msgid "Specifies which refs to fetch and which local refs to update. When no <refspec>s appear on the command line, the refs to fetch are read from `remote.<repository>.fetch` variables instead"
msgstr ""
#. type: Plain text
@@ -69973,57 +54453,27 @@ 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 "
-"<dst>. The colon can be omitted when <dst> is empty."
+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 <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."
+msgid "`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 "
-"result in a fast-forward update."
+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 result in a fast-forward update."
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:51
-msgid ""
-"When the remote branch you want to fetch is known to be rewound and rebased "
-"regularly, it is expected that its new tip will not be descendant of its "
-"previous tip (as stored in your remote-tracking branch the last time you "
-"fetched). You would want to use the `+` sign to indicate non-fast-forward "
-"updates will be needed for such branches. There is no way to determine or "
-"declare that a branch will be made available in a repository with this "
-"behavior; the pulling user simply must know this is the expected usage "
-"pattern for a branch."
+msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:71
-msgid ""
-"There is a difference between listing multiple <refspec> directly on 'git "
-"pull' command line and having multiple `remote.<repository>.fetch` entries "
-"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 "
-"<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 "
-"because making an Octopus from remote refs is rarely done, while keeping "
-"track of multiple remote heads in one-go by fetching more than one is often "
-"useful."
+msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries 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 <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 because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
msgstr ""
#. type: Title -
@@ -70034,11 +54484,7 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:9
-msgid ""
-"A revision parameter '<rev>' typically, but not necessarily, names a commit "
-"object. It uses what is called an 'extended SHA-1' syntax. Here are "
-"various ways to spell object names. The ones listed near the end of this "
-"list name trees and blobs contained in a commit."
+msgid "A revision parameter '<rev>' typically, but not necessarily, names a commit object. It uses what is called an 'extended SHA-1' syntax. Here are various ways to spell object names. The ones listed near the end of this list name trees and blobs contained in a commit."
msgstr ""
#. type: Labeled list
@@ -70049,12 +54495,7 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:16
-msgid ""
-"The full SHA-1 object name (40-byte hexadecimal string), or a leading "
-"substring that is unique within the repository. E.g. "
-"dae86e1950b1277e545cee180551750029cfe735 and dae86e both name the same "
-"commit object if there is no other object in your repository whose object "
-"name starts with dae86e."
+msgid "The full SHA-1 object name (40-byte hexadecimal string), or a leading substring that is unique within the repository. E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both name the same commit object if there is no other object in your repository whose object name starts with dae86e."
msgstr ""
#. type: Labeled list
@@ -70065,10 +54506,7 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:21
-msgid ""
-"Output from `git describe`; i.e. a closest tag, optionally followed by a "
-"dash and a number of commits, followed by a dash, a 'g', and an abbreviated "
-"object name."
+msgid "Output from `git describe`; i.e. a closest tag, optionally followed by a dash and a number of commits, followed by a dash, a 'g', and an abbreviated object name."
msgstr ""
#. type: Labeled list
@@ -70079,20 +54517,12 @@ msgstr ""
#. type: Plain text
#: 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:"
+msgid "A symbolic ref name. E.g. 'master' typically means the commit object referenced by 'refs/heads/master'. If you happen to have both 'heads/master' and 'tags/master', you can explicitly say 'heads/master' to tell Git which one you mean. When ambiguous, a '<refname>' is disambiguated by taking the first match in the following rules:"
msgstr ""
#. type: Plain text
#: en/revisions.txt:33
-msgid ""
-"If '$GIT_DIR/<refname>' exists, that is what you mean (this is usually "
-"useful only for `HEAD`, `FETCH_HEAD`, `ORIG_HEAD`, `MERGE_HEAD` and "
-"`CHERRY_PICK_HEAD`);"
+msgid "If '$GIT_DIR/<refname>' exists, that is what you mean (this is usually useful only for `HEAD`, `FETCH_HEAD`, `ORIG_HEAD`, `MERGE_HEAD` and `CHERRY_PICK_HEAD`);"
msgstr ""
#. type: Plain text
@@ -70122,25 +54552,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) "
-"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`."
+msgid "`HEAD` names the commit on which you based the changes in the working tree. `FETCH_HEAD` records the branch which you fetched from a remote repository with your last `git fetch` invocation. `ORIG_HEAD` is created by commands that move your `HEAD` in a drastic way, to record the position of the `HEAD` before their operation, so that you can easily change the tip of the branch back to the state before you ran them. `MERGE_HEAD` records the commit(s) which you are merging into your branch when you run `git merge`. `CHERRY_PICK_HEAD` records the commit which you are cherry-picking when you run `git cherry-pick`."
msgstr ""
#. 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."
+msgid "Note that any of the 'refs/*' cases above may come either from the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file. While the ref name encoding is unspecified, UTF-8 is preferred as some output processing may assume ref names in UTF-8."
msgstr ""
#. type: Labeled list
@@ -70157,21 +54574,12 @@ 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 "
-"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`."
+msgid "A ref followed by the suffix '@' with a date specification enclosed in a brace pair (e.g. '\\{yesterday\\}', '{1 month 2 weeks 3 days 1 hour 1 second ago}' or '{1979-02-26 18:30:00}') specifies the value of the ref at a prior point in time. This suffix may only be used immediately following a ref name and the ref must have an existing log ('$GIT_DIR/logs/<ref>'). Note that this looks up the state of your *local* ref at a given time; e.g., what was in your local 'master' branch last week. If you want to look at commits made during certain times, see `--since` and `--until`."
msgstr ""
#. type: Labeled list
@@ -70182,13 +54590,7 @@ 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 "
-"that ref. For example 'master@\\{1\\}' is the immediate prior value of "
-"'master' while 'master@\\{5\\}' is the 5th prior value of 'master'. This "
-"suffix may only be used immediately following a ref name and the ref must "
-"have an existing log ('$GIT_DIR/logs/<refname>')."
+msgid "A ref followed by the suffix '@' with an ordinal specification enclosed in a brace pair (e.g. '\\{1\\}', '\\{15\\}') specifies the n-th prior value of that ref. For example 'master@\\{1\\}' is the immediate prior value of 'master' while 'master@\\{5\\}' is the 5th prior value of 'master'. This suffix may only be used immediately following a ref name and the ref must have an existing log ('$GIT_DIR/logs/<refname>')."
msgstr ""
#. type: Labeled list
@@ -70199,10 +54601,7 @@ msgstr ""
#. type: Plain text
#: 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\\}'."
+msgid "You can use the '@' construct with an empty ref part to get at a reflog entry of the current branch. For example, if you are on branch 'blabla' then '@\\{1\\}' means the same as 'blabla@\\{1\\}'."
msgstr ""
#. type: Labeled list
@@ -70213,9 +54612,7 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:93
-msgid ""
-"The construct '@{-<n>}' means the <n>th branch/commit checked out before the"
-" current one."
+msgid "The construct '@{-<n>}' means the <n>th branch/commit checked out before the current one."
msgstr ""
#. type: Labeled list
@@ -70226,12 +54623,7 @@ 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."
+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."
msgstr ""
#. type: Labeled list
@@ -70242,12 +54634,7 @@ 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 "
-"repository, of course, we report the local tracking branch that corresponds "
-"to that branch (i.e., something in 'refs/remotes/')."
+msgid "The suffix '@\\{push}' reports the branch \"where we would push to\" if `git push` were run while `branchname` was checked out (or the current `HEAD` if no branchname is specified). Since our push destination is in a remote repository, of course, we report the local tracking branch that corresponds to that branch (i.e., something in 'refs/remotes/')."
msgstr ""
#. type: Plain text
@@ -70282,10 +54669,7 @@ 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."
+msgid "Note in the example that we set up a triangular workflow, where we pull from one location and push to another. In a non-triangular workflow, '@\\{push}' is the same as '@\\{upstream}', and there is no need for it."
msgstr ""
#. type: Labeled list
@@ -70296,12 +54680,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"the commit itself and is used when '<rev>' is the object name of a tag "
-"object that refers to a commit object."
+msgid "A suffix '{caret}' to a revision parameter means the first parent of that commit object. '{caret}<n>' means the <n>th parent (i.e. '<rev>{caret}' is equivalent to '<rev>{caret}1'). As a special rule, '<rev>{caret}0' means the commit itself and is used when '<rev>' is the object name of a tag object that refers to a commit object."
msgstr ""
#. type: Labeled list
@@ -70312,13 +54691,7 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:141
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -70329,31 +54702,17 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:153
-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\\}'."
+msgid "A suffix '{caret}' followed by an object type name enclosed in brace pair means dereference the object at '<rev>' recursively until an object of type '<type>' is found or the object cannot be dereferenced anymore (in which case, barf). For example, if '<rev>' is a commit-ish, '<rev>{caret}\\{commit\\}' describes the corresponding commit object. Similarly, if '<rev>' is a tree-ish, '<rev>{caret}\\{tree\\}' describes the corresponding tree object. '<rev>{caret}0' is a short-hand for '<rev>{caret}\\{commit\\}'."
msgstr ""
#. 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'; because a tag is already an object, it does not have to be "
-"dereferenced even once to get to an object."
+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'; because a tag is already an object, it does not have to be dereferenced even once to get to an object."
msgstr ""
#. type: Plain text
#: en/revisions.txt:161
-msgid ""
-"'rev{caret}\\{tag\\}' can be used to ensure that 'rev' identifies an "
-"existing tag object."
+msgid "'rev{caret}\\{tag\\}' can be used to ensure that 'rev' identifies an existing tag object."
msgstr ""
#. type: Labeled list
@@ -70364,9 +54723,7 @@ 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."
+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."
msgstr ""
#. type: Labeled list
@@ -70377,11 +54734,7 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:174
-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}'."
+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}'."
msgstr ""
#. type: Labeled list
@@ -70392,15 +54745,7 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:185
-msgid ""
-"A colon, followed by a slash, followed by a text, names a commit whose "
-"commit message matches the specified regular expression. This name returns "
-"the youngest matching commit which is reachable from any ref. The regular "
-"expression can match any part of the commit message. To match messages "
-"starting with a string, one can use e.g. ':/^foo'. The special sequence "
-"':/!' is reserved for modifiers to what is matched. ':/!-foo' performs a "
-"negative match, while ':/!!foo' matches a literal '!' character, followed by"
-" 'foo'. Any other sequence beginning with ':/!' is reserved for now."
+msgid "A colon, followed by a slash, followed by a text, names a commit whose commit message matches the specified regular expression. This name returns the youngest matching commit which is reachable from any ref. The regular expression can match any part of the commit message. To match messages starting with a string, one can use e.g. ':/^foo'. The special sequence ':/!' is reserved for modifiers to what is matched. ':/!-foo' performs a negative match, while ':/!!foo' matches a literal '!' character, followed by 'foo'. Any other sequence beginning with ':/!' is reserved for now."
msgstr ""
#. type: Labeled list
@@ -70411,15 +54756,7 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:197
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -70430,20 +54767,12 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:206
-msgid ""
-"A colon, optionally followed by a stage number (0 to 3) and a colon, "
-"followed by a path, names a blob object in the index at the given path. A "
-"missing stage number (and the colon that follows it) names a stage 0 entry. "
-"During a merge, stage 1 is the common ancestor, stage 2 is the target "
-"branch's version (typically the current branch), and stage 3 is the version "
-"from the branch which is being merged."
+msgid "A colon, optionally followed by a stage number (0 to 3) and a colon, followed by a path, names a blob object in the index at the given path. A missing stage number (and the colon that follows it) names a stage 0 entry. During a merge, stage 1 is the common ancestor, stage 2 is the target branch's version (typically the current branch), and stage 3 is the version from the branch which is being merged."
msgstr ""
#. type: Plain text
#: en/revisions.txt:210
-msgid ""
-"Here is an illustration, by Jon Loeliger. Both commit nodes B and C are "
-"parents of commit node A. Parent commits are ordered left-to-right."
+msgid "Here is an illustration, by Jon Loeliger. Both commit nodes B and C are parents of commit node A. Parent commits are ordered left-to-right."
msgstr ""
#. type: delimited block .
@@ -70480,24 +54809,17 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:241
-msgid ""
-"History traversing commands such as `git log` operate on a set of commits, "
-"not just a single commit."
+msgid "History traversing commands such as `git log` operate on a set of commits, not just a single commit."
msgstr ""
#. type: Plain text
#: 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."
+msgid "For these commands, specifying a single revision, using the notation described in the previous section, means the set of commits `reachable` from the given commit."
msgstr ""
#. type: Plain text
#: en/revisions.txt:249
-msgid ""
-"A commit's reachable set is the commit itself and the commits in its "
-"ancestry chain."
+msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
msgstr ""
#. type: Title ~
@@ -70514,10 +54836,7 @@ msgstr ""
#. type: Plain text
#: 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)."
+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)."
msgstr ""
#. type: Title ~
@@ -70534,12 +54853,7 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:269
-msgid ""
-"The '{caret}r1 r2' set operation appears so often that there is a shorthand "
-"for it. When you have two commits 'r1' and 'r2' (named according to the "
-"syntax explained in SPECIFYING REVISIONS above), you can ask for commits "
-"that are reachable from r2 excluding those that are reachable from r1 by "
-"'{caret}r1 r2' and it can be written as 'r1..r2'."
+msgid "The '{caret}r1 r2' set operation appears so often that there is a shorthand for it. When you have two commits 'r1' and 'r2' (named according to the syntax explained in SPECIFYING REVISIONS above), you can ask for commits that are reachable from r2 excluding those that are reachable from r1 by '{caret}r1 r2' and it can be written as 'r1..r2'."
msgstr ""
#. type: Labeled list
@@ -70550,22 +54864,12 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:276
-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."
+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."
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."
+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."
msgstr ""
#. type: Title ~
@@ -70576,9 +54880,7 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:288
-msgid ""
-"Three other shorthands exist, particularly useful for merge commits, for "
-"naming a set that is formed by a commit and its parent commits."
+msgid "Three other shorthands exist, particularly useful for merge commits, for naming a set that is formed by a commit and its parent commits."
msgstr ""
#. type: Plain text
@@ -70588,27 +54890,17 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:293
-msgid ""
-"The 'r1{caret}!' notation includes commit 'r1' but excludes all of its "
-"parents. By itself, this notation denotes the single commit 'r1'."
+msgid "The 'r1{caret}!' notation includes commit 'r1' but excludes all of its parents. By itself, this notation denotes the single commit 'r1'."
msgstr ""
#. type: Plain text
#: en/revisions.txt:300
-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)."
+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)."
msgstr ""
#. type: Plain text
#: en/revisions.txt:304
-msgid ""
-"While '<rev>{caret}<n>' was about specifying a single commit parent, these "
-"three notations also consider its parents. For example you can say "
-"'HEAD{caret}2{caret}@', however you cannot say 'HEAD{caret}@{caret}2'."
+msgid "While '<rev>{caret}<n>' was about specifying a single commit parent, these three notations also consider its parents. For example you can say 'HEAD{caret}2{caret}@', however you cannot say 'HEAD{caret}@{caret}2'."
msgstr ""
#. type: Title -
@@ -70625,9 +54917,7 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:311
-msgid ""
-"Include commits that are reachable from <rev> (i.e. <rev> and its "
-"ancestors)."
+msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
msgstr ""
#. type: Labeled list
@@ -70638,9 +54928,7 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:315
-msgid ""
-"Exclude commits that are reachable from <rev> (i.e. <rev> and its "
-"ancestors)."
+msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
msgstr ""
#. type: Labeled list
@@ -70651,10 +54939,7 @@ msgstr ""
#. type: Plain text
#: 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`."
+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`."
msgstr ""
#. type: Labeled list
@@ -70665,10 +54950,7 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:325
-msgid ""
-"Include commits that are reachable from either <rev1> or <rev2> but exclude "
-"those that are reachable from both. When either <rev1> or <rev2> is "
-"omitted, it defaults to `HEAD`."
+msgid "Include commits that are reachable from either <rev1> or <rev2> but exclude those that are reachable from both. When either <rev1> or <rev2> is omitted, it defaults to `HEAD`."
msgstr ""
#. type: Labeled list
@@ -70679,10 +54961,7 @@ 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 "
-"the commit itself)."
+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 the commit itself)."
msgstr ""
#. type: Labeled list
@@ -70693,10 +54972,7 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:335
-msgid ""
-"A suffix '{caret}' followed by an exclamation mark is the same as giving "
-"commit '<rev>' and then all its parents prefixed with '{caret}' to exclude "
-"them (and their ancestors)."
+msgid "A suffix '{caret}' followed by an exclamation mark is the same as giving commit '<rev>' and then all its parents prefixed with '{caret}' to exclude them (and their ancestors)."
msgstr ""
#. type: Labeled list
@@ -70712,9 +54988,7 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:343
-msgid ""
-"Here are a handful of examples using the Loeliger illustration above, with "
-"each step in the notation's expansion and selection carefully spelt out:"
+msgid "Here are a handful of examples using the Loeliger illustration above, with each step in the notation's expansion and selection carefully spelt out:"
msgstr ""
#. type: Plain text
@@ -70754,26 +55028,17 @@ msgstr "Configuration"
#. type: Plain text
#: en/rev-list-options.txt:7
-msgid ""
-"Besides specifying a range of commits that should be listed using the "
-"special notations explained in the description, additional commit limiting "
-"may be applied."
+msgid "Besides specifying a range of commits that should be listed using the special notations explained in the description, additional commit limiting may be applied."
msgstr ""
#. 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."
+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."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:15
-msgid ""
-"Note that these are applied before commit ordering and formatting options, "
-"such as `--reverse`."
+msgid "Note that these are applied before commit ordering and formatting options, such as `--reverse`."
msgstr ""
#. type: Labeled list
@@ -70878,11 +55143,7 @@ msgstr "status"
#. type: Plain text
#: 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>`)."
+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>`)."
msgstr ""
#. type: Labeled list
@@ -70893,11 +55154,7 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:54
-msgid ""
-"Limit the commits output to ones with reflog entries that match the "
-"specified pattern (regular expression). With more than one `--grep-reflog`, "
-"commits whose reflog message matches any of the given patterns are chosen. "
-"It is an error to use this option unless `--walk-reflogs` is in use."
+msgid "Limit the commits output to ones with reflog entries that match the specified pattern (regular expression). With more than one `--grep-reflog`, commits whose reflog message matches any of the given patterns are chosen. It is an error to use this option unless `--walk-reflogs` is in use."
msgstr ""
#. type: Labeled list
@@ -70908,84 +55165,64 @@ 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>`, "
-"commits whose message matches any of the given patterns are chosen (but see "
-"`--all-match`)."
+msgid "Limit the commits output to ones with log message that matches the specified pattern (regular expression). With more than one `--grep=<pattern>`, commits whose message matches any of the given patterns are chosen (but see `--all-match`)."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:65
-msgid ""
-"When `--show-notes` is in effect, the message from the notes is matched as "
-"if it were part of the log message."
+msgid "When `--show-notes` is in effect, the message from the notes is matched as if it were part of the log message."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:70
-msgid ""
-"Limit the commits output to ones that match all given `--grep`, instead of "
-"ones that match at least one."
+msgid "Limit the commits output to ones that match all given `--grep`, instead of ones that match at least one."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:71
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--invert-grep"
msgstr "--invert-grep"
#. type: Plain text
#: en/rev-list-options.txt:74
-msgid ""
-"Limit the commits output to ones with log message that do not match the "
-"pattern specified with `--grep=<pattern>`."
+msgid "Limit the commits output to ones with log message that do not match the pattern specified with `--grep=<pattern>`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:76
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--regexp-ignore-case"
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."
+msgid "Match the regular expression limiting patterns without regard to letter case."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:83
-msgid ""
-"Consider the limiting patterns to be basic regular expressions; this is the "
-"default."
+msgid "Consider the limiting patterns to be basic regular expressions; this is the default."
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."
+msgid "Consider the limiting patterns to be extended regular expressions instead of the default basic regular expressions."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:93
-msgid ""
-"Consider the limiting patterns to be fixed strings (don't interpret pattern "
-"as a regular expression)."
+msgid "Consider the limiting patterns to be fixed strings (don't interpret pattern as a regular expression)."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:97
-msgid ""
-"Consider the limiting patterns to be Perl-compatible regular expressions. "
-"Requires libpcre to be compiled in."
+msgid "Consider the limiting patterns to be Perl-compatible regular expressions. Requires libpcre to be compiled in."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:98
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--remove-empty"
msgstr "--remove-empty"
@@ -70996,27 +55233,24 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:101
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--merges"
msgstr "--merges"
#. type: Plain text
#: en/rev-list-options.txt:103
-msgid ""
-"Print only merge commits. This is exactly the same as `--min-parents=2`."
+msgid "Print only merge commits. This is exactly the same as `--min-parents=2`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:104
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-merges"
msgstr "--no-merges"
#. type: Plain text
#: en/rev-list-options.txt:107
-msgid ""
-"Do not print commits with more than one parent. This is exactly the same as "
-"`--max-parents=1`."
+msgid "Do not print commits with more than one parent. This is exactly the same as `--max-parents=1`."
msgstr ""
#. type: Labeled list
@@ -71033,56 +55267,39 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:110
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-min-parents"
msgstr "--no-min-parents"
#. type: Labeled list
#: en/rev-list-options.txt:111
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--no-max-parents"
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-"
-"parents=2` is the same as `--merges`. `--max-parents=0` gives all root "
-"commits and `--min-parents=3` all octopus merges."
+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-parents=2` is the same as `--merges`. `--max-parents=0` gives all root commits and `--min-parents=3` all octopus merges."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:120
-msgid ""
-"`--no-min-parents` and `--no-max-parents` reset these limits (to no limit) "
-"again. Equivalent forms are `--min-parents=0` (any commit has 0 or more "
-"parents) and `--max-parents=-1` (negative numbers denote no upper limit)."
+msgid "`--no-min-parents` and `--no-max-parents` reset these limits (to no limit) again. Equivalent forms are `--min-parents=0` (any commit has 0 or more parents) and `--max-parents=-1` (negative numbers denote no upper limit)."
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 "
-"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."
+msgid "Follow only the first parent commit upon seeing a merge commit. This option can give a better overview when viewing the evolution of a particular topic branch, because merges into a topic branch tend to be only about adjusting to updated upstream from time to time, and this option allows you to ignore the individual commits brought in to your history by such a merge. Cannot be combined with --bisect."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:134
-msgid ""
-"Reverses the meaning of the '{caret}' prefix (or lack thereof) for all "
-"following revision specifiers, up to the next `--not`."
+msgid "Reverses the meaning of the '{caret}' prefix (or lack thereof) for all following revision specifiers, up to the next `--not`."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:138
-msgid ""
-"Pretend as if all the refs in `refs/`, along with `HEAD`, are listed on the "
-"command line as '<commit>'."
+msgid "Pretend as if all the refs in `refs/`, along with `HEAD`, are listed on the command line as '<commit>'."
msgstr ""
#. type: Labeled list
@@ -71093,11 +55310,7 @@ 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."
+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."
msgstr ""
#. type: Labeled list
@@ -71108,11 +55321,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"is implied."
+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 is implied."
msgstr ""
#. type: Labeled list
@@ -71123,11 +55332,7 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:156
-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."
+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."
msgstr ""
#. type: Labeled list
@@ -71138,189 +55343,135 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:162
-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."
+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."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:178
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--reflog"
msgstr "--reflog"
#. type: Plain text
#: en/rev-list-options.txt:181
-msgid ""
-"Pretend as if all objects mentioned by reflogs are listed on the command "
-"line as `<commit>`."
+msgid "Pretend as if all objects mentioned by reflogs are listed on the command line as `<commit>`."
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."
+msgid "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, ignore-translated
+#, no-wrap
msgid "--bisect"
msgstr "--bisect"
#. type: Plain text
#: en/rev-list-options.txt:192
-msgid ""
-"Pretend as if the bad bisection ref `refs/bisect/bad` was listed and as if "
-"it was followed by `--not` and the good bisection refs `refs/bisect/good-*` "
-"on the command line. Cannot be combined with --first-parent."
+msgid "Pretend as if the bad bisection ref `refs/bisect/bad` was listed and as if it was followed by `--not` and the good bisection refs `refs/bisect/good-*` on the command line. Cannot be combined with --first-parent."
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."
+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."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:207
-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."
+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."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:209
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--cherry-mark"
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 `+`."
+msgid "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, ignore-translated
+#, no-wrap
msgid "--cherry-pick"
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."
+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."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:225
-msgid ""
-"For example, if you have two branches, `A` and `B`, a usual way to list all "
-"commits on only one side of them is with `--left-right` (see the example "
-"below in the description of the `--left-right` option). However, it shows "
-"the commits that were cherry-picked from the other branch (for example, "
-"``3rd on b'' may be cherry-picked from branch A). With this option, such "
-"pairs of commits are excluded from the output."
+msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:226
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--left-only"
msgstr "--left-only"
#. type: Labeled list
#: en/rev-list-options.txt:227
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--right-only"
msgstr "--right-only"
#. type: Plain text
#: en/rev-list-options.txt:231
-msgid ""
-"List only commits on the respective side of a symmetric difference, i.e. "
-"only those which would be marked `<` resp. `>` by `--left-right`."
+msgid "List only commits on the respective side of a symmetric difference, i.e. only those which would be marked `<` resp. `>` by `--left-right`."
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."
+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."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:238
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--cherry"
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`."
+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`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:246
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--walk-reflogs"
msgstr "--walk-reflogs"
#. type: Plain text
#: en/rev-list-options.txt:252
-msgid ""
-"Instead of walking the commit ancestry chain, walk reflog entries from the "
-"most recent one to older ones. When this option is used you cannot specify "
-"commits to exclude (that is, '{caret}commit', 'commit1..commit2', and "
-"'commit1\\...commit2' notations cannot be used)."
+msgid "Instead of walking the commit ancestry chain, walk reflog entries from the most recent one to older ones. When this option is used you cannot specify commits to exclude (that is, '{caret}commit', 'commit1..commit2', and 'commit1\\...commit2' notations cannot be used)."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:259
-msgid ""
-"With `--pretty` format other than `oneline` (for obvious reasons), this "
-"causes the output to have two extra lines of information taken from the "
-"reflog. The reflog designator in the output may be shown as `ref@{Nth}` "
-"(where `Nth` is the reverse-chronological index in the reflog) or as "
-"`ref@{timestamp}` (with the timestamp for that entry), depending on a few "
-"rules:"
+msgid "With `--pretty` format other than `oneline` (for obvious reasons), this causes the output to have two extra lines of information taken from the reflog. The reflog designator in the output may be shown as `ref@{Nth}` (where `Nth` is the reverse-chronological index in the reflog) or as `ref@{timestamp}` (with the timestamp for that entry), depending on a few rules:"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:263
-msgid ""
-"If the starting point is specified as `ref@{Nth}`, show the index format."
+msgid "If the starting point is specified as `ref@{Nth}`, show the index format."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:266
-msgid ""
-"If the starting point was specified as `ref@{now}`, show the timestamp "
-"format."
+msgid "If the starting point was specified as `ref@{now}`, show the timestamp format."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:269
-msgid ""
-"If neither was used, but `--date` was given on the command line, show the "
-"timestamp in the format requested by `--date`."
+msgid "If neither was used, but `--date` was given on the command line, show the timestamp in the format requested by `--date`."
msgstr ""
#. type: Plain text
@@ -71330,43 +55481,34 @@ msgstr ""
#. type: Plain text
#: 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]."
+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]."
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."
+msgid "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, ignore-translated
+#, no-wrap
msgid "--boundary"
msgstr "--boundary"
#. type: Plain text
#: en/rev-list-options.txt:285
-msgid ""
-"Output excluded boundary commits. Boundary commits are prefixed with `-`."
+msgid "Output excluded boundary commits. Boundary commits are prefixed with `-`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:287
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--use-bitmap-index"
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."
+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."
msgstr ""
#. type: Labeled list
@@ -71377,9 +55519,7 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:296
-msgid ""
-"Show progress reports on stderr as objects are considered. The `<header>` "
-"text will be printed with each progress update."
+msgid "Show progress reports on stderr as objects are considered. The `<header>` text will be printed with each progress update."
msgstr ""
#. type: Title ~
@@ -71390,11 +55530,7 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:307
-msgid ""
-"Sometimes you are only interested in parts of the history, for example the "
-"commits modifying a particular <path>. But there are two parts of 'History "
-"Simplification', one part is selecting the commits and the other is how to "
-"do it, as there are various strategies to simplify the history."
+msgid "Sometimes you are only interested in parts of the history, for example the commits modifying a particular <path>. But there are two parts of 'History Simplification', one part is selecting the commits and the other is how to do it, as there are various strategies to simplify the history."
msgstr ""
#. type: Plain text
@@ -71415,7 +55551,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:313
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--simplify-by-decoration"
msgstr "--simplify-by-decoration"
@@ -71443,15 +55579,12 @@ 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)"
+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)"
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:326
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--full-history"
msgstr "--full-history"
@@ -71462,14 +55595,13 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:329 en/rev-list-options.txt:462
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--dense"
msgstr "--dense"
#. type: Plain text
#: en/rev-list-options.txt:332
-msgid ""
-"Only the selected commits are shown, plus some to have a meaningful history."
+msgid "Only the selected commits are shown, plus some to have a meaningful history."
msgstr ""
#. type: Plain text
@@ -71479,31 +55611,24 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:336 en/rev-list-options.txt:473
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--simplify-merges"
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."
+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."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:341 en/rev-list-options.txt:520
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--ancestry-path"
msgstr "--ancestry-path"
#. type: Plain text
#: en/rev-list-options.txt:347
-msgid ""
-"When given a range of commits to display (e.g. 'commit1..commit2' or "
-"'commit2 {caret}commit1'), only display commits that exist directly on the "
-"ancestry chain between the 'commit1' and 'commit2', i.e. commits that are "
-"both descendants of 'commit1', and ancestors of 'commit2'."
+msgid "When given a range of commits to display (e.g. 'commit1..commit2' or 'commit2 {caret}commit1'), only display commits that exist directly on the ancestry chain between the 'commit1' and 'commit2', i.e. commits that are both descendants of 'commit1', and ancestors of 'commit2'."
msgstr ""
#. type: Plain text
@@ -71513,18 +55638,12 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:353
-msgid ""
-"Suppose you specified `foo` as the <paths>. We shall call commits that "
-"modify `foo` !TREESAME, and the rest TREESAME. (In a diff filtered for "
-"`foo`, they look different and equal, respectively.)"
+msgid "Suppose you specified `foo` as the <paths>. We shall call commits that modify `foo` !TREESAME, and the rest TREESAME. (In a diff filtered for `foo`, they look different and equal, respectively.)"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:357
-msgid ""
-"In the following, we will always refer to the same example history to "
-"illustrate the differences between simplification settings. We assume that "
-"you are filtering for a file `foo` in this commit graph:"
+msgid "In the following, we will always refer to the same example history to illustrate the differences between simplification settings. We assume that you are filtering for a file `foo` in this commit graph:"
msgstr ""
#. type: delimited block -
@@ -71540,17 +55659,12 @@ 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:"
+msgid "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."
+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."
msgstr ""
#. type: Plain text
@@ -71560,55 +55674,37 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:375
-msgid ""
-"`B` contains the same change as `A`. Its merge `M` is trivial and hence "
-"TREESAME to all parents."
+msgid "`B` contains the same change as `A`. Its merge `M` is trivial and hence TREESAME to all parents."
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."
+msgid "`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
#: en/rev-list-options.txt:381
-msgid ""
-"`D` sets `foo` to ``baz''. Its merge `O` combines the strings from `N` and "
-"`D` to ``foobarbaz''; i.e., it is not TREESAME to any parent."
+msgid "`D` sets `foo` to ``baz''. Its merge `O` combines the strings from `N` and `D` to ``foobarbaz''; i.e., it is not TREESAME to any parent."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:384
-msgid ""
-"`E` changes `quux` to ``xyzzy'', and its merge `P` combines the strings to "
-"``quux xyzzy''. `P` is TREESAME to `O`, but not to `E`."
+msgid "`E` changes `quux` to ``xyzzy'', and its merge `P` combines the strings to ``quux xyzzy''. `P` is TREESAME to `O`, but not to `E`."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:388
-msgid ""
-"`X` is an independent root commit that added a new file `side`, and `Y` "
-"modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and "
-"`Q` is TREESAME to `P`, but not to `Y`."
+msgid "`X` is an independent root commit that added a new file `side`, and `Y` modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and `Q` is TREESAME to `P`, but not to `Y`."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:393
-msgid ""
-"`rev-list` walks backwards through history, including or excluding commits "
-"based on whether `--full-history` and/or parent rewriting (via `--parents` "
-"or `--children`) are used. The following settings are available."
+msgid "`rev-list` walks backwards through history, including or excluding commits based on whether `--full-history` and/or parent rewriting (via `--parents` or `--children`) are used. The following settings are available."
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."
+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."
msgstr ""
#. type: Plain text
@@ -71627,18 +55723,12 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:418
-msgid ""
-"Parent/child relations are only visible with `--parents`, but that does not "
-"affect the commits selected in default mode, so we have shown the parent "
-"lines."
+msgid "Parent/child relations are only visible with `--parents`, but that does not affect the commits selected in default mode, so we have shown the parent lines."
msgstr ""
#. type: Labeled list
@@ -71649,11 +55739,7 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:425
-msgid ""
-"This mode differs from the default in one point: always follow all parents "
-"of a merge, even if it is TREESAME to one of them. Even if more than one "
-"side of the merge has commits that are included, this does not imply that "
-"the merge itself is! In the example, we get"
+msgid "This mode differs from the default in one point: always follow all parents of a merge, even if it is TREESAME to one of them. Even if more than one side of the merge has commits that are included, this does not imply that the merge itself is! In the example, we get"
msgstr ""
#. type: delimited block -
@@ -71664,17 +55750,12 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:433
-msgid ""
-"`M` was excluded because it is TREESAME to both parents. `E`, `C` and `B` "
-"were all walked, but only `B` was !TREESAME, so the others do not appear."
+msgid "`M` was excluded because it is TREESAME to both parents. `E`, `C` and `B` were all walked, but only `B` was !TREESAME, so the others do not appear."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:437
-msgid ""
-"Note that without parent rewriting, it is not really possible to talk about "
-"the parent/child relationships between the commits, so we show them "
-"disconnected."
+msgid "Note that without parent rewriting, it is not really possible to talk about the parent/child relationships between the commits, so we show them disconnected."
msgstr ""
#. type: Labeled list
@@ -71685,17 +55766,12 @@ 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)."
+msgid "Ordinary commits are only included if they are !TREESAME (though this can be changed, see `--sparse` below)."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:445
-msgid ""
-"Merges are always included. However, their parent list is rewritten: Along "
-"each parent, prune away commits that are not included themselves. This "
-"results in"
+msgid "Merges are always included. However, their parent list is rewritten: Along each parent, prune away commits that are not included themselves. This results in"
msgstr ""
#. type: delimited block -
@@ -71711,24 +55787,17 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:458
-msgid ""
-"Compare to `--full-history` without rewriting above. Note that `E` was "
-"pruned away because it is TREESAME, but the parent list of P was rewritten "
-"to contain `E`'s parent `I`. The same happened for `C` and `N`, and `X`, "
-"`Y` and `Q`."
+msgid "Compare to `--full-history` without rewriting above. Note that `E` was pruned away because it is TREESAME, but the parent list of P was rewritten to contain `E`'s parent `I`. The same happened for `C` and `N`, and `X`, `Y` and `Q`."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:461
-msgid ""
-"In addition to the above settings, you can change whether TREESAME affects "
-"inclusion:"
+msgid "In addition to the above settings, you can change whether TREESAME affects inclusion:"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:465
-msgid ""
-"Commits that are walked are included if they are not TREESAME to any parent."
+msgid "Commits that are walked are included if they are not TREESAME to any parent."
msgstr ""
#. type: Plain text
@@ -71738,24 +55807,17 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:472
-msgid ""
-"Note that without `--full-history`, this still simplifies merges: if one of "
-"the parents is TREESAME, we follow only that one, so the other sides of the "
-"merge are never walked."
+msgid "Note that without `--full-history`, this still simplifies merges: if one of the parents is TREESAME, we follow only that one, so the other sides of the merge are never walked."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:476
-msgid ""
-"First, build a history graph in the same way that `--full-history` with "
-"parent rewriting does (see above)."
+msgid "First, build a history graph in the same way that `--full-history` with parent rewriting does (see above)."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:479
-msgid ""
-"Then simplify each commit `C` to its replacement `C'` in the final history "
-"according to the following rules:"
+msgid "Then simplify each commit `C` to its replacement `C'` in the final history according to the following rules:"
msgstr ""
#. type: Plain text
@@ -71765,26 +55827,17 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:487
-msgid ""
-"Replace each parent `P` of `C'` with its simplification `P'`. In the "
-"process, drop parents that are ancestors of other parents or that are root "
-"commits TREESAME to an empty tree, and remove duplicates, but take care to "
-"never drop all parents that we are TREESAME to."
+msgid "Replace each parent `P` of `C'` with its simplification `P'`. In the process, drop parents that are ancestors of other parents or that are root commits TREESAME to an empty tree, and remove duplicates, but take care to never drop all parents that we are TREESAME to."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:491
-msgid ""
-"If after this parent rewriting, `C'` is a root or merge commit (has zero or "
-">1 parents), a boundary commit, or !TREESAME, it remains. Otherwise, it is "
-"replaced with its only parent."
+msgid "If after this parent rewriting, `C'` is a root or merge commit (has zero or >1 parents), a boundary commit, or !TREESAME, it remains. Otherwise, it is replaced with its only parent."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:495
-msgid ""
-"The effect of this is best shown by way of comparing to `--full-history` "
-"with parent rewriting. The example turns into:"
+msgid "The effect of this is best shown by way of comparing to `--full-history` with parent rewriting. The example turns into:"
msgstr ""
#. type: delimited block -
@@ -71805,24 +55858,17 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:509
-msgid ""
-"`N`'s parent list had `I` removed, because it is an ancestor of the other "
-"parent `M`. Still, `N` remained because it is !TREESAME."
+msgid "`N`'s parent list had `I` removed, because it is an ancestor of the other parent `M`. Still, `N` remained because it is !TREESAME."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:512
-msgid ""
-"`P`'s parent list similarly had `I` removed. `P` was then removed "
-"completely, because it had one parent and is TREESAME."
+msgid "`P`'s parent list similarly had `I` removed. `P` was then removed completely, because it had one parent and is TREESAME."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:516
-msgid ""
-"`Q`'s parent list had `Y` simplified to `X`. `X` was then removed, because "
-"it was a TREESAME root. `Q` was then removed completely, because it had one "
-"parent and is TREESAME."
+msgid "`Q`'s parent list had `Y` simplified to `X`. `X` was then removed, because it was a TREESAME root. `Q` was then removed completely, because it had one parent and is TREESAME."
msgstr ""
#. type: Plain text
@@ -71832,11 +55878,7 @@ msgstr ""
#. type: Plain text
#: 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 "
-"``from'' commit."
+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 ``from'' commit."
msgstr ""
#. type: Plain text
@@ -71857,22 +55899,12 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:542
-msgid ""
-"A regular 'D..M' computes the set of commits that are ancestors of `M`, but "
-"excludes the ones that are ancestors of `D`. This is useful to see what "
-"happened to the history leading to `M` since `D`, in the sense that ``what "
-"does `M` have that did not exist in `D`''. The result in this example would "
-"be all the commits, except `A` and `B` (and `D` itself, of course)."
+msgid "A regular 'D..M' computes the set of commits that are ancestors of `M`, but excludes the ones that are ancestors of `D`. This is useful to see what happened to the history leading to `M` since `D`, in the sense that ``what does `M` have that did not exist in `D`''. The result in this example would be all the commits, except `A` and `B` (and `D` itself, of course)."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:548
-msgid ""
-"When we want to find out what commits in `M` are contaminated with the bug "
-"introduced by `D` and need fixing, however, we might want to view only the "
-"subset of 'D..M' that are actually descendants of `D`, i.e. excluding `C` "
-"and `K`. This is exactly what the `--ancestry-path` option does. Applied to "
-"the 'D..M' range, it results in:"
+msgid "When we want to find out what commits in `M` are contaminated with the bug introduced by `D` and need fixing, however, we might want to view only the subset of 'D..M' that are actually descendants of `D`, i.e. excluding `C` and `K`. This is exactly what the `--ancestry-path` option does. Applied to the 'D..M' range, it results in:"
msgstr ""
#. type: delimited block -
@@ -71888,14 +55920,7 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:564
-msgid ""
-"The `--simplify-by-decoration` option allows you to view only the big "
-"picture of the topology of the history, by omitting commits that are not "
-"referenced by tags. Commits are marked as !TREESAME (in other words, kept "
-"after history simplification rules described above) if (1) they are "
-"referenced by tags, or (2) they change the contents of the paths given on "
-"the command line. All other commits are marked as TREESAME (subject to be "
-"simplified away)."
+msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
@@ -71906,12 +55931,7 @@ msgstr ""
#. type: Plain text
#: 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"
+msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
@@ -71935,62 +55955,39 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:592
-msgid ""
-"would be of roughly the same length. Finding the change which introduces a "
-"regression is thus reduced to a binary search: repeatedly generate and test "
-"new 'midpoint's until the commit chain is of length one. Cannot be combined "
-"with --first-parent."
+msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:593
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
#: en/rev-list-options.txt:604
-msgid ""
-"This calculates the same as `--bisect`, except that refs in `refs/bisect/` "
-"are not used, and except that this outputs text ready to be eval'ed by the "
-"shell. These lines will assign the name of the midpoint revision to the "
-"variable `bisect_rev`, and the expected number of commits to be tested after"
-" `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be"
-" tested if `bisect_rev` turns out to be good to `bisect_good`, the expected "
-"number of commits to be tested if `bisect_rev` turns out to be bad to "
-"`bisect_bad`, and the number of commits we are bisecting right now to "
-"`bisect_all`."
+msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:605
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
#: en/rev-list-options.txt:611
-msgid ""
-"This outputs all the commit objects between the included and excluded "
-"commits, ordered by their distance to the included and excluded commits. "
-"Refs in `refs/bisect/` are not used. The farthest from them is displayed "
-"first. (This is the only one displayed by `--bisect`.)"
+msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt: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)."
+msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt: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."
+msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
@@ -72007,29 +56004,23 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:630
-msgid ""
-"Show no parents before all of its children are shown, but otherwise show "
-"commits in the commit timestamp order."
+msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:631
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
#: en/rev-list-options.txt:634
-msgid ""
-"Show no parents before all of its children are shown, but otherwise show "
-"commits in the author timestamp order."
+msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:639
-msgid ""
-"Show no parents before all of its children are shown, and avoid showing "
-"commits on multiple lines of history intermixed."
+msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
@@ -72048,25 +56039,17 @@ msgstr ""
#. type: Plain text
#: 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."
+msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt: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."
+msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:663
-msgid ""
-"Output the commits chosen to be shown (see Commit Limiting section above) in"
-" reverse order. Cannot be combined with `--walk-reflogs`."
+msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
@@ -72082,64 +56065,51 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:670
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--objects"
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 "
-"download if I have the commit object _bar_ but not _foo_''."
+msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:676
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
#: en/rev-list-options.txt:682
-msgid ""
-"Similar to `--objects`, but also print the IDs of excluded commits prefixed "
-"with a ``-'' character. This is used by linkgit:git-pack-objects[1] to "
-"build a ``thin'' pack, which records objects in deltified form based on "
-"objects contained in these excluded commits to reduce network traffic."
+msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:683
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--objects-edge-aggressive"
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 "
-"build ``thin'' packs for shallow repositories."
+msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:688
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
#: en/rev-list-options.txt:692
-msgid ""
-"Pretend as if all trees and blobs used by the index are listed on the "
-"command line. Note that you probably want to use `--objects`, too."
+msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:696
-msgid ""
-"Only useful with `--objects`; print the object IDs that are not in packs."
+msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
@@ -72150,18 +56120,12 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:706
-msgid ""
-"Only show the given commits, but do not traverse their ancestors. This has "
-"no effect if a range is specified. If the argument `unsorted` is given, the "
-"commits are shown in the order they were given on the command line. "
-"Otherwise (if `sorted` or no argument was given), the commits are shown in "
-"reverse chronological order by commit time. Cannot be combined with "
-"`--graph`."
+msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:707
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--do-walk"
msgstr "--do-walk"
@@ -72179,15 +56143,12 @@ msgstr "Configuration"
#. type: Plain text
#: en/rev-list-options.txt:717
-msgid ""
-"Using these options, linkgit:git-rev-list[1] will act similar to the more "
-"specialized family of commit log tools: linkgit:git-log[1], linkgit:git-"
-"show[1], and linkgit:git-whatchanged[1]"
+msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:721
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--relative-date"
msgstr "--relative-date"
@@ -72205,19 +56166,12 @@ msgstr "Configuration"
#. type: Plain text
#: en/rev-list-options.txt:731
-msgid ""
-"Only takes effect for dates shown in human-readable format, such as when "
-"using `--pretty`. `log.date` config variable sets a default value for the "
-"log command's `--date` option. By default, dates are shown in the original "
-"time zone (either committer's or author's). If `-local` is appended to the "
-"format (e.g., `iso-local`), the user's local time zone is used instead."
+msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:735
-msgid ""
-"`--date=relative` shows dates relative to the current time, e.g. ``2 hours "
-"ago''. The `-local` option has no effect for `--date=relative`."
+msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
@@ -72227,9 +56181,7 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:740
-msgid ""
-"`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like "
-"format. The differences to the strict ISO 8601 format are:"
+msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
@@ -72249,60 +56201,37 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:748
-msgid ""
-"`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict "
-"ISO 8601 format."
+msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:751
-msgid ""
-"`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, "
-"often found in email messages."
+msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:753
-msgid ""
-"`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` "
-"format."
+msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt: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-"
-"epoch value (which is always measured in UTC), but does switch the "
-"accompanying timezone value."
+msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt: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 "
-"effect."
+msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:772
-msgid ""
-"`--date=format:...` feeds the format `...` to your system `strftime`. Use "
-"`--date=format:%c` to show the date in your system locale's preferred "
-"format. See the `strftime` manual for a complete list of format "
-"placeholders. When using `-local`, the correct syntax is `--date=format-"
-"local:...`."
+msgid "`--date=format:...` feeds the format `...` to your system `strftime`. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:775
-msgid ""
-"`--date=default` is the default format, and is similar to `--date=rfc2822`, "
-"with a few exceptions:"
+msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
@@ -72317,40 +56246,34 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:781
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--header"
msgstr "--header"
#. type: Plain text
#: en/rev-list-options.txt:784
-msgid ""
-"Print the contents of the commit in raw-format; each record is separated "
-"with a NUL character."
+msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:789
-msgid ""
-"Print also the parents of the commit (in the form \"commit parent...\"). "
-"Also enables parent rewriting, see 'History Simplification' below."
+msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' below."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:790
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--children"
msgstr "--children"
#. type: Plain text
#: en/rev-list-options.txt:793
-msgid ""
-"Print also the children of the commit (in the form \"commit child...\"). "
-"Also enables parent rewriting, see 'History Simplification' below."
+msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' below."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:795
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--timestamp"
msgstr "--timestamp"
@@ -72361,17 +56284,13 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:799
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--left-right"
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 "
-"`-`."
+msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
@@ -72415,17 +56334,13 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:828
-#, no-wrap, ignore-translated
+#, no-wrap
msgid "--graph"
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 "
-"between commits, in order for the graph history to be drawn properly. "
-"Cannot be combined with `--no-walk`."
+msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
@@ -72435,9 +56350,7 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:839
-msgid ""
-"This implies the `--topo-order` option by default, but the `--date-order` "
-"option may also be specified."
+msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
@@ -72448,22 +56361,12 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:846
-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."
+msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt: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."
+msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
@@ -72475,37 +56378,22 @@ msgstr "Configuration"
#. type: Plain text
#: en/rev-list-options.txt:865
-msgid ""
-"Listed below are options that control the formatting of diff output. Some "
-"of them are specific to linkgit:git-rev-list[1], however other diff options "
-"may be given. See linkgit:git-diff-files[1] for more options."
+msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:872
-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."
+msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt: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 "
-"variants and the merge result picks one of them without modification."
+msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:886
-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."
+msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
@@ -72520,17 +56408,12 @@ 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."
+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."
msgstr ""
#. type: Plain text
#: en/sequencer.txt:10
-msgid ""
-"Forget about the current operation in progress. Can be used to clear the "
-"sequencer state after a failed cherry-pick or revert."
+msgid "Forget about the current operation in progress. Can be used to clear the sequencer state after a failed cherry-pick or revert."
msgstr ""
#. type: Plain text
@@ -72540,14 +56423,7 @@ msgstr ""
#. type: Plain text
#: en/transfer-data-leaks.txt:11
-msgid ""
-"The fetch and push protocols are not designed to prevent one side from "
-"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."
+msgid "The fetch and push protocols are not designed to prevent one side from 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."
msgstr ""
#. type: Plain text
@@ -72557,28 +56433,12 @@ msgstr ""
#. type: Plain text
#: en/transfer-data-leaks.txt:26
-msgid ""
-"The victim sends \"have\" lines advertising the IDs of objects it has that "
-"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 "
-"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 "
-"to \"merge\" X into a public branch and hope that the user does additional "
-"work on this branch and pushes it back to the server without noticing the "
-"merge.)"
+msgid "The victim sends \"have\" lines advertising the IDs of objects it has that 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 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 to \"merge\" X into a public branch and hope that the user does additional work on this branch and pushes it back to the server without noticing the merge.)"
msgstr ""
#. type: Plain text
#: en/transfer-data-leaks.txt:30
-msgid ""
-"As in #1, the attacker chooses an object ID X to steal. The victim sends an "
-"object Y that the attacker already has, and the attacker falsely claims to "
-"have X and not Y, so the victim sends Y as a delta against X. The delta "
-"reveals regions of X that are similar to Y to the attacker."
+msgid "As in #1, the attacker chooses an object ID X to steal. The victim sends an object Y that the attacker already has, and the attacker falsely claims to have X and not Y, so the victim sends Y as a delta against X. The delta reveals regions of X that are similar to Y to the attacker."
msgstr ""
#. type: Title -
@@ -72589,9 +56449,7 @@ msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:8
-msgid ""
-"The name of one of the following can be used instead of a URL as "
-"`<repository>` argument:"
+msgid "The name of one of the following can be used instead of a URL as `<repository>` argument:"
msgstr ""
#. type: Plain text
@@ -72611,9 +56469,7 @@ msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:15
-msgid ""
-"All of these also allow you to omit the refspec from the command line "
-"because they each contain a refspec which git will use by default."
+msgid "All of these also allow you to omit the refspec from the command line because they each contain a refspec which git will use by default."
msgstr ""
#. type: Title ~
@@ -72624,13 +56480,7 @@ msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:26
-msgid ""
-"You can choose to provide the name of a remote which you had previously "
-"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:"
+msgid "You can choose to provide the name of a remote which you had previously 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:"
msgstr ""
#. type: delimited block -
@@ -72646,9 +56496,7 @@ msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:37
-msgid ""
-"The `<pushurl>` is used for pushes only. It is optional and defaults to "
-"`<url>`."
+msgid "The `<pushurl>` is used for pushes only. It is optional and defaults to `<url>`."
msgstr ""
#. type: Title ~
@@ -72659,11 +56507,7 @@ 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 "
-"file will be used as default when you do not provide a refspec on the "
-"command line. This file should have the following format:"
+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 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 ""
#. type: delimited block -
@@ -72677,10 +56521,7 @@ msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:59
-msgid ""
-"`Push:` lines are used by 'git push' and `Pull:` lines are used by 'git "
-"pull' and 'git fetch'. Multiple `Push:` and `Pull:` lines may be specified "
-"for additional branch mappings."
+msgid "`Push:` lines are used by 'git push' and `Pull:` lines are used by 'git pull' and 'git fetch'. Multiple `Push:` and `Pull:` lines may be specified for additional branch mappings."
msgstr ""
#. type: Title ~
@@ -72691,10 +56532,7 @@ msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:67
-msgid ""
-"You can choose to provide the name of a file in `$GIT_DIR/branches`. The "
-"URL in this file will be used to access the repository. This file should "
-"have the following format:"
+msgid "You can choose to provide the name of a file in `$GIT_DIR/branches`. The URL in this file will be used to access the repository. This file should have the following format:"
msgstr ""
#. type: delimited block -
@@ -72710,10 +56548,7 @@ msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:79
-msgid ""
-"Depending on the operation, git will use one of the following refspecs, if "
-"you don't provide one on the command line. `<branch>` is the name of this "
-"file in `$GIT_DIR/branches` and `<head>` defaults to `master`."
+msgid "Depending on the operation, git will use one of the following refspecs, if you don't provide one on the command line. `<branch>` is the name of this file in `$GIT_DIR/branches` and `<head>` defaults to `master`."
msgstr ""
#. type: Plain text
@@ -72746,25 +56581,17 @@ msgstr ""
#. type: Plain text
#: en/urls.txt:8
-msgid ""
-"In general, URLs contain information about the transport protocol, the "
-"address of the remote server, and the path to the repository. Depending on "
-"the transport protocol, some of this information may be absent."
+msgid "In general, URLs contain information about the transport protocol, the address of the remote server, and the path to the repository. Depending on the transport protocol, some of this information may be absent."
msgstr ""
#. 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)."
+msgid "Git supports ssh, git, http, and https protocols (in addition, ftp, and ftps can be used for fetching, but this is inefficient and deprecated; do not use it)."
msgstr ""
#. type: Plain text
#: en/urls.txt:15
-msgid ""
-"The native transport (i.e. git:// URL) does no authentication and should be "
-"used with caution on unsecured networks."
+msgid "The native transport (i.e. git:// URL) does no authentication and should be used with caution on unsecured networks."
msgstr ""
#. type: Plain text
@@ -72774,8 +56601,7 @@ msgstr ""
#. type: Plain text
#: en/urls.txt:19
-msgid ""
-"ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/path/to/repo.git/"
+msgid "ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/path/to/repo.git/"
msgstr ""
#. type: Plain text
@@ -72805,11 +56631,7 @@ msgstr ""
#. type: Plain text
#: en/urls.txt:32
-msgid ""
-"This syntax is only recognized if there are no slashes before the first "
-"colon. This helps differentiate a local path that contains a colon. For "
-"example the local path `foo:bar` could be specified as an absolute path or "
-"`./foo:bar` to avoid being misinterpreted as an ssh url."
+msgid "This syntax is only recognized if there are no slashes before the first colon. This helps differentiate a local path that contains a colon. For example the local path `foo:bar` could be specified as an absolute path or `./foo:bar` to avoid being misinterpreted as an ssh url."
msgstr ""
#. type: Plain text
@@ -72819,14 +56641,12 @@ 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/"
+msgid "ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/"
msgstr ""
#. type: Plain text
#: en/urls.txt:37
-msgid ""
-"git://host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/"
+msgid "git://host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/"
msgstr ""
#. type: Plain text
@@ -72836,9 +56656,7 @@ msgstr ""
#. type: Plain text
#: en/urls.txt:41
-msgid ""
-"For local repositories, also supported by Git natively, the following "
-"syntaxes may be used:"
+msgid "For local repositories, also supported by Git natively, the following syntaxes may be used:"
msgstr ""
#. type: Plain text
@@ -72853,24 +56671,17 @@ msgstr ""
#. type: Plain text
#: en/urls.txt:49
-msgid ""
-"These two syntaxes are mostly equivalent, except when cloning, when the "
-"former implies --local option. See linkgit:git-clone[1] for details."
+msgid "These two syntaxes are mostly equivalent, except when cloning, when the former implies --local option. See linkgit:git-clone[1] for details."
msgstr ""
#. type: Plain text
#: en/urls.txt:54
-msgid ""
-"These two syntaxes are mostly equivalent, except the former implies --local "
-"option."
+msgid "These two syntaxes are mostly equivalent, except the former implies --local option."
msgstr ""
#. type: Plain text
#: en/urls.txt:60
-msgid ""
-"When Git doesn't know how to handle a certain transport protocol, it "
-"attempts to use the 'remote-<transport>' remote helper, if one exists. To "
-"explicitly request a remote helper, the following syntax may be used:"
+msgid "When Git doesn't know how to handle a certain transport protocol, it attempts to use the 'remote-<transport>' remote helper, if one exists. To explicitly request a remote helper, the following syntax may be used:"
msgstr ""
#. type: Plain text
@@ -72880,19 +56691,12 @@ msgstr ""
#. type: Plain text
#: 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."
+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."
msgstr ""
#. type: Plain text
#: en/urls.txt:71
-msgid ""
-"If there are a large number of similarly-named remote repositories and you "
-"want to use a different format for them (such that the URLs you use will be "
-"rewritten into URLs that work), you can create a configuration section of "
-"the form:"
+msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
msgstr ""
#. type: delimited block -
@@ -72919,17 +56723,12 @@ msgstr ""
#. type: Plain text
#: 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\"."
+msgid "a URL like \"work:repo.git\" or like \"host.xz:/path/to/repo.git\" will be rewritten in any context that takes a URL to be \"git://git.host.xz/repo.git\"."
msgstr ""
#. type: Plain text
#: en/urls.txt:90
-msgid ""
-"If you want to rewrite URLs for push only, you can create a configuration "
-"section of the form:"
+msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
msgstr ""
#. type: delimited block -
@@ -72950,10 +56749,7 @@ msgstr ""
#. type: Plain text
#: en/urls.txt:105
-msgid ""
-"a URL like \"git://example.org/path/to/repo.git\" will be rewritten to "
-"\"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use "
-"the original URL."
+msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL."
msgstr ""
#~ msgid ""
@@ -73022,15 +56818,12 @@ msgstr ""
#~ "--branch::\n"
#~ "\tMontrer la branche et l'information de suivi, y compris en format court.\n"
-#, ignore-translated
#~ msgid "`GIT_TRACE_FSMONITOR`"
#~ msgstr "`GIT_TRACE_FSMONITOR`"
-#, ignore-translated
#~ msgid "`GIT_REDIRECT_STDIN`"
#~ msgstr "`GIT_REDIRECT_STDIN`"
-#, ignore-translated
#~ msgid "`GIT_REDIRECT_STDOUT`"
#~ msgstr "`GIT_REDIRECT_STDOUT`"
@@ -73039,14 +56832,8 @@ msgstr ""
#~ msgstr "$ git add Documentation/\\*.txt\n"
#, fuzzy
-#~ msgid ""
-#~ "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."
+#~ msgid "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."
#, fuzzy
#~ msgid "'traditional' - Shows ignored files and directories, unless"
@@ -73094,26 +56881,18 @@ msgstr ""
#~ "\tUtilisez '-' pour lire le message depuis l'entr챕e standard.\n"
#, fuzzy
-#~ msgid ""
-#~ "If true, makes linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-"
-#~ "whatchanged[1] assume `--show-signature`."
-#~ msgstr ""
-#~ "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`."
+#~ msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
-#, ignore-translated
#~ msgid "sendemail.tocmd"
#~ msgstr "sendemail.tocmd"
-#, ignore-translated
#~ msgid "sendemail.smtpBatchSize"
#~ msgstr "sendemail.smtpBatchSize"
-#, ignore-translated
#~ msgid "sendemail.smtpReloginDelay"
#~ msgstr "sendemail.smtpReloginDelay"
-#, ignore-translated
#~ msgid "status.showStash"
#~ msgstr "status.showStash"
@@ -73121,19 +56900,15 @@ msgstr ""
#~ msgid "submodule.<name>.active"
#~ msgstr "git-add(1)"
-#, ignore-translated
#~ msgid "submodule.active"
#~ msgstr "submodule.active"
-#, ignore-translated
#~ msgid "submodule.recurse"
#~ msgstr "submodule.recurse"
#, fuzzy
#~ 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])."
+#~ msgstr "La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration `commit.cleanup` (voir linkgit:git-config[1])."
#, fuzzy
#~ msgid ""
@@ -73180,7 +56955,6 @@ msgstr ""
#~ msgid "HOOKS\n"
#~ msgstr "CROCHETS"
-#, ignore-translated
#~ msgid "linkgit:git-blame[1]\n"
#~ msgstr "linkgit:git-blame[1]\n"
@@ -73192,7 +56966,6 @@ msgstr ""
#~ msgid "SEE ALSO\n"
#~ msgstr "VOIR AUSSI"
-#, ignore-translated
#~ msgid "linkgit:git-annotate[1]\n"
#~ msgstr "linkgit:git-annotate[1]\n"
@@ -73200,7 +56973,6 @@ msgstr ""
#~ msgid "EXAMPLE\n"
#~ msgstr "EXEMPLES"
-#, ignore-translated
#~ msgid "linkgit:git-revert[1]\n"
#~ msgstr "linkgit:git-revert[1]\n"
@@ -73216,23 +56988,18 @@ msgstr ""
#~ msgid "DESCRIPTION\n"
#~ msgstr "DESCRIPTION"
-#, ignore-translated
#~ msgid "linkgit:git-fast-export[1]\n"
#~ msgstr "linkgit:git-fast-export[1]\n"
-#, ignore-translated
#~ msgid "linkgit:git-fetch[1]\n"
#~ msgstr "linkgit:git-fetch[1]\n"
-#, ignore-translated
#~ msgid "linkgit:git-pull[1]\n"
#~ msgstr "linkgit:git-pull[1]\n"
-#, ignore-translated
#~ msgid "linkgit:git-merge[1]\n"
#~ msgstr "linkgit:git-merge[1]\n"
-#, ignore-translated
#~ msgid "linkgit:git-show-ref[1]\n"
#~ msgstr "linkgit:git-show-ref[1]\n"
@@ -73246,9 +57013,7 @@ msgstr ""
#~ "quoted as explained for the configuration variable `core.quotePath`\n"
#~ "(see linkgit:git-config[1]). Using `-z` the filename is output\n"
#~ "verbatim and the line is terminated by a NUL byte.\n"
-#~ msgstr ""
-#~ "La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration "
-#~ "`commit.cleanup` (voir linkgit:git-config[1])."
+#~ msgstr "La valeur par d챕faut peut 챗tre modifi챕e par la variable de configuration `commit.cleanup` (voir linkgit:git-config[1])."
#, fuzzy
#~ msgid "CONFIGURATION VARIABLES\n"