From 3e7ed5ba89eaa05ab533ec26a6d39922171b5af3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>
Date: Sun, 13 Jan 2019 16:19:08 +0100
Subject: [PATCH] More automatic translations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Jean-No챘l Avila <jn.avila@free.fr>
---
po/documentation.de.po | 2985 +++++++++++++++++++-------------------
po/documentation.fr.po | 393 ++++-
scripts/pre-translate-po | 4 +-
3 files changed, 1809 insertions(+), 1573 deletions(-)
diff --git a/po/documentation.de.po b/po/documentation.de.po
index ecd6bf2..1e5162c 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -21,7 +21,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "-b"
msgstr "-b"
@@ -35,7 +35,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--root"
msgstr "--root"
@@ -48,7 +48,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:9
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--show-stats"
msgstr "--show-stats"
@@ -89,7 +89,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, ignore-translated
+#, no-wrap, ignore-translated
msgid "-l"
msgstr "-l"
@@ -107,7 +107,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, ignore-translated
+#, no-wrap, ignore-translated
msgid "-t"
msgstr "-t"
@@ -156,14 +156,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, ignore-translated
+#, no-wrap, ignore-translated
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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--porcelain"
msgstr "--porcelain"
@@ -174,7 +174,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:43
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--line-porcelain"
msgstr "--line-porcelain"
@@ -187,7 +187,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:48 en/git-pack-objects.txt:123 en/git-svn.txt:357
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--incremental"
msgstr "--incremental"
@@ -245,7 +245,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:73 en/git-checkout.txt:110 en/git-fsck.txt:92
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]progress"
msgstr "--[no-]progress"
@@ -314,7 +314,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "-h"
msgstr "-h"
@@ -325,7 +325,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:234
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-annotate[1]"
msgstr "linkgit:git-annotate[1]"
@@ -336,7 +336,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:4 en/git-annotate.txt:31
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-blame[1]"
msgstr "linkgit:git-blame[1]"
@@ -347,7 +347,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-cherry[1]"
msgstr "linkgit:git-cherry[1]"
@@ -358,7 +358,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:10
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
@@ -369,7 +369,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:13
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
@@ -380,7 +380,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:16
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
@@ -397,7 +397,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:19
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-get-tar-commit-id[1]"
msgstr "linkgit:git-get-tar-commit-id[1]"
@@ -408,7 +408,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:22
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
@@ -421,7 +421,7 @@ msgstr "Gibt Informationen 체ber das entfernte Repository <Name> aus."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:25
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
@@ -434,7 +434,7 @@ msgstr "Initialized empty Git repository in .git/\n"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:28
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
@@ -445,7 +445,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:31
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
@@ -456,7 +456,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:34
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-rev-parse[1]"
msgstr "linkgit:git-rev-parse[1]"
@@ -467,7 +467,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:37
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
@@ -480,7 +480,7 @@ msgstr "Zeigt die Geschichte des Projekts"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:40
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
@@ -493,7 +493,7 @@ msgstr "git-verify-tag - Die GPG-Signaturen von Markierungs 체berpr체fen"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:43
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
@@ -506,7 +506,7 @@ msgstr "git-verify-tag - Die GPG-Signaturen von Markierungs 체berpr체fen"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:46
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
@@ -529,7 +529,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:142
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
@@ -543,7 +543,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1472
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -554,7 +554,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:215
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -565,7 +565,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:10
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-filter-branch[1]"
msgstr "linkgit:git-filter-branch[1]"
@@ -578,7 +578,7 @@ msgstr "switch branch"
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:139
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-mergetool[1]"
msgstr "linkgit:git-mergetool[1]"
@@ -589,7 +589,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:16
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-pack-refs[1]"
msgstr "linkgit:git-pack-refs[1]"
@@ -600,7 +600,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:19
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-prune[1]"
msgstr "linkgit:git-prune[1]"
@@ -611,7 +611,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:22
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-reflog[1]"
msgstr "linkgit:git-reflog[1]"
@@ -622,7 +622,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:25
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-remote[1]"
msgstr "linkgit:git-remote[1]"
@@ -635,7 +635,7 @@ msgstr "git-remote - Einen Satz entfernter Repositories verwalten"
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:28
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-repack[1]"
msgstr "linkgit:git-repack[1]"
@@ -646,7 +646,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:31
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-replace[1]"
msgstr "linkgit:git-replace[1]"
@@ -657,7 +657,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:1
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-archimport[1]"
msgstr "linkgit:git-archimport[1]"
@@ -668,7 +668,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:4
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-cvsexportcommit[1]"
msgstr "linkgit:git-cvsexportcommit[1]"
@@ -679,7 +679,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:7
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-cvsimport[1]"
msgstr "linkgit:git-cvsimport[1]"
@@ -690,7 +690,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:10
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-cvsserver[1]"
msgstr "linkgit:git-cvsserver[1]"
@@ -701,7 +701,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:13
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-imap-send[1]"
msgstr "linkgit:git-imap-send[1]"
@@ -712,7 +712,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:16
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-p4[1]"
msgstr "linkgit:git-p4[1]"
@@ -725,7 +725,7 @@ msgstr "git-remote - Einen Satz entfernter Repositories verwalten"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:19
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-quiltimport[1]"
msgstr "linkgit:git-quiltimport[1]"
@@ -736,7 +736,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:22
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-request-pull[1]"
msgstr "linkgit:git-request-pull[1]"
@@ -747,7 +747,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:25
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-send-email[1]"
msgstr "linkgit:git-send-email[1]"
@@ -758,7 +758,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:28
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-svn[1]"
msgstr "linkgit:git-svn[1]"
@@ -769,7 +769,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:185
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -782,7 +782,7 @@ msgstr "git-add - F체ge Dateiinhalte zum Index hinzu."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:4
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-am[1]"
msgstr "linkgit:git-am[1]"
@@ -793,7 +793,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:7
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-archive[1]"
msgstr "linkgit:git-archive[1]"
@@ -804,7 +804,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:10
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-bisect[1]"
msgstr "linkgit:git-bisect[1]"
@@ -815,7 +815,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:13
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-branch[1]"
msgstr "linkgit:git-branch[1]"
@@ -830,7 +830,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:16
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-bundle[1]"
msgstr "linkgit:git-bundle[1]"
@@ -841,7 +841,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:19
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-checkout[1]"
msgstr "linkgit:git-checkout[1]"
@@ -852,7 +852,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:22 en/git-revert.txt:126
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-cherry-pick[1]"
msgstr "linkgit:git-cherry-pick[1]"
@@ -863,7 +863,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:25
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-citool[1]"
msgstr "linkgit:git-citool[1]"
@@ -876,7 +876,7 @@ msgstr "git-gitool - Graphische Alternative zu git-commit"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:28
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-clean[1]"
msgstr "linkgit:git-clean[1]"
@@ -890,7 +890,7 @@ msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:31
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-clone[1]"
msgstr "linkgit:git-clone[1]"
@@ -904,7 +904,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:34
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-commit[1]"
msgstr "linkgit:git-commit[1]"
@@ -917,7 +917,7 @@ msgstr "git-commit - Trage 횆nderungen im Projektarchiv (repository) ein"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:37
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-describe[1]"
msgstr "linkgit:git-describe[1]"
@@ -928,7 +928,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:136
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-diff[1]"
msgstr "linkgit:git-diff[1]"
@@ -944,7 +944,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-fetch[1]"
msgstr "linkgit:git-fetch[1]"
@@ -955,7 +955,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:46
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-format-patch[1]"
msgstr "linkgit:git-format-patch[1]"
@@ -966,7 +966,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:49
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-gc[1]"
msgstr "linkgit:git-gc[1]"
@@ -977,7 +977,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:52
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-grep[1]"
msgstr "linkgit:git-grep[1]"
@@ -988,7 +988,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:55
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-gui[1]"
msgstr "linkgit:git-gui[1]"
@@ -999,7 +999,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:58
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-init[1]"
msgstr "linkgit:git-init[1]"
@@ -1010,7 +1010,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:61
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-log[1]"
msgstr "linkgit:git-log[1]"
@@ -1023,7 +1023,7 @@ msgstr "Zeigt die Geschichte des Projekts"
#. type: Plain text
#: en/cmds-mainporcelain.txt:64 en/git-fmt-merge-msg.txt:75
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-merge[1]"
msgstr "linkgit:git-merge[1]"
@@ -1034,7 +1034,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:67
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-mv[1]"
msgstr "linkgit:git-mv[1]"
@@ -1049,7 +1049,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:70
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-notes[1]"
msgstr "linkgit:git-notes[1]"
@@ -1060,7 +1060,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:73 en/git-fetch.txt:209
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-pull[1]"
msgstr "linkgit:git-pull[1]"
@@ -1071,7 +1071,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:76
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-push[1]"
msgstr "linkgit:git-push[1]"
@@ -1082,7 +1082,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:79 en/git-svn.txt:1133
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-rebase[1]"
msgstr "linkgit:git-rebase[1]"
@@ -1093,7 +1093,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:82
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-reset[1]"
msgstr "linkgit:git-reset[1]"
@@ -1104,7 +1104,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:85 en/git-cherry-pick.txt:230
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-revert[1]"
msgstr "linkgit:git-revert[1]"
@@ -1115,7 +1115,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:88
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-rm[1]"
msgstr "linkgit:git-rm[1]"
@@ -1129,7 +1129,7 @@ msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:91
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-shortlog[1]"
msgstr "linkgit:git-shortlog[1]"
@@ -1140,7 +1140,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:94
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-show[1]"
msgstr "linkgit:git-show[1]"
@@ -1151,7 +1151,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:97
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
@@ -1162,7 +1162,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:100
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
@@ -1173,7 +1173,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
@@ -1184,7 +1184,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:106
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
@@ -1195,7 +1195,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:109
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
@@ -1218,7 +1218,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:1
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-cat-file[1]"
msgstr "linkgit:git-cat-file[1]"
@@ -1229,7 +1229,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:4
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-diff-files[1]"
msgstr "linkgit:git-diff-files[1]"
@@ -1243,7 +1243,7 @@ msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:7
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-diff-index[1]"
msgstr "linkgit:git-diff-index[1]"
@@ -1256,7 +1256,7 @@ msgstr "Erstellt ein Baumobjekt mit dem aktuellen Index."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:10
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-diff-tree[1]"
msgstr "linkgit:git-diff-tree[1]"
@@ -1267,7 +1267,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:13
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-for-each-ref[1]"
msgstr "linkgit:git-for-each-ref[1]"
@@ -1278,7 +1278,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:16
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-ls-files[1]"
msgstr "linkgit:git-ls-files[1]"
@@ -1289,7 +1289,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:19
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-ls-remote[1]"
msgstr "linkgit:git-ls-remote[1]"
@@ -1302,7 +1302,7 @@ msgstr "--reference <repository>"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:22
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-ls-tree[1]"
msgstr "linkgit:git-ls-tree[1]"
@@ -1313,7 +1313,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:25
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-merge-base[1]"
msgstr "linkgit:git-merge-base[1]"
@@ -1324,7 +1324,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:28
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-name-rev[1]"
msgstr "linkgit:git-name-rev[1]"
@@ -1335,7 +1335,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:31
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-pack-redundant[1]"
msgstr "linkgit:git-pack-redundant[1]"
@@ -1346,7 +1346,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:34
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-rev-list[1]"
msgstr "linkgit:git-rev-list[1]"
@@ -1357,7 +1357,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:37
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-show-index[1]"
msgstr "linkgit:git-show-index[1]"
@@ -1368,7 +1368,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:40 en/git-for-each-ref.txt:341
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-show-ref[1]"
msgstr "linkgit:git-show-ref[1]"
@@ -1381,7 +1381,7 @@ msgstr "--reference <repository>"
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:43
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-unpack-file[1]"
msgstr "linkgit:git-unpack-file[1]"
@@ -1392,7 +1392,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:46
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-var[1]"
msgstr "linkgit:git-var[1]"
@@ -1403,7 +1403,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:49
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-verify-pack[1]"
msgstr "linkgit:git-verify-pack[1]"
@@ -1414,7 +1414,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:1
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-apply[1]"
msgstr "linkgit:git-apply[1]"
@@ -1425,7 +1425,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:4
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-checkout-index[1]"
msgstr "linkgit:git-checkout-index[1]"
@@ -1436,7 +1436,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:7
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-commit-tree[1]"
msgstr "linkgit:git-commit-tree[1]"
@@ -1447,7 +1447,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:10
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-hash-object[1]"
msgstr "linkgit:git-hash-object[1]"
@@ -1458,7 +1458,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:13
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-index-pack[1]"
msgstr "linkgit:git-index-pack[1]"
@@ -1469,7 +1469,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:16
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-merge-file[1]"
msgstr "linkgit:git-merge-file[1]"
@@ -1480,7 +1480,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:19
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-merge-index[1]"
msgstr "linkgit:git-merge-index[1]"
@@ -1491,7 +1491,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:22
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-mktag[1]"
msgstr "linkgit:git-mktag[1]"
@@ -1502,7 +1502,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:25
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-mktree[1]"
msgstr "linkgit:git-mktree[1]"
@@ -1513,7 +1513,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:28
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-pack-objects[1]"
msgstr "linkgit:git-pack-objects[1]"
@@ -1524,7 +1524,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:31
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-prune-packed[1]"
msgstr "linkgit:git-prune-packed[1]"
@@ -1535,7 +1535,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:34
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-read-tree[1]"
msgstr "linkgit:git-read-tree[1]"
@@ -1548,7 +1548,7 @@ msgstr "Gibt Informationen 체ber das entfernte Repository <Name> aus."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:37
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-symbolic-ref[1]"
msgstr "linkgit:git-symbolic-ref[1]"
@@ -1559,7 +1559,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:40
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-unpack-objects[1]"
msgstr "linkgit:git-unpack-objects[1]"
@@ -1570,7 +1570,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:43
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-update-index[1]"
msgstr "linkgit:git-update-index[1]"
@@ -1584,7 +1584,7 @@ msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:46
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-update-ref[1]"
msgstr "linkgit:git-update-ref[1]"
@@ -1595,7 +1595,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:49 en/git-commit-tree.txt:115
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -1608,7 +1608,7 @@ msgstr "Erstellt ein Baumobjekt mit dem aktuellen Index."
#. type: Labeled list
#: en/cmds-purehelpers.txt:1
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-check-attr[1]"
msgstr "linkgit:git-check-attr[1]"
@@ -1619,7 +1619,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:4
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-check-ignore[1]"
msgstr "linkgit:git-check-ignore[1]"
@@ -1630,7 +1630,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:7
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-check-mailmap[1]"
msgstr "linkgit:git-check-mailmap[1]"
@@ -1641,7 +1641,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:10
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-check-ref-format[1]"
msgstr "linkgit:git-check-ref-format[1]"
@@ -1652,7 +1652,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:13
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-column[1]"
msgstr "linkgit:git-column[1]"
@@ -1663,7 +1663,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:16
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-credential[1]"
msgstr "linkgit:git-credential[1]"
@@ -1674,7 +1674,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:19
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-credential-cache[1]"
msgstr "linkgit:git-credential-cache[1]"
@@ -1685,7 +1685,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:22
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-credential-store[1]"
msgstr "linkgit:git-credential-store[1]"
@@ -1696,7 +1696,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:25
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-fmt-merge-msg[1]"
msgstr "linkgit:git-fmt-merge-msg[1]"
@@ -1709,7 +1709,7 @@ msgstr "Unterdr체cke die zusammenfassende Nachricht 체ber die Eintragung."
#. type: Labeled list
#: en/cmds-purehelpers.txt:28
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-interpret-trailers[1]"
msgstr "linkgit:git-interpret-trailers[1]"
@@ -1720,7 +1720,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:31
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-mailinfo[1]"
msgstr "linkgit:git-mailinfo[1]"
@@ -1731,7 +1731,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:34
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-mailsplit[1]"
msgstr "linkgit:git-mailsplit[1]"
@@ -1742,7 +1742,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:37
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-merge-one-file[1]"
msgstr "linkgit:git-merge-one-file[1]"
@@ -1758,7 +1758,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-patch-id[1]"
msgstr "linkgit:git-patch-id[1]"
@@ -1769,7 +1769,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:43
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-sh-i18n[1]"
msgstr "linkgit:git-sh-i18n[1]"
@@ -1780,7 +1780,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:46
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-sh-setup[1]"
msgstr "linkgit:git-sh-setup[1]"
@@ -1791,7 +1791,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:49
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-stripspace[1]"
msgstr "linkgit:git-stripspace[1]"
@@ -1802,7 +1802,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:1
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-http-fetch[1]"
msgstr "linkgit:git-http-fetch[1]"
@@ -1813,7 +1813,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:4
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-http-push[1]"
msgstr "linkgit:git-http-push[1]"
@@ -1824,7 +1824,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:7
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-parse-remote[1]"
msgstr "linkgit:git-parse-remote[1]"
@@ -1835,7 +1835,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:10
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-receive-pack[1]"
msgstr "linkgit:git-receive-pack[1]"
@@ -1846,7 +1846,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:13
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-shell[1]"
msgstr "linkgit:git-shell[1]"
@@ -1857,7 +1857,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:16
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-upload-archive[1]"
msgstr "linkgit:git-upload-archive[1]"
@@ -1868,7 +1868,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:19
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-upload-pack[1]"
msgstr "linkgit:git-upload-pack[1]"
@@ -1879,7 +1879,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:1
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-daemon[1]"
msgstr "linkgit:git-daemon[1]"
@@ -1890,7 +1890,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:4
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-fetch-pack[1]"
msgstr "linkgit:git-fetch-pack[1]"
@@ -1901,7 +1901,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:7
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-http-backend[1]"
msgstr "linkgit:git-http-backend[1]"
@@ -1912,7 +1912,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:10
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-send-pack[1]"
msgstr "linkgit:git-send-pack[1]"
@@ -1923,7 +1923,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:13
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "linkgit:git-update-server-info[1]"
msgstr "linkgit:git-update-server-info[1]"
@@ -2107,9 +2107,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:105
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`gitdir`"
-msgstr ""
+msgstr "`gitdir`"
#. type: Plain text
#: en/config.txt:110
@@ -2731,7 +2731,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:332
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.fileMode"
msgstr "core.fileMode"
@@ -2772,7 +2772,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:354
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.hideDotFiles"
msgstr "core.hideDotFiles"
@@ -2787,7 +2787,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:360
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.ignoreCase"
msgstr "core.ignoreCase"
@@ -2811,7 +2811,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:372
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.precomposeUnicode"
msgstr "core.precomposeUnicode"
@@ -2828,7 +2828,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:381
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.protectHFS"
msgstr "core.protectHFS"
@@ -2842,7 +2842,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:386
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.protectNTFS"
msgstr "core.protectNTFS"
@@ -2856,7 +2856,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:392
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.trustctime"
msgstr "core.trustctime"
@@ -2871,7 +2871,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:399
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.splitIndex"
msgstr "core.splitIndex"
@@ -2884,7 +2884,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:403
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.untrackedCache"
msgstr "core.untrackedCache"
@@ -2901,7 +2901,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:412
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.checkStat"
msgstr "core.checkStat"
@@ -2916,7 +2916,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:418
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.quotePath"
msgstr "core.quotePath"
@@ -2938,7 +2938,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:433
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.eol"
msgstr "core.eol"
@@ -2954,7 +2954,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:441
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.safecrlf"
msgstr "core.safecrlf"
@@ -3019,7 +3019,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:486
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.autocrlf"
msgstr "core.autocrlf"
@@ -3035,7 +3035,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:494
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.symlinks"
msgstr "core.symlinks"
@@ -3058,7 +3058,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:505
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.gitProxy"
msgstr "core.gitProxy"
@@ -3091,7 +3091,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:523
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.sshCommand"
msgstr "core.sshCommand"
@@ -3106,7 +3106,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:530
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.ignoreStat"
msgstr "core.ignoreStat"
@@ -3140,7 +3140,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:545
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.preferSymlinkRefs"
msgstr "core.preferSymlinkRefs"
@@ -3154,7 +3154,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:551
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.bare"
msgstr "core.bare"
@@ -3184,7 +3184,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:563
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.worktree"
msgstr "core.worktree"
@@ -3217,7 +3217,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:587
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.logAllRefUpdates"
msgstr "core.logAllRefUpdates"
@@ -3250,7 +3250,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:606
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.repositoryFormatVersion"
msgstr "core.repositoryFormatVersion"
@@ -3262,7 +3262,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:610
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.sharedRepository"
msgstr "core.sharedRepository"
@@ -3285,7 +3285,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:625
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.warnAmbiguousRefs"
msgstr "core.warnAmbiguousRefs"
@@ -3298,7 +3298,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:629
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.compression"
msgstr "core.compression"
@@ -3313,7 +3313,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:636
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.looseCompression"
msgstr "core.looseCompression"
@@ -3328,7 +3328,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:643
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.packedGitWindowSize"
msgstr "core.packedGitWindowSize"
@@ -3358,7 +3358,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:659
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.packedGitLimit"
msgstr "core.packedGitLimit"
@@ -3381,7 +3381,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:671
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.deltaBaseCacheLimit"
msgstr "core.deltaBaseCacheLimit"
@@ -3404,7 +3404,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:684
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.bigFileThreshold"
msgstr "core.bigFileThreshold"
@@ -3427,7 +3427,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:697
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.excludesFile"
msgstr "core.excludesFile"
@@ -3443,7 +3443,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:705
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.askPass"
msgstr "core.askPass"
@@ -3461,7 +3461,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:714
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.attributesFile"
msgstr "core.attributesFile"
@@ -3477,7 +3477,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:722
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.hooksPath"
msgstr "core.hooksPath"
@@ -3509,7 +3509,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:739
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.editor"
msgstr "core.editor"
@@ -3523,7 +3523,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:745
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.commentChar"
msgstr "core.commentChar"
@@ -3544,7 +3544,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:754
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.packedRefsTimeout"
msgstr "core.packedRefsTimeout"
@@ -3573,7 +3573,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:766
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.pager"
msgstr "core.pager"
@@ -3613,7 +3613,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:791
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.whitespace"
msgstr "core.whitespace"
@@ -3687,7 +3687,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:820
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.fsyncObjectFiles"
msgstr "core.fsyncObjectFiles"
@@ -3707,7 +3707,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:828
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.preloadIndex"
msgstr "core.preloadIndex"
@@ -3727,7 +3727,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:837
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.createObject"
msgstr "core.createObject"
@@ -3749,7 +3749,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:846 en/git-notes.txt:313
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.notesRef"
msgstr "core.notesRef"
@@ -3770,7 +3770,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:855
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.sparseCheckout"
msgstr "core.sparseCheckout"
@@ -3783,7 +3783,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:859
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "core.abbrev"
msgstr "core.abbrev"
@@ -3881,9 +3881,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:908 en/git-apply.txt:246
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "apply.ignoreWhitespace"
-msgstr ""
+msgstr "apply.ignoreWhitespace"
#. type: Plain text
#: en/config.txt:915
@@ -3896,9 +3896,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:916 en/git-apply.txt:250
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "apply.whitespace"
-msgstr ""
+msgstr "apply.whitespace"
#. type: Plain text
#: en/config.txt:919
@@ -3909,7 +3909,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:920
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "branch.autoSetupMerge"
msgstr "branch.autoSetupMerge"
@@ -3928,7 +3928,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:932
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "branch.autoSetupRebase"
msgstr "branch.autoSetupRebase"
@@ -4118,10 +4118,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1027
-#, fuzzy, no-wrap
-#| msgid "<oldbranch>"
+#, no-wrap, ignore-translated
msgid "color.branch"
-msgstr "<oldbranch>"
+msgstr "color.branch"
#. type: Plain text
#: en/config.txt:1033
@@ -4150,9 +4149,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1041
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "color.diff"
-msgstr ""
+msgstr "color.diff"
#. type: Plain text
#: en/config.txt:1049
@@ -4205,9 +4204,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1068
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "color.grep"
-msgstr ""
+msgstr "color.grep"
#. type: Plain text
#: en/config.txt:1073
@@ -4233,9 +4232,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1079
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`context`"
-msgstr ""
+msgstr "`context`"
#. type: Plain text
#: en/config.txt:1081
@@ -4244,9 +4243,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1081
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`filename`"
-msgstr ""
+msgstr "`filename`"
#. type: Plain text
#: en/config.txt:1083
@@ -4255,9 +4254,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1083
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`function`"
-msgstr ""
+msgstr "`function`"
#. type: Plain text
#: en/config.txt:1085
@@ -4266,9 +4265,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1085
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`linenumber`"
-msgstr ""
+msgstr "`linenumber`"
#. type: Plain text
#: en/config.txt:1087
@@ -4277,10 +4276,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1087
-#, fuzzy, no-wrap
-#| msgid "patch"
+#, no-wrap, ignore-translated
msgid "`match`"
-msgstr "patch"
+msgstr "`match`"
#. type: Plain text
#: en/config.txt:1089
@@ -4289,9 +4287,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1089
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`matchContext`"
-msgstr ""
+msgstr "`matchContext`"
#. type: Plain text
#: en/config.txt:1091
@@ -4300,9 +4298,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1091
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`matchSelected`"
-msgstr ""
+msgstr "`matchSelected`"
#. type: Plain text
#: en/config.txt:1093
@@ -4311,9 +4309,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1093
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`selected`"
-msgstr ""
+msgstr "`selected`"
#. type: Plain text
#: en/config.txt:1095
@@ -4322,9 +4320,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1095
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`separator`"
-msgstr ""
+msgstr "`separator`"
#. type: Plain text
#: en/config.txt:1098
@@ -4335,10 +4333,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1100
-#, fuzzy, no-wrap
-#| msgid "--interactive"
+#, no-wrap, ignore-translated
msgid "color.interactive"
-msgstr "--interactive"
+msgstr "color.interactive"
#. type: Plain text
#: en/config.txt:1107
@@ -4366,9 +4363,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1114
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "color.pager"
-msgstr ""
+msgstr "color.pager"
#. type: Plain text
#: en/config.txt:1117
@@ -4379,9 +4376,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1118
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "color.showBranch"
-msgstr ""
+msgstr "color.showBranch"
#. type: Plain text
#: en/config.txt:1124
@@ -4395,10 +4392,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1125
-#, fuzzy, no-wrap
-#| msgid "status"
+#, no-wrap, ignore-translated
msgid "color.status"
-msgstr "status"
+msgstr "color.status"
#. type: Plain text
#: en/config.txt:1131
@@ -4429,10 +4425,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1143
-#, fuzzy, no-wrap
-#| msgid "--color"
+#, no-wrap, ignore-translated
msgid "color.ui"
-msgstr "--color"
+msgstr "color.ui"
#. type: Plain text
#: en/config.txt:1154
@@ -4450,9 +4445,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1155
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "column.ui"
-msgstr ""
+msgstr "column.ui"
#. type: Plain text
#: en/config.txt:1159
@@ -4470,9 +4465,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1164
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`always`"
-msgstr ""
+msgstr "`always`"
#. type: Plain text
#: en/config.txt:1166
@@ -4481,10 +4476,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1166
-#, fuzzy, no-wrap
-#| msgid "revert"
+#, no-wrap, ignore-translated
msgid "`never`"
-msgstr "revert"
+msgstr "`never`"
#. type: Plain text
#: en/config.txt:1168
@@ -4493,9 +4487,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1168
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`auto`"
-msgstr ""
+msgstr "`auto`"
#. type: Plain text
#: en/config.txt:1170
@@ -4511,9 +4505,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1177
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`column`"
-msgstr ""
+msgstr "`column`"
#. type: Plain text
#: en/config.txt:1179
@@ -4522,9 +4516,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1179
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`row`"
-msgstr ""
+msgstr "`row`"
#. type: Plain text
#: en/config.txt:1181
@@ -4533,9 +4527,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1181
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`plain`"
-msgstr ""
+msgstr "`plain`"
#. type: Plain text
#: en/config.txt:1183
@@ -4551,9 +4545,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1189
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`dense`"
-msgstr ""
+msgstr "`dense`"
#. type: Plain text
#: en/config.txt:1191
@@ -4562,9 +4556,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1191
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`nodense`"
-msgstr ""
+msgstr "`nodense`"
#. type: Plain text
#: en/config.txt:1193
@@ -4573,10 +4567,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1195
-#, fuzzy, no-wrap
-#| msgid "<oldbranch>"
+#, no-wrap, ignore-translated
msgid "column.branch"
-msgstr "<oldbranch>"
+msgstr "column.branch"
#. type: Plain text
#: en/config.txt:1198
@@ -4587,9 +4580,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1199
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "column.clean"
-msgstr ""
+msgstr "column.clean"
#. type: Plain text
#: en/config.txt:1202
@@ -4600,10 +4593,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1203
-#, fuzzy, no-wrap
-#| msgid "status"
+#, no-wrap, ignore-translated
msgid "column.status"
-msgstr "status"
+msgstr "column.status"
#. type: Plain text
#: en/config.txt:1206
@@ -4614,9 +4606,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1207
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "column.tag"
-msgstr ""
+msgstr "column.tag"
#. type: Plain text
#: en/config.txt:1210
@@ -4627,9 +4619,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1211
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "commit.cleanup"
-msgstr ""
+msgstr "commit.cleanup"
#. type: Plain text
#: en/config.txt:1219
@@ -4644,9 +4636,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1220
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "commit.gpgSign"
-msgstr ""
+msgstr "commit.gpgSign"
#. type: Plain text
#: en/config.txt:1227
@@ -4659,10 +4651,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1228
-#, fuzzy, no-wrap
-#| msgid "status"
+#, no-wrap, ignore-translated
msgid "commit.status"
-msgstr "status"
+msgstr "commit.status"
#. type: Plain text
#: en/config.txt:1232
@@ -4674,9 +4665,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1233
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "commit.template"
-msgstr ""
+msgstr "commit.template"
#. type: Plain text
#: en/config.txt:1236
@@ -4687,10 +4678,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1237
-#, fuzzy, no-wrap
-#| msgid "--verbose"
+#, no-wrap, ignore-translated
msgid "commit.verbose"
-msgstr "--verbose"
+msgstr "commit.verbose"
#. type: Plain text
#: en/config.txt:1240
@@ -4701,9 +4691,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1241
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "credential.helper"
-msgstr ""
+msgstr "credential.helper"
#. type: Plain text
#: en/config.txt:1247
@@ -4716,9 +4706,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1248
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "credential.useHttpPath"
-msgstr ""
+msgstr "credential.useHttpPath"
#. type: Plain text
#: en/config.txt:1252
@@ -4730,9 +4720,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1253
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "credential.username"
-msgstr ""
+msgstr "credential.username"
#. type: Plain text
#: en/config.txt:1257
@@ -4799,9 +4789,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1282 en/git-difftool.txt:126
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "difftool.prompt"
-msgstr ""
+msgstr "difftool.prompt"
#. type: Plain text
#: en/config.txt:1284 en/git-difftool.txt:128
@@ -4810,9 +4800,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1285 en/git-fast-import.txt:139
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "fastimport.unpackLimit"
-msgstr ""
+msgstr "fastimport.unpackLimit"
#. type: Plain text
#: en/config.txt:1293
@@ -4827,9 +4817,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1294
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "fetch.recurseSubmodules"
-msgstr ""
+msgstr "fetch.recurseSubmodules"
#. type: Plain text
#: en/config.txt:1302
@@ -4844,10 +4834,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1303
-#, fuzzy, no-wrap
-#| msgid "git-fsck-objects(1)"
+#, no-wrap, ignore-translated
msgid "fetch.fsckObjects"
-msgstr "git-fsck-objects(1)"
+msgstr "fetch.fsckObjects"
#. type: Plain text
#: en/config.txt:1309
@@ -4860,9 +4849,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1310
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "fetch.unpackLimit"
-msgstr ""
+msgstr "fetch.unpackLimit"
#. type: Plain text
#: en/config.txt:1320
@@ -4878,9 +4867,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1321
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "fetch.prune"
-msgstr ""
+msgstr "fetch.prune"
#. type: Plain text
#: en/config.txt:1324
@@ -4891,9 +4880,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1325
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "fetch.output"
-msgstr ""
+msgstr "fetch.output"
#. type: Plain text
#: en/config.txt:1329
@@ -4905,9 +4894,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1330
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "format.attach"
-msgstr ""
+msgstr "format.attach"
#. type: Plain text
#: en/config.txt:1336
@@ -4920,9 +4909,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1337
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "format.from"
-msgstr ""
+msgstr "format.from"
#. type: Plain text
#: en/config.txt:1346
@@ -4939,9 +4928,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1347
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "format.numbered"
-msgstr ""
+msgstr "format.numbered"
#. type: Plain text
#: en/config.txt:1353
@@ -4955,9 +4944,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1354
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "format.headers"
-msgstr ""
+msgstr "format.headers"
#. type: Plain text
#: en/config.txt:1357
@@ -4968,15 +4957,15 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1358
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "format.to"
-msgstr ""
+msgstr "format.to"
#. type: Labeled list
#: en/config.txt:1359
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "format.cc"
-msgstr ""
+msgstr "format.cc"
#. type: Plain text
#: en/config.txt:1363
@@ -4987,9 +4976,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1364
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "format.subjectPrefix"
-msgstr ""
+msgstr "format.subjectPrefix"
#. type: Plain text
#: en/config.txt:1367
@@ -5000,9 +4989,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1368
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "format.signature"
-msgstr ""
+msgstr "format.signature"
#. type: Plain text
#: en/config.txt:1373
@@ -5014,9 +5003,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1374
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "format.signatureFile"
-msgstr ""
+msgstr "format.signatureFile"
#. type: Plain text
#: en/config.txt:1377
@@ -5027,9 +5016,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1378
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "format.suffix"
-msgstr ""
+msgstr "format.suffix"
#. type: Plain text
#: en/config.txt:1382
@@ -5041,9 +5030,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1383 en/git-log.txt:175
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "format.pretty"
-msgstr ""
+msgstr "format.pretty"
#. type: Plain text
#: en/config.txt:1387
@@ -5054,9 +5043,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1388
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "format.thread"
-msgstr ""
+msgstr "format.thread"
#. type: Plain text
#: en/config.txt:1397
@@ -5071,9 +5060,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1398
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "format.signOff"
-msgstr ""
+msgstr "format.signOff"
#. type: Plain text
#: en/config.txt:1404
@@ -5087,9 +5076,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1405
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "format.coverLetter"
-msgstr ""
+msgstr "format.coverLetter"
#. type: Plain text
#: en/config.txt:1409
@@ -5101,9 +5090,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1410
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "format.outputDirectory"
-msgstr ""
+msgstr "format.outputDirectory"
#. type: Plain text
#: en/config.txt:1413
@@ -5114,9 +5103,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1414
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "format.useAutoBase"
-msgstr ""
+msgstr "format.useAutoBase"
#. type: Plain text
#: en/config.txt:1417
@@ -5545,27 +5534,27 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1602
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gitweb.category"
-msgstr ""
+msgstr "gitweb.category"
#. type: Labeled list
#: en/config.txt:1603
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gitweb.description"
-msgstr ""
+msgstr "gitweb.description"
#. type: Labeled list
#: en/config.txt:1604
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gitweb.owner"
-msgstr ""
+msgstr "gitweb.owner"
#. type: Labeled list
#: en/config.txt:1605
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gitweb.url"
-msgstr ""
+msgstr "gitweb.url"
#. type: Plain text
#: en/config.txt:1607
@@ -5574,57 +5563,57 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1608
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gitweb.avatar"
-msgstr ""
+msgstr "gitweb.avatar"
#. type: Labeled list
#: en/config.txt:1609
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gitweb.blame"
-msgstr ""
+msgstr "gitweb.blame"
#. type: Labeled list
#: en/config.txt:1610
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gitweb.grep"
-msgstr ""
+msgstr "gitweb.grep"
#. type: Labeled list
#: en/config.txt:1611
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gitweb.highlight"
-msgstr ""
+msgstr "gitweb.highlight"
#. type: Labeled list
#: en/config.txt:1612
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gitweb.patches"
-msgstr ""
+msgstr "gitweb.patches"
#. type: Labeled list
#: en/config.txt:1613
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gitweb.pickaxe"
-msgstr ""
+msgstr "gitweb.pickaxe"
#. type: Labeled list
#: en/config.txt:1614
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gitweb.remote_heads"
-msgstr ""
+msgstr "gitweb.remote_heads"
#. type: Labeled list
#: en/config.txt:1615
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gitweb.showSizes"
-msgstr ""
+msgstr "gitweb.showSizes"
#. type: Labeled list
#: en/config.txt:1616
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gitweb.snapshot"
-msgstr ""
+msgstr "gitweb.snapshot"
#. type: Plain text
#: en/config.txt:1618
@@ -5718,9 +5707,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1652
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gui.commitMsgWidth"
-msgstr ""
+msgstr "gui.commitMsgWidth"
#. type: Plain text
#: en/config.txt:1655
@@ -5731,9 +5720,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1656
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gui.diffContext"
-msgstr ""
+msgstr "gui.diffContext"
#. type: Plain text
#: en/config.txt:1659
@@ -5744,9 +5733,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1660
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gui.displayUntracked"
-msgstr ""
+msgstr "gui.displayUntracked"
#. type: Plain text
#: en/config.txt:1663
@@ -5757,9 +5746,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1664
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gui.encoding"
-msgstr ""
+msgstr "gui.encoding"
#. type: Plain text
#: en/config.txt:1671
@@ -5772,9 +5761,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1672
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gui.matchTrackingBranch"
-msgstr ""
+msgstr "gui.matchTrackingBranch"
#. type: Plain text
#: en/config.txt:1676
@@ -5785,9 +5774,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1677
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gui.newBranchTemplate"
-msgstr ""
+msgstr "gui.newBranchTemplate"
#. type: Plain text
#: en/config.txt:1680
@@ -5798,9 +5787,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1681
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gui.pruneDuringFetch"
-msgstr ""
+msgstr "gui.pruneDuringFetch"
#. type: Plain text
#: en/config.txt:1684
@@ -5811,9 +5800,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1685
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gui.trustmtime"
-msgstr ""
+msgstr "gui.trustmtime"
#. type: Plain text
#: en/config.txt:1688
@@ -5824,9 +5813,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1689
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gui.spellingDictionary"
-msgstr ""
+msgstr "gui.spellingDictionary"
#. type: Plain text
#: en/config.txt:1693
@@ -5837,9 +5826,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1694
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gui.fastCopyBlame"
-msgstr ""
+msgstr "gui.fastCopyBlame"
#. type: Plain text
#: en/config.txt:1698
@@ -5851,9 +5840,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1699
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gui.copyBlameThreshold"
-msgstr ""
+msgstr "gui.copyBlameThreshold"
#. type: Plain text
#: en/config.txt:1703
@@ -5865,9 +5854,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1704
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "gui.blamehistoryctx"
-msgstr ""
+msgstr "gui.blamehistoryctx"
#. type: Plain text
#: en/config.txt:1709
@@ -6018,9 +6007,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1761
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "help.browser"
-msgstr ""
+msgstr "help.browser"
#. type: Plain text
#: en/config.txt:1764
@@ -6031,9 +6020,9 @@ msgstr ""
#. type: Title ~
#: en/config.txt:1765 en/git-help.txt:81
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "help.format"
-msgstr ""
+msgstr "help.format"
#. type: Plain text
#: en/config.txt:1769
@@ -6045,9 +6034,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1770
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "help.autoCorrect"
-msgstr ""
+msgstr "help.autoCorrect"
#. type: Plain text
#: en/config.txt:1778
@@ -6062,9 +6051,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1779
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "help.htmlPath"
-msgstr ""
+msgstr "help.htmlPath"
#. type: Plain text
#: en/config.txt:1784
@@ -6649,9 +6638,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2046
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "i18n.commitEncoding"
-msgstr ""
+msgstr "i18n.commitEncoding"
#. type: Plain text
#: en/config.txt:2052
@@ -6665,9 +6654,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2053 en/git-log.txt:179
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "i18n.logOutputEncoding"
-msgstr ""
+msgstr "i18n.logOutputEncoding"
#. type: Plain text
#: en/config.txt:2056
@@ -6717,9 +6706,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2069
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "instaweb.browser"
-msgstr ""
+msgstr "instaweb.browser"
#. type: Plain text
#: en/config.txt:2072
@@ -6730,9 +6719,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2073
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "instaweb.httpd"
-msgstr ""
+msgstr "instaweb.httpd"
#. type: Plain text
#: en/config.txt:2076
@@ -6743,9 +6732,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2077
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "instaweb.local"
-msgstr ""
+msgstr "instaweb.local"
#. type: Plain text
#: en/config.txt:2080
@@ -6756,9 +6745,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2081
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "instaweb.modulePath"
-msgstr ""
+msgstr "instaweb.modulePath"
#. type: Plain text
#: en/config.txt:2085
@@ -6769,9 +6758,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2086
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "instaweb.port"
-msgstr ""
+msgstr "instaweb.port"
#. type: Plain text
#: en/config.txt:2089
@@ -6781,10 +6770,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2090
-#, fuzzy, no-wrap
-#| msgid "--interactive"
+#, no-wrap, ignore-translated
msgid "interactive.singleKey"
-msgstr "--interactive"
+msgstr "interactive.singleKey"
#. type: Plain text
#: en/config.txt:2098
@@ -6799,10 +6787,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2099
-#, fuzzy, no-wrap
-#| msgid "Interactive mode"
+#, no-wrap, ignore-translated
msgid "interactive.diffFilter"
-msgstr "Interaktiver Modus"
+msgstr "interactive.diffFilter"
#. type: Plain text
#: en/config.txt:2106
@@ -6816,9 +6803,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2107
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "log.abbrevCommit"
-msgstr ""
+msgstr "log.abbrevCommit"
#. type: Plain text
#: en/config.txt:2111
@@ -6830,9 +6817,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2112 en/git-log.txt:184
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "log.date"
-msgstr ""
+msgstr "log.date"
#. type: Plain text
#: en/config.txt:2116
@@ -6844,10 +6831,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2117
-#, fuzzy, no-wrap
-#| msgid "--decorate"
+#, no-wrap, ignore-translated
msgid "log.decorate"
-msgstr "--decorate"
+msgstr "log.decorate"
#. type: Plain text
#: en/config.txt:2126
@@ -6863,10 +6849,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2127 en/git-log.txt:189
-#, fuzzy, no-wrap
-#| msgid "--follow"
+#, no-wrap, ignore-translated
msgid "log.follow"
-msgstr "--follow"
+msgstr "log.follow"
#. type: Plain text
#: en/config.txt:2132 en/git-log.txt:194
@@ -6879,9 +6864,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2133
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "log.graphColors"
-msgstr ""
+msgstr "log.graphColors"
#. type: Plain text
#: en/config.txt:2136
@@ -6892,9 +6877,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2137 en/git-log.txt:195
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "log.showRoot"
-msgstr ""
+msgstr "log.showRoot"
#. type: Plain text
#: en/config.txt:2142
@@ -6907,9 +6892,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2143
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "log.mailmap"
-msgstr ""
+msgstr "log.mailmap"
#. type: Plain text
#: en/config.txt:2146
@@ -6920,9 +6905,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2147
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "mailinfo.scissors"
-msgstr ""
+msgstr "mailinfo.scissors"
#. type: Plain text
#: en/config.txt:2153
@@ -7048,9 +7033,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2208
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "mergetool.meld.hasOutput"
-msgstr ""
+msgstr "mergetool.meld.hasOutput"
#. type: Plain text
#: en/config.txt:2216
@@ -7065,9 +7050,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2217
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "mergetool.keepBackup"
-msgstr ""
+msgstr "mergetool.keepBackup"
#. type: Plain text
#: en/config.txt:2222
@@ -7080,9 +7065,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2223
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "mergetool.keepTemporaries"
-msgstr ""
+msgstr "mergetool.keepTemporaries"
#. type: Plain text
#: en/config.txt:2229
@@ -7095,9 +7080,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2230
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "mergetool.writeToTemp"
-msgstr ""
+msgstr "mergetool.writeToTemp"
#. type: Plain text
#: en/config.txt:2235
@@ -7109,9 +7094,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2236
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "mergetool.prompt"
-msgstr ""
+msgstr "mergetool.prompt"
#. type: Plain text
#: en/config.txt:2238
@@ -7633,9 +7618,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2501
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "push.default"
-msgstr ""
+msgstr "push.default"
#. type: Plain text
#: en/config.txt:2507
@@ -7728,9 +7713,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2558
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "push.followTags"
-msgstr ""
+msgstr "push.followTags"
#. type: Plain text
#: en/config.txt:2562
@@ -7741,9 +7726,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2563
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "push.gpgSign"
-msgstr ""
+msgstr "push.gpgSign"
#. type: Plain text
#: en/config.txt:2571
@@ -7758,9 +7743,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2572
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "push.recurseSubmodules"
-msgstr ""
+msgstr "push.recurseSubmodules"
#. type: Plain text
#: en/config.txt:2585
@@ -7851,9 +7836,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2617
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "receive.advertiseAtomic"
-msgstr ""
+msgstr "receive.advertiseAtomic"
#. type: Plain text
#: en/config.txt:2621
@@ -7865,9 +7850,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2622
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "receive.advertisePushOptions"
-msgstr ""
+msgstr "receive.advertisePushOptions"
#. type: Plain text
#: en/config.txt:2626
@@ -7879,9 +7864,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2627
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "receive.autogc"
-msgstr ""
+msgstr "receive.autogc"
#. type: Plain text
#: en/config.txt:2631
@@ -7893,9 +7878,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2632
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "receive.certNonceSeed"
-msgstr ""
+msgstr "receive.certNonceSeed"
#. type: Plain text
#: en/config.txt:2637
@@ -7907,9 +7892,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2638
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "receive.certNonceSlop"
-msgstr ""
+msgstr "receive.certNonceSlop"
#. type: Plain text
#: en/config.txt:2650
@@ -7927,9 +7912,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2651
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "receive.fsckObjects"
-msgstr ""
+msgstr "receive.fsckObjects"
#. type: Plain text
#: en/config.txt:2657
@@ -7969,15 +7954,15 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2672
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "receive.fsck.skipList"
-msgstr ""
+msgstr "receive.fsck.skipList"
#. type: Labeled list
#: en/config.txt:2680
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "receive.keepAlive"
-msgstr ""
+msgstr "receive.keepAlive"
#. type: Plain text
#: en/config.txt:2688
@@ -7992,9 +7977,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2689
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "receive.unpackLimit"
-msgstr ""
+msgstr "receive.unpackLimit"
#. type: Plain text
#: en/config.txt:2698
@@ -8010,9 +7995,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2699
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "receive.maxInputSize"
-msgstr ""
+msgstr "receive.maxInputSize"
#. type: Plain text
#: en/config.txt:2704
@@ -8024,9 +8009,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2705
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "receive.denyDeletes"
-msgstr ""
+msgstr "receive.denyDeletes"
#. type: Plain text
#: en/config.txt:2708
@@ -8037,9 +8022,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2709
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "receive.denyDeleteCurrent"
-msgstr ""
+msgstr "receive.denyDeleteCurrent"
#. type: Plain text
#: en/config.txt:2712
@@ -8050,9 +8035,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2713
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "receive.denyCurrentBranch"
-msgstr ""
+msgstr "receive.denyCurrentBranch"
#. type: Plain text
#: en/config.txt:2721
@@ -8086,9 +8071,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2733
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "receive.denyNonFastForwards"
-msgstr ""
+msgstr "receive.denyNonFastForwards"
#. type: Plain text
#: en/config.txt:2738
@@ -8101,9 +8086,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2739
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "receive.hideRefs"
-msgstr ""
+msgstr "receive.hideRefs"
#. type: Plain text
#: en/config.txt:2744
@@ -8115,9 +8100,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2745
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "receive.updateServerInfo"
-msgstr ""
+msgstr "receive.updateServerInfo"
#. type: Plain text
#: en/config.txt:2748
@@ -8128,9 +8113,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2749
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "receive.shallowUpdate"
-msgstr ""
+msgstr "receive.shallowUpdate"
#. type: Plain text
#: en/config.txt:2752
@@ -8141,9 +8126,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2753
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "remote.pushDefault"
-msgstr ""
+msgstr "remote.pushDefault"
#. type: Plain text
#: en/config.txt:2757
@@ -8348,9 +8333,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2827
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "repack.useDeltaBaseOffset"
-msgstr ""
+msgstr "repack.useDeltaBaseOffset"
#. type: Plain text
#: en/config.txt:2834
@@ -8364,9 +8349,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2835
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "repack.packKeptObjects"
-msgstr ""
+msgstr "repack.packKeptObjects"
#. type: Plain text
#: en/config.txt:2841
@@ -8379,9 +8364,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2842
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "repack.writeBitmaps"
-msgstr ""
+msgstr "repack.writeBitmaps"
#. type: Plain text
#: en/config.txt:2850
@@ -8425,9 +8410,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2864
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.identity"
-msgstr ""
+msgstr "sendemail.identity"
#. type: Plain text
#: en/config.txt:2869 en/git-send-email.txt:279
@@ -8440,9 +8425,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2870
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.smtpEncryption"
-msgstr ""
+msgstr "sendemail.smtpEncryption"
#. type: Plain text
#: en/config.txt:2873
@@ -8464,9 +8449,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2877
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.smtpsslcertpath"
-msgstr ""
+msgstr "sendemail.smtpsslcertpath"
#. type: Plain text
#: en/config.txt:2880
@@ -8491,153 +8476,153 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2887 en/git-send-email.txt:404
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.aliasesFile"
-msgstr ""
+msgstr "sendemail.aliasesFile"
#. type: Labeled list
#: en/config.txt:2888 en/git-send-email.txt:408
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.aliasFileType"
-msgstr ""
+msgstr "sendemail.aliasFileType"
#. type: Labeled list
#: en/config.txt:2889
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.annotate"
-msgstr ""
+msgstr "sendemail.annotate"
#. type: Labeled list
#: en/config.txt:2890
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.bcc"
-msgstr ""
+msgstr "sendemail.bcc"
#. type: Labeled list
#: en/config.txt:2891
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.cc"
-msgstr ""
+msgstr "sendemail.cc"
#. type: Labeled list
#: en/config.txt:2892
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.ccCmd"
-msgstr ""
+msgstr "sendemail.ccCmd"
#. type: Labeled list
#: en/config.txt:2893
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.chainReplyTo"
-msgstr ""
+msgstr "sendemail.chainReplyTo"
#. type: Labeled list
#: en/config.txt:2894 en/git-send-email.txt:435
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.confirm"
-msgstr ""
+msgstr "sendemail.confirm"
#. type: Labeled list
#: en/config.txt:2895
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.envelopeSender"
-msgstr ""
+msgstr "sendemail.envelopeSender"
#. type: Labeled list
#: en/config.txt:2896
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.from"
-msgstr ""
+msgstr "sendemail.from"
#. type: Labeled list
#: en/config.txt:2897 en/git-send-email.txt:429
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.multiEdit"
-msgstr ""
+msgstr "sendemail.multiEdit"
#. type: Labeled list
#: en/config.txt:2898
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.signedoffbycc"
-msgstr ""
+msgstr "sendemail.signedoffbycc"
#. type: Labeled list
#: en/config.txt:2899
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.smtpPass"
-msgstr ""
+msgstr "sendemail.smtpPass"
#. type: Labeled list
#: en/config.txt:2900
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.suppresscc"
-msgstr ""
+msgstr "sendemail.suppresscc"
#. type: Labeled list
#: en/config.txt:2901
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.suppressFrom"
-msgstr ""
+msgstr "sendemail.suppressFrom"
#. type: Labeled list
#: en/config.txt:2902
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.to"
-msgstr ""
+msgstr "sendemail.to"
#. type: Labeled list
#: en/config.txt:2903
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.smtpDomain"
-msgstr ""
+msgstr "sendemail.smtpDomain"
#. type: Labeled list
#: en/config.txt:2904
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.smtpServer"
-msgstr ""
+msgstr "sendemail.smtpServer"
#. type: Labeled list
#: en/config.txt:2905
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.smtpServerPort"
-msgstr ""
+msgstr "sendemail.smtpServerPort"
#. type: Labeled list
#: en/config.txt:2906
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.smtpServerOption"
-msgstr ""
+msgstr "sendemail.smtpServerOption"
#. type: Labeled list
#: en/config.txt:2907
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.smtpUser"
-msgstr ""
+msgstr "sendemail.smtpUser"
#. type: Labeled list
#: en/config.txt:2908
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.thread"
-msgstr ""
+msgstr "sendemail.thread"
#. type: Labeled list
#: en/config.txt:2909
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.transferEncoding"
-msgstr ""
+msgstr "sendemail.transferEncoding"
#. type: Labeled list
#: en/config.txt:2910
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.validate"
-msgstr ""
+msgstr "sendemail.validate"
#. type: Labeled list
#: en/config.txt:2911
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "sendemail.xmailer"
-msgstr ""
+msgstr "sendemail.xmailer"
#. type: Plain text
#: en/config.txt:2913
@@ -8657,9 +8642,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2917
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "showbranch.default"
-msgstr ""
+msgstr "showbranch.default"
#. type: Plain text
#: en/config.txt:2920
@@ -8670,9 +8655,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2921
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "splitIndex.maxPercentChange"
-msgstr ""
+msgstr "splitIndex.maxPercentChange"
#. type: Plain text
#: en/config.txt:2933
@@ -8689,9 +8674,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2934
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "splitIndex.sharedIndexExpire"
-msgstr ""
+msgstr "splitIndex.sharedIndexExpire"
#. type: Plain text
#: en/config.txt:2945
@@ -8708,9 +8693,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2946
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "status.relativePaths"
-msgstr ""
+msgstr "status.relativePaths"
#. type: Plain text
#: en/config.txt:2951
@@ -8722,10 +8707,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2952
-#, fuzzy, no-wrap
-#| msgid "status"
+#, no-wrap, ignore-translated
msgid "status.short"
-msgstr "status"
+msgstr "status.short"
#. type: Plain text
#: en/config.txt:2955
@@ -8736,10 +8720,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2956
-#, fuzzy, no-wrap
-#| msgid "status"
+#, no-wrap, ignore-translated
msgid "status.branch"
-msgstr "status"
+msgstr "status.branch"
#. type: Plain text
#: en/config.txt:2959
@@ -8750,9 +8733,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2960
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "status.displayCommentPrefix"
-msgstr ""
+msgstr "status.displayCommentPrefix"
#. type: Plain text
#: en/config.txt:2966
@@ -8765,9 +8748,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2967
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "status.showUntrackedFiles"
-msgstr ""
+msgstr "status.showUntrackedFiles"
#. type: Plain text
#: en/config.txt:2975
@@ -8814,9 +8797,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2986
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "status.submoduleSummary"
-msgstr ""
+msgstr "status.submoduleSummary"
#. type: Plain text
#: en/config.txt:3001
@@ -8836,9 +8819,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3002
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "stash.showPatch"
-msgstr ""
+msgstr "stash.showPatch"
#. type: Plain text
#: en/config.txt:3006
@@ -8850,9 +8833,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3007
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "stash.showStat"
-msgstr ""
+msgstr "stash.showStat"
#. type: Plain text
#: en/config.txt:3011
@@ -8948,9 +8931,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3055
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "submodule.fetchJobs"
-msgstr ""
+msgstr "submodule.fetchJobs"
#. type: Plain text
#: en/config.txt:3060
@@ -8963,9 +8946,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3061
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "submodule.alternateLocation"
-msgstr ""
+msgstr "submodule.alternateLocation"
#. type: Plain text
#: en/config.txt:3067
@@ -8979,9 +8962,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3068
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "submodule.alternateErrorStrategy"
-msgstr ""
+msgstr "submodule.alternateErrorStrategy"
#. type: Plain text
#: en/config.txt:3072
@@ -9036,9 +9019,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3090
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "transfer.fsckObjects"
-msgstr ""
+msgstr "transfer.fsckObjects"
#. type: Plain text
#: en/config.txt:3094
@@ -9049,9 +9032,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3095
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "transfer.hideRefs"
-msgstr ""
+msgstr "transfer.hideRefs"
#. type: Plain text
#: en/config.txt:3103
@@ -9097,9 +9080,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3123
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "transfer.unpackLimit"
-msgstr ""
+msgstr "transfer.unpackLimit"
#. type: Plain text
#: en/config.txt:3127
@@ -9271,9 +9254,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3214
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "user.email"
-msgstr ""
+msgstr "user.email"
#. type: Plain text
#: en/config.txt:3218
@@ -9285,9 +9268,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3219
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "user.name"
-msgstr ""
+msgstr "user.name"
#. type: Plain text
#: en/config.txt:3223
@@ -9299,9 +9282,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3224
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "user.useConfigOnly"
-msgstr ""
+msgstr "user.useConfigOnly"
#. type: Plain text
#: en/config.txt:3233
@@ -9317,9 +9300,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3234
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "user.signingKey"
-msgstr ""
+msgstr "user.signingKey"
#. type: Plain text
#: en/config.txt:3240
@@ -9485,7 +9468,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:1
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "diff.autoRefreshIndex"
msgstr "diff.autoRefreshIndex"
@@ -9502,7 +9485,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:11
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "diff.dirstat"
msgstr "diff.dirstat"
@@ -9519,10 +9502,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:20 en/diff-options.txt:137
-#, fuzzy, no-wrap
-#| msgid "Making changes"
+#, no-wrap, ignore-translated
msgid "`changes`"
-msgstr "횆nderungen vornehmen"
+msgstr "`changes`"
#. type: Plain text
#: en/diff-config.txt:26 en/diff-options.txt:143
@@ -9536,9 +9518,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:26 en/diff-options.txt:143
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`lines`"
-msgstr ""
+msgstr "`lines`"
#. type: Plain text
#: en/diff-config.txt:34 en/diff-options.txt:151
@@ -9554,9 +9536,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:34 en/diff-options.txt:151
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`files`"
-msgstr ""
+msgstr "`files`"
#. type: Plain text
#: en/diff-config.txt:39 en/diff-options.txt:156
@@ -9569,9 +9551,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:39 en/diff-options.txt:156
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`cumulative`"
-msgstr ""
+msgstr "`cumulative`"
#. type: Plain text
#: en/diff-config.txt:44 en/diff-options.txt:161
@@ -9606,7 +9588,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:55
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "diff.statGraphWidth"
msgstr "diff.statGraphWidth"
@@ -9619,7 +9601,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:59
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "diff.context"
msgstr "diff.context"
@@ -9632,7 +9614,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:63
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "diff.interHunkContext"
msgstr "diff.interHunkContext"
@@ -9646,7 +9628,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:69
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "diff.external"
msgstr "diff.external"
@@ -9663,7 +9645,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:78
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "diff.ignoreSubmodules"
msgstr "diff.ignoreSubmodules"
@@ -9681,7 +9663,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:88
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "diff.mnemonicPrefix"
msgstr "diff.mnemonicPrefix"
@@ -9755,7 +9737,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:104
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "diff.noprefix"
msgstr "diff.noprefix"
@@ -9766,7 +9748,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:107
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "diff.orderFile"
msgstr "diff.orderFile"
@@ -9780,7 +9762,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:113
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "diff.renameLimit"
msgstr "diff.renameLimit"
@@ -9793,7 +9775,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:117
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "diff.renames"
msgstr "diff.renames"
@@ -9810,7 +9792,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:126
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "diff.suppressBlankEmpty"
msgstr "diff.suppressBlankEmpty"
@@ -9823,7 +9805,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:130
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "diff.submodule"
msgstr "diff.submodule"
@@ -9839,7 +9821,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:138
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "diff.wordRegex"
msgstr "diff.wordRegex"
@@ -9933,7 +9915,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:172 en/git-difftool.txt:111
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "diff.tool"
msgstr "diff.tool"
@@ -9948,7 +9930,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:181
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "diff.indentHeuristic"
msgstr "diff.indentHeuristic"
@@ -9961,7 +9943,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:185
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "diff.algorithm"
msgstr "diff.algorithm"
@@ -9983,9 +9965,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:191 en/diff-options.txt:84
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`minimal`"
-msgstr ""
+msgstr "`minimal`"
#. type: Plain text
#: en/diff-config.txt:194 en/diff-options.txt:71 en/diff-options.txt:87
@@ -9994,9 +9976,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:194 en/diff-options.txt:87
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`patience`"
-msgstr ""
+msgstr "`patience`"
#. type: Plain text
#: en/diff-config.txt:196 en/diff-options.txt:89
@@ -10005,9 +9987,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:196 en/diff-options.txt:89
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`histogram`"
-msgstr ""
+msgstr "`histogram`"
#. type: Plain text
#: en/diff-config.txt:199 en/diff-options.txt:92
@@ -10018,7 +10000,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:202
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "diff.wsErrorHighlight"
msgstr "diff.wsErrorHighlight"
@@ -10791,7 +10773,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:17 en/git-rebase.txt:319 en/merge-options.txt:57
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-stat"
msgstr "--no-stat"
@@ -10805,14 +10787,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, ignore-translated
+#, no-wrap, ignore-translated
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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--patch"
msgstr "--patch"
@@ -10834,13 +10816,13 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "-s"
msgstr "-s"
#. type: Labeled list
#: en/diff-options.txt:31
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-patch"
msgstr "--no-patch"
@@ -10877,7 +10859,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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--raw"
msgstr "--raw"
@@ -10900,7 +10882,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:62
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--patch-with-raw"
msgstr "--patch-with-raw"
@@ -10911,13 +10893,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:68
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--minimal"
msgstr "--minimal"
#. type: Labeled list
#: en/diff-options.txt:72
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--patience"
msgstr "--patience"
@@ -10928,7 +10910,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:75
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--histogram"
msgstr "--histogram"
@@ -10986,7 +10968,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:116 en/git-apply.txt:45
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--numstat"
msgstr "--numstat"
@@ -11000,7 +10982,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:123
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--shortstat"
msgstr "--shortstat"
@@ -11039,7 +11021,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--summary"
msgstr "--summary"
@@ -11052,7 +11034,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:177
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--patch-with-stat"
msgstr "--patch-with-stat"
@@ -11067,7 +11049,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, ignore-translated
+#, no-wrap, ignore-translated
msgid "-z"
msgstr "-z"
@@ -11103,7 +11085,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--name-only"
msgstr "--name-only"
@@ -11114,7 +11096,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:202 en/git-ls-tree.txt:60
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--name-status"
msgstr "--name-status"
@@ -11171,7 +11153,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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-color"
msgstr "--no-color"
@@ -11315,7 +11297,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:287
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-renames"
msgstr "--no-renames"
@@ -11334,7 +11316,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:292 en/git-apply.txt:58
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--check"
msgstr "--check"
@@ -11370,7 +11352,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:315
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--full-index"
msgstr "--full-index"
@@ -11384,7 +11366,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:320 en/git-apply.txt:150
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--binary"
msgstr "--binary"
@@ -11520,7 +11502,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:380 en/git-svn.txt:595
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--find-copies-harder"
msgstr "--find-copies-harder"
@@ -11542,7 +11524,7 @@ msgstr "-D"
#. type: Labeled list
#: en/diff-options.txt:390
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--irreversible-delete"
msgstr "--irreversible-delete"
@@ -11673,7 +11655,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:457
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--pickaxe-all"
msgstr "--pickaxe-all"
@@ -11686,7 +11668,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:462
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--pickaxe-regex"
msgstr "--pickaxe-regex"
@@ -11795,13 +11777,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, ignore-translated
+#, no-wrap, ignore-translated
msgid "-a"
msgstr "-a"
#. type: Labeled list
#: en/diff-options.txt:519 en/git-grep.txt:106
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--text"
msgstr "--text"
@@ -11812,7 +11794,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:522
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ignore-space-at-eol"
msgstr "--ignore-space-at-eol"
@@ -11823,7 +11805,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:526 en/git-am.txt:102 en/git-apply.txt:172
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ignore-space-change"
msgstr "--ignore-space-change"
@@ -11838,13 +11820,13 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "-w"
msgstr "-w"
#. type: Labeled list
#: en/diff-options.txt:532
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ignore-all-space"
msgstr "--ignore-all-space"
@@ -11857,7 +11839,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:537
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ignore-blank-lines"
msgstr "--ignore-blank-lines"
@@ -11888,7 +11870,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:547 en/git-grep.txt:247
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--function-context"
msgstr "--function-context"
@@ -11899,7 +11881,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:552 en/git-ls-remote.txt:46
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--exit-code"
msgstr "--exit-code"
@@ -11923,7 +11905,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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--quiet"
msgstr "--quiet"
@@ -11934,7 +11916,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:562
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ext-diff"
msgstr "--ext-diff"
@@ -11948,7 +11930,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:567
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-ext-diff"
msgstr "--no-ext-diff"
@@ -11959,13 +11941,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:570 en/git-cat-file.txt:59 en/git-grep.txt:109
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
#: en/diff-options.txt:571 en/git-grep.txt:112
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -12029,7 +12011,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:600
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-prefix"
msgstr "--no-prefix"
@@ -12052,7 +12034,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:606
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ita-invisible-in-index"
msgstr "--ita-invisible-in-index"
@@ -12082,7 +12064,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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--all"
msgstr "--all"
@@ -12093,7 +12075,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:5
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--append"
msgstr "--append"
@@ -12166,7 +12148,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:31
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--unshallow"
msgstr "--unshallow"
@@ -12186,7 +12168,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:39
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--update-shallow"
msgstr "--update-shallow"
@@ -12206,7 +12188,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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--dry-run"
msgstr "--dry-run"
@@ -12223,7 +12205,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, ignore-translated
+#, no-wrap, ignore-translated
msgid "-f"
msgstr "-f"
@@ -12235,7 +12217,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--force"
msgstr "--force"
@@ -12252,14 +12234,14 @@ msgstr ""
#: 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, ignore-translated
+#, no-wrap, ignore-translated
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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--keep"
msgstr "--keep"
@@ -12270,7 +12252,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:63
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--multiple"
msgstr "--multiple"
@@ -12283,7 +12265,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:68 en/git-push.txt:98
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--prune"
msgstr "--prune"
@@ -12310,13 +12292,13 @@ msgstr ""
#: 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "-n"
msgstr "-n"
#. type: Labeled list
#: en/fetch-options.txt:82
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-tags"
msgstr "--no-tags"
@@ -12349,7 +12331,7 @@ msgstr ""
#: 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--tags"
msgstr "--tags"
@@ -12384,7 +12366,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:118
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "-j"
msgstr "-j"
@@ -12404,7 +12386,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:125 en/git-push.txt:274
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -12447,7 +12429,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:144
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--update-head-ok"
msgstr "--update-head-ok"
@@ -12494,7 +12476,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "-q"
msgstr "-q"
@@ -12519,7 +12501,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, ignore-translated
+#, no-wrap, ignore-translated
msgid "-v"
msgstr "-v"
@@ -12535,7 +12517,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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--verbose"
msgstr "--verbose"
@@ -12548,7 +12530,7 @@ msgstr "Gib ausf체hrliche Informationen aus."
#. 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--progress"
msgstr "--progress"
@@ -12563,13 +12545,13 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:176 en/git-push.txt:295
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "-4"
msgstr "-4"
#. type: Labeled list
#: en/fetch-options.txt:177 en/git-push.txt:296
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ipv4"
msgstr "--ipv4"
@@ -12580,13 +12562,13 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:180 en/git-push.txt:299
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "-6"
msgstr "-6"
#. type: Labeled list
#: en/fetch-options.txt:181 en/git-push.txt:300
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ipv6"
msgstr "--ipv6"
@@ -12625,7 +12607,7 @@ msgstr ""
#. type: Title =
#: en/git-add.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-add(1)"
msgstr "git-add(1)"
@@ -13014,14 +12996,14 @@ msgstr "Erzwinge das Hinzuf체gen normalerweise ignorierter Dateien."
#: 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, ignore-translated
+#, no-wrap, ignore-translated
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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--interactive"
msgstr "--interactive"
@@ -13058,7 +13040,7 @@ msgstr ""
#: 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "-e"
msgstr "-e"
@@ -13066,7 +13048,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--edit"
msgstr "--edit"
@@ -13090,7 +13072,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:109
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--update"
msgstr "--update"
@@ -13118,7 +13100,7 @@ msgstr "-A"
#. type: Labeled list
#: en/git-add.txt:121
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-ignore-removal"
msgstr "--no-ignore-removal"
@@ -13140,13 +13122,13 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:132
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-all"
msgstr "--no-all"
#. type: Labeled list
#: en/git-add.txt:133
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ignore-removal"
msgstr "--ignore-removal"
@@ -13174,7 +13156,7 @@ msgstr "-N"
#. type: Labeled list
#: en/git-add.txt:144
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--intent-to-add"
msgstr "--intent-to-add"
@@ -13189,7 +13171,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:151 en/git-update-index.txt:52
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--refresh"
msgstr "--refresh"
@@ -13204,7 +13186,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:155
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ignore-errors"
msgstr "--ignore-errors"
@@ -13229,7 +13211,7 @@ msgstr ""
#. 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ignore-missing"
msgstr "--ignore-missing"
@@ -13869,7 +13851,7 @@ msgstr "SEE ALSO"
#. type: Plain text
#: en/git-add.txt:413
-#, ignore-translated, ignore-translated
+#, 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]"
@@ -14000,7 +13982,7 @@ msgstr "Teil der linkgit:git[1] Suite"
#. type: Title =
#: en/git-am.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-am(1)"
msgstr "git-am(1)"
@@ -14047,7 +14029,7 @@ msgstr ""
#. 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--signoff"
msgstr "--signoff"
@@ -14066,7 +14048,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:44
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--keep-non-patch"
msgstr "--keep-non-patch"
@@ -14077,7 +14059,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:47
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]keep-cr"
msgstr "--[no-]keep-cr"
@@ -14095,13 +14077,13 @@ msgstr ""
#: 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "-c"
msgstr "-c"
#. type: Labeled list
#: en/git-am.txt:54 en/git-mailinfo.txt:74
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--scissors"
msgstr "--scissors"
@@ -14115,7 +14097,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:59 en/git-mailinfo.txt:90
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-scissors"
msgstr "--no-scissors"
@@ -14131,13 +14113,13 @@ msgstr ""
#: 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "-m"
msgstr "-m"
#. type: Labeled list
#: en/git-am.txt:63 en/git-mailinfo.txt:70
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--message-id"
msgstr "--message-id"
@@ -14151,7 +14133,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:69
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-message-id"
msgstr "--no-message-id"
@@ -14169,7 +14151,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:78
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--utf8"
msgstr "--utf8"
@@ -14192,7 +14174,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:88
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-utf8"
msgstr "--no-utf8"
@@ -14203,19 +14185,19 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:92 en/git-apply.txt:77
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "-3"
msgstr "-3"
#. type: Labeled list
#: en/git-am.txt:93 en/git-apply.txt:78
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--3way"
msgstr "--3way"
#. type: Labeled list
#: en/git-am.txt:94
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-3way"
msgstr "--no-3way"
@@ -14231,7 +14213,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:103 en/git-apply.txt:173 en/git-rebase.txt:361
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
@@ -14275,7 +14257,7 @@ msgstr "--include"
#. type: Labeled list
#: en/git-am.txt:110 en/git-apply.txt:100
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--reject"
msgstr "--reject"
@@ -14288,7 +14270,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:115
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--patch-format"
msgstr "--patch-format"
@@ -14310,7 +14292,7 @@ msgstr "--interactive"
#. type: Labeled list
#: en/git-am.txt:126 en/git-rebase.txt:367
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -14325,7 +14307,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:133 en/git-rebase.txt:368
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -14340,7 +14322,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:140 en/git-rebase.txt:264
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--skip"
msgstr "--skip"
@@ -14379,7 +14361,7 @@ msgstr ""
#. 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--continue"
msgstr "--continue"
@@ -14388,13 +14370,13 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "-r"
msgstr "-r"
#. type: Labeled list
#: en/git-am.txt:152
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--resolved"
msgstr "--resolved"
@@ -14426,7 +14408,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--abort"
msgstr "--abort"
@@ -14573,7 +14555,7 @@ msgstr "linkgit:git-add[1]"
#. type: Title =
#: en/git-annotate.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-annotate(1)"
msgstr "git-annotate(1)"
@@ -14606,7 +14588,7 @@ msgstr ""
#. type: Title =
#: en/git-apply.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-apply(1)"
msgstr "git-apply(1)"
@@ -14672,7 +14654,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:41 en/git-rebase.txt:314 en/merge-options.txt:55
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--stat"
msgstr "--stat"
@@ -14710,7 +14692,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--index"
msgstr "--index"
@@ -14728,7 +14710,7 @@ msgstr ""
#: 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--cached"
msgstr "--cached"
@@ -14775,7 +14757,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:97 en/rev-list-options.txt:659
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--reverse"
msgstr "--reverse"
@@ -14818,7 +14800,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:125
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--unidiff-zero"
msgstr "--unidiff-zero"
@@ -14840,7 +14822,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:135
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--apply"
msgstr "--apply"
@@ -14854,7 +14836,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:142
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-add"
msgstr "--no-add"
@@ -14869,7 +14851,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:149
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--allow-binary-replacement"
msgstr "--allow-binary-replacement"
@@ -14993,7 +14975,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:207
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--inaccurate-eof"
msgstr "--inaccurate-eof"
@@ -15016,7 +14998,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:220
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--recount"
msgstr "--recount"
@@ -15052,7 +15034,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:233
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--unsafe-paths"
msgstr "--unsafe-paths"
@@ -15128,7 +15110,7 @@ msgstr "linkgit:git-add[1]"
#. type: Title =
#: en/git-archimport.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-archimport(1)"
msgstr "git-archimport(1)"
@@ -15269,7 +15251,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "-o"
msgstr "-o"
@@ -15332,7 +15314,7 @@ msgstr ""
#. type: Title =
#: en/git-archive.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-archive(1)"
msgstr "git-archive(1)"
@@ -15389,7 +15371,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--list"
msgstr "--list"
@@ -15435,7 +15417,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:58
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--worktree-attributes"
msgstr "--worktree-attributes"
@@ -15529,7 +15511,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:90 en/git-diff-files.txt:28
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "-0"
msgstr "-0"
@@ -15540,7 +15522,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:92
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "-9"
msgstr "-9"
@@ -15773,7 +15755,7 @@ msgstr "linkgit:git-add[1]"
#. type: Title =
#: en/git-bisect.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-bisect(1)"
msgstr "git-bisect(1)"
@@ -16400,7 +16382,7 @@ msgstr ""
#. type: Labeled list
#: en/git-bisect.txt:358 en/git-clone.txt:134
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-checkout"
msgstr "--no-checkout"
@@ -16645,7 +16627,7 @@ msgstr ""
#. type: Title =
#: en/git-blame.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-blame(1)"
msgstr "git-blame(1)"
@@ -16724,7 +16706,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:55
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--score-debug"
msgstr "--score-debug"
@@ -16741,7 +16723,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:65
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--show-name"
msgstr "--show-name"
@@ -16755,7 +16737,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:71
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--show-number"
msgstr "--show-number"
@@ -16771,7 +16753,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:78
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--show-email"
msgstr "--show-email"
@@ -17079,7 +17061,7 @@ msgstr ""
#. type: Title =
#: en/git-branch.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-branch(1)"
msgstr "git-branch(1)"
@@ -17269,14 +17251,14 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--delete"
msgstr "--delete"
@@ -17294,7 +17276,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:88 en/git-tag.txt:152
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--create-reflog"
msgstr "--create-reflog"
@@ -17322,7 +17304,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:108
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--move"
msgstr "--move"
@@ -17371,7 +17353,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -17388,7 +17370,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-status.txt:105 en/git-tag.txt:116
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-column"
msgstr "--no-column"
@@ -17407,7 +17389,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:137 en/git-show-branch.txt:44
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--remotes"
msgstr "--remotes"
@@ -17432,7 +17414,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:149
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "-vv"
msgstr "-vv"
@@ -17471,7 +17453,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:167
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-abbrev"
msgstr "--no-abbrev"
@@ -17486,7 +17468,7 @@ msgstr "Zeige die volle L채nge des sha1, anstatt ihn abzuk체rzen."
#. type: Labeled list
#: en/git-branch.txt:171 en/git-checkout.txt:156
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--track"
msgstr "--track"
@@ -17518,7 +17500,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:186 en/git-checkout.txt:170
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-track"
msgstr "--no-track"
@@ -17536,7 +17518,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:190 en/git-push.txt:246
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -17571,7 +17553,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:202
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--unset-upstream"
msgstr "--unset-upstream"
@@ -17584,7 +17566,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:206
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--edit-description"
msgstr "--edit-description"
@@ -17938,7 +17920,7 @@ msgstr ""
#. type: Title =
#: en/git-bundle.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-bundle(1)"
msgstr "git-bundle(1)"
@@ -18297,7 +18279,7 @@ msgstr ""
#. type: Title =
#: en/git-cat-file.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-cat-file(1)"
msgstr "git-cat-file(1)"
@@ -18398,7 +18380,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:65
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--filters"
msgstr "--filters"
@@ -18428,7 +18410,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:76 en/git-mktree.txt:32
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--batch"
msgstr "--batch"
@@ -18450,7 +18432,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:84
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--batch-check"
msgstr "--batch-check"
@@ -18471,7 +18453,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:92
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--batch-all-objects"
msgstr "--batch-all-objects"
@@ -18487,7 +18469,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:99
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--buffer"
msgstr "--buffer"
@@ -18502,7 +18484,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:106
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--allow-unknown-type"
msgstr "--allow-unknown-type"
@@ -18513,7 +18495,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:109
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--follow-symlinks"
msgstr "--follow-symlinks"
@@ -18676,9 +18658,9 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:191
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`objectname`"
-msgstr ""
+msgstr "`objectname`"
#. type: Plain text
#: en/git-cat-file.txt:193
@@ -18687,9 +18669,9 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:194
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`objecttype`"
-msgstr ""
+msgstr "`objecttype`"
#. type: Plain text
#: en/git-cat-file.txt:196
@@ -18698,9 +18680,9 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:197
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`objectsize`"
-msgstr ""
+msgstr "`objectsize`"
#. type: Plain text
#: en/git-cat-file.txt:200
@@ -18722,9 +18704,9 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:205
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`deltabase`"
-msgstr ""
+msgstr "`deltabase`"
#. type: Plain text
#: en/git-cat-file.txt:209
@@ -18736,9 +18718,9 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:210
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`rest`"
-msgstr ""
+msgstr "`rest`"
#. type: Plain text
#: en/git-cat-file.txt:216
@@ -18908,7 +18890,7 @@ msgstr ""
#. type: Title =
#: en/git-check-attr.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-check-attr(1)"
msgstr "git-check-attr(1)"
@@ -18960,7 +18942,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--stdin"
msgstr "--stdin"
@@ -19160,7 +19142,7 @@ msgstr "linkgit:git-add[1]"
#. type: Title =
#: en/git-check-ignore.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-check-ignore(1)"
msgstr "git-check-ignore(1)"
@@ -19245,7 +19227,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ignore.txt:52 en/git-grep.txt:76
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-index"
msgstr "--no-index"
@@ -19365,7 +19347,7 @@ msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-check-mailmap.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-check-mailmap(1)"
msgstr "git-check-mailmap(1)"
@@ -19408,7 +19390,7 @@ msgstr ""
#. type: Title =
#: en/git-checkout-index.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-checkout-index(1)"
msgstr "git-checkout-index(1)"
@@ -19463,7 +19445,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:44
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-create"
msgstr "--no-create"
@@ -19502,7 +19484,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:57
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--temp"
msgstr "--temp"
@@ -19728,7 +19710,7 @@ msgstr ""
#. type: Title =
#: en/git-checkout.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-checkout(1)"
msgstr "git-checkout(1)"
@@ -19965,13 +19947,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:125 en/git-merge-file.txt:73
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:126 en/git-merge-file.txt:74
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--theirs"
msgstr "--theirs"
@@ -20060,7 +20042,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:178 en/git-daemon.txt:134 en/git-worktree.txt:100
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--detach"
msgstr "--detach"
@@ -20120,7 +20102,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:210
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -20135,7 +20117,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:217 en/git-rebase.txt:271 en/git-reset.txt:71
#: en/git-submodule.txt:363 en/git-svn.txt:638 en/rev-list-options.txt:278
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--merge"
msgstr "--merge"
@@ -20218,7 +20200,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:253
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ignore-other-worktrees"
msgstr "--ignore-other-worktrees"
@@ -20762,7 +20744,7 @@ msgstr ""
#. type: Title =
#: en/git-check-ref-format.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-check-ref-format(1)"
msgstr "git-check-ref-format(1)"
@@ -20915,7 +20897,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:88
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]allow-onelevel"
msgstr "--[no-]allow-onelevel"
@@ -20929,7 +20911,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:93
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--refspec-pattern"
msgstr "--refspec-pattern"
@@ -20944,7 +20926,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:100
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--normalize"
msgstr "--normalize"
@@ -20984,7 +20966,7 @@ msgstr ""
#. type: Title =
#: en/git-cherry-pick.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-cherry-pick(1)"
msgstr "git-cherry-pick(1)"
@@ -21086,7 +21068,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:60 en/git-clean.txt:62
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "-x"
msgstr "-x"
@@ -21135,7 +21117,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:88 en/git-revert.txt:70 en/merge-options.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-commit"
msgstr "--no-commit"
@@ -21169,7 +21151,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:111 en/merge-options.txt:30
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ff"
msgstr "--ff"
@@ -21182,7 +21164,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:116 en/git-commit.txt:173 en/git-notes.txt:158
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--allow-empty"
msgstr "--allow-empty"
@@ -21202,7 +21184,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:129 en/git-commit.txt:179
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -21216,7 +21198,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:134
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--keep-redundant-commits"
msgstr "--keep-redundant-commits"
@@ -21425,7 +21407,7 @@ msgstr ""
#. type: Title =
#: en/git-cherry.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-cherry(1)"
msgstr "git-cherry(1)"
@@ -21651,7 +21633,7 @@ msgstr ""
#. type: Title =
#: en/git-citool.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-citool(1)"
msgstr "git-citool(1)"
@@ -21701,7 +21683,7 @@ msgstr ""
#. type: Title =
#: en/git-clean.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-clean(1)"
msgstr "git-clean(1)"
@@ -21989,7 +21971,7 @@ msgstr "linkgit:git-add[1]"
#. type: Title =
#: en/git-clone.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-clone(1)"
msgstr "git-clone(1)"
@@ -22081,7 +22063,7 @@ msgstr ""
#. 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--local"
msgstr "--local"
@@ -22129,7 +22111,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:59
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-hardlinks"
msgstr "--no-hardlinks"
@@ -22150,7 +22132,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:65
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--shared"
msgstr "--shared"
@@ -22266,7 +22248,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:107
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--dissociate"
msgstr "--dissociate"
@@ -22309,7 +22291,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--bare"
msgstr "--bare"
@@ -22351,7 +22333,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:150 en/git-push.txt:106
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--mirror"
msgstr "--mirror"
@@ -22498,7 +22480,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:208
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -22515,13 +22497,13 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:218 en/git-submodule.txt:400
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -22537,7 +22519,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:227
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]shallow-submodules"
msgstr "--[no-]shallow-submodules"
@@ -22718,7 +22700,7 @@ msgstr "$ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n"
#. type: Title =
#: en/git-column.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-column(1)"
msgstr "git-column(1)"
@@ -22829,7 +22811,7 @@ msgstr ""
#. type: Title =
#: en/git-commit-tree.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-commit-tree(1)"
msgstr "git-commit-tree(1)"
@@ -22946,7 +22928,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit-tree.txt:63 en/git-commit.txt:332
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
@@ -23049,7 +23031,7 @@ msgstr ""
#. type: Title =
#: en/git-commit.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-commit(1)"
msgstr "git-commit(1)"
@@ -23304,7 +23286,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:96
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--reset-author"
msgstr "--reset-author"
@@ -23319,7 +23301,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:102 en/git-rev-parse.txt:139 en/git-status.txt:28
#: en/git-symbolic-ref.txt:45
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--short"
msgstr "--short"
@@ -23332,7 +23314,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:106 en/git-status.txt:32 en/git-submodule.txt:280
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--branch"
msgstr "--branch"
@@ -23351,7 +23333,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:114 en/git-describe.txt:74 en/git-ls-tree.txt:52
#: en/git-status.txt:44
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--long"
msgstr "--long"
@@ -23364,7 +23346,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:119 en/git-config.txt:184 en/git-grep.txt:197
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--null"
msgstr "--null"
@@ -23479,7 +23461,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:169 en/git-rebase.txt:322
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-verify"
msgstr "--no-verify"
@@ -23632,7 +23614,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:219 en/git-revert.txt:65 en/merge-options.txt:12
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-edit"
msgstr "--no-edit"
@@ -23646,7 +23628,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:224
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--amend"
msgstr "--amend"
@@ -23696,7 +23678,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:250
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-post-rewrite"
msgstr "--no-post-rewrite"
@@ -23707,7 +23689,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:254
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--include"
msgstr "--include"
@@ -23725,7 +23707,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:261
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--only"
msgstr "--only"
@@ -23876,7 +23858,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:315
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--status"
msgstr "--status"
@@ -23890,7 +23872,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:321
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-status"
msgstr "--no-status"
@@ -24234,7 +24216,7 @@ msgstr ""
#. type: Title =
#: en/git-config.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-config(1)"
msgstr "git-config(1)"
@@ -24433,7 +24415,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:74
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--replace-all"
msgstr "--replace-all"
@@ -24448,7 +24430,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:78 en/git-update-index.txt:42
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--add"
msgstr "--add"
@@ -24467,7 +24449,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:83
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--get"
msgstr "--get"
@@ -24490,7 +24472,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:88
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--get-all"
msgstr "--get-all"
@@ -24501,7 +24483,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:91
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--get-regexp"
msgstr "--get-regexp"
@@ -24532,7 +24514,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:106
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--global"
msgstr "--global"
@@ -24571,7 +24553,7 @@ msgstr "Siehe auch <<FILES>>."
#. type: Labeled list
#: en/git-config.txt:117
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--system"
msgstr "--system"
@@ -24664,7 +24646,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:147
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--remove-section"
msgstr "--remove-section"
@@ -24675,7 +24657,7 @@ msgstr "L철sche das gegebene Abteil aus der Konfigurationsdatei."
#. type: Labeled list
#: en/git-config.txt:150
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--rename-section"
msgstr "--rename-section"
@@ -24686,7 +24668,7 @@ msgstr "Gib dem gegebenen Abteil einen neuen Namen."
#. type: Labeled list
#: en/git-config.txt:153
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--unset"
msgstr "--unset"
@@ -24698,7 +24680,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:156
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--unset-all"
msgstr "--unset-all"
@@ -24718,7 +24700,7 @@ msgstr "Zeige alle in der Konfigurationsdatei gesetzten Variablen an."
#. type: Labeled list
#: en/git-config.txt:163
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--bool"
msgstr "--bool"
@@ -24733,7 +24715,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:166
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--int"
msgstr "--int"
@@ -24756,7 +24738,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:172
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--bool-or-int"
msgstr "--bool-or-int"
@@ -24773,7 +24755,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:176 en/git-hash-object.txt:41
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--path"
msgstr "--path"
@@ -24808,7 +24790,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:196
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--show-origin"
msgstr "--show-origin"
@@ -24875,7 +24857,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]includes"
msgstr "--[no-]includes"
@@ -25362,7 +25344,7 @@ msgstr ""
#. type: Title =
#: en/git-count-objects.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-count-objects(1)"
msgstr "git-count-objects(1)"
@@ -25451,7 +25433,7 @@ msgstr ""
#. type: Labeled list
#: en/git-count-objects.txt:48
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--human-readable"
msgstr "--human-readable"
@@ -25462,7 +25444,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-cache--daemon.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-credential-cache--daemon(1)"
msgstr "git-credential-cache--daemon(1)"
@@ -25504,7 +25486,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-cache.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-credential-cache(1)"
msgstr "git-credential-cache(1)"
@@ -25622,7 +25604,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-store.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-credential-store(1)"
msgstr "git-credential-store(1)"
@@ -25794,7 +25776,7 @@ msgstr ""
#. type: Title =
#: en/git-credential.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-credential(1)"
msgstr "git-credential(1)"
@@ -25984,9 +25966,9 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:120
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`protocol`"
-msgstr ""
+msgstr "`protocol`"
#. type: Plain text
#: en/git-credential.txt:124
@@ -25995,9 +25977,9 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:125
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`host`"
-msgstr ""
+msgstr "`host`"
#. type: Plain text
#: en/git-credential.txt:128
@@ -26006,9 +25988,9 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:129
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`path`"
-msgstr ""
+msgstr "`path`"
#. type: Plain text
#: en/git-credential.txt:134
@@ -26019,9 +26001,9 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:135
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`username`"
-msgstr ""
+msgstr "`username`"
#. type: Plain text
#: en/git-credential.txt:139
@@ -26032,9 +26014,9 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:140
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`password`"
-msgstr ""
+msgstr "`password`"
#. type: Plain text
#: en/git-credential.txt:143
@@ -26043,9 +26025,9 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:144
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`url`"
-msgstr ""
+msgstr "`url`"
#. type: Plain text
#: en/git-credential.txt:154
@@ -26062,7 +26044,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsexportcommit.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-cvsexportcommit(1)"
msgstr "git-cvsexportcommit(1)"
@@ -26262,7 +26244,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsimport.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-cvsimport(1)"
msgstr "git-cvsimport(1)"
@@ -26737,7 +26719,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsserver.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-cvsserver(1)"
msgstr "git-cvsserver(1)"
@@ -26805,7 +26787,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:37 en/git-daemon.txt:48
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--strict-paths"
msgstr "--strict-paths"
@@ -26816,7 +26798,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:40 en/git-daemon.txt:77
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--export-all"
msgstr "--export-all"
@@ -26835,7 +26817,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:45 en/git.txt:534
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--version"
msgstr "--version"
@@ -26846,7 +26828,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:50 en/git.txt:537
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--help"
msgstr "--help"
@@ -27581,7 +27563,7 @@ msgstr ""
#. type: Title =
#: en/git-daemon.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-daemon(1)"
msgstr "git-daemon(1)"
@@ -27675,7 +27657,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:61
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--base-path-relaxed"
msgstr "--base-path-relaxed"
@@ -27716,7 +27698,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:82
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--inetd"
msgstr "--inetd"
@@ -27797,7 +27779,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:112
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--syslog"
msgstr "--syslog"
@@ -27810,7 +27792,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:116
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--user-path"
msgstr "--user-path"
@@ -27837,7 +27819,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:129
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--reuseaddr"
msgstr "--reuseaddr"
@@ -27949,7 +27931,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:174
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]informative-errors"
msgstr "--[no-]informative-errors"
@@ -28200,7 +28182,7 @@ msgstr ""
#. type: Title =
#: en/git-describe.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-describe(1)"
msgstr "git-describe(1)"
@@ -28277,7 +28259,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:47
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--contains"
msgstr "--contains"
@@ -28313,7 +28295,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:65
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--exact-match"
msgstr "--exact-match"
@@ -28326,7 +28308,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:69 en/git-ls-files.txt:151
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--debug"
msgstr "--debug"
@@ -28385,7 +28367,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--always"
msgstr "--always"
@@ -28396,7 +28378,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:104 en/rev-list-options.txt:121
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--first-parent"
msgstr "--first-parent"
@@ -28541,7 +28523,7 @@ msgstr ""
#. type: Title =
#: en/git-diff-files.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-diff-files(1)"
msgstr "git-diff-files(1)"
@@ -28609,7 +28591,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--cc"
msgstr "--cc"
@@ -28628,7 +28610,7 @@ msgstr ""
#. type: Title =
#: en/git-diff-index.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-diff-index(1)"
msgstr "git-diff-index(1)"
@@ -28845,7 +28827,7 @@ msgstr ""
#. type: Title =
#: en/git-difftool.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-difftool(1)"
msgstr "git-difftool(1)"
@@ -28877,7 +28859,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:23
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--dir-diff"
msgstr "--dir-diff"
@@ -28890,13 +28872,13 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:28 en/git-mergetool.txt:70
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "-y"
msgstr "-y"
#. type: Labeled list
#: en/git-difftool.txt:29 en/git-mergetool.txt:71
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-prompt"
msgstr "--no-prompt"
@@ -28907,7 +28889,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:32 en/git-mergetool.txt:78
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--prompt"
msgstr "--prompt"
@@ -28979,7 +28961,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:69 en/git-mergetool.txt:67
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--tool-help"
msgstr "--tool-help"
@@ -28990,7 +28972,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:72
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]symlinks"
msgstr "--[no-]symlinks"
@@ -29033,13 +29015,13 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "-g"
msgstr "-g"
#. type: Labeled list
#: en/git-difftool.txt:89
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]gui"
msgstr "--[no-]gui"
@@ -29053,7 +29035,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:95
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]trust-exit-code"
msgstr "--[no-]trust-exit-code"
@@ -29098,7 +29080,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:114
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "diff.guitool"
msgstr "diff.guitool"
@@ -29119,9 +29101,9 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:129
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "difftool.trustExitCode"
-msgstr ""
+msgstr "difftool.trustExitCode"
#. type: Plain text
#: en/git-difftool.txt:131
@@ -29158,7 +29140,7 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
@@ -29293,7 +29275,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:87
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-commit-id"
msgstr "--no-commit-id"
@@ -29437,7 +29419,7 @@ msgstr ""
#. type: Title =
#: en/git-diff.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-diff(1)"
msgstr "git-diff(1)"
@@ -29873,7 +29855,7 @@ msgstr ""
#. type: Title =
#: en/git-fast-export.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
@@ -30029,7 +30011,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:84
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
@@ -30043,7 +30025,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:90
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--use-done-feature"
msgstr "--use-done-feature"
@@ -30056,7 +30038,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:94
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-data"
msgstr "--no-data"
@@ -30072,7 +30054,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--full-tree"
msgstr "--full-tree"
@@ -30087,7 +30069,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:108
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--anonymize"
msgstr "--anonymize"
@@ -30100,7 +30082,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:113
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--refspec"
msgstr "--refspec"
@@ -30268,7 +30250,7 @@ msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
@@ -30327,7 +30309,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:47
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--stats"
msgstr "--stats"
@@ -30376,7 +30358,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:68
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--done"
msgstr "--done"
@@ -30429,7 +30411,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:98
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
@@ -30702,9 +30684,9 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:238
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`raw`"
-msgstr ""
+msgstr "`raw`"
#. type: Plain text
#: en/git-fast-import.txt:242
@@ -30804,9 +30786,9 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:291
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`now`"
-msgstr ""
+msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:294
@@ -30857,10 +30839,9 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:318 en/git-fast-import.txt:380
-#, fuzzy, no-wrap
-#| msgid "-C <commit>"
+#, no-wrap, ignore-translated
msgid "`commit`"
-msgstr "-C <commit>"
+msgstr "`commit`"
#. type: Plain text
#: en/git-fast-import.txt:322
@@ -30871,9 +30852,9 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:323 en/git-fast-import.txt:744
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`tag`"
-msgstr ""
+msgstr "`tag`"
#. type: Plain text
#: en/git-fast-import.txt:328
@@ -30885,9 +30866,9 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:329 en/git-fast-import.txt:787
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`reset`"
-msgstr ""
+msgstr "`reset`"
#. type: Plain text
#: en/git-fast-import.txt:333
@@ -30899,9 +30880,9 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:334 en/git-fast-import.txt:816
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`blob`"
-msgstr ""
+msgstr "`blob`"
#. type: Plain text
#: en/git-fast-import.txt:338
@@ -30912,9 +30893,9 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:339 en/git-fast-import.txt:888
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`checkpoint`"
-msgstr ""
+msgstr "`checkpoint`"
#. type: Plain text
#: en/git-fast-import.txt:344
@@ -30926,9 +30907,9 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:345 en/git-fast-import.txt:916
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`progress`"
-msgstr ""
+msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:349
@@ -30939,9 +30920,9 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:350 en/git-fast-import.txt:1126
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`done`"
-msgstr ""
+msgstr "`done`"
#. type: Plain text
#: en/git-fast-import.txt:354
@@ -30953,9 +30934,9 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:355 en/git-fast-import.txt:941
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`get-mark`"
-msgstr ""
+msgstr "`get-mark`"
#. type: Plain text
#: en/git-fast-import.txt:359
@@ -30966,9 +30947,9 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:360 en/git-fast-import.txt:960
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`cat-blob`"
-msgstr ""
+msgstr "`cat-blob`"
#. type: Plain text
#: en/git-fast-import.txt:364
@@ -30979,9 +30960,9 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:365 en/git-fast-import.txt:990
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`ls`"
-msgstr ""
+msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:369
@@ -30993,9 +30974,9 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:370 en/git-fast-import.txt:1043
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`feature`"
-msgstr ""
+msgstr "`feature`"
#. type: Plain text
#: en/git-fast-import.txt:373
@@ -31006,9 +30987,9 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:374 en/git-fast-import.txt:1098
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`option`"
-msgstr ""
+msgstr "`option`"
#. type: Plain text
#: en/git-fast-import.txt:378
@@ -31091,10 +31072,9 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:426
-#, fuzzy, no-wrap
-#| msgid "Author"
+#, no-wrap, ignore-translated
msgid "`author`"
-msgstr "Author"
+msgstr "`author`"
#. type: Plain text
#: en/git-fast-import.txt:432
@@ -31108,9 +31088,9 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:434
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`committer`"
-msgstr ""
+msgstr "`committer`"
#. type: Plain text
#: en/git-fast-import.txt:437
@@ -31141,9 +31121,9 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:452
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`from`"
-msgstr ""
+msgstr "`from`"
#. type: Plain text
#: en/git-fast-import.txt:458
@@ -31251,10 +31231,9 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, fuzzy, no-wrap
-#| msgid "--merged"
+#, no-wrap, ignore-translated
msgid "`merge`"
-msgstr "--merged"
+msgstr "`merge`"
#. type: Plain text
#: en/git-fast-import.txt:517
@@ -31276,9 +31255,9 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:522
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`filemodify`"
-msgstr ""
+msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:526
@@ -31448,9 +31427,9 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:594
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`filedelete`"
-msgstr ""
+msgstr "`filedelete`"
#. type: Plain text
#: en/git-fast-import.txt:600
@@ -31478,9 +31457,9 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:610
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`filecopy`"
-msgstr ""
+msgstr "`filecopy`"
#. type: Plain text
#: en/git-fast-import.txt:615
@@ -31516,9 +31495,9 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:631
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`filerename`"
-msgstr ""
+msgstr "`filerename`"
#. type: Plain text
#: en/git-fast-import.txt:635
@@ -31557,9 +31536,9 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:660
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`filedeleteall`"
-msgstr ""
+msgstr "`filedeleteall`"
#. type: Plain text
#: en/git-fast-import.txt:665
@@ -31597,9 +31576,9 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:684
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`notemodify`"
-msgstr ""
+msgstr "`notemodify`"
#. type: Plain text
#: en/git-fast-import.txt:693
@@ -31658,9 +31637,9 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:723
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`mark`"
-msgstr ""
+msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:729
@@ -31844,9 +31823,9 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:834
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`data`"
-msgstr ""
+msgstr "`data`"
#. type: Plain text
#: en/git-fast-import.txt:841
@@ -33005,7 +32984,7 @@ msgstr ""
#. type: Title =
#: en/git-fetch-pack.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-fetch-pack(1)"
msgstr "git-fetch-pack(1)"
@@ -33089,7 +33068,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--thin"
msgstr "--thin"
@@ -33102,7 +33081,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:64 en/git-pack-objects.txt:81
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--include-tag"
msgstr "--include-tag"
@@ -33166,7 +33145,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:99
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--deepen-relative"
msgstr "--deepen-relative"
@@ -33179,7 +33158,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:104 en/merge-options.txt:113
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-progress"
msgstr "--no-progress"
@@ -33190,7 +33169,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:107 en/git-index-pack.txt:77
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--check-self-contained-and-connected"
msgstr "--check-self-contained-and-connected"
@@ -33241,7 +33220,7 @@ msgstr ""
#. type: Title =
#: en/git-fetch.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-fetch(1)"
msgstr "git-fetch(1)"
@@ -33446,7 +33425,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:128 en/git-push.txt:332
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`-`"
msgstr "`-`"
@@ -33457,9 +33436,9 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:129
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "`t`"
-msgstr ""
+msgstr "`t`"
#. type: Plain text
#: en/git-fetch.txt:130
@@ -33656,7 +33635,7 @@ msgstr ""
#. type: Title =
#: en/git-filter-branch.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-filter-branch(1)"
msgstr "git-filter-branch(1)"
@@ -33952,7 +33931,7 @@ msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:169
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--prune-empty"
msgstr "--prune-empty"
@@ -34446,7 +34425,7 @@ msgstr ""
#. type: Title =
#: en/git-fmt-merge-msg.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-fmt-merge-msg(1)"
msgstr "git-fmt-merge-msg(1)"
@@ -34495,7 +34474,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:46
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-log"
msgstr "--no-log"
@@ -34507,7 +34486,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:38
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]summary"
msgstr "--[no-]summary"
@@ -34574,7 +34553,7 @@ msgstr ""
#. type: Title =
#: en/git-for-each-ref.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-for-each-ref(1)"
msgstr "git-for-each-ref(1)"
@@ -34666,25 +34645,25 @@ msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:58
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--shell"
msgstr "--shell"
#. type: Labeled list
#: en/git-for-each-ref.txt:59
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--perl"
msgstr "--perl"
#. type: Labeled list
#: en/git-for-each-ref.txt:60
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--python"
msgstr "--python"
#. type: Labeled list
#: en/git-for-each-ref.txt:61
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--tcl"
msgstr "--tcl"
@@ -35200,7 +35179,7 @@ msgstr ""
#. type: Title =
#: en/git-format-patch.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-format-patch(1)"
msgstr "git-format-patch(1)"
@@ -35348,7 +35327,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:94 en/git-shortlog.txt:30
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--numbered"
msgstr "--numbered"
@@ -35359,7 +35338,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:98
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-numbered"
msgstr "--no-numbered"
@@ -35381,7 +35360,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:104
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--numbered-files"
msgstr "--numbered-files"
@@ -35394,7 +35373,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:109
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--keep-subject"
msgstr "--keep-subject"
@@ -35414,7 +35393,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:119 en/git-pack-objects.txt:57
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--stdout"
msgstr "--stdout"
@@ -35441,7 +35420,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:128
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-attach"
msgstr "--no-attach"
@@ -35473,7 +35452,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:138
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-thread"
msgstr "--no-thread"
@@ -35527,7 +35506,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:163
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
@@ -35557,7 +35536,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:176
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--rfc"
msgstr "--rfc"
@@ -35621,7 +35600,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:202
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--from"
msgstr "--from"
@@ -35668,7 +35647,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:225
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
@@ -35760,7 +35739,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:264
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-binary"
msgstr "--no-binary"
@@ -35774,7 +35753,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:270
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--zero-commit"
msgstr "--zero-commit"
@@ -36480,7 +36459,7 @@ msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-fsck-objects.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-fsck-objects(1)"
msgstr "git-fsck-objects(1)"
@@ -36511,7 +36490,7 @@ msgstr ""
#. type: Title =
#: en/git-fsck.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-fsck(1)"
msgstr "git-fsck(1)"
@@ -36553,7 +36532,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:30
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--unreachable"
msgstr "--unreachable"
@@ -36566,7 +36545,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:34
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]dangling"
msgstr "--[no-]dangling"
@@ -36589,7 +36568,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:44
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--cache"
msgstr "--cache"
@@ -36602,7 +36581,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:48
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-reflogs"
msgstr "--no-reflogs"
@@ -36616,7 +36595,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:54
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--full"
msgstr "--full"
@@ -36633,7 +36612,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:64
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--connectivity-only"
msgstr "--connectivity-only"
@@ -36647,7 +36626,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--strict"
msgstr "--strict"
@@ -36668,7 +36647,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:80
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--lost-found"
msgstr "--lost-found"
@@ -36682,7 +36661,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:86
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--name-objects"
msgstr "--name-objects"
@@ -36849,7 +36828,7 @@ msgstr ""
#. type: Title =
#: en/git-gc.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-gc(1)"
msgstr "git-gc(1)"
@@ -36900,7 +36879,7 @@ msgstr "% git config --get-all core.gitproxy\n"
#. type: Labeled list
#: en/git-gc.txt:36 en/git-read-tree.txt:71
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--aggressive"
msgstr "--aggressive"
@@ -36916,7 +36895,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:44
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--auto"
msgstr "--auto"
@@ -36966,7 +36945,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:71 en/git-pack-refs.txt:57
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-prune"
msgstr "--no-prune"
@@ -37138,7 +37117,7 @@ msgstr ""
#. type: Plain text
#: en/git-gc.txt:183
-#, ignore-translated, ignore-translated
+#, ignore-translated
msgid ""
"linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] "
"linkgit:git-rerere[1]"
@@ -37148,7 +37127,7 @@ msgstr ""
#. type: Title =
#: en/git-get-tar-commit-id.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-get-tar-commit-id(1)"
msgstr "git-get-tar-commit-id(1)"
@@ -37186,7 +37165,7 @@ msgstr ""
#. type: Title =
#: en/git-grep.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-grep(1)"
msgstr "git-grep(1)"
@@ -37262,7 +37241,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:79
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--untracked"
msgstr "--untracked"
@@ -37275,7 +37254,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:83
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-exclude-standard"
msgstr "--no-exclude-standard"
@@ -37288,7 +37267,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:87 en/git-ls-files.txt:97
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--exclude-standard"
msgstr "--exclude-standard"
@@ -37374,7 +37353,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:132
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--word-regexp"
msgstr "--word-regexp"
@@ -37388,7 +37367,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:138
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--invert-match"
msgstr "--invert-match"
@@ -37407,7 +37386,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--full-name"
msgstr "--full-name"
@@ -37427,7 +37406,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:156 en/rev-list-options.txt:85
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--extended-regexp"
msgstr "--extended-regexp"
@@ -37439,7 +37418,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:158 en/rev-list-options.txt:80
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--basic-regexp"
msgstr "--basic-regexp"
@@ -37452,7 +37431,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:163 en/rev-list-options.txt:94
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--perl-regexp"
msgstr "--perl-regexp"
@@ -37470,7 +37449,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:168 en/rev-list-options.txt:90
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--fixed-strings"
msgstr "--fixed-strings"
@@ -37481,7 +37460,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:173
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--line-number"
msgstr "--line-number"
@@ -37492,7 +37471,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:177
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--files-with-matches"
msgstr "--files-with-matches"
@@ -37504,7 +37483,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:180
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--files-without-match"
msgstr "--files-without-match"
@@ -37546,7 +37525,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:202 en/rev-list-options.txt:848
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--count"
msgstr "--count"
@@ -37578,7 +37557,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:215
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--break"
msgstr "--break"
@@ -37589,7 +37568,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:218
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--heading"
msgstr "--heading"
@@ -37602,7 +37581,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:223
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--show-function"
msgstr "--show-function"
@@ -37722,19 +37701,19 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:266
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--and"
msgstr "--and"
#. type: Labeled list
#: en/git-grep.txt:267
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--not"
msgstr "--not"
@@ -37754,7 +37733,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:275 en/rev-list-options.txt:67
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--all-match"
msgstr "--all-match"
@@ -37849,7 +37828,7 @@ msgstr ""
#. type: Title =
#: en/git-gui.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-gui(1)"
msgstr "git-gui(1)"
@@ -38106,7 +38085,7 @@ msgstr ""
#. type: Title =
#: en/git-hash-object.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-hash-object(1)"
msgstr "git-hash-object(1)"
@@ -38160,7 +38139,7 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:37
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--stdin-paths"
msgstr "--stdin-paths"
@@ -38185,7 +38164,7 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:51
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-filters"
msgstr "--no-filters"
@@ -38200,7 +38179,7 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:57
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--literally"
msgstr "--literally"
@@ -38215,7 +38194,7 @@ msgstr ""
#. type: Title =
#: en/git-help.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-help(1)"
msgstr "git-help(1)"
@@ -38288,7 +38267,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:47
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--guides"
msgstr "--guides"
@@ -38301,7 +38280,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:52
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--info"
msgstr "--info"
@@ -38314,7 +38293,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:57
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--man"
msgstr "--man"
@@ -38335,7 +38314,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:67
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--web"
msgstr "--web"
@@ -38572,7 +38551,7 @@ msgstr ""
#. type: Title =
#: en/git-http-backend.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-http-backend(1)"
msgstr "git-http-backend(1)"
@@ -39050,7 +39029,7 @@ msgstr ""
#. type: Title =
#: en/git-http-fetch.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-http-fetch(1)"
msgstr "git-http-fetch(1)"
@@ -39145,7 +39124,7 @@ msgstr ""
#. type: Labeled list
#: en/git-http-fetch.txt:46
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--recover"
msgstr "--recover"
@@ -39158,7 +39137,7 @@ msgstr ""
#. type: Title =
#: en/git-http-push.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-http-push(1)"
msgstr "git-http-push(1)"
@@ -39329,7 +39308,7 @@ msgstr ""
#. type: Title =
#: en/git-imap-send.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-imap-send(1)"
msgstr "git-imap-send(1)"
@@ -39374,7 +39353,7 @@ msgstr "--quiet"
#. type: Labeled list
#: en/git-imap-send.txt:40
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--curl"
msgstr "--curl"
@@ -39387,7 +39366,7 @@ msgstr ""
#. type: Labeled list
#: en/git-imap-send.txt:45
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-curl"
msgstr "--no-curl"
@@ -39656,7 +39635,7 @@ msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-index-pack.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-index-pack(1)"
msgstr "git-index-pack(1)"
@@ -39716,7 +39695,7 @@ msgstr ""
#. type: Labeled list
#: en/git-index-pack.txt:48
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--fix-thin"
msgstr "--fix-thin"
@@ -39838,7 +39817,7 @@ msgstr "Ident mit dem vorhergehenden Beispiel."
#. type: Title =
#: en/git-init-db.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-init-db(1)"
msgstr "git-init-db(1)"
@@ -39873,7 +39852,7 @@ msgstr ""
#. type: Title =
#: en/git-init.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-init(1)"
msgstr "git-init(1)"
@@ -40167,7 +40146,7 @@ msgstr ""
#. type: Title =
#: en/git-instaweb.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-instaweb(1)"
msgstr "git-instaweb(1)"
@@ -40199,7 +40178,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:28
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--httpd"
msgstr "--httpd"
@@ -40214,7 +40193,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:36
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--module-path"
msgstr "--module-path"
@@ -40227,7 +40206,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:41
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--port"
msgstr "--port"
@@ -40238,7 +40217,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:45
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--browser"
msgstr "--browser"
@@ -40259,7 +40238,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:53
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--start"
msgstr "--start"
@@ -40278,7 +40257,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:58
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--stop"
msgstr "--stop"
@@ -40298,7 +40277,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:64
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--restart"
msgstr "--restart"
@@ -40336,7 +40315,7 @@ msgstr ""
#. type: Title =
#: en/git-interpret-trailers.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-interpret-trailers(1)"
msgstr "git-interpret-trailers(1)"
@@ -40446,7 +40425,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:70
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--in-place"
msgstr "--in-place"
@@ -40457,7 +40436,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:73
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--trim-empty"
msgstr "--trim-empty"
@@ -40970,7 +40949,7 @@ msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-log.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-log(1)"
msgstr "git-log(1)"
@@ -41009,7 +40988,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:27
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--follow"
msgstr "--follow"
@@ -41024,7 +41003,7 @@ msgstr "Zeigt die Geschichte inklusive Umbennenungen an."
#. type: Labeled list
#: en/git-log.txt:31
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-decorate"
msgstr "--no-decorate"
@@ -41047,7 +41026,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:41
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--source"
msgstr "--source"
@@ -41062,7 +41041,7 @@ msgstr "Zeigt den Referenznamen f체r jeden dargestellt Commits."
#. type: Labeled list
#: en/git-log.txt:45
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--use-mailmap"
msgstr "--use-mailmap"
@@ -41075,7 +41054,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:50
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--full-diff"
msgstr "--full-diff"
@@ -41109,7 +41088,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:60
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--log-size"
msgstr "--log-size"
@@ -41392,9 +41371,9 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:201
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "log.showSignature"
-msgstr ""
+msgstr "log.showSignature"
#. type: Plain text
#: en/git-log.txt:204
@@ -41442,7 +41421,7 @@ msgstr ""
#. type: Title =
#: en/git-ls-files.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-ls-files(1)"
msgstr "git-ls-files(1)"
@@ -41494,7 +41473,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:40
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--deleted"
msgstr "--deleted"
@@ -41505,7 +41484,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:44
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--modified"
msgstr "--modified"
@@ -41516,7 +41495,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:48
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--others"
msgstr "--others"
@@ -41527,7 +41506,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:52 en/git-status.txt:97
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ignored"
msgstr "--ignored"
@@ -41541,7 +41520,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:59
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--stage"
msgstr "--stage"
@@ -41553,7 +41532,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:62
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--directory"
msgstr "--directory"
@@ -41566,7 +41545,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:66
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-empty-directory"
msgstr "--no-empty-directory"
@@ -41577,7 +41556,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:70 en/git-update-index.txt:65
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--unmerged"
msgstr "--unmerged"
@@ -41588,7 +41567,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:74
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--killed"
msgstr "--killed"
@@ -41661,7 +41640,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:101
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--error-unmatch"
msgstr "--error-unmatch"
@@ -41819,7 +41798,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:157
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--eol"
msgstr "--eol"
@@ -41978,7 +41957,7 @@ msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-ls-remote.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-ls-remote(1)"
msgstr "git-ls-remote(1)"
@@ -42005,7 +41984,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:25 en/git-show-ref.txt:41
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--heads"
msgstr "--heads"
@@ -42019,7 +41998,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:33
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--refs"
msgstr "--refs"
@@ -42059,7 +42038,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:52
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--get-url"
msgstr "--get-url"
@@ -42073,7 +42052,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:57
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--symref"
msgstr "--symref"
@@ -42124,7 +42103,7 @@ msgstr ""
#. type: Title =
#: en/git-ls-tree.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-ls-tree(1)"
msgstr "git-ls-tree(1)"
@@ -42280,7 +42259,7 @@ msgstr ""
#. type: Title =
#: en/git-mailinfo.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-mailinfo(1)"
msgstr "git-mailinfo(1)"
@@ -42453,7 +42432,7 @@ msgstr ""
#. type: Title =
#: en/git-mailsplit.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-mailsplit(1)"
msgstr "git-mailsplit(1)"
@@ -42556,7 +42535,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:48
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--keep-cr"
msgstr "--keep-cr"
@@ -42567,7 +42546,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:51
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--mboxrd"
msgstr "--mboxrd"
@@ -42578,7 +42557,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-base.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-merge-base(1)"
msgstr "git-merge-base(1)"
@@ -42643,7 +42622,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:43
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--octopus"
msgstr "--octopus"
@@ -42657,7 +42636,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:48 en/git-show-branch.txt:90
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--independent"
msgstr "--independent"
@@ -42672,7 +42651,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:55
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--is-ancestor"
msgstr "--is-ancestor"
@@ -42686,7 +42665,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:60 en/git-rebase.txt:346
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--fork-point"
msgstr "--fork-point"
@@ -42912,7 +42891,7 @@ msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-merge-file.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-merge-file(1)"
msgstr "git-merge-file(1)"
@@ -43016,7 +42995,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:70
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--diff3"
msgstr "--diff3"
@@ -43027,7 +43006,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:75
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--union"
msgstr "--union"
@@ -43066,7 +43045,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-index.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-merge-index(1)"
msgstr "git-merge-index(1)"
@@ -43188,7 +43167,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-one-file.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-merge-one-file(1)"
msgstr "git-merge-one-file(1)"
@@ -43319,7 +43298,7 @@ msgstr ""
#. type: Title =
#: en/git-mergetool.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-mergetool(1)"
msgstr "git-mergetool(1)"
@@ -43463,7 +43442,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-tree.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-merge-tree(1)"
msgstr "git-merge-tree(1)"
@@ -43498,7 +43477,7 @@ msgstr ""
#. type: Title =
#: en/git-merge.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-merge(1)"
msgstr "git-merge(1)"
@@ -43631,7 +43610,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge.txt:89
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]rerere-autoupdate"
msgstr "--[no-]rerere-autoupdate"
@@ -44099,7 +44078,7 @@ msgstr ""
#. type: Title =
#: en/git-mktag.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-mktag(1)"
msgstr "git-mktag(1)"
@@ -44160,7 +44139,7 @@ msgstr ""
#. type: Title =
#: en/git-mktree.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-mktree(1)"
msgstr "git-mktree(1)"
@@ -44193,7 +44172,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mktree.txt:26
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--missing"
msgstr "--missing"
@@ -44216,7 +44195,7 @@ msgstr ""
#. type: Title =
#: en/git-mv.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-mv(1)"
msgstr "git-mv(1)"
@@ -44346,7 +44325,7 @@ msgstr ""
#. type: Title =
#: en/git-name-rev.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-name-rev(1)"
msgstr "git-name-rev(1)"
@@ -44425,7 +44404,7 @@ msgstr ""
#. type: Labeled list
#: en/git-name-rev.txt:57
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-undefined"
msgstr "--no-undefined"
@@ -44478,7 +44457,7 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-notes(1)"
msgstr "git-notes(1)"
@@ -44874,7 +44853,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--commit"
msgstr "--commit"
@@ -45139,7 +45118,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
@@ -45152,7 +45131,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
@@ -45173,7 +45152,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:389
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
@@ -45187,7 +45166,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
@@ -45207,7 +45186,7 @@ msgstr ""
#. type: Title =
#: en/git-p4.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-p4(1)"
msgstr "git-p4(1)"
@@ -45574,7 +45553,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:199
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--detect-branches"
msgstr "--detect-branches"
@@ -45602,7 +45581,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:208
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--silent"
msgstr "--silent"
@@ -45618,7 +45597,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:211
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--detect-labels"
msgstr "--detect-labels"
@@ -45632,7 +45611,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:216 en/git-p4.txt:331
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--import-labels"
msgstr "--import-labels"
@@ -45643,7 +45622,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:219
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--import-local"
msgstr "--import-local"
@@ -45691,7 +45670,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:243
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--keep-path"
msgstr "--keep-path"
@@ -45707,7 +45686,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:251
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--use-client-spec"
msgstr "--use-client-spec"
@@ -45797,7 +45776,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:286
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--preserve-user"
msgstr "--preserve-user"
@@ -45810,7 +45789,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:290
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--export-labels"
msgstr "--export-labels"
@@ -45830,7 +45809,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:299
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--prepare-p4-only"
msgstr "--prepare-p4-only"
@@ -45846,7 +45825,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:306
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--shelve"
msgstr "--shelve"
@@ -46690,7 +46669,7 @@ msgstr ""
#. type: Title =
#: en/git-pack-objects.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-pack-objects(1)"
msgstr "git-pack-objects(1)"
@@ -46777,7 +46756,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:61
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--revs"
msgstr "--revs"
@@ -46793,7 +46772,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:70 en/rev-list-options.txt:693
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--unpacked"
msgstr "--unpacked"
@@ -46871,7 +46850,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:118
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--honor-pack-keep"
msgstr "--honor-pack-keep"
@@ -46898,7 +46877,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:132
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--non-empty"
msgstr "--non-empty"
@@ -46909,7 +46888,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:142
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--all-progress"
msgstr "--all-progress"
@@ -46927,7 +46906,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:153
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--all-progress-implied"
msgstr "--all-progress-implied"
@@ -46948,7 +46927,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:162
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-reuse-delta"
msgstr "--no-reuse-delta"
@@ -46963,7 +46942,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:169
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-reuse-object"
msgstr "--no-reuse-object"
@@ -47011,7 +46990,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:194
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--shallow"
msgstr "--shallow"
@@ -47025,7 +47004,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:199
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--delta-base-offset"
msgstr "--delta-base-offset"
@@ -47064,7 +47043,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:230
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--keep-true-parents"
msgstr "--keep-true-parents"
@@ -47076,7 +47055,7 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:239
-#, ignore-translated, ignore-translated
+#, ignore-translated
msgid ""
"linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
msgstr ""
@@ -47084,7 +47063,7 @@ msgstr ""
#. type: Title =
#: en/git-pack-redundant.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-pack-redundant(1)"
msgstr "git-pack-redundant(1)"
@@ -47132,7 +47111,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-redundant.txt:35
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--alt-odb"
msgstr "--alt-odb"
@@ -47150,7 +47129,7 @@ msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:47
-#, ignore-translated, ignore-translated
+#, ignore-translated
msgid ""
"linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-"
"packed[1]"
@@ -47160,7 +47139,7 @@ msgstr ""
#. type: Title =
#: en/git-pack-refs.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-pack-refs(1)"
msgstr "git-pack-refs(1)"
@@ -47240,7 +47219,7 @@ msgstr ""
#. type: Title =
#: en/git-parse-remote.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-parse-remote(1)"
msgstr "git-parse-remote(1)"
@@ -47267,7 +47246,7 @@ msgstr ""
#. type: Title =
#: en/git-patch-id.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-patch-id(1)"
msgstr "git-patch-id(1)"
@@ -47314,7 +47293,7 @@ msgstr ""
#. type: Labeled list
#: en/git-patch-id.txt:33
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--stable"
msgstr "--stable"
@@ -47351,7 +47330,7 @@ msgstr ""
#. type: Labeled list
#: en/git-patch-id.txt:50
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--unstable"
msgstr "--unstable"
@@ -47377,7 +47356,7 @@ msgstr ""
#. type: Title =
#: en/git-prune-packed.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-prune-packed(1)"
msgstr "git-prune-packed(1)"
@@ -47439,13 +47418,13 @@ msgstr ""
#. type: Plain text
#: en/git-prune-packed.txt:44
-#, ignore-translated, ignore-translated
+#, 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-prune(1)"
msgstr "git-prune(1)"
@@ -47563,7 +47542,7 @@ msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-pull.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-pull(1)"
msgstr "git-pull(1)"
@@ -47756,7 +47735,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pull.txt:128 en/git-svn.txt:245
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-rebase"
msgstr "--no-rebase"
@@ -47767,13 +47746,13 @@ msgstr ""
#. type: Labeled list
#: en/git-pull.txt:131 en/git-rebase.txt:442
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
#: en/git-pull.txt:132 en/git-rebase.txt:443
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -47954,7 +47933,7 @@ msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-push.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-push(1)"
msgstr "git-push(1)"
@@ -48159,7 +48138,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:135
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--follow-tags"
msgstr "--follow-tags"
@@ -48175,7 +48154,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:143 en/git-send-pack.txt:73
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]signed"
msgstr "--[no-]signed"
@@ -48199,7 +48178,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:154
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]atomic"
msgstr "--[no-]atomic"
@@ -48213,7 +48192,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:160
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--push-option"
msgstr "--push-option"
@@ -48247,7 +48226,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:172
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]force-with-lease"
msgstr "--[no-]force-with-lease"
@@ -48396,7 +48375,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:252
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]thin"
msgstr "--[no-]thin"
@@ -48440,7 +48419,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:290
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]verify"
msgstr "--[no-]verify"
@@ -48953,7 +48932,7 @@ msgstr ""
#. type: Title =
#: en/git-quiltimport.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-quiltimport(1)"
msgstr "git-quiltimport(1)"
@@ -49056,7 +49035,7 @@ msgstr ""
#. type: Title =
#: en/git-read-tree.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-read-tree(1)"
msgstr "git-read-tree(1)"
@@ -49111,7 +49090,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:40
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--reset"
msgstr "--reset"
@@ -49152,7 +49131,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:65
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--trivial"
msgstr "--trivial"
@@ -49242,7 +49221,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:118
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-sparse-checkout"
msgstr "--no-sparse-checkout"
@@ -49253,7 +49232,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:122
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--empty"
msgstr "--empty"
@@ -49798,7 +49777,7 @@ msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-rebase.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-rebase(1)"
msgstr "git-rebase(1)"
@@ -50210,7 +50189,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:255 en/sequencer.txt:6
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--quit"
msgstr "--quit"
@@ -50223,7 +50202,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:260
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--keep-empty"
msgstr "--keep-empty"
@@ -50240,7 +50219,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:267
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--edit-todo"
msgstr "--edit-todo"
@@ -50339,7 +50318,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--verify"
msgstr "--verify"
@@ -50352,7 +50331,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:336
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--force-rebase"
msgstr "--force-rebase"
@@ -50375,7 +50354,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:347
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-fork-point"
msgstr "--no-fork-point"
@@ -50436,7 +50415,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:384 en/git-svn.txt:642
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--preserve-merges"
msgstr "--preserve-merges"
@@ -50528,13 +50507,13 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:425
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
#: en/git-rebase.txt:426
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-autosquash"
msgstr "--no-autosquash"
@@ -50574,7 +50553,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:450 en/merge-options.txt:35
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-ff"
msgstr "--no-ff"
@@ -51251,7 +51230,7 @@ msgstr ""
#. type: Title =
#: en/git-receive-pack.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-receive-pack(1)"
msgstr "git-receive-pack(1)"
@@ -51363,7 +51342,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:66
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_PUSH_CERT_SIGNER`"
msgstr "`GIT_PUSH_CERT_SIGNER`"
@@ -51376,7 +51355,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:70
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_PUSH_CERT_KEY`"
msgstr "`GIT_PUSH_CERT_KEY`"
@@ -51387,7 +51366,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:73
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_PUSH_CERT_STATUS`"
msgstr "`GIT_PUSH_CERT_STATUS`"
@@ -51401,7 +51380,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:78
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_PUSH_CERT_NONCE`"
msgstr "`GIT_PUSH_CERT_NONCE`"
@@ -51416,13 +51395,13 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:85
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
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, ignore-translated
+#, no-wrap, ignore-translated
msgid "`UNSOLICITED`"
msgstr "`UNSOLICITED`"
@@ -51433,7 +51412,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:89
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`MISSING`"
msgstr "`MISSING`"
@@ -51444,7 +51423,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:91
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`BAD`"
msgstr "`BAD`"
@@ -51455,7 +51434,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:93
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`OK`"
msgstr "`OK`"
@@ -51466,7 +51445,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:95
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`SLOP`"
msgstr "`SLOP`"
@@ -51480,7 +51459,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:100
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_PUSH_CERT_NONCE_SLOP`"
msgstr "`GIT_PUSH_CERT_NONCE_SLOP`"
@@ -51691,7 +51670,7 @@ msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-reflog.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-reflog(1)"
msgstr "git-reflog(1)"
@@ -51829,7 +51808,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:93
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--updateref"
msgstr "--updateref"
@@ -51843,7 +51822,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:98
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--rewrite"
msgstr "--rewrite"
@@ -51856,7 +51835,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:103
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--stale-fix"
msgstr "--stale-fix"
@@ -51904,7 +51883,7 @@ msgstr ""
#. type: Title =
#: en/git-remote-ext.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-remote-ext(1)"
msgstr "git-remote-ext(1)"
@@ -52187,7 +52166,7 @@ msgstr "linkgit:git-add[1]"
#. type: Title =
#: en/git-remote-fd.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-remote-fd(1)"
msgstr "git-remote-fd(1)"
@@ -52280,7 +52259,7 @@ msgstr ""
#. type: Title =
#: en/git-remote-testgit.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-remote-testgit(1)"
msgstr "git-remote-testgit(1)"
@@ -52312,7 +52291,7 @@ msgstr ""
#. type: Title =
#: en/git-remote.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-remote(1)"
msgstr "git-remote(1)"
@@ -52851,13 +52830,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:249
-#, ignore-translated, ignore-translated
+#, 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-repack(1)"
msgstr "git-repack(1)"
@@ -52985,7 +52964,7 @@ msgstr ""
#. type: Labeled list
#: en/git-repack.txt:117
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--write-bitmap-index"
msgstr "--write-bitmap-index"
@@ -53001,7 +52980,7 @@ msgstr ""
#. type: Labeled list
#: en/git-repack.txt:124
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--pack-kept-objects"
msgstr "--pack-kept-objects"
@@ -53032,7 +53011,7 @@ msgstr ""
#. type: Labeled list
#: en/git-repack.txt:140
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--keep-unreachable"
msgstr "--keep-unreachable"
@@ -53060,13 +53039,13 @@ msgstr ""
#. type: Plain text
#: en/git-repack.txt:163
-#, ignore-translated, ignore-translated
+#, 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-replace(1)"
msgstr "git-replace(1)"
@@ -53358,7 +53337,7 @@ msgstr ""
#. type: Title =
#: en/git-request-pull.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-request-pull(1)"
msgstr "git-request-pull(1)"
@@ -53503,7 +53482,7 @@ msgstr ""
#. type: Title =
#: en/git-rerere.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-rerere(1)"
msgstr "git-rerere(1)"
@@ -53865,7 +53844,7 @@ msgstr ""
#. type: Title =
#: en/git-reset.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-reset(1)"
msgstr "git-reset(1)"
@@ -53962,7 +53941,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:53
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--soft"
msgstr "--soft"
@@ -53976,7 +53955,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:59
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--mixed"
msgstr "--mixed"
@@ -53997,7 +53976,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:67
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--hard"
msgstr "--hard"
@@ -54700,7 +54679,7 @@ msgstr ""
#. type: Title =
#: en/git-revert.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-revert(1)"
msgstr "git-revert(1)"
@@ -54837,7 +54816,7 @@ msgstr ""
#. type: Title =
#: en/git-rev-list.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-rev-list(1)"
msgstr "git-rev-list(1)"
@@ -54983,7 +54962,7 @@ msgstr ""
#. type: Title =
#: en/git-rev-parse.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-rev-parse(1)"
msgstr "git-rev-parse(1)"
@@ -55022,7 +55001,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:33
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--parseopt"
msgstr "--parseopt"
@@ -55034,7 +55013,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:36
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--sq-quote"
msgstr "--sq-quote"
@@ -55054,7 +55033,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:44
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--keep-dashdash"
msgstr "--keep-dashdash"
@@ -55067,7 +55046,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:48
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--stop-at-non-option"
msgstr "--stop-at-non-option"
@@ -55081,7 +55060,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:53
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--stuck-long"
msgstr "--stuck-long"
@@ -55100,7 +55079,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:60
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--revs-only"
msgstr "--revs-only"
@@ -55112,7 +55091,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:64
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-revs"
msgstr "--no-revs"
@@ -55123,7 +55102,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:68
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--flags"
msgstr "--flags"
@@ -55134,7 +55113,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:71
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-flags"
msgstr "--no-flags"
@@ -55223,7 +55202,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:120
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--sq"
msgstr "--sq"
@@ -55273,7 +55252,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:145
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--symbolic"
msgstr "--symbolic"
@@ -55287,7 +55266,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:150
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--symbolic-full-name"
msgstr "--symbolic-full-name"
@@ -55409,7 +55388,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:205
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--local-env-vars"
msgstr "--local-env-vars"
@@ -55423,7 +55402,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:211
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--git-dir"
msgstr "--git-dir"
@@ -55444,7 +55423,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:220
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--absolute-git-dir"
msgstr "--absolute-git-dir"
@@ -55456,7 +55435,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:224
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--git-common-dir"
msgstr "--git-common-dir"
@@ -55467,7 +55446,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:227
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--is-inside-git-dir"
msgstr "--is-inside-git-dir"
@@ -55480,7 +55459,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:231
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--is-inside-work-tree"
msgstr "--is-inside-work-tree"
@@ -55493,7 +55472,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:235
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--is-bare-repository"
msgstr "--is-bare-repository"
@@ -55534,7 +55513,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:251
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--show-cdup"
msgstr "--show-cdup"
@@ -55548,7 +55527,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:256
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--show-prefix"
msgstr "--show-prefix"
@@ -55561,7 +55540,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:261
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--show-toplevel"
msgstr "--show-toplevel"
@@ -55583,7 +55562,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:270
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--shared-index-path"
msgstr "--shared-index-path"
@@ -55966,7 +55945,7 @@ msgstr ""
#. type: Title =
#: en/git-rm.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-rm(1)"
msgstr "git-rm(1)"
@@ -56084,7 +56063,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rm.txt:63
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
@@ -56355,7 +56334,7 @@ msgstr ""
#. type: Title =
#: en/git-send-email.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-send-email(1)"
msgstr "git-send-email(1)"
@@ -56428,7 +56407,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:48 en/git-tag.txt:60
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--annotate"
msgstr "--annotate"
@@ -56473,7 +56452,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:65
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--compose"
msgstr "--compose"
@@ -56647,13 +56626,13 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:145
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--xmailer"
msgstr "--xmailer"
#. type: Labeled list
#: en/git-send-email.txt:146
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-xmailer"
msgstr "--no-xmailer"
@@ -56827,7 +56806,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:227
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--smtp-ssl"
msgstr "--smtp-ssl"
@@ -56838,7 +56817,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:230
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--smtp-ssl-cert-path"
msgstr "--smtp-ssl-cert-path"
@@ -56921,7 +56900,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:266
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]chain-reply-to"
msgstr "--[no-]chain-reply-to"
@@ -56944,7 +56923,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:280
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]signed-off-by-cc"
msgstr "--[no-]signed-off-by-cc"
@@ -56958,7 +56937,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:285
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]cc-cover"
msgstr "--[no-]cc-cover"
@@ -56973,7 +56952,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:291
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]to-cover"
msgstr "--[no-]to-cover"
@@ -57058,7 +57037,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:319
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]suppress-from"
msgstr "--[no-]suppress-from"
@@ -57072,7 +57051,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:324
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]thread"
msgstr "--[no-]thread"
@@ -57165,7 +57144,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:365
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]format-patch"
msgstr "--[no-]format-patch"
@@ -57187,7 +57166,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:375
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]validate"
msgstr "--[no-]validate"
@@ -57231,7 +57210,7 @@ msgstr "Configuration"
#. type: Labeled list
#: en/git-send-email.txt:394
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--dump-aliases"
msgstr "--dump-aliases"
@@ -57405,7 +57384,7 @@ msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-send-pack.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-send-pack(1)"
msgstr "git-send-pack(1)"
@@ -57459,7 +57438,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-pack.txt:68
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--atomic"
msgstr "--atomic"
@@ -57536,7 +57515,7 @@ msgstr ""
#. type: Title =
#: en/git-shell.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-shell(1)"
msgstr "git-shell(1)"
@@ -57726,7 +57705,7 @@ msgstr ""
#. type: Title =
#: en/git-sh-i18n.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-sh-i18n(1)"
msgstr "git-sh-i18n(1)"
@@ -57782,7 +57761,7 @@ msgstr ""
#. type: Title =
#: en/git-shortlog.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-shortlog(1)"
msgstr "git-shortlog(1)"
@@ -57834,7 +57813,7 @@ msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:39
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--email"
msgstr "--email"
@@ -57865,7 +57844,7 @@ msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:51
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--committer"
msgstr "--committer"
@@ -57933,7 +57912,7 @@ msgstr ""
#. type: Title =
#: en/git-show-branch.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-show-branch(1)"
msgstr "git-show-branch(1)"
@@ -58019,7 +57998,7 @@ msgstr "Zeige sowohl lokale wie auch remote-tracking Entwicklungszweige an."
#. type: Labeled list
#: en/git-show-branch.txt:51
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--current"
msgstr "--current"
@@ -58038,7 +58017,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:56 en/rev-list-options.txt:635
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--topo-order"
msgstr "--topo-order"
@@ -58052,7 +58031,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:62 en/rev-list-options.txt:627
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--date-order"
msgstr "--date-order"
@@ -58067,7 +58046,7 @@ 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "--sparse"
msgstr "--sparse"
@@ -58100,7 +58079,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:83
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--merge-base"
msgstr "--merge-base"
@@ -58122,7 +58101,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:94
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-name"
msgstr "--no-name"
@@ -58133,7 +58112,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:97
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--sha1-name"
msgstr "--sha1-name"
@@ -58147,7 +58126,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:103
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--topics"
msgstr "--topics"
@@ -58307,7 +58286,7 @@ msgstr ""
#. type: Title =
#: en/git-show-index.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-show-index(1)"
msgstr "git-show-index(1)"
@@ -58339,7 +58318,7 @@ msgstr ""
#. type: Title =
#: en/git-show-ref.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-show-ref(1)"
msgstr "git-show-ref(1)"
@@ -58389,7 +58368,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:36
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--head"
msgstr "--head"
@@ -58408,7 +58387,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:48
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--dereference"
msgstr "--dereference"
@@ -58654,7 +58633,7 @@ msgstr ""
#. type: Title =
#: en/git-show.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-show(1)"
msgstr "git-show(1)"
@@ -58798,7 +58777,7 @@ msgstr ""
#. type: Title =
#: en/git-sh-setup.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-sh-setup(1)"
msgstr "git-sh-setup(1)"
@@ -58990,7 +58969,7 @@ msgstr ""
#. type: Title =
#: en/git-stage.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-stage(1)"
msgstr "git-stage(1)"
@@ -59023,7 +59002,7 @@ msgstr ""
#. type: Title =
#: en/git-stash.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-stash(1)"
msgstr "git-stash(1)"
@@ -59522,7 +59501,7 @@ msgstr ""
#. type: Title =
#: en/git-status.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-status(1)"
msgstr "git-status(1)"
@@ -60103,7 +60082,7 @@ msgstr ""
#. type: Title =
#: en/git-stripspace.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-stripspace(1)"
msgstr "git-stripspace(1)"
@@ -60173,7 +60152,7 @@ msgstr ""
#. type: Labeled list
#: en/git-stripspace.txt:39
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--strip-comments"
msgstr "--strip-comments"
@@ -60185,7 +60164,7 @@ msgstr ""
#. type: Labeled list
#: en/git-stripspace.txt:43
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--comment-lines"
msgstr "--comment-lines"
@@ -60258,7 +60237,7 @@ msgstr ""
#. type: Title =
#: en/git-submodule.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-submodule(1)"
msgstr "git-submodule(1)"
@@ -60814,7 +60793,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:305
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--files"
msgstr "--files"
@@ -60828,7 +60807,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:311
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--summary-limit"
msgstr "--summary-limit"
@@ -60844,7 +60823,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:318
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--remote"
msgstr "--remote"
@@ -60895,7 +60874,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:350
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-fetch"
msgstr "--no-fetch"
@@ -60908,7 +60887,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:354
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--checkout"
msgstr "--checkout"
@@ -60937,7 +60916,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:373
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--rebase"
msgstr "--rebase"
@@ -60954,7 +60933,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:382
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--init"
msgstr "--init"
@@ -60968,7 +60947,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:387
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--name"
msgstr "--name"
@@ -61013,7 +60992,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:406
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--depth"
msgstr "--depth"
@@ -61027,7 +61006,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:411
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
@@ -61067,7 +61046,7 @@ msgstr ""
#. type: Title =
#: en/git-svn.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-svn(1)"
msgstr "git-svn(1)"
@@ -61162,7 +61141,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:47
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--stdlayout"
msgstr "--stdlayout"
@@ -61181,7 +61160,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:58
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-metadata"
msgstr "--no-metadata"
@@ -61195,7 +61174,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:62
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--use-svm-props"
msgstr "--use-svm-props"
@@ -61206,7 +61185,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:64
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--use-svnsync-props"
msgstr "--use-svnsync-props"
@@ -61313,7 +61292,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:106
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-minimize-url"
msgstr "--no-minimize-url"
@@ -61353,7 +61332,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:127
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--localtime"
msgstr "--localtime"
@@ -61376,7 +61355,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:138 en/git-svn.txt:505
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--parent"
msgstr "--parent"
@@ -61485,7 +61464,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:199
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--preserve-empty-dirs"
msgstr "--preserve-empty-dirs"
@@ -61691,7 +61670,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:293
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--message"
msgstr "--message"
@@ -61705,7 +61684,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:297
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--tag"
msgstr "--tag"
@@ -61756,7 +61735,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:317
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--username"
msgstr "--username"
@@ -61769,7 +61748,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:321
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--commit-url"
msgstr "--commit-url"
@@ -61790,7 +61769,7 @@ msgstr "% git config --get-all core.gitproxy\n"
#. type: Labeled list
#: en/git-svn.txt:330 en/rev-list-options.txt:786
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--parents"
msgstr "--parents"
@@ -61880,7 +61859,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:364
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--show-commit"
msgstr "--show-commit"
@@ -61893,7 +61872,7 @@ msgstr "Zeigt die Geschichte des Projekts"
#. type: Labeled list
#: en/git-svn.txt:366 en/pretty-options.txt:31
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--oneline"
msgstr "--oneline"
@@ -61933,7 +61912,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:384
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--git-format"
msgstr "--git-format"
@@ -61969,7 +61948,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:397
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--before"
msgstr "--before"
@@ -61983,7 +61962,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:403
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--after"
msgstr "--after"
@@ -62340,7 +62319,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:571
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--rmdir"
msgstr "--rmdir"
@@ -62510,7 +62489,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:663
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--use-log-author"
msgstr "--use-log-author"
@@ -62530,7 +62509,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:671
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--add-author-from"
msgstr "--add-author-from"
@@ -62600,7 +62579,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:697
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--follow-parent"
msgstr "--follow-parent"
@@ -63322,7 +63301,7 @@ msgstr ""
#. type: Title =
#: en/git-symbolic-ref.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-symbolic-ref(1)"
msgstr "git-symbolic-ref(1)"
@@ -63417,7 +63396,7 @@ msgstr ""
#. type: Title =
#: en/git-tag.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-tag(1)"
msgstr "git-tag(1)"
@@ -63507,7 +63486,7 @@ msgstr ""
#. type: Labeled list
#: en/git-tag.txt:64
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--sign"
msgstr "--sign"
@@ -64838,7 +64817,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:579
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--html-path"
msgstr "--html-path"
@@ -64851,7 +64830,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:583
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--man-path"
msgstr "--man-path"
@@ -64864,7 +64843,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:587
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--info-path"
msgstr "--info-path"
@@ -64877,7 +64856,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:592
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--paginate"
msgstr "--paginate"
@@ -64891,7 +64870,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:598
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-pager"
msgstr "--no-pager"
@@ -64967,7 +64946,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:629
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
@@ -64980,7 +64959,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:633
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
@@ -64994,7 +64973,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:638
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
@@ -65008,7 +64987,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:644
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
@@ -65022,7 +65001,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:650
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
@@ -65412,7 +65391,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:858
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
@@ -65425,7 +65404,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:863
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
@@ -65440,7 +65419,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:869
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
@@ -65454,7 +65433,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:875
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
@@ -65479,7 +65458,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:888
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
@@ -65493,7 +65472,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:894
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
@@ -65507,7 +65486,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:899
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
@@ -65520,7 +65499,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:903
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
@@ -65541,7 +65520,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:918
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
@@ -65559,7 +65538,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:928
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
@@ -65583,37 +65562,37 @@ msgstr "$ git commit\n"
#. type: Labeled list
#: en/git.txt:939
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
#. type: Labeled list
#: en/git.txt:940
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
#. type: Labeled list
#: en/git.txt:941
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
#. type: Labeled list
#: en/git.txt:942
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
#. type: Labeled list
#: en/git.txt:943
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
#. type: Labeled list
#: en/git.txt:944
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
@@ -65638,7 +65617,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:950
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
@@ -65653,7 +65632,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:956
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
@@ -65741,7 +65720,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:983
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
@@ -65752,7 +65731,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:986
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
@@ -65763,7 +65742,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:991
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
@@ -65776,7 +65755,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:996
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
@@ -65790,7 +65769,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1002
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
@@ -65805,13 +65784,13 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1008
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
#: en/git.txt:1009
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
@@ -65846,7 +65825,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1029
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
@@ -65861,7 +65840,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1035
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
@@ -65877,7 +65856,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1042
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
@@ -65890,7 +65869,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1046
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
@@ -65907,7 +65886,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1054
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
@@ -65928,7 +65907,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1065
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
@@ -65971,7 +65950,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1086
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
@@ -65986,7 +65965,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1093
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
@@ -66002,7 +65981,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1100
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
@@ -66025,7 +66004,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1111
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
@@ -66038,7 +66017,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1116
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
@@ -66052,7 +66031,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1121
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
@@ -66065,7 +66044,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1126
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
@@ -66081,7 +66060,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1134
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
@@ -66098,7 +66077,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1143
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
@@ -66111,7 +66090,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1147
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
@@ -66124,7 +66103,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1151
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
@@ -66137,7 +66116,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1155
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
@@ -66155,7 +66134,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1165
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
@@ -66174,7 +66153,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1176
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
@@ -66191,7 +66170,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1185
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
@@ -66397,7 +66376,7 @@ msgstr ""
#. type: Title =
#: en/git-unpack-file.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-unpack-file(1)"
msgstr "git-unpack-file(1)"
@@ -66428,7 +66407,7 @@ msgstr ""
#. type: Title =
#: en/git-unpack-objects.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-unpack-objects(1)"
msgstr "git-unpack-objects(1)"
@@ -66497,7 +66476,7 @@ msgstr ""
#. type: Title =
#: en/git-update-index.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-update-index(1)"
msgstr "git-update-index(1)"
@@ -66561,7 +66540,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:47
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--remove"
msgstr "--remove"
@@ -66593,7 +66572,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:61
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ignore-submodules"
msgstr "--ignore-submodules"
@@ -66647,7 +66626,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:80
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--index-info"
msgstr "--index-info"
@@ -66663,7 +66642,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:86
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]assume-unchanged"
msgstr "--[no-]assume-unchanged"
@@ -66690,7 +66669,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:104
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--really-refresh"
msgstr "--really-refresh"
@@ -66703,7 +66682,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:108
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]skip-worktree"
msgstr "--[no-]skip-worktree"
@@ -66718,7 +66697,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:115
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--again"
msgstr "--again"
@@ -66731,7 +66710,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:119
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--unresolve"
msgstr "--unresolve"
@@ -66744,7 +66723,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:123
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--info-only"
msgstr "--info-only"
@@ -66757,7 +66736,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:128
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--force-remove"
msgstr "--force-remove"
@@ -66770,7 +66749,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:132
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--replace"
msgstr "--replace"
@@ -66821,13 +66800,13 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:164
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--split-index"
msgstr "--split-index"
#. type: Labeled list
#: en/git-update-index.txt:165
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-split-index"
msgstr "--no-split-index"
@@ -66851,13 +66830,13 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:177
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--untracked-cache"
msgstr "--untracked-cache"
#. type: Labeled list
#: en/git-update-index.txt:178
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-untracked-cache"
msgstr "--no-untracked-cache"
@@ -66880,7 +66859,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:188
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--test-untracked-cache"
msgstr "--test-untracked-cache"
@@ -66897,7 +66876,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:198
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--force-untracked-cache"
msgstr "--force-untracked-cache"
@@ -67403,7 +67382,7 @@ msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-update-ref.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-update-ref(1)"
msgstr "git-update-ref(1)"
@@ -67693,7 +67672,7 @@ msgstr ""
#. type: Title =
#: en/git-update-server-info.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-update-server-info(1)"
msgstr "git-update-server-info(1)"
@@ -67742,7 +67721,7 @@ msgstr ""
#. type: Title =
#: en/git-upload-archive.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-upload-archive(1)"
msgstr "git-upload-archive(1)"
@@ -67836,7 +67815,7 @@ msgstr ""
#. type: Title =
#: en/git-upload-pack.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-upload-pack(1)"
msgstr "git-upload-pack(1)"
@@ -67881,7 +67860,7 @@ msgstr "OPTIONS"
#. type: Labeled list
#: en/git-upload-pack.txt:28
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]strict"
msgstr "--[no-]strict"
@@ -67897,7 +67876,7 @@ msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:34
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--stateless-rpc"
msgstr "--stateless-rpc"
@@ -67911,7 +67890,7 @@ msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:39
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--advertise-refs"
msgstr "--advertise-refs"
@@ -67937,7 +67916,7 @@ msgstr "linkgit:git-add[1]"
#. type: Title =
#: en/git-var.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-var(1)"
msgstr "git-var(1)"
@@ -68041,13 +68020,13 @@ msgstr ""
#. type: Plain text
#: en/git-var.txt:67
-#, ignore-translated, ignore-translated
+#, 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, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-verify-commit(1)"
msgstr "git-verify-commit(1)"
@@ -68093,7 +68072,7 @@ msgstr "SHA1 eines git-Markierungobjektes."
#. type: Title =
#: en/git-verify-pack.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-verify-pack(1)"
msgstr "git-verify-pack(1)"
@@ -68135,7 +68114,7 @@ msgstr ""
#. type: Labeled list
#: en/git-verify-pack.txt:32
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--stat-only"
msgstr "--stat-only"
@@ -68181,7 +68160,7 @@ msgstr ""
#. type: Title =
#: en/git-verify-tag.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-verify-tag(1)"
msgstr "git-verify-tag(1)"
@@ -68481,7 +68460,7 @@ msgstr "% git config --get-all core.gitproxy\n"
#. type: Title =
#: en/git-whatchanged.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-whatchanged(1)"
msgstr "git-whatchanged(1)"
@@ -68557,7 +68536,7 @@ msgstr ""
#. type: Title =
#: en/git-worktree.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-worktree(1)"
msgstr "git-worktree(1)"
@@ -68730,7 +68709,7 @@ msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:104
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]checkout"
msgstr "--[no-]checkout"
@@ -68995,7 +68974,7 @@ msgstr ""
#. type: Title =
#: en/git-write-tree.txt:2
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "git-write-tree(1)"
msgstr "git-write-tree(1)"
@@ -69044,7 +69023,7 @@ msgstr ""
#. type: Labeled list
#: en/git-write-tree.txt:30
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--missing-ok"
msgstr "--missing-ok"
@@ -69612,7 +69591,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:40
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ff-only"
msgstr "--ff-only"
@@ -69652,13 +69631,13 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:64
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
#: en/merge-options.txt:65
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-squash"
msgstr "--no-squash"
@@ -69702,13 +69681,13 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:90
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
#: en/merge-options.txt:91
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
@@ -69723,7 +69702,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:99
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-summary"
msgstr "--no-summary"
@@ -69749,7 +69728,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:121
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
@@ -70868,7 +70847,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:17
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--abbrev-commit"
msgstr "--abbrev-commit"
@@ -70889,7 +70868,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:26
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-abbrev-commit"
msgstr "--no-abbrev-commit"
@@ -70927,13 +70906,13 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:46
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--expand-tabs"
msgstr "--expand-tabs"
#. type: Labeled list
#: en/pretty-options.txt:47
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-expand-tabs"
msgstr "--no-expand-tabs"
@@ -70997,7 +70976,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:81
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-notes"
msgstr "--no-notes"
@@ -71018,7 +70997,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:89
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--[no-]standard-notes"
msgstr "--[no-]standard-notes"
@@ -71031,7 +71010,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:94
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--show-signature"
msgstr "--show-signature"
@@ -72066,7 +72045,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:71
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--invert-grep"
msgstr "--invert-grep"
@@ -72079,7 +72058,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:76
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--regexp-ignore-case"
msgstr "--regexp-ignore-case"
@@ -72120,7 +72099,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:98
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--remove-empty"
msgstr "--remove-empty"
@@ -72131,7 +72110,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:101
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--merges"
msgstr "--merges"
@@ -72143,7 +72122,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:104
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-merges"
msgstr "--no-merges"
@@ -72168,13 +72147,13 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:110
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-min-parents"
msgstr "--no-min-parents"
#. type: Labeled list
#: en/rev-list-options.txt:111
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--no-max-parents"
msgstr "--no-max-parents"
@@ -72282,7 +72261,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:178
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--reflog"
msgstr "--reflog"
@@ -72302,7 +72281,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:187 en/rev-list-options.txt:569
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--bisect"
msgstr "--bisect"
@@ -72333,7 +72312,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:209
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--cherry-mark"
msgstr "--cherry-mark"
@@ -72346,7 +72325,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:213
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--cherry-pick"
msgstr "--cherry-pick"
@@ -72371,13 +72350,13 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:226
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--left-only"
msgstr "--left-only"
#. type: Labeled list
#: en/rev-list-options.txt:227
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--right-only"
msgstr "--right-only"
@@ -72399,7 +72378,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:238
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--cherry"
msgstr "--cherry"
@@ -72414,7 +72393,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:246
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--walk-reflogs"
msgstr "--walk-reflogs"
@@ -72480,7 +72459,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:282
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--boundary"
msgstr "--boundary"
@@ -72492,7 +72471,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:287
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--use-bitmap-index"
msgstr "--use-bitmap-index"
@@ -72551,7 +72530,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:313
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--simplify-by-decoration"
msgstr "--simplify-by-decoration"
@@ -72586,7 +72565,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:326
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--full-history"
msgstr "--full-history"
@@ -72597,7 +72576,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:329 en/rev-list-options.txt:462
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--dense"
msgstr "--dense"
@@ -72614,7 +72593,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:336 en/rev-list-options.txt:473
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--simplify-merges"
msgstr "--simplify-merges"
@@ -72628,7 +72607,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:341 en/rev-list-options.txt:520
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--ancestry-path"
msgstr "--ancestry-path"
@@ -73079,7 +73058,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:593
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--bisect-vars"
msgstr "--bisect-vars"
@@ -73099,7 +73078,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:605
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--bisect-all"
msgstr "--bisect-all"
@@ -73148,7 +73127,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:631
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--author-date-order"
msgstr "--author-date-order"
@@ -73216,7 +73195,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:670
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--objects"
msgstr "--objects"
@@ -73230,7 +73209,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:676
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--objects-edge"
msgstr "--objects-edge"
@@ -73245,7 +73224,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:683
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
@@ -73259,7 +73238,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:688
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--indexed-objects"
msgstr "--indexed-objects"
@@ -73295,7 +73274,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:707
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--do-walk"
msgstr "--do-walk"
@@ -73320,7 +73299,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:721
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--relative-date"
msgstr "--relative-date"
@@ -73449,7 +73428,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:781
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--header"
msgstr "--header"
@@ -73469,7 +73448,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:790
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--children"
msgstr "--children"
@@ -73482,7 +73461,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:795
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--timestamp"
msgstr "--timestamp"
@@ -73493,7 +73472,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:799
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--left-right"
msgstr "--left-right"
@@ -73547,7 +73526,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:828
-#, no-wrap, ignore-translated, ignore-translated
+#, no-wrap, ignore-translated
msgid "--graph"
msgstr "--graph"
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index 1bb8d6f..a28635a 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -6906,9 +6906,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2208
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "mergetool.meld.hasOutput"
-msgstr ""
+msgstr "mergetool.meld.hasOutput"
#. type: Plain text
#: en/config.txt:2216
@@ -7827,9 +7827,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2672
-#, no-wrap
+#, no-wrap, ignore-translated
msgid "receive.fsck.skipList"
-msgstr ""
+msgstr "receive.fsck.skipList"
#. type: Labeled list
#: en/config.txt:2680
@@ -17249,7 +17249,9 @@ msgstr "--no-track"
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."
+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
@@ -19353,7 +19355,9 @@ 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
@@ -19379,7 +19383,11 @@ 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."
+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
@@ -19394,14 +19402,22 @@ msgid ""
"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>."
+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 횪"
+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
@@ -19416,7 +19432,11 @@ msgid ""
"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."
+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
@@ -19432,14 +19452,21 @@ msgid ""
"`--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."
+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"
+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
@@ -19456,7 +19483,9 @@ msgstr ""
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."
+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
@@ -19478,7 +19507,12 @@ msgid ""
"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."
+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
@@ -19486,7 +19520,10 @@ 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)."
+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
@@ -19509,7 +19546,15 @@ msgid ""
" 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."
+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
@@ -19517,7 +19562,11 @@ 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>)."
+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
@@ -19529,7 +19578,15 @@ msgid ""
"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."
+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
@@ -19543,21 +19600,31 @@ msgid ""
"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`."
+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."
+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."
+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
@@ -19576,7 +19643,9 @@ msgstr "--theirs"
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."
+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
@@ -19585,7 +19654,11 @@ msgid ""
"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챕."
+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
@@ -19598,7 +19671,16 @@ msgid ""
" 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혻쨩)."
+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
@@ -19611,7 +19693,9 @@ msgstr "-b <nouvelle_branche>"
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."
+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
@@ -19625,14 +19709,21 @@ 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."
+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."
-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. "
+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
@@ -19645,12 +19736,23 @@ msgid ""
"\"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."
+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
@@ -19665,7 +19767,11 @@ msgid ""
"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."
+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
@@ -19680,7 +19786,12 @@ msgid ""
" 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."
+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
@@ -19689,7 +19800,11 @@ msgid ""
"\"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혻쨩"
+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혻쨩"
#. type: Plain text
#: en/git-checkout.txt:202
@@ -19698,7 +19813,12 @@ msgid ""
"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."
+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
@@ -19709,7 +19829,14 @@ msgid ""
"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."
+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
@@ -19723,7 +19850,11 @@ 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>."
+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
@@ -19741,7 +19872,14 @@ msgid ""
"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."
+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
@@ -19750,14 +19888,20 @@ msgid ""
"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)."
+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."
+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
@@ -19772,7 +19916,12 @@ msgid ""
"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)."
+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
@@ -19781,7 +19930,11 @@ msgid ""
"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)."
+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
@@ -19789,7 +19942,11 @@ 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`."
+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
@@ -19803,7 +19960,10 @@ 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."
+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
@@ -19818,7 +19978,12 @@ msgid ""
"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)."
+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
@@ -19826,7 +19991,10 @@ 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}\"`."
+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
@@ -19834,7 +20002,11 @@ 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."
+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
@@ -19858,14 +20030,18 @@ msgstr "<point_de_d챕part>"
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."
+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챕."
+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
@@ -19879,7 +20055,11 @@ 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혻:"
+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
@@ -19909,7 +20089,13 @@ msgid ""
"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'혻:"
+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
@@ -19944,7 +20130,11 @@ msgid ""
"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)혻:"
+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
@@ -19983,7 +20173,12 @@ msgid ""
"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챕챕혻:"
+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
@@ -20014,7 +20209,9 @@ msgstr ""
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혻:"
+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
@@ -20045,7 +20242,9 @@ msgstr ""
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 :"
+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
@@ -20081,7 +20280,13 @@ msgid ""
"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혻:"
+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
@@ -20101,20 +20306,27 @@ 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."
+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."
+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."
+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
@@ -20123,7 +20335,12 @@ msgid ""
" 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혻:"
+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
@@ -20152,7 +20369,17 @@ msgid ""
"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."
+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
@@ -20160,7 +20387,10 @@ 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. "
+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 -
#: en/git-checkout.txt:446
@@ -20195,7 +20425,9 @@ msgstr "restaure hello.c depuis l'index"
#: 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"
+msgstr ""
+"Si vous souhaitez extraire _tous_ les fichiers source C de l'index, vous "
+"pouvez lancer"
#. type: delimited block -
#: en/git-checkout.txt:457
@@ -20210,7 +20442,11 @@ msgid ""
"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)."
+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
@@ -20218,7 +20454,10 @@ 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혻:"
+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
@@ -20231,7 +20470,9 @@ msgstr "$ git checkout -- hello.c\n"
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혻:"
+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
@@ -20245,7 +20486,10 @@ 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혻:"
+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
@@ -20262,7 +20506,9 @@ msgstr ""
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혻:"
+msgstr ""
+"Vous pouvez fournir l'option `-m` 횪 la commande, ce qui essaierait une "
+"fusion 횪 trois points혻:"
#. type: delimited block -
#: en/git-checkout.txt:494
@@ -20280,14 +20526,19 @@ 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."
+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혻:"
+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
@@ -20309,7 +20560,11 @@ 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혻:"
+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
diff --git a/scripts/pre-translate-po b/scripts/pre-translate-po
index d0d725d..b04ea92 100755
--- a/scripts/pre-translate-po
+++ b/scripts/pre-translate-po
@@ -10,9 +10,11 @@ def main (f):
for entry in po:
if (re.fullmatch(r'-[-a-z0-9[\]]+', entry.msgid)) \
or re.fullmatch(r'((linkgit:)?git-[-a-z0-9[\]]+(\[1\]|\(1\))(\n| )?)+', entry.msgid) \
- or re.fullmatch(r'`[A-Z-_]+`|(core|branch|diff)\.[a-zA-Z]+', entry.msgid):
+ or re.fullmatch(r'`[a-zA-Z-_]+`|(user|transfer|submodule|stash|status|splitIndex|showbranch|sendemail|repack|remote|receive|push|mergetool|mailinfo|log|interactive|instaweb|i18n|help|gui|gitweb|fastimport|format|fetch|difftool|credential|commit|column|core|branch|diff|apply|color)\.[a-zA-Z_.]+', entry.msgid):
entry.msgstr = entry.msgid
entry.flags.append("ignore-translated")
+ flags = set(entry.flags)
+ entry.flags = list(flags)
if 'fuzzy' in entry.flags:
entry.flags.remove('fuzzy')
entry.previous_msgid = None
--
GitLab