From 0af2390a3d823dbd2b005b08add3542955af8a28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20A=C3=9Fhauer?= <mha1993@live.de>
Date: Mon, 28 Jan 2019 14:16:26 +0100
Subject: [PATCH] pre-translate-po: automatically translate environment
variables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Matthias A횩hauer <mha1993@live.de>
---
po/documentation.de.po | 2613 +++++++++++++++++++------------------
po/documentation.fr.po | 46 +-
po/documentation.nl.po | 2614 +++++++++++++++++++-------------------
scripts/pre-translate-po | 3 +-
4 files changed, 2638 insertions(+), 2638 deletions(-)
diff --git a/po/documentation.de.po b/po/documentation.de.po
index cc8401a..1128a7d 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-same
+#, ignore-same, no-wrap
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-same
+#, ignore-same, no-wrap
msgid "--root"
msgstr "--root"
@@ -48,7 +48,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:9
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
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-same
+#, ignore-same, no-wrap
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-same
+#, ignore-same, no-wrap
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-same
+#, ignore-same, no-wrap
msgid "-p"
msgstr "-p"
#. type: Labeled list
#: en/blame-options.txt:40 en/git-commit.txt:109 en/git-push.txt:121
#: en/git-worktree.txt:115
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--porcelain"
msgstr "--porcelain"
@@ -174,7 +174,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
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-same
+#, ignore-same, no-wrap
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-same
+#, ignore-same, no-wrap
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-same
+#, ignore-same, no-wrap
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-same
+#, ignore-same, no-wrap
msgid "linkgit:git-annotate[1]"
msgstr "linkgit:git-annotate[1]"
@@ -336,7 +336,7 @@ msgstr "Zeilen der Datei mit Commit-Informationen versehen und anzeigen."
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:4 en/git-annotate.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-blame[1]"
msgstr "linkgit:git-blame[1]"
@@ -349,7 +349,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-cherry[1]"
msgstr "linkgit:git-cherry[1]"
@@ -361,7 +361,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
@@ -372,7 +372,7 @@ msgstr "Anzahl und Speicherverbrauch ungepackter Objekte z채hlen."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
@@ -383,7 +383,7 @@ msgstr "횆nderungen mittels den allgemeinen Diff-Tools anzeigen."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
@@ -395,7 +395,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-get-tar-commit-id[1]"
msgstr "linkgit:git-get-tar-commit-id[1]"
@@ -407,7 +407,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:22
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
@@ -418,7 +418,7 @@ msgstr "Hilfsinformationen 체ber Git anzeigen."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
@@ -429,7 +429,7 @@ msgstr "Ihr aktuelles Repository sofort in gitweb betrachten."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
@@ -440,7 +440,7 @@ msgstr "3-Wege-Merge anzeigen ohne den Index zu ver채ndern."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
@@ -451,7 +451,7 @@ msgstr "Aufgezeichnete Aufl철sung von Merge-Konflikten wiederverwenden."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:34
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-rev-parse[1]"
msgstr "linkgit:git-rev-parse[1]"
@@ -462,7 +462,7 @@ msgstr "Parameter herauspicken und 채ndern."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:37
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
@@ -473,7 +473,7 @@ msgstr "Branches und ihre Commits ausgeben."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
@@ -484,7 +484,7 @@ msgstr "Die GPG-Signatur von Commits pr체fen."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
@@ -495,7 +495,7 @@ msgstr "Die GPG-Signatur von Tags pr체fen."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
@@ -506,7 +506,7 @@ msgstr "Logs mit dem Unterschied, den jeder Commit einf체hrt, anzeigen."
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:49 en/git-instaweb.txt:90
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
@@ -517,7 +517,7 @@ msgstr "Git Web Interface (Web-Frontend f체r Git-Repositories)."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:142
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
@@ -528,7 +528,7 @@ msgstr "Repositoryweite oder globale Optionen lesen und setzen."
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1472
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -539,7 +539,7 @@ msgstr "Export-Tool f체r Git-Daten."
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:215
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -550,7 +550,7 @@ msgstr "Backend f체r schnelle Git-Datenimport-Tools."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-filter-branch[1]"
msgstr "linkgit:git-filter-branch[1]"
@@ -561,7 +561,7 @@ msgstr "Branches umschreiben."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:139
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-mergetool[1]"
msgstr "linkgit:git-mergetool[1]"
@@ -573,7 +573,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-pack-refs[1]"
msgstr "linkgit:git-pack-refs[1]"
@@ -584,7 +584,7 @@ msgstr "Branches und Tags f체r effizienten Zugriff auf das Repository packen."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-prune[1]"
msgstr "linkgit:git-prune[1]"
@@ -595,7 +595,7 @@ msgstr "Alle nicht erreichbaren Objekte von der Objektdatenbank entfernen."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:22
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-reflog[1]"
msgstr "linkgit:git-reflog[1]"
@@ -606,7 +606,7 @@ msgstr "Reflog-Informationen verwalten."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-remote[1]"
msgstr "linkgit:git-remote[1]"
@@ -617,7 +617,7 @@ msgstr "Einen Satz entfernter Repositories verwalten."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-repack[1]"
msgstr "linkgit:git-repack[1]"
@@ -628,7 +628,7 @@ msgstr "Ungepackte Objekte in einem Repository packen."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-replace[1]"
msgstr "linkgit:git-replace[1]"
@@ -639,7 +639,7 @@ msgstr "Referenzen f체r ersetzende Objekte erstellen, auflisten, l철schen."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-archimport[1]"
msgstr "linkgit:git-archimport[1]"
@@ -650,7 +650,7 @@ msgstr "Ein Arch-Repository in Git importieren."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-cvsexportcommit[1]"
msgstr "linkgit:git-cvsexportcommit[1]"
@@ -661,7 +661,7 @@ msgstr "Einzelnen Commit zu einem ausgecheckten CVS-Repository exportieren."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-cvsimport[1]"
msgstr "linkgit:git-cvsimport[1]"
@@ -672,7 +672,7 @@ msgstr "Ihre Daten aus einem anderen SCM 체bernehmen."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-cvsserver[1]"
msgstr "linkgit:git-cvsserver[1]"
@@ -683,7 +683,7 @@ msgstr "Ein CVS-Server-Emulator f체r Git"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-imap-send[1]"
msgstr "linkgit:git-imap-send[1]"
@@ -696,7 +696,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-p4[1]"
msgstr "linkgit:git-p4[1]"
@@ -707,7 +707,7 @@ msgstr "Repositories aus Perforce importieren und an diese senden."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-quiltimport[1]"
msgstr "linkgit:git-quiltimport[1]"
@@ -718,7 +718,7 @@ msgstr "Patches aus quilt auf aktuellen Branch anwenden."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:22
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-request-pull[1]"
msgstr "linkgit:git-request-pull[1]"
@@ -729,7 +729,7 @@ msgstr "Eine 횥bersicht 체ber ausstehende 횆nderungen generieren."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-send-email[1]"
msgstr "linkgit:git-send-email[1]"
@@ -740,7 +740,7 @@ msgstr "Eine Sammlung von Patches als E-Mails versenden."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-svn[1]"
msgstr "linkgit:git-svn[1]"
@@ -752,7 +752,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:185
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -763,7 +763,7 @@ msgstr "F체ge Dateiinhalte zum Index hinzu."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-am[1]"
msgstr "linkgit:git-am[1]"
@@ -774,7 +774,7 @@ msgstr "Eine Serie von Patches von einer Mailbox anwenden."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-archive[1]"
msgstr "linkgit:git-archive[1]"
@@ -785,7 +785,7 @@ msgstr "Dateiarchiv von angegebenem Verzeichnis erstellen."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-bisect[1]"
msgstr "linkgit:git-bisect[1]"
@@ -798,7 +798,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-branch[1]"
msgstr "linkgit:git-branch[1]"
@@ -809,7 +809,7 @@ msgstr "Branches anzeigen, erstellen oder entfernen."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-bundle[1]"
msgstr "linkgit:git-bundle[1]"
@@ -820,7 +820,7 @@ msgstr "Objekte und Referenzen 체ber ein Archiv verteilen."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-checkout[1]"
msgstr "linkgit:git-checkout[1]"
@@ -832,7 +832,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:22 en/git-revert.txt:126
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-cherry-pick[1]"
msgstr "linkgit:git-cherry-pick[1]"
@@ -843,7 +843,7 @@ msgstr "횆nderungen eines existierenden Commits anwenden."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-citool[1]"
msgstr "linkgit:git-citool[1]"
@@ -854,7 +854,7 @@ msgstr "Graphische Alternative zu git-commit."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-clean[1]"
msgstr "linkgit:git-clean[1]"
@@ -865,7 +865,7 @@ msgstr "Unversionierte Dateien vom Arbeitsverzeichnis entfernen."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-clone[1]"
msgstr "linkgit:git-clone[1]"
@@ -876,7 +876,7 @@ msgstr "Ein Repository in einem neuen Verzeichnis klonen."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:34
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-commit[1]"
msgstr "linkgit:git-commit[1]"
@@ -887,7 +887,7 @@ msgstr "횆nderungen in das Repository eintragen."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:37
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-describe[1]"
msgstr "linkgit:git-describe[1]"
@@ -900,7 +900,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:136
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-diff[1]"
msgstr "linkgit:git-diff[1]"
@@ -912,7 +912,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-fetch[1]"
msgstr "linkgit:git-fetch[1]"
@@ -923,7 +923,7 @@ msgstr "Objekte und Referenzen von einem anderen Repository herunterladen."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-format-patch[1]"
msgstr "linkgit:git-format-patch[1]"
@@ -934,7 +934,7 @@ msgstr "Patches f체r E-Mail-Versand vorbereiten."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:49
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-gc[1]"
msgstr "linkgit:git-gc[1]"
@@ -946,7 +946,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:52
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-grep[1]"
msgstr "linkgit:git-grep[1]"
@@ -957,7 +957,7 @@ msgstr "Zeilen darstellen, die einem Muster entsprechen."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:55
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-gui[1]"
msgstr "linkgit:git-gui[1]"
@@ -968,7 +968,7 @@ msgstr "Eine portable grafische Schnittstelle zu Git."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-init[1]"
msgstr "linkgit:git-init[1]"
@@ -980,7 +980,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:61
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-log[1]"
msgstr "linkgit:git-log[1]"
@@ -991,7 +991,7 @@ msgstr "Commit-Historie anzeigen."
#. type: Plain text
#: en/cmds-mainporcelain.txt:64 en/git-fmt-merge-msg.txt:75
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-merge[1]"
msgstr "linkgit:git-merge[1]"
@@ -1002,7 +1002,7 @@ msgstr "Zwei oder mehr Entwicklungszweige zusammenf체hren."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:67
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-mv[1]"
msgstr "linkgit:git-mv[1]"
@@ -1014,7 +1014,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:70
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-notes[1]"
msgstr "linkgit:git-notes[1]"
@@ -1025,7 +1025,7 @@ msgstr "Objekt-Notizen hinzuf체gen oder 체berpr체fen."
#. type: Plain text
#: en/cmds-mainporcelain.txt:73 en/git-fetch.txt:209
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-pull[1]"
msgstr "linkgit:git-pull[1]"
@@ -1038,7 +1038,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:76
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-push[1]"
msgstr "linkgit:git-push[1]"
@@ -1049,7 +1049,7 @@ msgstr "Remote-Referenzen mitsamt den verbundenen Objekten aktualisieren."
#. type: Plain text
#: en/cmds-mainporcelain.txt:79 en/git-svn.txt:1133
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-rebase[1]"
msgstr "linkgit:git-rebase[1]"
@@ -1060,7 +1060,7 @@ msgstr "Wiederholtes Anwenden von Commits auf anderem Basis-Commit."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:82
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-reset[1]"
msgstr "linkgit:git-reset[1]"
@@ -1071,7 +1071,7 @@ msgstr "Aktuellen HEAD zu einem spezifizierten Zustand setzen."
#. type: Plain text
#: en/cmds-mainporcelain.txt:85 en/git-cherry-pick.txt:230
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-revert[1]"
msgstr "linkgit:git-revert[1]"
@@ -1082,7 +1082,7 @@ msgstr "Einige bestehende Commits r체ckg채ngig machen."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:88
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-rm[1]"
msgstr "linkgit:git-rm[1]"
@@ -1093,7 +1093,7 @@ msgstr "Dateien aus dem Arbeitsverzeichnis und dem Index l철schen."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:91
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-shortlog[1]"
msgstr "linkgit:git-shortlog[1]"
@@ -1104,7 +1104,7 @@ msgstr "Ausgabe von 'git log' zusammenfassen."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:94
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-show[1]"
msgstr "linkgit:git-show[1]"
@@ -1115,7 +1115,7 @@ msgstr "Verschiedene Arten von Objekten anzeigen."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:97
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
@@ -1126,7 +1126,7 @@ msgstr "횆nderungen in einem Arbeitsverzeichnis aufbewahren."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
@@ -1137,7 +1137,7 @@ msgstr "Den Zustand des Arbeitsverzeichnisses anzeigen."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
@@ -1148,7 +1148,7 @@ msgstr "Submodule initialisieren, aktualisieren oder inspizieren."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:106
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
@@ -1161,7 +1161,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:109
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
@@ -1172,7 +1172,7 @@ msgstr "Mehrere Arbeitsverzeichnisse verwalten."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:112 en/git-gui.txt:104
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
@@ -1183,7 +1183,7 @@ msgstr "Der Git-Repository-Browser."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-cat-file[1]"
msgstr "linkgit:git-cat-file[1]"
@@ -1196,7 +1196,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-diff-files[1]"
msgstr "linkgit:git-diff-files[1]"
@@ -1207,7 +1207,7 @@ msgstr "Dateien von dem Arbeitsverzeichnis und dem Index vergleichen."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-diff-index[1]"
msgstr "linkgit:git-diff-index[1]"
@@ -1218,7 +1218,7 @@ msgstr "Ein Verzeichnis von dem Arbeitsverzeichnis und dem Index vergleichen."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-diff-tree[1]"
msgstr "linkgit:git-diff-tree[1]"
@@ -1230,7 +1230,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-for-each-ref[1]"
msgstr "linkgit:git-for-each-ref[1]"
@@ -1241,7 +1241,7 @@ msgstr "Informationen f체r jede Referenz ausgeben."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-ls-files[1]"
msgstr "linkgit:git-ls-files[1]"
@@ -1253,7 +1253,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-ls-remote[1]"
msgstr "linkgit:git-ls-remote[1]"
@@ -1264,7 +1264,7 @@ msgstr "Referenzen in einem Remote-Repository auflisten."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:22
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-ls-tree[1]"
msgstr "linkgit:git-ls-tree[1]"
@@ -1275,7 +1275,7 @@ msgstr "Inhalte eines Tree-Objektes auflisten."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-merge-base[1]"
msgstr "linkgit:git-merge-base[1]"
@@ -1286,7 +1286,7 @@ msgstr "Bestm철glichen gemeinsamen Vorg채nger-Commit f체r einen Merge finden."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-name-rev[1]"
msgstr "linkgit:git-name-rev[1]"
@@ -1297,7 +1297,7 @@ msgstr "Symbolische Namen f체r die gegebenen Commits finden."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-pack-redundant[1]"
msgstr "linkgit:git-pack-redundant[1]"
@@ -1308,7 +1308,7 @@ msgstr "Redundante Paketdateien finden."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:34
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-rev-list[1]"
msgstr "linkgit:git-rev-list[1]"
@@ -1319,7 +1319,7 @@ msgstr "Commit-Objekte chronologisch absteigend sortiert auflisten."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:37
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-show-index[1]"
msgstr "linkgit:git-show-index[1]"
@@ -1330,7 +1330,7 @@ msgstr "Gepackten Archiv-Index anzeigen."
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:40 en/git-for-each-ref.txt:341
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-show-ref[1]"
msgstr "linkgit:git-show-ref[1]"
@@ -1341,7 +1341,7 @@ msgstr "Referenzen in einem lokalen Repository auflisten."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-unpack-file[1]"
msgstr "linkgit:git-unpack-file[1]"
@@ -1352,7 +1352,7 @@ msgstr "Eine tempor채re Datei mit den Inhalten eines Blobs erstellen."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-var[1]"
msgstr "linkgit:git-var[1]"
@@ -1363,7 +1363,7 @@ msgstr "Eine logische Variable von Git anzeigen."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:49
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-verify-pack[1]"
msgstr "linkgit:git-verify-pack[1]"
@@ -1374,7 +1374,7 @@ msgstr "Gepackte Git-Archivdateien validieren."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-apply[1]"
msgstr "linkgit:git-apply[1]"
@@ -1385,7 +1385,7 @@ msgstr "Einen Patch auf Dateien und/oder den Index anwenden."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-checkout-index[1]"
msgstr "linkgit:git-checkout-index[1]"
@@ -1396,7 +1396,7 @@ msgstr "Dateien von dem Index ins Arbeitsverzeichnis kopieren."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-commit-tree[1]"
msgstr "linkgit:git-commit-tree[1]"
@@ -1407,7 +1407,7 @@ msgstr "Ein neues Commit-Objekt erstellen."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-hash-object[1]"
msgstr "linkgit:git-hash-object[1]"
@@ -1419,7 +1419,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-index-pack[1]"
msgstr "linkgit:git-index-pack[1]"
@@ -1430,7 +1430,7 @@ msgstr "Pack-Index-Datei f체r ein existierendes gepacktes Archiv erzeugen."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-merge-file[1]"
msgstr "linkgit:git-merge-file[1]"
@@ -1441,7 +1441,7 @@ msgstr "Einen 3-Wege-Datei-Merge ausf체hren."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-merge-index[1]"
msgstr "linkgit:git-merge-index[1]"
@@ -1452,7 +1452,7 @@ msgstr "Einen Merge f체r zusammenzuf체hrende Dateien ausf체hren."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:22
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-mktag[1]"
msgstr "linkgit:git-mktag[1]"
@@ -1463,7 +1463,7 @@ msgstr "Ein Tag-Objekt erstellen."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-mktree[1]"
msgstr "linkgit:git-mktree[1]"
@@ -1474,7 +1474,7 @@ msgstr "Tree-Objekt aus ls-tree formattiertem Text erzeugen."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-pack-objects[1]"
msgstr "linkgit:git-pack-objects[1]"
@@ -1485,7 +1485,7 @@ msgstr "Ein gepacktes Archiv von Objekten erstellen."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-prune-packed[1]"
msgstr "linkgit:git-prune-packed[1]"
@@ -1497,7 +1497,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:34
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-read-tree[1]"
msgstr "linkgit:git-read-tree[1]"
@@ -1508,7 +1508,7 @@ msgstr "Verzeichnisinformationen in den Index einlesen."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:37
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-symbolic-ref[1]"
msgstr "linkgit:git-symbolic-ref[1]"
@@ -1519,7 +1519,7 @@ msgstr "Symbolische Referenzen lesen, 채ndern und l철schen."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-unpack-objects[1]"
msgstr "linkgit:git-unpack-objects[1]"
@@ -1530,7 +1530,7 @@ msgstr "Objekte aus einem gepackten Archiv entpacken."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-update-index[1]"
msgstr "linkgit:git-update-index[1]"
@@ -1541,7 +1541,7 @@ msgstr "Dateiinhalte aus dem Arbeitsverzeichnis im Index registrieren."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-update-ref[1]"
msgstr "linkgit:git-update-ref[1]"
@@ -1554,7 +1554,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:49 en/git-commit-tree.txt:115
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -1565,7 +1565,7 @@ msgstr "Tree-Objekt vom aktuellen Index erstellen."
#. type: Labeled list
#: en/cmds-purehelpers.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-check-attr[1]"
msgstr "linkgit:git-check-attr[1]"
@@ -1576,7 +1576,7 @@ msgstr "gitattributes-Informationen darstellen."
#. type: Labeled list
#: en/cmds-purehelpers.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-check-ignore[1]"
msgstr "linkgit:git-check-ignore[1]"
@@ -1587,7 +1587,7 @@ msgstr "Fehlersuche in gitignore- / exclude-Dateien."
#. type: Labeled list
#: en/cmds-purehelpers.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-check-mailmap[1]"
msgstr "linkgit:git-check-mailmap[1]"
@@ -1598,7 +1598,7 @@ msgstr "Name und E-Mail-Adresse von Kontakten anzeigen."
#. type: Labeled list
#: en/cmds-purehelpers.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-check-ref-format[1]"
msgstr "linkgit:git-check-ref-format[1]"
@@ -1609,7 +1609,7 @@ msgstr "Sicherstellen, dass ein Referenzname wohlgeformt ist."
#. type: Labeled list
#: en/cmds-purehelpers.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-column[1]"
msgstr "linkgit:git-column[1]"
@@ -1620,7 +1620,7 @@ msgstr "Daten in Spalten anzeigen."
#. type: Labeled list
#: en/cmds-purehelpers.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-credential[1]"
msgstr "linkgit:git-credential[1]"
@@ -1631,7 +1631,7 @@ msgstr "Zugangsdaten des Benutzers abrufen und speichern."
#. type: Labeled list
#: en/cmds-purehelpers.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-credential-cache[1]"
msgstr "linkgit:git-credential-cache[1]"
@@ -1643,7 +1643,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:22
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-credential-store[1]"
msgstr "linkgit:git-credential-store[1]"
@@ -1654,7 +1654,7 @@ msgstr "Hilfsprogramm zum Speichern von Zugangsdaten auf der Festplatte."
#. type: Labeled list
#: en/cmds-purehelpers.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-fmt-merge-msg[1]"
msgstr "linkgit:git-fmt-merge-msg[1]"
@@ -1665,7 +1665,7 @@ msgstr "Beschreibung eines Merge-Commits erzeugen."
#. type: Labeled list
#: en/cmds-purehelpers.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-interpret-trailers[1]"
msgstr "linkgit:git-interpret-trailers[1]"
@@ -1677,7 +1677,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-mailinfo[1]"
msgstr "linkgit:git-mailinfo[1]"
@@ -1689,7 +1689,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:34
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-mailsplit[1]"
msgstr "linkgit:git-mailsplit[1]"
@@ -1700,7 +1700,7 @@ msgstr "Einfaches UNIX mbox Splitter-Programm."
#. type: Labeled list
#: en/cmds-purehelpers.txt:37
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-merge-one-file[1]"
msgstr "linkgit:git-merge-one-file[1]"
@@ -1711,7 +1711,7 @@ msgstr "Das Standard-Hilfsprogramm f체r die Verwendung mit git-merge-index."
#. type: Plain text
#: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-patch-id[1]"
msgstr "linkgit:git-patch-id[1]"
@@ -1722,7 +1722,7 @@ msgstr "Eindeutige ID f체r einen Patch berechnen."
#. type: Labeled list
#: en/cmds-purehelpers.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-sh-i18n[1]"
msgstr "linkgit:git-sh-i18n[1]"
@@ -1733,7 +1733,7 @@ msgstr "Git's i18n-Konfigurationscode f체r Shell-Skripte."
#. type: Labeled list
#: en/cmds-purehelpers.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-sh-setup[1]"
msgstr "linkgit:git-sh-setup[1]"
@@ -1744,7 +1744,7 @@ msgstr "Allgemeiner Git Shell-Skript Konfigurationscode."
#. type: Labeled list
#: en/cmds-purehelpers.txt:49
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-stripspace[1]"
msgstr "linkgit:git-stripspace[1]"
@@ -1755,7 +1755,7 @@ msgstr "Nicht erforderlichen Whitespace entfernen."
#. type: Labeled list
#: en/cmds-synchelpers.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-http-fetch[1]"
msgstr "linkgit:git-http-fetch[1]"
@@ -1766,7 +1766,7 @@ msgstr "Von einem Remote-Git-Repository 체ber HTTP herunterladen."
#. type: Labeled list
#: en/cmds-synchelpers.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-http-push[1]"
msgstr "linkgit:git-http-push[1]"
@@ -1777,7 +1777,7 @@ msgstr "Objekte 체ber HTTP/DAV zu einem anderen Repository 체bertragen."
#. type: Labeled list
#: en/cmds-synchelpers.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-parse-remote[1]"
msgstr "linkgit:git-parse-remote[1]"
@@ -1790,7 +1790,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-receive-pack[1]"
msgstr "linkgit:git-receive-pack[1]"
@@ -1801,7 +1801,7 @@ msgstr "Empfangen was in das Repository 체bertragen wurde."
#. type: Labeled list
#: en/cmds-synchelpers.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-shell[1]"
msgstr "linkgit:git-shell[1]"
@@ -1812,7 +1812,7 @@ msgstr "Login-Shell beschr채nkt f체r Nur-Git SSH-Zugriff."
#. type: Labeled list
#: en/cmds-synchelpers.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-upload-archive[1]"
msgstr "linkgit:git-upload-archive[1]"
@@ -1823,7 +1823,7 @@ msgstr "Archiv zur체ck zu git-archive senden."
#. type: Labeled list
#: en/cmds-synchelpers.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-upload-pack[1]"
msgstr "linkgit:git-upload-pack[1]"
@@ -1834,7 +1834,7 @@ msgstr "Objekte gepackt zur체ck an git-fetch-pack senden."
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-daemon[1]"
msgstr "linkgit:git-daemon[1]"
@@ -1845,7 +1845,7 @@ msgstr "Ein wirklich einfacher Server f체r Git Repositories."
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-fetch-pack[1]"
msgstr "linkgit:git-fetch-pack[1]"
@@ -1856,7 +1856,7 @@ msgstr "Fehlende Objekte von einem anderen Repository empfangen."
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-http-backend[1]"
msgstr "linkgit:git-http-backend[1]"
@@ -1867,7 +1867,7 @@ msgstr "Serverseitige Implementierung von Git 체ber HTTP."
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-send-pack[1]"
msgstr "linkgit:git-send-pack[1]"
@@ -1879,7 +1879,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-update-server-info[1]"
msgstr "linkgit:git-update-server-info[1]"
@@ -2063,7 +2063,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:105
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`gitdir`"
msgstr "`gitdir`"
@@ -2687,7 +2687,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:332
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.fileMode"
msgstr "core.fileMode"
@@ -2728,7 +2728,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:354
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.hideDotFiles"
msgstr "core.hideDotFiles"
@@ -2743,7 +2743,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:360
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.ignoreCase"
msgstr "core.ignoreCase"
@@ -2767,7 +2767,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:372
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.precomposeUnicode"
msgstr "core.precomposeUnicode"
@@ -2784,7 +2784,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:381
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.protectHFS"
msgstr "core.protectHFS"
@@ -2798,7 +2798,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:386
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.protectNTFS"
msgstr "core.protectNTFS"
@@ -2812,7 +2812,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:392
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.trustctime"
msgstr "core.trustctime"
@@ -2827,7 +2827,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:399
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.splitIndex"
msgstr "core.splitIndex"
@@ -2840,7 +2840,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:403
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.untrackedCache"
msgstr "core.untrackedCache"
@@ -2857,7 +2857,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:412
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.checkStat"
msgstr "core.checkStat"
@@ -2872,7 +2872,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:418
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.quotePath"
msgstr "core.quotePath"
@@ -2894,7 +2894,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:433
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.eol"
msgstr "core.eol"
@@ -2910,7 +2910,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:441
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.safecrlf"
msgstr "core.safecrlf"
@@ -2975,7 +2975,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:486
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.autocrlf"
msgstr "core.autocrlf"
@@ -2991,7 +2991,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:494
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.symlinks"
msgstr "core.symlinks"
@@ -3014,7 +3014,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:505
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.gitProxy"
msgstr "core.gitProxy"
@@ -3047,7 +3047,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:523
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.sshCommand"
msgstr "core.sshCommand"
@@ -3062,7 +3062,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:530
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.ignoreStat"
msgstr "core.ignoreStat"
@@ -3096,7 +3096,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:545
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.preferSymlinkRefs"
msgstr "core.preferSymlinkRefs"
@@ -3110,7 +3110,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:551
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.bare"
msgstr "core.bare"
@@ -3140,7 +3140,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:563
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.worktree"
msgstr "core.worktree"
@@ -3173,7 +3173,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:587
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.logAllRefUpdates"
msgstr "core.logAllRefUpdates"
@@ -3206,7 +3206,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:606
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.repositoryFormatVersion"
msgstr "core.repositoryFormatVersion"
@@ -3218,7 +3218,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:610
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.sharedRepository"
msgstr "core.sharedRepository"
@@ -3241,7 +3241,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:625
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.warnAmbiguousRefs"
msgstr "core.warnAmbiguousRefs"
@@ -3254,7 +3254,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:629
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.compression"
msgstr "core.compression"
@@ -3269,7 +3269,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:636
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.looseCompression"
msgstr "core.looseCompression"
@@ -3284,7 +3284,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:643
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.packedGitWindowSize"
msgstr "core.packedGitWindowSize"
@@ -3314,7 +3314,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:659
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.packedGitLimit"
msgstr "core.packedGitLimit"
@@ -3337,7 +3337,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:671
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.deltaBaseCacheLimit"
msgstr "core.deltaBaseCacheLimit"
@@ -3360,7 +3360,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:684
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.bigFileThreshold"
msgstr "core.bigFileThreshold"
@@ -3383,7 +3383,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:697
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.excludesFile"
msgstr "core.excludesFile"
@@ -3399,7 +3399,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:705
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.askPass"
msgstr "core.askPass"
@@ -3417,7 +3417,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:714
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.attributesFile"
msgstr "core.attributesFile"
@@ -3433,7 +3433,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:722
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.hooksPath"
msgstr "core.hooksPath"
@@ -3465,7 +3465,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:739
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.editor"
msgstr "core.editor"
@@ -3479,7 +3479,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:745
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.commentChar"
msgstr "core.commentChar"
@@ -3500,7 +3500,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:754
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.packedRefsTimeout"
msgstr "core.packedRefsTimeout"
@@ -3529,7 +3529,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:766
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.pager"
msgstr "core.pager"
@@ -3569,7 +3569,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:791
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.whitespace"
msgstr "core.whitespace"
@@ -3643,7 +3643,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:820
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.fsyncObjectFiles"
msgstr "core.fsyncObjectFiles"
@@ -3663,7 +3663,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:828
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.preloadIndex"
msgstr "core.preloadIndex"
@@ -3683,7 +3683,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:837
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.createObject"
msgstr "core.createObject"
@@ -3705,7 +3705,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:846 en/git-notes.txt:313
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.notesRef"
msgstr "core.notesRef"
@@ -3726,7 +3726,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:855
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.sparseCheckout"
msgstr "core.sparseCheckout"
@@ -3739,7 +3739,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:859
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.abbrev"
msgstr "core.abbrev"
@@ -3837,7 +3837,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:908 en/git-apply.txt:246
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "apply.ignoreWhitespace"
msgstr "apply.ignoreWhitespace"
@@ -3852,7 +3852,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:916 en/git-apply.txt:250
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "apply.whitespace"
msgstr "apply.whitespace"
@@ -3865,7 +3865,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:920
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "branch.autoSetupMerge"
msgstr "branch.autoSetupMerge"
@@ -3884,7 +3884,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:932
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "branch.autoSetupRebase"
msgstr "branch.autoSetupRebase"
@@ -4074,7 +4074,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1027
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.branch"
msgstr "color.branch"
@@ -4105,7 +4105,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1041
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.diff"
msgstr "color.diff"
@@ -4160,7 +4160,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1068
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.grep"
msgstr "color.grep"
@@ -4188,7 +4188,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1079
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`context`"
msgstr "`context`"
@@ -4199,7 +4199,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1081
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`filename`"
msgstr "`filename`"
@@ -4210,7 +4210,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1083
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`function`"
msgstr "`function`"
@@ -4221,7 +4221,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1085
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`linenumber`"
msgstr "`linenumber`"
@@ -4232,7 +4232,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1087
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`match`"
msgstr "`match`"
@@ -4243,7 +4243,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1089
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`matchContext`"
msgstr "`matchContext`"
@@ -4254,7 +4254,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1091
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`matchSelected`"
msgstr "`matchSelected`"
@@ -4265,7 +4265,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1093
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`selected`"
msgstr "`selected`"
@@ -4276,7 +4276,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1095
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`separator`"
msgstr "`separator`"
@@ -4289,7 +4289,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.interactive"
msgstr "color.interactive"
@@ -4319,7 +4319,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1114
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.pager"
msgstr "color.pager"
@@ -4332,7 +4332,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1118
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.showBranch"
msgstr "color.showBranch"
@@ -4348,7 +4348,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1125
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.status"
msgstr "color.status"
@@ -4381,7 +4381,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1143
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.ui"
msgstr "color.ui"
@@ -4401,7 +4401,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1155
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "column.ui"
msgstr "column.ui"
@@ -4421,7 +4421,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1164
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`always`"
msgstr "`always`"
@@ -4432,7 +4432,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1166
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`never`"
msgstr "`never`"
@@ -4443,7 +4443,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1168
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`auto`"
msgstr "`auto`"
@@ -4461,7 +4461,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1177
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`column`"
msgstr "`column`"
@@ -4472,7 +4472,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1179
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`row`"
msgstr "`row`"
@@ -4483,7 +4483,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1181
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`plain`"
msgstr "`plain`"
@@ -4501,7 +4501,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1189
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`dense`"
msgstr "`dense`"
@@ -4512,7 +4512,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1191
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`nodense`"
msgstr "`nodense`"
@@ -4523,7 +4523,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1195
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "column.branch"
msgstr "column.branch"
@@ -4536,7 +4536,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1199
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "column.clean"
msgstr "column.clean"
@@ -4549,7 +4549,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1203
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "column.status"
msgstr "column.status"
@@ -4562,7 +4562,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1207
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "column.tag"
msgstr "column.tag"
@@ -4575,7 +4575,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1211
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "commit.cleanup"
msgstr "commit.cleanup"
@@ -4592,7 +4592,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1220
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "commit.gpgSign"
msgstr "commit.gpgSign"
@@ -4607,7 +4607,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1228
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "commit.status"
msgstr "commit.status"
@@ -4621,7 +4621,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1233
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "commit.template"
msgstr "commit.template"
@@ -4634,7 +4634,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1237
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "commit.verbose"
msgstr "commit.verbose"
@@ -4647,7 +4647,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1241
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "credential.helper"
msgstr "credential.helper"
@@ -4662,7 +4662,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1248
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "credential.useHttpPath"
msgstr "credential.useHttpPath"
@@ -4676,7 +4676,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1253
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "credential.username"
msgstr "credential.username"
@@ -4745,7 +4745,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1282 en/git-difftool.txt:126
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "difftool.prompt"
msgstr "difftool.prompt"
@@ -4756,7 +4756,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1285 en/git-fast-import.txt:139
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
@@ -4773,7 +4773,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1294
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "fetch.recurseSubmodules"
msgstr "fetch.recurseSubmodules"
@@ -4790,7 +4790,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1303
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "fetch.fsckObjects"
msgstr "fetch.fsckObjects"
@@ -4805,7 +4805,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1310
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "fetch.unpackLimit"
msgstr "fetch.unpackLimit"
@@ -4823,7 +4823,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1321
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "fetch.prune"
msgstr "fetch.prune"
@@ -4836,7 +4836,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1325
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "fetch.output"
msgstr "fetch.output"
@@ -4850,7 +4850,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1330
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.attach"
msgstr "format.attach"
@@ -4865,7 +4865,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1337
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.from"
msgstr "format.from"
@@ -4884,7 +4884,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1347
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.numbered"
msgstr "format.numbered"
@@ -4900,7 +4900,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1354
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.headers"
msgstr "format.headers"
@@ -4913,13 +4913,13 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1358
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.to"
msgstr "format.to"
#. type: Labeled list
#: en/config.txt:1359
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.cc"
msgstr "format.cc"
@@ -4932,7 +4932,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1364
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.subjectPrefix"
msgstr "format.subjectPrefix"
@@ -4945,7 +4945,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1368
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.signature"
msgstr "format.signature"
@@ -4959,7 +4959,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1374
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.signatureFile"
msgstr "format.signatureFile"
@@ -4972,7 +4972,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1378
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.suffix"
msgstr "format.suffix"
@@ -4986,7 +4986,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1383 en/git-log.txt:175
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.pretty"
msgstr "format.pretty"
@@ -4999,7 +4999,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1388
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.thread"
msgstr "format.thread"
@@ -5016,7 +5016,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1398
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.signOff"
msgstr "format.signOff"
@@ -5032,7 +5032,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1405
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.coverLetter"
msgstr "format.coverLetter"
@@ -5046,7 +5046,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1410
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.outputDirectory"
msgstr "format.outputDirectory"
@@ -5059,7 +5059,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1414
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.useAutoBase"
msgstr "format.useAutoBase"
@@ -5490,25 +5490,25 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1602
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.category"
msgstr "gitweb.category"
#. type: Labeled list
#: en/config.txt:1603
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.description"
msgstr "gitweb.description"
#. type: Labeled list
#: en/config.txt:1604
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.owner"
msgstr "gitweb.owner"
#. type: Labeled list
#: en/config.txt:1605
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.url"
msgstr "gitweb.url"
@@ -5519,55 +5519,55 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1608
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.avatar"
msgstr "gitweb.avatar"
#. type: Labeled list
#: en/config.txt:1609
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.blame"
msgstr "gitweb.blame"
#. type: Labeled list
#: en/config.txt:1610
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.grep"
msgstr "gitweb.grep"
#. type: Labeled list
#: en/config.txt:1611
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.highlight"
msgstr "gitweb.highlight"
#. type: Labeled list
#: en/config.txt:1612
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.patches"
msgstr "gitweb.patches"
#. type: Labeled list
#: en/config.txt:1613
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.pickaxe"
msgstr "gitweb.pickaxe"
#. type: Labeled list
#: en/config.txt:1614
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.remote_heads"
msgstr "gitweb.remote_heads"
#. type: Labeled list
#: en/config.txt:1615
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.showSizes"
msgstr "gitweb.showSizes"
#. type: Labeled list
#: en/config.txt:1616
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.snapshot"
msgstr "gitweb.snapshot"
@@ -5663,7 +5663,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1652
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.commitMsgWidth"
msgstr "gui.commitMsgWidth"
@@ -5676,7 +5676,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1656
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.diffContext"
msgstr "gui.diffContext"
@@ -5689,7 +5689,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1660
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.displayUntracked"
msgstr "gui.displayUntracked"
@@ -5702,7 +5702,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1664
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.encoding"
msgstr "gui.encoding"
@@ -5717,7 +5717,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1672
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.matchTrackingBranch"
msgstr "gui.matchTrackingBranch"
@@ -5730,7 +5730,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1677
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.newBranchTemplate"
msgstr "gui.newBranchTemplate"
@@ -5743,7 +5743,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1681
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.pruneDuringFetch"
msgstr "gui.pruneDuringFetch"
@@ -5756,7 +5756,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1685
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.trustmtime"
msgstr "gui.trustmtime"
@@ -5769,7 +5769,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1689
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.spellingDictionary"
msgstr "gui.spellingDictionary"
@@ -5782,7 +5782,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1694
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.fastCopyBlame"
msgstr "gui.fastCopyBlame"
@@ -5796,7 +5796,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1699
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.copyBlameThreshold"
msgstr "gui.copyBlameThreshold"
@@ -5810,7 +5810,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1704
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.blamehistoryctx"
msgstr "gui.blamehistoryctx"
@@ -5963,7 +5963,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1761
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "help.browser"
msgstr "help.browser"
@@ -5976,7 +5976,7 @@ msgstr ""
#. type: Title ~
#: en/config.txt:1765 en/git-help.txt:81
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "help.format"
msgstr "help.format"
@@ -5990,7 +5990,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1770
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "help.autoCorrect"
msgstr "help.autoCorrect"
@@ -6007,7 +6007,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1779
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "help.htmlPath"
msgstr "help.htmlPath"
@@ -6594,7 +6594,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2046
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "i18n.commitEncoding"
msgstr "i18n.commitEncoding"
@@ -6610,7 +6610,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2053 en/git-log.txt:179
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "i18n.logOutputEncoding"
msgstr "i18n.logOutputEncoding"
@@ -6662,7 +6662,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2069
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "instaweb.browser"
msgstr "instaweb.browser"
@@ -6675,7 +6675,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2073
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "instaweb.httpd"
msgstr "instaweb.httpd"
@@ -6688,7 +6688,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2077
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "instaweb.local"
msgstr "instaweb.local"
@@ -6701,7 +6701,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2081
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "instaweb.modulePath"
msgstr "instaweb.modulePath"
@@ -6714,7 +6714,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2086
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "instaweb.port"
msgstr "instaweb.port"
@@ -6726,7 +6726,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2090
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "interactive.singleKey"
msgstr "interactive.singleKey"
@@ -6743,7 +6743,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2099
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "interactive.diffFilter"
msgstr "interactive.diffFilter"
@@ -6759,7 +6759,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2107
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.abbrevCommit"
msgstr "log.abbrevCommit"
@@ -6773,7 +6773,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2112 en/git-log.txt:184
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.date"
msgstr "log.date"
@@ -6787,7 +6787,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2117
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.decorate"
msgstr "log.decorate"
@@ -6805,7 +6805,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2127 en/git-log.txt:189
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.follow"
msgstr "log.follow"
@@ -6820,7 +6820,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2133
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.graphColors"
msgstr "log.graphColors"
@@ -6833,7 +6833,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2137 en/git-log.txt:195
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.showRoot"
msgstr "log.showRoot"
@@ -6848,7 +6848,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2143
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.mailmap"
msgstr "log.mailmap"
@@ -6861,7 +6861,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2147
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "mailinfo.scissors"
msgstr "mailinfo.scissors"
@@ -6989,7 +6989,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2208
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "mergetool.meld.hasOutput"
msgstr "mergetool.meld.hasOutput"
@@ -7006,7 +7006,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2217
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "mergetool.keepBackup"
msgstr "mergetool.keepBackup"
@@ -7021,7 +7021,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2223
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "mergetool.keepTemporaries"
msgstr "mergetool.keepTemporaries"
@@ -7036,7 +7036,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2230
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "mergetool.writeToTemp"
msgstr "mergetool.writeToTemp"
@@ -7050,7 +7050,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2236
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "mergetool.prompt"
msgstr "mergetool.prompt"
@@ -7574,7 +7574,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2501
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "push.default"
msgstr "push.default"
@@ -7669,7 +7669,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2558
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "push.followTags"
msgstr "push.followTags"
@@ -7682,7 +7682,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2563
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "push.gpgSign"
msgstr "push.gpgSign"
@@ -7699,7 +7699,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2572
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "push.recurseSubmodules"
msgstr "push.recurseSubmodules"
@@ -7792,7 +7792,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2617
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.advertiseAtomic"
msgstr "receive.advertiseAtomic"
@@ -7806,7 +7806,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2622
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.advertisePushOptions"
msgstr "receive.advertisePushOptions"
@@ -7820,7 +7820,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2627
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.autogc"
msgstr "receive.autogc"
@@ -7834,7 +7834,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2632
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.certNonceSeed"
msgstr "receive.certNonceSeed"
@@ -7848,7 +7848,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2638
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.certNonceSlop"
msgstr "receive.certNonceSlop"
@@ -7868,7 +7868,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2651
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.fsckObjects"
msgstr "receive.fsckObjects"
@@ -7910,13 +7910,13 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2672
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.fsck.skipList"
msgstr "receive.fsck.skipList"
#. type: Labeled list
#: en/config.txt:2680
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.keepAlive"
msgstr "receive.keepAlive"
@@ -7933,7 +7933,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2689
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.unpackLimit"
msgstr "receive.unpackLimit"
@@ -7951,7 +7951,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2699
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.maxInputSize"
msgstr "receive.maxInputSize"
@@ -7965,7 +7965,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2705
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.denyDeletes"
msgstr "receive.denyDeletes"
@@ -7978,7 +7978,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2709
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.denyDeleteCurrent"
msgstr "receive.denyDeleteCurrent"
@@ -7991,7 +7991,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2713
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.denyCurrentBranch"
msgstr "receive.denyCurrentBranch"
@@ -8027,7 +8027,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2733
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.denyNonFastForwards"
msgstr "receive.denyNonFastForwards"
@@ -8042,7 +8042,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2739
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.hideRefs"
msgstr "receive.hideRefs"
@@ -8056,7 +8056,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2745
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.updateServerInfo"
msgstr "receive.updateServerInfo"
@@ -8069,7 +8069,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2749
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.shallowUpdate"
msgstr "receive.shallowUpdate"
@@ -8082,7 +8082,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2753
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "remote.pushDefault"
msgstr "remote.pushDefault"
@@ -8289,7 +8289,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2827
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "repack.useDeltaBaseOffset"
msgstr "repack.useDeltaBaseOffset"
@@ -8305,7 +8305,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2835
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "repack.packKeptObjects"
msgstr "repack.packKeptObjects"
@@ -8320,7 +8320,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2842
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "repack.writeBitmaps"
msgstr "repack.writeBitmaps"
@@ -8366,7 +8366,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2864
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.identity"
msgstr "sendemail.identity"
@@ -8381,7 +8381,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2870
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpEncryption"
msgstr "sendemail.smtpEncryption"
@@ -8405,7 +8405,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2877
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpsslcertpath"
msgstr "sendemail.smtpsslcertpath"
@@ -8432,151 +8432,151 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2887 en/git-send-email.txt:404
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.aliasesFile"
msgstr "sendemail.aliasesFile"
#. type: Labeled list
#: en/config.txt:2888 en/git-send-email.txt:408
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.aliasFileType"
msgstr "sendemail.aliasFileType"
#. type: Labeled list
#: en/config.txt:2889
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.annotate"
msgstr "sendemail.annotate"
#. type: Labeled list
#: en/config.txt:2890
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.bcc"
msgstr "sendemail.bcc"
#. type: Labeled list
#: en/config.txt:2891
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.cc"
msgstr "sendemail.cc"
#. type: Labeled list
#: en/config.txt:2892
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.ccCmd"
msgstr "sendemail.ccCmd"
#. type: Labeled list
#: en/config.txt:2893
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.chainReplyTo"
msgstr "sendemail.chainReplyTo"
#. type: Labeled list
#: en/config.txt:2894 en/git-send-email.txt:435
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.confirm"
msgstr "sendemail.confirm"
#. type: Labeled list
#: en/config.txt:2895
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.envelopeSender"
msgstr "sendemail.envelopeSender"
#. type: Labeled list
#: en/config.txt:2896
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.from"
msgstr "sendemail.from"
#. type: Labeled list
#: en/config.txt:2897 en/git-send-email.txt:429
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.multiEdit"
msgstr "sendemail.multiEdit"
#. type: Labeled list
#: en/config.txt:2898
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.signedoffbycc"
msgstr "sendemail.signedoffbycc"
#. type: Labeled list
#: en/config.txt:2899
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpPass"
msgstr "sendemail.smtpPass"
#. type: Labeled list
#: en/config.txt:2900
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.suppresscc"
msgstr "sendemail.suppresscc"
#. type: Labeled list
#: en/config.txt:2901
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.suppressFrom"
msgstr "sendemail.suppressFrom"
#. type: Labeled list
#: en/config.txt:2902
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.to"
msgstr "sendemail.to"
#. type: Labeled list
#: en/config.txt:2903
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpDomain"
msgstr "sendemail.smtpDomain"
#. type: Labeled list
#: en/config.txt:2904
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpServer"
msgstr "sendemail.smtpServer"
#. type: Labeled list
#: en/config.txt:2905
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpServerPort"
msgstr "sendemail.smtpServerPort"
#. type: Labeled list
#: en/config.txt:2906
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpServerOption"
msgstr "sendemail.smtpServerOption"
#. type: Labeled list
#: en/config.txt:2907
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpUser"
msgstr "sendemail.smtpUser"
#. type: Labeled list
#: en/config.txt:2908
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.thread"
msgstr "sendemail.thread"
#. type: Labeled list
#: en/config.txt:2909
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.transferEncoding"
msgstr "sendemail.transferEncoding"
#. type: Labeled list
#: en/config.txt:2910
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.validate"
msgstr "sendemail.validate"
#. type: Labeled list
#: en/config.txt:2911
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.xmailer"
msgstr "sendemail.xmailer"
@@ -8598,7 +8598,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2917
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "showbranch.default"
msgstr "showbranch.default"
@@ -8611,7 +8611,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2921
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "splitIndex.maxPercentChange"
msgstr "splitIndex.maxPercentChange"
@@ -8630,7 +8630,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2934
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "splitIndex.sharedIndexExpire"
msgstr "splitIndex.sharedIndexExpire"
@@ -8649,7 +8649,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2946
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "status.relativePaths"
msgstr "status.relativePaths"
@@ -8663,7 +8663,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2952
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "status.short"
msgstr "status.short"
@@ -8676,7 +8676,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2956
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "status.branch"
msgstr "status.branch"
@@ -8689,7 +8689,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2960
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "status.displayCommentPrefix"
msgstr "status.displayCommentPrefix"
@@ -8704,7 +8704,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2967
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "status.showUntrackedFiles"
msgstr "status.showUntrackedFiles"
@@ -8753,7 +8753,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2986
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "status.submoduleSummary"
msgstr "status.submoduleSummary"
@@ -8775,7 +8775,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3002
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "stash.showPatch"
msgstr "stash.showPatch"
@@ -8789,7 +8789,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3007
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "stash.showStat"
msgstr "stash.showStat"
@@ -8887,7 +8887,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3055
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "submodule.fetchJobs"
msgstr "submodule.fetchJobs"
@@ -8902,7 +8902,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3061
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "submodule.alternateLocation"
msgstr "submodule.alternateLocation"
@@ -8918,7 +8918,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3068
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "submodule.alternateErrorStrategy"
msgstr "submodule.alternateErrorStrategy"
@@ -8975,7 +8975,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3090
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "transfer.fsckObjects"
msgstr "transfer.fsckObjects"
@@ -8988,7 +8988,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3095
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "transfer.hideRefs"
msgstr "transfer.hideRefs"
@@ -9036,7 +9036,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3123
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "transfer.unpackLimit"
msgstr "transfer.unpackLimit"
@@ -9210,7 +9210,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3214
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "user.email"
msgstr "user.email"
@@ -9224,7 +9224,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3219
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "user.name"
msgstr "user.name"
@@ -9238,7 +9238,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3224
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "user.useConfigOnly"
msgstr "user.useConfigOnly"
@@ -9256,7 +9256,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3234
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "user.signingKey"
msgstr "user.signingKey"
@@ -9424,7 +9424,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.autoRefreshIndex"
msgstr "diff.autoRefreshIndex"
@@ -9441,7 +9441,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:11
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.dirstat"
msgstr "diff.dirstat"
@@ -9458,7 +9458,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:20 en/diff-options.txt:137
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`changes`"
msgstr "`changes`"
@@ -9474,7 +9474,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:26 en/diff-options.txt:143
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`lines`"
msgstr "`lines`"
@@ -9492,7 +9492,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:34 en/diff-options.txt:151
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`files`"
msgstr "`files`"
@@ -9507,7 +9507,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:39 en/diff-options.txt:156
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`cumulative`"
msgstr "`cumulative`"
@@ -9544,7 +9544,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:55
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.statGraphWidth"
msgstr "diff.statGraphWidth"
@@ -9557,7 +9557,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:59
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.context"
msgstr "diff.context"
@@ -9570,7 +9570,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:63
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.interHunkContext"
msgstr "diff.interHunkContext"
@@ -9584,7 +9584,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:69
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.external"
msgstr "diff.external"
@@ -9601,7 +9601,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:78
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.ignoreSubmodules"
msgstr "diff.ignoreSubmodules"
@@ -9619,7 +9619,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:88
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.mnemonicPrefix"
msgstr "diff.mnemonicPrefix"
@@ -9693,7 +9693,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:104
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.noprefix"
msgstr "diff.noprefix"
@@ -9704,7 +9704,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:107
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.orderFile"
msgstr "diff.orderFile"
@@ -9718,7 +9718,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:113
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.renameLimit"
msgstr "diff.renameLimit"
@@ -9731,7 +9731,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:117
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.renames"
msgstr "diff.renames"
@@ -9748,7 +9748,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:126
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.suppressBlankEmpty"
msgstr "diff.suppressBlankEmpty"
@@ -9761,7 +9761,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:130
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.submodule"
msgstr "diff.submodule"
@@ -9777,7 +9777,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:138
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.wordRegex"
msgstr "diff.wordRegex"
@@ -9871,7 +9871,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:172 en/git-difftool.txt:111
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.tool"
msgstr "diff.tool"
@@ -9886,7 +9886,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:181
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.indentHeuristic"
msgstr "diff.indentHeuristic"
@@ -9899,7 +9899,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:185
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.algorithm"
msgstr "diff.algorithm"
@@ -9921,7 +9921,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:191 en/diff-options.txt:84
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`minimal`"
msgstr "`minimal`"
@@ -9932,7 +9932,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:194 en/diff-options.txt:87
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`patience`"
msgstr "`patience`"
@@ -9943,7 +9943,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:196 en/diff-options.txt:89
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`histogram`"
msgstr "`histogram`"
@@ -9956,7 +9956,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:202
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.wsErrorHighlight"
msgstr "diff.wsErrorHighlight"
@@ -10729,7 +10729,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:17 en/git-rebase.txt:319 en/merge-options.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-stat"
msgstr "--no-stat"
@@ -10743,14 +10743,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-same
+#, ignore-same, no-wrap
msgid "-u"
msgstr "-u"
#. type: Labeled list
#: en/diff-options.txt:24 en/git-add.txt:86 en/git-checkout.txt:243
#: en/git-commit.txt:67
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--patch"
msgstr "--patch"
@@ -10772,13 +10772,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-same
+#, ignore-same, no-wrap
msgid "-s"
msgstr "-s"
#. type: Labeled list
#: en/diff-options.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-patch"
msgstr "--no-patch"
@@ -10815,7 +10815,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-same
+#, ignore-same, no-wrap
msgid "--raw"
msgstr "--raw"
@@ -10838,7 +10838,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:62
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--patch-with-raw"
msgstr "--patch-with-raw"
@@ -10849,13 +10849,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:68
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--minimal"
msgstr "--minimal"
#. type: Labeled list
#: en/diff-options.txt:72
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--patience"
msgstr "--patience"
@@ -10866,7 +10866,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:75
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--histogram"
msgstr "--histogram"
@@ -10924,7 +10924,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:116 en/git-apply.txt:45
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--numstat"
msgstr "--numstat"
@@ -10938,7 +10938,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:123
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--shortstat"
msgstr "--shortstat"
@@ -10977,7 +10977,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-same
+#, ignore-same, no-wrap
msgid "--summary"
msgstr "--summary"
@@ -10990,7 +10990,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:177
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--patch-with-stat"
msgstr "--patch-with-stat"
@@ -11005,7 +11005,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-same
+#, ignore-same, no-wrap
msgid "-z"
msgstr "-z"
@@ -11041,7 +11041,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-same
+#, ignore-same, no-wrap
msgid "--name-only"
msgstr "--name-only"
@@ -11052,7 +11052,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:202 en/git-ls-tree.txt:60
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--name-status"
msgstr "--name-status"
@@ -11109,7 +11109,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-same
+#, ignore-same, no-wrap
msgid "--no-color"
msgstr "--no-color"
@@ -11253,7 +11253,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:287
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-renames"
msgstr "--no-renames"
@@ -11272,7 +11272,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:292 en/git-apply.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--check"
msgstr "--check"
@@ -11308,7 +11308,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:315
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--full-index"
msgstr "--full-index"
@@ -11322,7 +11322,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:320 en/git-apply.txt:150
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--binary"
msgstr "--binary"
@@ -11458,7 +11458,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:380 en/git-svn.txt:595
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--find-copies-harder"
msgstr "--find-copies-harder"
@@ -11480,7 +11480,7 @@ msgstr "-D"
#. type: Labeled list
#: en/diff-options.txt:390
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--irreversible-delete"
msgstr "--irreversible-delete"
@@ -11611,7 +11611,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:457
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--pickaxe-all"
msgstr "--pickaxe-all"
@@ -11624,7 +11624,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:462
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--pickaxe-regex"
msgstr "--pickaxe-regex"
@@ -11733,13 +11733,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-same
+#, ignore-same, no-wrap
msgid "-a"
msgstr "-a"
#. type: Labeled list
#: en/diff-options.txt:519 en/git-grep.txt:106
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--text"
msgstr "--text"
@@ -11750,7 +11750,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:522
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-space-at-eol"
msgstr "--ignore-space-at-eol"
@@ -11761,7 +11761,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:526 en/git-am.txt:102 en/git-apply.txt:172
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-space-change"
msgstr "--ignore-space-change"
@@ -11776,13 +11776,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-same
+#, ignore-same, no-wrap
msgid "-w"
msgstr "-w"
#. type: Labeled list
#: en/diff-options.txt:532
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-all-space"
msgstr "--ignore-all-space"
@@ -11795,7 +11795,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:537
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-blank-lines"
msgstr "--ignore-blank-lines"
@@ -11826,7 +11826,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:547 en/git-grep.txt:247
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--function-context"
msgstr "--function-context"
@@ -11837,7 +11837,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:552 en/git-ls-remote.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--exit-code"
msgstr "--exit-code"
@@ -11861,7 +11861,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-same
+#, ignore-same, no-wrap
msgid "--quiet"
msgstr "--quiet"
@@ -11872,7 +11872,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:562
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ext-diff"
msgstr "--ext-diff"
@@ -11886,7 +11886,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:567
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-ext-diff"
msgstr "--no-ext-diff"
@@ -11897,13 +11897,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:570 en/git-cat-file.txt:59 en/git-grep.txt:109
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
#: en/diff-options.txt:571 en/git-grep.txt:112
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -11967,7 +11967,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:600
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-prefix"
msgstr "--no-prefix"
@@ -11990,7 +11990,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:606
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ita-invisible-in-index"
msgstr "--ita-invisible-in-index"
@@ -12020,7 +12020,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-same
+#, ignore-same, no-wrap
msgid "--all"
msgstr "--all"
@@ -12031,7 +12031,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:5
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--append"
msgstr "--append"
@@ -12104,7 +12104,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unshallow"
msgstr "--unshallow"
@@ -12124,7 +12124,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:39
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--update-shallow"
msgstr "--update-shallow"
@@ -12144,7 +12144,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-same
+#, ignore-same, no-wrap
msgid "--dry-run"
msgstr "--dry-run"
@@ -12161,7 +12161,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-same
+#, ignore-same, no-wrap
msgid "-f"
msgstr "-f"
@@ -12173,7 +12173,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-same
+#, ignore-same, no-wrap
msgid "--force"
msgstr "--force"
@@ -12190,14 +12190,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-same
+#, ignore-same, no-wrap
msgid "-k"
msgstr "-k"
#. type: Labeled list
#: en/fetch-options.txt:59 en/git-am.txt:41 en/git-fetch-pack.txt:54
#: en/git-index-pack.txt:54 en/git-reset.txt:82
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep"
msgstr "--keep"
@@ -12208,7 +12208,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:63
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--multiple"
msgstr "--multiple"
@@ -12221,7 +12221,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:68 en/git-push.txt:98
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--prune"
msgstr "--prune"
@@ -12248,13 +12248,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-same
+#, ignore-same, no-wrap
msgid "-n"
msgstr "-n"
#. type: Labeled list
#: en/fetch-options.txt:82
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-tags"
msgstr "--no-tags"
@@ -12287,7 +12287,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-same
+#, ignore-same, no-wrap
msgid "--tags"
msgstr "--tags"
@@ -12322,7 +12322,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:118
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-j"
msgstr "-j"
@@ -12342,7 +12342,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:125 en/git-push.txt:274
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -12385,7 +12385,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:144
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--update-head-ok"
msgstr "--update-head-ok"
@@ -12432,7 +12432,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-same
+#, ignore-same, no-wrap
msgid "-q"
msgstr "-q"
@@ -12457,7 +12457,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-same
+#, ignore-same, no-wrap
msgid "-v"
msgstr "-v"
@@ -12473,7 +12473,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-same
+#, ignore-same, no-wrap
msgid "--verbose"
msgstr "--verbose"
@@ -12486,7 +12486,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-same
+#, ignore-same, no-wrap
msgid "--progress"
msgstr "--progress"
@@ -12501,13 +12501,13 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:176 en/git-push.txt:295
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-4"
msgstr "-4"
#. type: Labeled list
#: en/fetch-options.txt:177 en/git-push.txt:296
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ipv4"
msgstr "--ipv4"
@@ -12518,13 +12518,13 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:180 en/git-push.txt:299
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-6"
msgstr "-6"
#. type: Labeled list
#: en/fetch-options.txt:181 en/git-push.txt:300
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ipv6"
msgstr "--ipv6"
@@ -12535,7 +12535,7 @@ msgstr ""
#. type: Labeled list
#: en/fmt-merge-msg-config.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.branchdesc"
msgstr "merge.branchdesc"
@@ -12548,7 +12548,7 @@ msgstr ""
#. type: Labeled list
#: en/fmt-merge-msg-config.txt:6
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.log"
msgstr "merge.log"
@@ -12562,7 +12562,7 @@ msgstr ""
#. type: Title =
#: en/git-add.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-add(1)"
msgstr "git-add(1)"
@@ -12953,14 +12953,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-same
+#, ignore-same, no-wrap
msgid "-i"
msgstr "-i"
#. type: Labeled list
#: en/git-add.txt:79 en/git-am.txt:123 en/git-clean.txt:43
#: en/git-rebase.txt:374 en/git-svn.txt:281
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--interactive"
msgstr "--interactive"
@@ -12997,7 +12997,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-same
+#, ignore-same, no-wrap
msgid "-e"
msgstr "-e"
@@ -13005,7 +13005,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-same
+#, ignore-same, no-wrap
msgid "--edit"
msgstr "--edit"
@@ -13029,7 +13029,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:109
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--update"
msgstr "--update"
@@ -13057,7 +13057,7 @@ msgstr "-A"
#. type: Labeled list
#: en/git-add.txt:121
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-ignore-removal"
msgstr "--no-ignore-removal"
@@ -13079,13 +13079,13 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:132
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-all"
msgstr "--no-all"
#. type: Labeled list
#: en/git-add.txt:133
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-removal"
msgstr "--ignore-removal"
@@ -13113,7 +13113,7 @@ msgstr "-N"
#. type: Labeled list
#: en/git-add.txt:144
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--intent-to-add"
msgstr "--intent-to-add"
@@ -13128,7 +13128,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:151 en/git-update-index.txt:52
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--refresh"
msgstr "--refresh"
@@ -13143,7 +13143,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:155
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-errors"
msgstr "--ignore-errors"
@@ -13168,7 +13168,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-same
+#, ignore-same, no-wrap
msgid "--ignore-missing"
msgstr "--ignore-missing"
@@ -13939,7 +13939,7 @@ msgstr "Teil der linkgit:git[1] Suite"
#. type: Title =
#: en/git-am.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-am(1)"
msgstr "git-am(1)"
@@ -13986,7 +13986,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-same
+#, ignore-same, no-wrap
msgid "--signoff"
msgstr "--signoff"
@@ -14005,7 +14005,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-non-patch"
msgstr "--keep-non-patch"
@@ -14016,7 +14016,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]keep-cr"
msgstr "--[no-]keep-cr"
@@ -14034,13 +14034,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-same
+#, ignore-same, no-wrap
msgid "-c"
msgstr "-c"
#. type: Labeled list
#: en/git-am.txt:54 en/git-mailinfo.txt:74
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--scissors"
msgstr "--scissors"
@@ -14054,7 +14054,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:59 en/git-mailinfo.txt:90
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-scissors"
msgstr "--no-scissors"
@@ -14070,13 +14070,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-same
+#, ignore-same, no-wrap
msgid "-m"
msgstr "-m"
#. type: Labeled list
#: en/git-am.txt:63 en/git-mailinfo.txt:70
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--message-id"
msgstr "--message-id"
@@ -14090,7 +14090,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:69
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-message-id"
msgstr "--no-message-id"
@@ -14108,7 +14108,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:78
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--utf8"
msgstr "--utf8"
@@ -14131,7 +14131,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:88
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-utf8"
msgstr "--no-utf8"
@@ -14142,19 +14142,19 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:92 en/git-apply.txt:77
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-3"
msgstr "-3"
#. type: Labeled list
#: en/git-am.txt:93 en/git-apply.txt:78
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--3way"
msgstr "--3way"
#. type: Labeled list
#: en/git-am.txt:94
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-3way"
msgstr "--no-3way"
@@ -14170,7 +14170,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:103 en/git-apply.txt:173 en/git-rebase.txt:361
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
@@ -14214,7 +14214,7 @@ msgstr "--include"
#. type: Labeled list
#: en/git-am.txt:110 en/git-apply.txt:100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--reject"
msgstr "--reject"
@@ -14227,7 +14227,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:115
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--patch-format"
msgstr "--patch-format"
@@ -14249,7 +14249,7 @@ msgstr "--interactive"
#. type: Labeled list
#: en/git-am.txt:126 en/git-rebase.txt:367
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -14264,7 +14264,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:133 en/git-rebase.txt:368
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -14279,7 +14279,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:140 en/git-rebase.txt:264
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--skip"
msgstr "--skip"
@@ -14318,7 +14318,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-same
+#, ignore-same, no-wrap
msgid "--continue"
msgstr "--continue"
@@ -14327,13 +14327,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-same
+#, ignore-same, no-wrap
msgid "-r"
msgstr "-r"
#. type: Labeled list
#: en/git-am.txt:152
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--resolved"
msgstr "--resolved"
@@ -14365,7 +14365,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-same
+#, ignore-same, no-wrap
msgid "--abort"
msgstr "--abort"
@@ -14512,7 +14512,7 @@ msgstr "linkgit:git-add[1]"
#. type: Title =
#: en/git-annotate.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-annotate(1)"
msgstr "git-annotate(1)"
@@ -14545,7 +14545,7 @@ msgstr ""
#. type: Title =
#: en/git-apply.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-apply(1)"
msgstr "git-apply(1)"
@@ -14611,7 +14611,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:41 en/git-rebase.txt:314 en/merge-options.txt:55
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stat"
msgstr "--stat"
@@ -14649,7 +14649,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--index"
msgstr "--index"
@@ -14667,7 +14667,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-same
+#, ignore-same, no-wrap
msgid "--cached"
msgstr "--cached"
@@ -14714,7 +14714,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:97 en/rev-list-options.txt:659
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--reverse"
msgstr "--reverse"
@@ -14757,7 +14757,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:125
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unidiff-zero"
msgstr "--unidiff-zero"
@@ -14779,7 +14779,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:135
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--apply"
msgstr "--apply"
@@ -14793,7 +14793,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:142
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-add"
msgstr "--no-add"
@@ -14808,7 +14808,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:149
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--allow-binary-replacement"
msgstr "--allow-binary-replacement"
@@ -14932,7 +14932,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:207
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--inaccurate-eof"
msgstr "--inaccurate-eof"
@@ -14955,7 +14955,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:220
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--recount"
msgstr "--recount"
@@ -14991,7 +14991,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:233
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unsafe-paths"
msgstr "--unsafe-paths"
@@ -15067,7 +15067,7 @@ msgstr "linkgit:git-add[1]"
#. type: Title =
#: en/git-archimport.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-archimport(1)"
msgstr "git-archimport(1)"
@@ -15208,7 +15208,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-same
+#, ignore-same, no-wrap
msgid "-o"
msgstr "-o"
@@ -15271,7 +15271,7 @@ msgstr ""
#. type: Title =
#: en/git-archive.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-archive(1)"
msgstr "git-archive(1)"
@@ -15328,7 +15328,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-same
+#, ignore-same, no-wrap
msgid "--list"
msgstr "--list"
@@ -15374,7 +15374,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--worktree-attributes"
msgstr "--worktree-attributes"
@@ -15468,7 +15468,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:90 en/git-diff-files.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-0"
msgstr "-0"
@@ -15479,7 +15479,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:92
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-9"
msgstr "-9"
@@ -15711,7 +15711,7 @@ msgstr "linkgit:gitattributes[5]"
#. type: Title =
#: en/git-bisect.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-bisect(1)"
msgstr "git-bisect(1)"
@@ -16338,7 +16338,7 @@ msgstr ""
#. type: Labeled list
#: en/git-bisect.txt:358 en/git-clone.txt:134
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-checkout"
msgstr "--no-checkout"
@@ -16583,7 +16583,7 @@ msgstr ""
#. type: Title =
#: en/git-blame.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-blame(1)"
msgstr "git-blame(1)"
@@ -16662,7 +16662,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:55
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--score-debug"
msgstr "--score-debug"
@@ -16679,7 +16679,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-name"
msgstr "--show-name"
@@ -16693,7 +16693,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:71
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-number"
msgstr "--show-number"
@@ -16709,7 +16709,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:78
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-email"
msgstr "--show-email"
@@ -17017,7 +17017,7 @@ msgstr ""
#. type: Title =
#: en/git-branch.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-branch(1)"
msgstr "git-branch(1)"
@@ -17207,14 +17207,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-same
+#, ignore-same, no-wrap
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:79 en/git-push.txt:126 en/git-replace.txt:65
#: en/git-symbolic-ref.txt:36 en/git-tag.txt:76
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--delete"
msgstr "--delete"
@@ -17232,7 +17232,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:88 en/git-tag.txt:152
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--create-reflog"
msgstr "--create-reflog"
@@ -17260,7 +17260,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:108
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--move"
msgstr "--move"
@@ -17309,7 +17309,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-same
+#, ignore-same, no-wrap
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -17326,7 +17326,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-status.txt:105 en/git-tag.txt:116
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-column"
msgstr "--no-column"
@@ -17345,7 +17345,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:137 en/git-show-branch.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--remotes"
msgstr "--remotes"
@@ -17370,7 +17370,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:149
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-vv"
msgstr "-vv"
@@ -17409,7 +17409,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:167
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-abbrev"
msgstr "--no-abbrev"
@@ -17424,7 +17424,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-same
+#, ignore-same, no-wrap
msgid "--track"
msgstr "--track"
@@ -17456,7 +17456,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:186 en/git-checkout.txt:170
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-track"
msgstr "--no-track"
@@ -17474,7 +17474,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:190 en/git-push.txt:246
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -17509,7 +17509,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:202
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unset-upstream"
msgstr "--unset-upstream"
@@ -17522,7 +17522,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:206
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--edit-description"
msgstr "--edit-description"
@@ -17876,7 +17876,7 @@ msgstr ""
#. type: Title =
#: en/git-bundle.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-bundle(1)"
msgstr "git-bundle(1)"
@@ -18235,7 +18235,7 @@ msgstr ""
#. type: Title =
#: en/git-cat-file.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-cat-file(1)"
msgstr "git-cat-file(1)"
@@ -18336,7 +18336,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--filters"
msgstr "--filters"
@@ -18366,7 +18366,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:76 en/git-mktree.txt:32
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--batch"
msgstr "--batch"
@@ -18388,7 +18388,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:84
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--batch-check"
msgstr "--batch-check"
@@ -18409,7 +18409,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:92
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--batch-all-objects"
msgstr "--batch-all-objects"
@@ -18425,7 +18425,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:99
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--buffer"
msgstr "--buffer"
@@ -18440,7 +18440,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:106
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--allow-unknown-type"
msgstr "--allow-unknown-type"
@@ -18451,7 +18451,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:109
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--follow-symlinks"
msgstr "--follow-symlinks"
@@ -18614,7 +18614,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:191
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`objectname`"
msgstr "`objectname`"
@@ -18625,7 +18625,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:194
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`objecttype`"
msgstr "`objecttype`"
@@ -18636,7 +18636,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:197
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`objectsize`"
msgstr "`objectsize`"
@@ -18660,7 +18660,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:205
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`deltabase`"
msgstr "`deltabase`"
@@ -18674,7 +18674,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:210
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`rest`"
msgstr "`rest`"
@@ -18846,7 +18846,7 @@ msgstr ""
#. type: Title =
#: en/git-check-attr.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-check-attr(1)"
msgstr "git-check-attr(1)"
@@ -18898,7 +18898,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-same
+#, ignore-same, no-wrap
msgid "--stdin"
msgstr "--stdin"
@@ -19098,7 +19098,7 @@ msgstr "linkgit:git-add[1]"
#. type: Title =
#: en/git-check-ignore.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-check-ignore(1)"
msgstr "git-check-ignore(1)"
@@ -19183,7 +19183,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ignore.txt:52 en/git-grep.txt:76
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-index"
msgstr "--no-index"
@@ -19301,7 +19301,7 @@ msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
#. type: Title =
#: en/git-check-mailmap.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-check-mailmap(1)"
msgstr "git-check-mailmap(1)"
@@ -19344,7 +19344,7 @@ msgstr ""
#. type: Title =
#: en/git-checkout-index.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-checkout-index(1)"
msgstr "git-checkout-index(1)"
@@ -19399,7 +19399,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-create"
msgstr "--no-create"
@@ -19438,7 +19438,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--temp"
msgstr "--temp"
@@ -19664,7 +19664,7 @@ msgstr ""
#. type: Title =
#: en/git-checkout.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-checkout(1)"
msgstr "git-checkout(1)"
@@ -19901,13 +19901,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:125 en/git-merge-file.txt:73
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:126 en/git-merge-file.txt:74
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--theirs"
msgstr "--theirs"
@@ -19996,7 +19996,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:178 en/git-daemon.txt:134 en/git-worktree.txt:100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--detach"
msgstr "--detach"
@@ -20056,7 +20056,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:210
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -20071,7 +20071,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-same
+#, ignore-same, no-wrap
msgid "--merge"
msgstr "--merge"
@@ -20154,7 +20154,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:253
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-other-worktrees"
msgstr "--ignore-other-worktrees"
@@ -20698,7 +20698,7 @@ msgstr ""
#. type: Title =
#: en/git-check-ref-format.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-check-ref-format(1)"
msgstr "git-check-ref-format(1)"
@@ -20851,7 +20851,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:88
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]allow-onelevel"
msgstr "--[no-]allow-onelevel"
@@ -20865,7 +20865,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:93
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--refspec-pattern"
msgstr "--refspec-pattern"
@@ -20880,7 +20880,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--normalize"
msgstr "--normalize"
@@ -20920,7 +20920,7 @@ msgstr ""
#. type: Title =
#: en/git-cherry-pick.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-cherry-pick(1)"
msgstr "git-cherry-pick(1)"
@@ -21022,7 +21022,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:60 en/git-clean.txt:62
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-x"
msgstr "-x"
@@ -21071,7 +21071,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:88 en/git-revert.txt:70 en/merge-options.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-commit"
msgstr "--no-commit"
@@ -21105,7 +21105,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:111 en/merge-options.txt:30
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ff"
msgstr "--ff"
@@ -21118,7 +21118,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:116 en/git-commit.txt:173 en/git-notes.txt:158
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--allow-empty"
msgstr "--allow-empty"
@@ -21138,7 +21138,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:129 en/git-commit.txt:179
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -21152,7 +21152,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:134
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-redundant-commits"
msgstr "--keep-redundant-commits"
@@ -21361,7 +21361,7 @@ msgstr ""
#. type: Title =
#: en/git-cherry.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-cherry(1)"
msgstr "git-cherry(1)"
@@ -21587,7 +21587,7 @@ msgstr ""
#. type: Title =
#: en/git-citool.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-citool(1)"
msgstr "git-citool(1)"
@@ -21637,7 +21637,7 @@ msgstr ""
#. type: Title =
#: en/git-clean.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-clean(1)"
msgstr "git-clean(1)"
@@ -21924,7 +21924,7 @@ msgstr "linkgit:gitignore[5]"
#. type: Title =
#: en/git-clone.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-clone(1)"
msgstr "git-clone(1)"
@@ -22016,7 +22016,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-same
+#, ignore-same, no-wrap
msgid "--local"
msgstr "--local"
@@ -22064,7 +22064,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:59
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-hardlinks"
msgstr "--no-hardlinks"
@@ -22085,7 +22085,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--shared"
msgstr "--shared"
@@ -22201,7 +22201,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:107
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--dissociate"
msgstr "--dissociate"
@@ -22244,7 +22244,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-same
+#, ignore-same, no-wrap
msgid "--bare"
msgstr "--bare"
@@ -22286,7 +22286,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:150 en/git-push.txt:106
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--mirror"
msgstr "--mirror"
@@ -22433,7 +22433,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:208
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -22450,13 +22450,13 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:218 en/git-submodule.txt:400
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--recursive"
msgstr "--recursive"
#. type: Labeled list
#: en/git-clone.txt:219 en/git-grep.txt:92 en/git-ls-files.txt:142
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -22472,7 +22472,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:227
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]shallow-submodules"
msgstr "--[no-]shallow-submodules"
@@ -22653,7 +22653,7 @@ msgstr "$ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n"
#. type: Title =
#: en/git-column.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-column(1)"
msgstr "git-column(1)"
@@ -22764,7 +22764,7 @@ msgstr ""
#. type: Title =
#: en/git-commit-tree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-commit-tree(1)"
msgstr "git-commit-tree(1)"
@@ -22881,7 +22881,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit-tree.txt:63 en/git-commit.txt:332
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
@@ -22984,7 +22984,7 @@ msgstr ""
#. type: Title =
#: en/git-commit.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-commit(1)"
msgstr "git-commit(1)"
@@ -23239,7 +23239,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:96
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--reset-author"
msgstr "--reset-author"
@@ -23254,7 +23254,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-same
+#, ignore-same, no-wrap
msgid "--short"
msgstr "--short"
@@ -23267,7 +23267,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:106 en/git-status.txt:32 en/git-submodule.txt:280
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--branch"
msgstr "--branch"
@@ -23286,7 +23286,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-same
+#, ignore-same, no-wrap
msgid "--long"
msgstr "--long"
@@ -23299,7 +23299,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:119 en/git-config.txt:184 en/git-grep.txt:197
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--null"
msgstr "--null"
@@ -23414,7 +23414,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:169 en/git-rebase.txt:322
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-verify"
msgstr "--no-verify"
@@ -23567,7 +23567,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:219 en/git-revert.txt:65 en/merge-options.txt:12
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-edit"
msgstr "--no-edit"
@@ -23581,7 +23581,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:224
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--amend"
msgstr "--amend"
@@ -23631,7 +23631,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:250
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-post-rewrite"
msgstr "--no-post-rewrite"
@@ -23642,7 +23642,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:254
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--include"
msgstr "--include"
@@ -23660,7 +23660,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:261
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--only"
msgstr "--only"
@@ -23811,7 +23811,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:315
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--status"
msgstr "--status"
@@ -23825,7 +23825,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:321
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-status"
msgstr "--no-status"
@@ -24170,7 +24170,7 @@ msgstr ""
#. type: Title =
#: en/git-config.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-config(1)"
msgstr "git-config(1)"
@@ -24369,7 +24369,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:74
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--replace-all"
msgstr "--replace-all"
@@ -24384,7 +24384,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:78 en/git-update-index.txt:42
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--add"
msgstr "--add"
@@ -24403,7 +24403,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:83
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--get"
msgstr "--get"
@@ -24426,7 +24426,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:88
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--get-all"
msgstr "--get-all"
@@ -24437,7 +24437,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:91
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--get-regexp"
msgstr "--get-regexp"
@@ -24468,7 +24468,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:106
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--global"
msgstr "--global"
@@ -24507,7 +24507,7 @@ msgstr "Siehe auch <<FILES>>."
#. type: Labeled list
#: en/git-config.txt:117
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--system"
msgstr "--system"
@@ -24600,7 +24600,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:147
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--remove-section"
msgstr "--remove-section"
@@ -24611,7 +24611,7 @@ msgstr "L철sche das gegebene Abteil aus der Konfigurationsdatei."
#. type: Labeled list
#: en/git-config.txt:150
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--rename-section"
msgstr "--rename-section"
@@ -24622,7 +24622,7 @@ msgstr "Gib dem gegebenen Abteil einen neuen Namen."
#. type: Labeled list
#: en/git-config.txt:153
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unset"
msgstr "--unset"
@@ -24634,7 +24634,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:156
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unset-all"
msgstr "--unset-all"
@@ -24654,7 +24654,7 @@ msgstr "Zeige alle in der Konfigurationsdatei gesetzten Variablen an."
#. type: Labeled list
#: en/git-config.txt:163
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--bool"
msgstr "--bool"
@@ -24669,7 +24669,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:166
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--int"
msgstr "--int"
@@ -24692,7 +24692,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:172
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--bool-or-int"
msgstr "--bool-or-int"
@@ -24709,7 +24709,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:176 en/git-hash-object.txt:41
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--path"
msgstr "--path"
@@ -24744,7 +24744,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:196
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-origin"
msgstr "--show-origin"
@@ -24811,7 +24811,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]includes"
msgstr "--[no-]includes"
@@ -24976,7 +24976,7 @@ msgstr "ENVIRONMENT"
#. type: Labeled list
#: en/git-config.txt:282
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
@@ -24993,10 +24993,9 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:287
-#, fuzzy, no-wrap
-#| msgid "GIT_CONFIG"
+#, no-wrap, ignore-same
msgid "GIT_CONFIG_NOSYSTEM"
-msgstr "GIT_CONFIG"
+msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
#: en/git-config.txt:290
@@ -25298,7 +25297,7 @@ msgstr ""
#. type: Title =
#: en/git-count-objects.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-count-objects(1)"
msgstr "git-count-objects(1)"
@@ -25387,7 +25386,7 @@ msgstr ""
#. type: Labeled list
#: en/git-count-objects.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--human-readable"
msgstr "--human-readable"
@@ -25398,7 +25397,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-cache--daemon.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-credential-cache--daemon(1)"
msgstr "git-credential-cache--daemon(1)"
@@ -25440,7 +25439,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-cache.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-credential-cache(1)"
msgstr "git-credential-cache(1)"
@@ -25558,7 +25557,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-store.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-credential-store(1)"
msgstr "git-credential-store(1)"
@@ -25730,7 +25729,7 @@ msgstr ""
#. type: Title =
#: en/git-credential.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-credential(1)"
msgstr "git-credential(1)"
@@ -25920,7 +25919,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:120
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`protocol`"
msgstr "`protocol`"
@@ -25931,7 +25930,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:125
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`host`"
msgstr "`host`"
@@ -25942,7 +25941,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:129
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`path`"
msgstr "`path`"
@@ -25955,7 +25954,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:135
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`username`"
msgstr "`username`"
@@ -25968,7 +25967,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:140
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`password`"
msgstr "`password`"
@@ -25979,7 +25978,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:144
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`url`"
msgstr "`url`"
@@ -25998,7 +25997,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsexportcommit.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-cvsexportcommit(1)"
msgstr "git-cvsexportcommit(1)"
@@ -26200,7 +26199,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsimport.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-cvsimport(1)"
msgstr "git-cvsimport(1)"
@@ -26675,7 +26674,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsserver.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-cvsserver(1)"
msgstr "git-cvsserver(1)"
@@ -26743,7 +26742,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:37 en/git-daemon.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--strict-paths"
msgstr "--strict-paths"
@@ -26754,7 +26753,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:40 en/git-daemon.txt:77
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--export-all"
msgstr "--export-all"
@@ -26773,7 +26772,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:45 en/git.txt:534
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--version"
msgstr "--version"
@@ -26784,7 +26783,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:50 en/git.txt:537
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--help"
msgstr "--help"
@@ -27519,7 +27518,7 @@ msgstr ""
#. type: Title =
#: en/git-daemon.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-daemon(1)"
msgstr "git-daemon(1)"
@@ -27613,7 +27612,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:61
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--base-path-relaxed"
msgstr "--base-path-relaxed"
@@ -27654,7 +27653,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:82
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--inetd"
msgstr "--inetd"
@@ -27735,7 +27734,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:112
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--syslog"
msgstr "--syslog"
@@ -27748,7 +27747,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:116
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--user-path"
msgstr "--user-path"
@@ -27775,7 +27774,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:129
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--reuseaddr"
msgstr "--reuseaddr"
@@ -27887,7 +27886,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:174
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]informative-errors"
msgstr "--[no-]informative-errors"
@@ -28138,7 +28137,7 @@ msgstr ""
#. type: Title =
#: en/git-describe.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-describe(1)"
msgstr "git-describe(1)"
@@ -28215,7 +28214,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--contains"
msgstr "--contains"
@@ -28251,7 +28250,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--exact-match"
msgstr "--exact-match"
@@ -28264,7 +28263,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:69 en/git-ls-files.txt:151
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--debug"
msgstr "--debug"
@@ -28323,7 +28322,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-same
+#, ignore-same, no-wrap
msgid "--always"
msgstr "--always"
@@ -28334,7 +28333,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:104 en/rev-list-options.txt:121
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--first-parent"
msgstr "--first-parent"
@@ -28479,7 +28478,7 @@ msgstr ""
#. type: Title =
#: en/git-diff-files.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-diff-files(1)"
msgstr "git-diff-files(1)"
@@ -28547,7 +28546,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-same
+#, ignore-same, no-wrap
msgid "--cc"
msgstr "--cc"
@@ -28566,7 +28565,7 @@ msgstr ""
#. type: Title =
#: en/git-diff-index.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-diff-index(1)"
msgstr "git-diff-index(1)"
@@ -28783,7 +28782,7 @@ msgstr ""
#. type: Title =
#: en/git-difftool.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-difftool(1)"
msgstr "git-difftool(1)"
@@ -28815,7 +28814,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:23
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--dir-diff"
msgstr "--dir-diff"
@@ -28828,13 +28827,13 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:28 en/git-mergetool.txt:70
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-y"
msgstr "-y"
#. type: Labeled list
#: en/git-difftool.txt:29 en/git-mergetool.txt:71
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-prompt"
msgstr "--no-prompt"
@@ -28845,7 +28844,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:32 en/git-mergetool.txt:78
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--prompt"
msgstr "--prompt"
@@ -28917,7 +28916,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:69 en/git-mergetool.txt:67
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--tool-help"
msgstr "--tool-help"
@@ -28928,7 +28927,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:72
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]symlinks"
msgstr "--[no-]symlinks"
@@ -28971,13 +28970,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-same
+#, ignore-same, no-wrap
msgid "-g"
msgstr "-g"
#. type: Labeled list
#: en/git-difftool.txt:89
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]gui"
msgstr "--[no-]gui"
@@ -28991,7 +28990,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:95
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]trust-exit-code"
msgstr "--[no-]trust-exit-code"
@@ -29036,7 +29035,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:114
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.guitool"
msgstr "diff.guitool"
@@ -29057,7 +29056,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:129
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "difftool.trustExitCode"
msgstr "difftool.trustExitCode"
@@ -29096,7 +29095,7 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
@@ -29231,7 +29230,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:87
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-commit-id"
msgstr "--no-commit-id"
@@ -29375,7 +29374,7 @@ msgstr ""
#. type: Title =
#: en/git-diff.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-diff(1)"
msgstr "git-diff(1)"
@@ -29811,7 +29810,7 @@ msgstr ""
#. type: Title =
#: en/git-fast-export.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
@@ -29967,7 +29966,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:84
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
@@ -29981,7 +29980,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:90
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-done-feature"
msgstr "--use-done-feature"
@@ -29994,7 +29993,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:94
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-data"
msgstr "--no-data"
@@ -30010,7 +30009,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--full-tree"
msgstr "--full-tree"
@@ -30025,7 +30024,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:108
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--anonymize"
msgstr "--anonymize"
@@ -30038,7 +30037,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:113
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--refspec"
msgstr "--refspec"
@@ -30206,7 +30205,7 @@ msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
@@ -30265,7 +30264,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stats"
msgstr "--stats"
@@ -30314,7 +30313,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:68
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--done"
msgstr "--done"
@@ -30367,7 +30366,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:98
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
@@ -30640,7 +30639,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:238
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`raw`"
msgstr "`raw`"
@@ -30742,7 +30741,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:291
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`now`"
msgstr "`now`"
@@ -30795,7 +30794,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:318 en/git-fast-import.txt:380
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`commit`"
msgstr "`commit`"
@@ -30808,7 +30807,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:323 en/git-fast-import.txt:744
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`tag`"
msgstr "`tag`"
@@ -30822,7 +30821,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:329 en/git-fast-import.txt:787
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`reset`"
msgstr "`reset`"
@@ -30836,7 +30835,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:334 en/git-fast-import.txt:816
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`blob`"
msgstr "`blob`"
@@ -30849,7 +30848,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:339 en/git-fast-import.txt:888
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`checkpoint`"
msgstr "`checkpoint`"
@@ -30863,7 +30862,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:345 en/git-fast-import.txt:916
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`progress`"
msgstr "`progress`"
@@ -30876,7 +30875,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:350 en/git-fast-import.txt:1126
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`done`"
msgstr "`done`"
@@ -30890,7 +30889,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:355 en/git-fast-import.txt:941
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`get-mark`"
msgstr "`get-mark`"
@@ -30903,7 +30902,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:360 en/git-fast-import.txt:960
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`cat-blob`"
msgstr "`cat-blob`"
@@ -30916,7 +30915,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:365 en/git-fast-import.txt:990
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`ls`"
msgstr "`ls`"
@@ -30930,7 +30929,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:370 en/git-fast-import.txt:1043
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`feature`"
msgstr "`feature`"
@@ -30943,7 +30942,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:374 en/git-fast-import.txt:1098
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`option`"
msgstr "`option`"
@@ -31028,7 +31027,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:426
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`author`"
msgstr "`author`"
@@ -31044,7 +31043,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:434
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`committer`"
msgstr "`committer`"
@@ -31077,7 +31076,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:452
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`from`"
msgstr "`from`"
@@ -31187,7 +31186,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`merge`"
msgstr "`merge`"
@@ -31211,7 +31210,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:522
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`filemodify`"
msgstr "`filemodify`"
@@ -31383,7 +31382,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:594
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`filedelete`"
msgstr "`filedelete`"
@@ -31413,7 +31412,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:610
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`filecopy`"
msgstr "`filecopy`"
@@ -31451,7 +31450,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:631
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`filerename`"
msgstr "`filerename`"
@@ -31492,7 +31491,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:660
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
@@ -31532,7 +31531,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:684
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`notemodify`"
msgstr "`notemodify`"
@@ -31593,7 +31592,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:723
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`mark`"
msgstr "`mark`"
@@ -31779,7 +31778,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:834
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`data`"
msgstr "`data`"
@@ -32940,7 +32939,7 @@ msgstr ""
#. type: Title =
#: en/git-fetch-pack.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fetch-pack(1)"
msgstr "git-fetch-pack(1)"
@@ -33024,7 +33023,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-same
+#, ignore-same, no-wrap
msgid "--thin"
msgstr "--thin"
@@ -33037,7 +33036,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:64 en/git-pack-objects.txt:81
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--include-tag"
msgstr "--include-tag"
@@ -33101,7 +33100,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:99
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--deepen-relative"
msgstr "--deepen-relative"
@@ -33114,7 +33113,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:104 en/merge-options.txt:113
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-progress"
msgstr "--no-progress"
@@ -33125,7 +33124,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:107 en/git-index-pack.txt:77
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--check-self-contained-and-connected"
msgstr "--check-self-contained-and-connected"
@@ -33176,7 +33175,7 @@ msgstr ""
#. type: Title =
#: en/git-fetch.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fetch(1)"
msgstr "git-fetch(1)"
@@ -33381,7 +33380,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:128 en/git-push.txt:332
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`-`"
msgstr "`-`"
@@ -33392,7 +33391,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:129
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`t`"
msgstr "`t`"
@@ -33591,7 +33590,7 @@ msgstr ""
#. type: Title =
#: en/git-filter-branch.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-filter-branch(1)"
msgstr "git-filter-branch(1)"
@@ -33887,7 +33886,7 @@ msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:169
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--prune-empty"
msgstr "--prune-empty"
@@ -34381,7 +34380,7 @@ msgstr ""
#. type: Title =
#: en/git-fmt-merge-msg.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fmt-merge-msg(1)"
msgstr "git-fmt-merge-msg(1)"
@@ -34430,7 +34429,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-log"
msgstr "--no-log"
@@ -34442,7 +34441,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:38
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]summary"
msgstr "--[no-]summary"
@@ -34481,7 +34480,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:56
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.summary"
msgstr "merge.summary"
@@ -34509,7 +34508,7 @@ msgstr ""
#. type: Title =
#: en/git-for-each-ref.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-for-each-ref(1)"
msgstr "git-for-each-ref(1)"
@@ -34601,25 +34600,25 @@ msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--shell"
msgstr "--shell"
#. type: Labeled list
#: en/git-for-each-ref.txt:59
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--perl"
msgstr "--perl"
#. type: Labeled list
#: en/git-for-each-ref.txt:60
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--python"
msgstr "--python"
#. type: Labeled list
#: en/git-for-each-ref.txt:61
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--tcl"
msgstr "--tcl"
@@ -35135,7 +35134,7 @@ msgstr ""
#. type: Title =
#: en/git-format-patch.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-format-patch(1)"
msgstr "git-format-patch(1)"
@@ -35283,7 +35282,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:94 en/git-shortlog.txt:30
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--numbered"
msgstr "--numbered"
@@ -35294,7 +35293,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:98
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-numbered"
msgstr "--no-numbered"
@@ -35316,7 +35315,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:104
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--numbered-files"
msgstr "--numbered-files"
@@ -35329,7 +35328,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:109
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-subject"
msgstr "--keep-subject"
@@ -35349,7 +35348,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:119 en/git-pack-objects.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stdout"
msgstr "--stdout"
@@ -35376,7 +35375,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:128
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-attach"
msgstr "--no-attach"
@@ -35408,7 +35407,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:138
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-thread"
msgstr "--no-thread"
@@ -35462,7 +35461,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:163
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
@@ -35492,7 +35491,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:176
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--rfc"
msgstr "--rfc"
@@ -35556,7 +35555,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:202
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--from"
msgstr "--from"
@@ -35603,7 +35602,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:225
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
@@ -35695,7 +35694,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:264
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-binary"
msgstr "--no-binary"
@@ -35709,7 +35708,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:270
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--zero-commit"
msgstr "--zero-commit"
@@ -36413,7 +36412,7 @@ msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
#. type: Title =
#: en/git-fsck-objects.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fsck-objects(1)"
msgstr "git-fsck-objects(1)"
@@ -36444,7 +36443,7 @@ msgstr ""
#. type: Title =
#: en/git-fsck.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fsck(1)"
msgstr "git-fsck(1)"
@@ -36486,7 +36485,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:30
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unreachable"
msgstr "--unreachable"
@@ -36499,7 +36498,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:34
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]dangling"
msgstr "--[no-]dangling"
@@ -36522,7 +36521,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--cache"
msgstr "--cache"
@@ -36535,7 +36534,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-reflogs"
msgstr "--no-reflogs"
@@ -36549,7 +36548,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:54
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--full"
msgstr "--full"
@@ -36566,7 +36565,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:64
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--connectivity-only"
msgstr "--connectivity-only"
@@ -36580,7 +36579,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-same
+#, ignore-same, no-wrap
msgid "--strict"
msgstr "--strict"
@@ -36601,7 +36600,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:80
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--lost-found"
msgstr "--lost-found"
@@ -36615,7 +36614,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:86
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--name-objects"
msgstr "--name-objects"
@@ -36749,9 +36748,9 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:148
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_OBJECT_DIRECTORY"
-msgstr ""
+msgstr "GIT_OBJECT_DIRECTORY"
#. type: Plain text
#: en/git-fsck.txt:150
@@ -36760,9 +36759,9 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:151
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_INDEX_FILE"
-msgstr ""
+msgstr "GIT_INDEX_FILE"
#. type: Plain text
#: en/git-fsck.txt:153
@@ -36771,9 +36770,9 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:154
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_ALTERNATE_OBJECT_DIRECTORIES"
-msgstr ""
+msgstr "GIT_ALTERNATE_OBJECT_DIRECTORIES"
#. type: Plain text
#: en/git-fsck.txt:156
@@ -36782,7 +36781,7 @@ msgstr ""
#. type: Title =
#: en/git-gc.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-gc(1)"
msgstr "git-gc(1)"
@@ -36833,7 +36832,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-same
+#, ignore-same, no-wrap
msgid "--aggressive"
msgstr "--aggressive"
@@ -36849,7 +36848,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--auto"
msgstr "--auto"
@@ -36899,7 +36898,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:71 en/git-pack-refs.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-prune"
msgstr "--no-prune"
@@ -37081,7 +37080,7 @@ msgstr ""
#. type: Title =
#: en/git-get-tar-commit-id.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-get-tar-commit-id(1)"
msgstr "git-get-tar-commit-id(1)"
@@ -37119,7 +37118,7 @@ msgstr ""
#. type: Title =
#: en/git-grep.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-grep(1)"
msgstr "git-grep(1)"
@@ -37195,7 +37194,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:79
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--untracked"
msgstr "--untracked"
@@ -37208,7 +37207,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:83
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-exclude-standard"
msgstr "--no-exclude-standard"
@@ -37221,7 +37220,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:87 en/git-ls-files.txt:97
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--exclude-standard"
msgstr "--exclude-standard"
@@ -37307,7 +37306,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:132
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--word-regexp"
msgstr "--word-regexp"
@@ -37321,7 +37320,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:138
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--invert-match"
msgstr "--invert-match"
@@ -37340,7 +37339,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-same
+#, ignore-same, no-wrap
msgid "--full-name"
msgstr "--full-name"
@@ -37360,7 +37359,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:156 en/rev-list-options.txt:85
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--extended-regexp"
msgstr "--extended-regexp"
@@ -37372,7 +37371,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:158 en/rev-list-options.txt:80
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--basic-regexp"
msgstr "--basic-regexp"
@@ -37385,7 +37384,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:163 en/rev-list-options.txt:94
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--perl-regexp"
msgstr "--perl-regexp"
@@ -37403,7 +37402,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:168 en/rev-list-options.txt:90
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--fixed-strings"
msgstr "--fixed-strings"
@@ -37414,7 +37413,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:173
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--line-number"
msgstr "--line-number"
@@ -37425,7 +37424,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:177
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--files-with-matches"
msgstr "--files-with-matches"
@@ -37437,7 +37436,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:180
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--files-without-match"
msgstr "--files-without-match"
@@ -37479,7 +37478,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:202 en/rev-list-options.txt:848
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--count"
msgstr "--count"
@@ -37511,7 +37510,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:215
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--break"
msgstr "--break"
@@ -37522,7 +37521,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:218
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--heading"
msgstr "--heading"
@@ -37535,7 +37534,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:223
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-function"
msgstr "--show-function"
@@ -37655,19 +37654,19 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:266
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--and"
msgstr "--and"
#. type: Labeled list
#: en/git-grep.txt:267
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--or"
msgstr "--or"
#. type: Labeled list
#: en/git-grep.txt:268 en/git-rev-parse.txt:129 en/rev-list-options.txt:131
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--not"
msgstr "--not"
@@ -37687,7 +37686,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:275 en/rev-list-options.txt:67
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--all-match"
msgstr "--all-match"
@@ -37782,7 +37781,7 @@ msgstr ""
#. type: Title =
#: en/git-gui.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-gui(1)"
msgstr "git-gui(1)"
@@ -38039,7 +38038,7 @@ msgstr ""
#. type: Title =
#: en/git-hash-object.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-hash-object(1)"
msgstr "git-hash-object(1)"
@@ -38093,7 +38092,7 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:37
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stdin-paths"
msgstr "--stdin-paths"
@@ -38118,7 +38117,7 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:51
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-filters"
msgstr "--no-filters"
@@ -38133,7 +38132,7 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--literally"
msgstr "--literally"
@@ -38148,7 +38147,7 @@ msgstr ""
#. type: Title =
#: en/git-help.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-help(1)"
msgstr "git-help(1)"
@@ -38221,7 +38220,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--guides"
msgstr "--guides"
@@ -38234,7 +38233,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:52
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--info"
msgstr "--info"
@@ -38247,7 +38246,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--man"
msgstr "--man"
@@ -38268,7 +38267,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:67
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--web"
msgstr "--web"
@@ -38505,7 +38504,7 @@ msgstr ""
#. type: Title =
#: en/git-http-backend.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-http-backend(1)"
msgstr "git-http-backend(1)"
@@ -38983,7 +38982,7 @@ msgstr ""
#. type: Title =
#: en/git-http-fetch.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-http-fetch(1)"
msgstr "git-http-fetch(1)"
@@ -39078,7 +39077,7 @@ msgstr ""
#. type: Labeled list
#: en/git-http-fetch.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--recover"
msgstr "--recover"
@@ -39091,7 +39090,7 @@ msgstr ""
#. type: Title =
#: en/git-http-push.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-http-push(1)"
msgstr "git-http-push(1)"
@@ -39262,7 +39261,7 @@ msgstr ""
#. type: Title =
#: en/git-imap-send.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-imap-send(1)"
msgstr "git-imap-send(1)"
@@ -39307,7 +39306,7 @@ msgstr "--quiet"
#. type: Labeled list
#: en/git-imap-send.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--curl"
msgstr "--curl"
@@ -39320,7 +39319,7 @@ msgstr ""
#. type: Labeled list
#: en/git-imap-send.txt:45
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-curl"
msgstr "--no-curl"
@@ -39589,7 +39588,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-same
+#, ignore-same, no-wrap
msgid "git-index-pack(1)"
msgstr "git-index-pack(1)"
@@ -39649,7 +39648,7 @@ msgstr ""
#. type: Labeled list
#: en/git-index-pack.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--fix-thin"
msgstr "--fix-thin"
@@ -39771,7 +39770,7 @@ msgstr "Ident mit dem vorhergehenden Beispiel."
#. type: Title =
#: en/git-init-db.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-init-db(1)"
msgstr "git-init-db(1)"
@@ -39806,7 +39805,7 @@ msgstr ""
#. type: Title =
#: en/git-init.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-init(1)"
msgstr "git-init(1)"
@@ -40100,7 +40099,7 @@ msgstr ""
#. type: Title =
#: en/git-instaweb.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-instaweb(1)"
msgstr "git-instaweb(1)"
@@ -40132,7 +40131,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--httpd"
msgstr "--httpd"
@@ -40147,7 +40146,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:36
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--module-path"
msgstr "--module-path"
@@ -40160,7 +40159,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:41
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--port"
msgstr "--port"
@@ -40171,7 +40170,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:45
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--browser"
msgstr "--browser"
@@ -40192,7 +40191,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:53
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--start"
msgstr "--start"
@@ -40211,7 +40210,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stop"
msgstr "--stop"
@@ -40231,7 +40230,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:64
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--restart"
msgstr "--restart"
@@ -40269,7 +40268,7 @@ msgstr ""
#. type: Title =
#: en/git-interpret-trailers.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-interpret-trailers(1)"
msgstr "git-interpret-trailers(1)"
@@ -40379,7 +40378,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:70
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--in-place"
msgstr "--in-place"
@@ -40390,7 +40389,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:73
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--trim-empty"
msgstr "--trim-empty"
@@ -40902,7 +40901,7 @@ msgstr ""
#. type: Title =
#: en/git-log.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-log(1)"
msgstr "git-log(1)"
@@ -40941,7 +40940,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:27
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--follow"
msgstr "--follow"
@@ -40956,7 +40955,7 @@ msgstr "Zeigt die Geschichte inklusive Umbennenungen an."
#. type: Labeled list
#: en/git-log.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-decorate"
msgstr "--no-decorate"
@@ -40979,7 +40978,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:41
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--source"
msgstr "--source"
@@ -40994,7 +40993,7 @@ msgstr "Zeigt den Referenznamen f체r jeden dargestellt Commits."
#. type: Labeled list
#: en/git-log.txt:45
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-mailmap"
msgstr "--use-mailmap"
@@ -41007,7 +41006,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:50
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--full-diff"
msgstr "--full-diff"
@@ -41041,7 +41040,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:60
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--log-size"
msgstr "--log-size"
@@ -41324,7 +41323,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:201
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.showSignature"
msgstr "log.showSignature"
@@ -41374,7 +41373,7 @@ msgstr ""
#. type: Title =
#: en/git-ls-files.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-ls-files(1)"
msgstr "git-ls-files(1)"
@@ -41426,7 +41425,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--deleted"
msgstr "--deleted"
@@ -41437,7 +41436,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--modified"
msgstr "--modified"
@@ -41448,7 +41447,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--others"
msgstr "--others"
@@ -41459,7 +41458,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:52 en/git-status.txt:97
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignored"
msgstr "--ignored"
@@ -41473,7 +41472,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:59
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stage"
msgstr "--stage"
@@ -41485,7 +41484,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:62
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--directory"
msgstr "--directory"
@@ -41498,7 +41497,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:66
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-empty-directory"
msgstr "--no-empty-directory"
@@ -41509,7 +41508,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:70 en/git-update-index.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unmerged"
msgstr "--unmerged"
@@ -41520,7 +41519,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:74
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--killed"
msgstr "--killed"
@@ -41593,7 +41592,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:101
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--error-unmatch"
msgstr "--error-unmatch"
@@ -41751,7 +41750,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:157
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--eol"
msgstr "--eol"
@@ -41908,7 +41907,7 @@ msgstr "linkgit:git-read-tree[1], linkgit:gitignore[5]"
#. type: Title =
#: en/git-ls-remote.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-ls-remote(1)"
msgstr "git-ls-remote(1)"
@@ -41935,7 +41934,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:25 en/git-show-ref.txt:41
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--heads"
msgstr "--heads"
@@ -41949,7 +41948,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:33
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--refs"
msgstr "--refs"
@@ -41989,7 +41988,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:52
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--get-url"
msgstr "--get-url"
@@ -42003,7 +42002,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--symref"
msgstr "--symref"
@@ -42054,7 +42053,7 @@ msgstr ""
#. type: Title =
#: en/git-ls-tree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-ls-tree(1)"
msgstr "git-ls-tree(1)"
@@ -42210,7 +42209,7 @@ msgstr ""
#. type: Title =
#: en/git-mailinfo.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-mailinfo(1)"
msgstr "git-mailinfo(1)"
@@ -42383,7 +42382,7 @@ msgstr ""
#. type: Title =
#: en/git-mailsplit.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-mailsplit(1)"
msgstr "git-mailsplit(1)"
@@ -42486,7 +42485,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-cr"
msgstr "--keep-cr"
@@ -42497,7 +42496,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:51
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--mboxrd"
msgstr "--mboxrd"
@@ -42508,7 +42507,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-base.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-merge-base(1)"
msgstr "git-merge-base(1)"
@@ -42573,7 +42572,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--octopus"
msgstr "--octopus"
@@ -42587,7 +42586,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:48 en/git-show-branch.txt:90
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--independent"
msgstr "--independent"
@@ -42602,7 +42601,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:55
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--is-ancestor"
msgstr "--is-ancestor"
@@ -42616,7 +42615,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:60 en/git-rebase.txt:346
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--fork-point"
msgstr "--fork-point"
@@ -42841,7 +42840,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-file.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-merge-file(1)"
msgstr "git-merge-file(1)"
@@ -42945,7 +42944,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:70
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--diff3"
msgstr "--diff3"
@@ -42956,7 +42955,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:75
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--union"
msgstr "--union"
@@ -42995,7 +42994,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-index.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-merge-index(1)"
msgstr "git-merge-index(1)"
@@ -43117,7 +43116,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-one-file.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-merge-one-file(1)"
msgstr "git-merge-one-file(1)"
@@ -43248,7 +43247,7 @@ msgstr ""
#. type: Title =
#: en/git-mergetool.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-mergetool(1)"
msgstr "git-mergetool(1)"
@@ -43392,7 +43391,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-tree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-merge-tree(1)"
msgstr "git-merge-tree(1)"
@@ -43427,7 +43426,7 @@ msgstr ""
#. type: Title =
#: en/git-merge.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-merge(1)"
msgstr "git-merge(1)"
@@ -43560,7 +43559,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge.txt:89
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]rerere-autoupdate"
msgstr "--[no-]rerere-autoupdate"
@@ -44026,7 +44025,7 @@ msgstr ""
#. type: Title =
#: en/git-mktag.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-mktag(1)"
msgstr "git-mktag(1)"
@@ -44087,7 +44086,7 @@ msgstr ""
#. type: Title =
#: en/git-mktree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-mktree(1)"
msgstr "git-mktree(1)"
@@ -44120,7 +44119,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mktree.txt:26
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--missing"
msgstr "--missing"
@@ -44143,7 +44142,7 @@ msgstr ""
#. type: Title =
#: en/git-mv.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-mv(1)"
msgstr "git-mv(1)"
@@ -44273,7 +44272,7 @@ msgstr ""
#. type: Title =
#: en/git-name-rev.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-name-rev(1)"
msgstr "git-name-rev(1)"
@@ -44352,7 +44351,7 @@ msgstr ""
#. type: Labeled list
#: en/git-name-rev.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-undefined"
msgstr "--no-undefined"
@@ -44405,7 +44404,7 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-notes(1)"
msgstr "git-notes(1)"
@@ -44801,7 +44800,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--commit"
msgstr "--commit"
@@ -45066,7 +45065,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
@@ -45079,7 +45078,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
@@ -45100,7 +45099,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:389
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
@@ -45114,7 +45113,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
@@ -45134,7 +45133,7 @@ msgstr ""
#. type: Title =
#: en/git-p4.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4(1)"
msgstr "git-p4(1)"
@@ -45501,7 +45500,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:199
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--detect-branches"
msgstr "--detect-branches"
@@ -45529,7 +45528,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:208
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--silent"
msgstr "--silent"
@@ -45545,7 +45544,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:211
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--detect-labels"
msgstr "--detect-labels"
@@ -45559,7 +45558,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:216 en/git-p4.txt:331
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--import-labels"
msgstr "--import-labels"
@@ -45570,7 +45569,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:219
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--import-local"
msgstr "--import-local"
@@ -45618,7 +45617,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:243
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-path"
msgstr "--keep-path"
@@ -45634,7 +45633,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:251
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-client-spec"
msgstr "--use-client-spec"
@@ -45724,7 +45723,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:286
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--preserve-user"
msgstr "--preserve-user"
@@ -45737,7 +45736,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:290
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--export-labels"
msgstr "--export-labels"
@@ -45757,7 +45756,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:299
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--prepare-p4-only"
msgstr "--prepare-p4-only"
@@ -45773,7 +45772,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:306
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--shelve"
msgstr "--shelve"
@@ -46083,7 +46082,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:456
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.user"
msgstr "git-p4.user"
@@ -46096,7 +46095,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:460
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.password"
msgstr "git-p4.password"
@@ -46109,7 +46108,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:465
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.port"
msgstr "git-p4.port"
@@ -46122,7 +46121,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:470
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.host"
msgstr "git-p4.host"
@@ -46135,7 +46134,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:475
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.client"
msgstr "git-p4.client"
@@ -46148,7 +46147,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:479
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.retries"
msgstr "git-p4.retries"
@@ -46168,7 +46167,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:487
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.syncFromOrigin"
msgstr "git-p4.syncFromOrigin"
@@ -46184,7 +46183,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:494
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.branchUser"
msgstr "git-p4.branchUser"
@@ -46198,7 +46197,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:500
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.branchList"
msgstr "git-p4.branchList"
@@ -46233,7 +46232,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:515
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.importLabels"
msgstr "git-p4.importLabels"
@@ -46244,7 +46243,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:518
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.labelImportRegexp"
msgstr "git-p4.labelImportRegexp"
@@ -46257,7 +46256,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:522
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.useClientSpec"
msgstr "git-p4.useClientSpec"
@@ -46272,7 +46271,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:528
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.pathEncoding"
msgstr "git-p4.pathEncoding"
@@ -46288,7 +46287,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:535
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.largeFileSystem"
msgstr "git-p4.largeFileSystem"
@@ -46310,7 +46309,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:546
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.largeFileExtensions"
msgstr "git-p4.largeFileExtensions"
@@ -46323,7 +46322,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:550
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.largeFileThreshold"
msgstr "git-p4.largeFileThreshold"
@@ -46337,7 +46336,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:555
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.largeFileCompressedThreshold"
msgstr "git-p4.largeFileCompressedThreshold"
@@ -46352,7 +46351,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:561
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.largeFilePush"
msgstr "git-p4.largeFilePush"
@@ -46365,7 +46364,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:565
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.keepEmptyCommits"
msgstr "git-p4.keepEmptyCommits"
@@ -46378,7 +46377,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:569
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.mapUser"
msgstr "git-p4.mapUser"
@@ -46410,7 +46409,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:582
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.detectRenames"
msgstr "git-p4.detectRenames"
@@ -46423,7 +46422,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:586
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.detectCopies"
msgstr "git-p4.detectCopies"
@@ -46436,7 +46435,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:590
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.detectCopiesHarder"
msgstr "git-p4.detectCopiesHarder"
@@ -46447,7 +46446,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:593
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.preserveUser"
msgstr "git-p4.preserveUser"
@@ -46473,7 +46472,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:602
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.skipSubmitEdit"
msgstr "git-p4.skipSubmitEdit"
@@ -46486,7 +46485,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:607
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.skipSubmitEditCheck"
msgstr "git-p4.skipSubmitEditCheck"
@@ -46500,7 +46499,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:612
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.allowSubmit"
msgstr "git-p4.allowSubmit"
@@ -46516,7 +46515,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:619
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.skipUserNameCheck"
msgstr "git-p4.skipUserNameCheck"
@@ -46529,7 +46528,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:624
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.attemptRCSCleanup"
msgstr "git-p4.attemptRCSCleanup"
@@ -46543,7 +46542,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:630
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.exportLabels"
msgstr "git-p4.exportLabels"
@@ -46554,7 +46553,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:633
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.labelExportRegexp"
msgstr "git-p4.labelExportRegexp"
@@ -46567,7 +46566,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:637
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.conflict"
msgstr "git-p4.conflict"
@@ -46614,7 +46613,7 @@ msgstr ""
#. type: Title =
#: en/git-pack-objects.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-pack-objects(1)"
msgstr "git-pack-objects(1)"
@@ -46701,7 +46700,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:61
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--revs"
msgstr "--revs"
@@ -46717,7 +46716,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:70 en/rev-list-options.txt:693
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unpacked"
msgstr "--unpacked"
@@ -46795,7 +46794,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:118
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--honor-pack-keep"
msgstr "--honor-pack-keep"
@@ -46822,7 +46821,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:132
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--non-empty"
msgstr "--non-empty"
@@ -46833,7 +46832,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:142
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--all-progress"
msgstr "--all-progress"
@@ -46851,7 +46850,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:153
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--all-progress-implied"
msgstr "--all-progress-implied"
@@ -46872,7 +46871,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:162
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-reuse-delta"
msgstr "--no-reuse-delta"
@@ -46887,7 +46886,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:169
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-reuse-object"
msgstr "--no-reuse-object"
@@ -46935,7 +46934,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:194
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--shallow"
msgstr "--shallow"
@@ -46949,7 +46948,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:199
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--delta-base-offset"
msgstr "--delta-base-offset"
@@ -46988,7 +46987,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:230
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-true-parents"
msgstr "--keep-true-parents"
@@ -47008,7 +47007,7 @@ msgstr ""
#. type: Title =
#: en/git-pack-redundant.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-pack-redundant(1)"
msgstr "git-pack-redundant(1)"
@@ -47056,7 +47055,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-redundant.txt:35
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--alt-odb"
msgstr "--alt-odb"
@@ -47084,7 +47083,7 @@ msgstr ""
#. type: Title =
#: en/git-pack-refs.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-pack-refs(1)"
msgstr "git-pack-refs(1)"
@@ -47164,7 +47163,7 @@ msgstr ""
#. type: Title =
#: en/git-parse-remote.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-parse-remote(1)"
msgstr "git-parse-remote(1)"
@@ -47191,7 +47190,7 @@ msgstr ""
#. type: Title =
#: en/git-patch-id.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-patch-id(1)"
msgstr "git-patch-id(1)"
@@ -47238,7 +47237,7 @@ msgstr ""
#. type: Labeled list
#: en/git-patch-id.txt:33
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stable"
msgstr "--stable"
@@ -47275,7 +47274,7 @@ msgstr ""
#. type: Labeled list
#: en/git-patch-id.txt:50
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unstable"
msgstr "--unstable"
@@ -47301,7 +47300,7 @@ msgstr ""
#. type: Title =
#: en/git-prune-packed.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-prune-packed(1)"
msgstr "git-prune-packed(1)"
@@ -47369,7 +47368,7 @@ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Title =
#: en/git-prune.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-prune(1)"
msgstr "git-prune(1)"
@@ -47485,7 +47484,7 @@ msgstr "linkgit:git-fsck[1], linkgit:git-gc[1], linkgit:git-reflog[1]"
#. type: Title =
#: en/git-pull.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-pull(1)"
msgstr "git-pull(1)"
@@ -47678,7 +47677,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pull.txt:128 en/git-svn.txt:245
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-rebase"
msgstr "--no-rebase"
@@ -47689,13 +47688,13 @@ msgstr ""
#. type: Labeled list
#: en/git-pull.txt:131 en/git-rebase.txt:442
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
#: en/git-pull.txt:132 en/git-rebase.txt:443
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -47874,7 +47873,7 @@ msgstr "linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]"
#. type: Title =
#: en/git-push.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-push(1)"
msgstr "git-push(1)"
@@ -48079,7 +48078,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:135
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--follow-tags"
msgstr "--follow-tags"
@@ -48095,7 +48094,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:143 en/git-send-pack.txt:73
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]signed"
msgstr "--[no-]signed"
@@ -48119,7 +48118,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:154
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]atomic"
msgstr "--[no-]atomic"
@@ -48133,7 +48132,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:160
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--push-option"
msgstr "--push-option"
@@ -48167,7 +48166,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:172
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]force-with-lease"
msgstr "--[no-]force-with-lease"
@@ -48316,7 +48315,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:252
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]thin"
msgstr "--[no-]thin"
@@ -48360,7 +48359,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:290
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]verify"
msgstr "--[no-]verify"
@@ -48873,7 +48872,7 @@ msgstr ""
#. type: Title =
#: en/git-quiltimport.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-quiltimport(1)"
msgstr "git-quiltimport(1)"
@@ -48976,7 +48975,7 @@ msgstr ""
#. type: Title =
#: en/git-read-tree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-read-tree(1)"
msgstr "git-read-tree(1)"
@@ -49031,7 +49030,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--reset"
msgstr "--reset"
@@ -49072,7 +49071,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--trivial"
msgstr "--trivial"
@@ -49162,7 +49161,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:118
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-sparse-checkout"
msgstr "--no-sparse-checkout"
@@ -49173,7 +49172,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:122
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--empty"
msgstr "--empty"
@@ -49717,7 +49716,7 @@ msgstr ""
#. type: Title =
#: en/git-rebase.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-rebase(1)"
msgstr "git-rebase(1)"
@@ -50129,7 +50128,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:255 en/sequencer.txt:6
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--quit"
msgstr "--quit"
@@ -50142,7 +50141,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:260
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-empty"
msgstr "--keep-empty"
@@ -50159,7 +50158,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:267
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--edit-todo"
msgstr "--edit-todo"
@@ -50258,7 +50257,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-same
+#, ignore-same, no-wrap
msgid "--verify"
msgstr "--verify"
@@ -50271,7 +50270,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:336
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--force-rebase"
msgstr "--force-rebase"
@@ -50294,7 +50293,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:347
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-fork-point"
msgstr "--no-fork-point"
@@ -50355,7 +50354,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:384 en/git-svn.txt:642
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--preserve-merges"
msgstr "--preserve-merges"
@@ -50447,13 +50446,13 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:425
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
#: en/git-rebase.txt:426
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-autosquash"
msgstr "--no-autosquash"
@@ -50493,7 +50492,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:450 en/merge-options.txt:35
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-ff"
msgstr "--no-ff"
@@ -51170,7 +51169,7 @@ msgstr ""
#. type: Title =
#: en/git-receive-pack.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-receive-pack(1)"
msgstr "git-receive-pack(1)"
@@ -51282,7 +51281,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:66
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PUSH_CERT_SIGNER`"
msgstr "`GIT_PUSH_CERT_SIGNER`"
@@ -51295,7 +51294,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:70
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PUSH_CERT_KEY`"
msgstr "`GIT_PUSH_CERT_KEY`"
@@ -51306,7 +51305,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:73
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PUSH_CERT_STATUS`"
msgstr "`GIT_PUSH_CERT_STATUS`"
@@ -51320,7 +51319,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:78
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PUSH_CERT_NONCE`"
msgstr "`GIT_PUSH_CERT_NONCE`"
@@ -51335,13 +51334,13 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:85
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PUSH_CERT_NONCE_STATUS`"
msgstr "`GIT_PUSH_CERT_NONCE_STATUS`"
#. type: Labeled list
#: en/git-receive-pack.txt:86
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`UNSOLICITED`"
msgstr "`UNSOLICITED`"
@@ -51352,7 +51351,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:89
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`MISSING`"
msgstr "`MISSING`"
@@ -51363,7 +51362,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:91
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`BAD`"
msgstr "`BAD`"
@@ -51374,7 +51373,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:93
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`OK`"
msgstr "`OK`"
@@ -51385,7 +51384,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:95
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`SLOP`"
msgstr "`SLOP`"
@@ -51399,7 +51398,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PUSH_CERT_NONCE_SLOP`"
msgstr "`GIT_PUSH_CERT_NONCE_SLOP`"
@@ -51608,7 +51607,7 @@ msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
#. type: Title =
#: en/git-reflog.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-reflog(1)"
msgstr "git-reflog(1)"
@@ -51746,7 +51745,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:93
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--updateref"
msgstr "--updateref"
@@ -51760,7 +51759,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:98
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--rewrite"
msgstr "--rewrite"
@@ -51773,7 +51772,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:103
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stale-fix"
msgstr "--stale-fix"
@@ -51821,7 +51820,7 @@ msgstr ""
#. type: Title =
#: en/git-remote-ext.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-remote-ext(1)"
msgstr "git-remote-ext(1)"
@@ -51954,9 +51953,9 @@ msgstr "ENVIRONMENT AND CONFIGURATION VARIABLES"
#. type: Labeled list
#: en/git-remote-ext.txt:61 en/git-remote-fd.txt:33
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_TRANSLOOP_DEBUG"
-msgstr ""
+msgstr "GIT_TRANSLOOP_DEBUG"
#. type: Plain text
#: en/git-remote-ext.txt:63 en/git-remote-fd.txt:35
@@ -51971,9 +51970,9 @@ msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:67
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_EXT_SERVICE"
-msgstr ""
+msgstr "GIT_EXT_SERVICE"
#. type: Plain text
#: en/git-remote-ext.txt:70
@@ -51984,9 +51983,9 @@ msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:71
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_EXT_SERVICE_NOPREFIX"
-msgstr ""
+msgstr "GIT_EXT_SERVICE_NOPREFIX"
#. type: Plain text
#: en/git-remote-ext.txt:74
@@ -52103,7 +52102,7 @@ msgstr "linkgit:gitremote-helpers[1]"
#. type: Title =
#: en/git-remote-fd.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-remote-fd(1)"
msgstr "git-remote-fd(1)"
@@ -52196,7 +52195,7 @@ msgstr ""
#. type: Title =
#: en/git-remote-testgit.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-remote-testgit(1)"
msgstr "git-remote-testgit(1)"
@@ -52228,7 +52227,7 @@ msgstr ""
#. type: Title =
#: en/git-remote.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-remote(1)"
msgstr "git-remote(1)"
@@ -52773,7 +52772,7 @@ msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-repack.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-repack(1)"
msgstr "git-repack(1)"
@@ -52901,7 +52900,7 @@ msgstr ""
#. type: Labeled list
#: en/git-repack.txt:117
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--write-bitmap-index"
msgstr "--write-bitmap-index"
@@ -52917,7 +52916,7 @@ msgstr ""
#. type: Labeled list
#: en/git-repack.txt:124
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--pack-kept-objects"
msgstr "--pack-kept-objects"
@@ -52948,7 +52947,7 @@ msgstr ""
#. type: Labeled list
#: en/git-repack.txt:140
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-unreachable"
msgstr "--keep-unreachable"
@@ -52982,7 +52981,7 @@ msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
#. type: Title =
#: en/git-replace.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-replace(1)"
msgstr "git-replace(1)"
@@ -53274,7 +53273,7 @@ msgstr ""
#. type: Title =
#: en/git-request-pull.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-request-pull(1)"
msgstr "git-request-pull(1)"
@@ -53419,7 +53418,7 @@ msgstr ""
#. type: Title =
#: en/git-rerere.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-rerere(1)"
msgstr "git-rerere(1)"
@@ -53781,7 +53780,7 @@ msgstr ""
#. type: Title =
#: en/git-reset.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-reset(1)"
msgstr "git-reset(1)"
@@ -53878,7 +53877,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:53
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--soft"
msgstr "--soft"
@@ -53892,7 +53891,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:59
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--mixed"
msgstr "--mixed"
@@ -53913,7 +53912,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:67
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--hard"
msgstr "--hard"
@@ -54616,7 +54615,7 @@ msgstr ""
#. type: Title =
#: en/git-revert.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-revert(1)"
msgstr "git-revert(1)"
@@ -54753,7 +54752,7 @@ msgstr ""
#. type: Title =
#: en/git-rev-list.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-rev-list(1)"
msgstr "git-rev-list(1)"
@@ -54899,7 +54898,7 @@ msgstr ""
#. type: Title =
#: en/git-rev-parse.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-rev-parse(1)"
msgstr "git-rev-parse(1)"
@@ -54938,7 +54937,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:33
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--parseopt"
msgstr "--parseopt"
@@ -54950,7 +54949,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:36
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--sq-quote"
msgstr "--sq-quote"
@@ -54970,7 +54969,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-dashdash"
msgstr "--keep-dashdash"
@@ -54983,7 +54982,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stop-at-non-option"
msgstr "--stop-at-non-option"
@@ -54997,7 +54996,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:53
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stuck-long"
msgstr "--stuck-long"
@@ -55016,7 +55015,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:60
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--revs-only"
msgstr "--revs-only"
@@ -55028,7 +55027,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:64
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-revs"
msgstr "--no-revs"
@@ -55039,7 +55038,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:68
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--flags"
msgstr "--flags"
@@ -55050,7 +55049,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:71
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-flags"
msgstr "--no-flags"
@@ -55139,7 +55138,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:120
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--sq"
msgstr "--sq"
@@ -55189,7 +55188,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:145
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--symbolic"
msgstr "--symbolic"
@@ -55203,7 +55202,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:150
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--symbolic-full-name"
msgstr "--symbolic-full-name"
@@ -55325,7 +55324,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:205
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--local-env-vars"
msgstr "--local-env-vars"
@@ -55339,7 +55338,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:211
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--git-dir"
msgstr "--git-dir"
@@ -55360,7 +55359,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:220
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--absolute-git-dir"
msgstr "--absolute-git-dir"
@@ -55372,7 +55371,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:224
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--git-common-dir"
msgstr "--git-common-dir"
@@ -55383,7 +55382,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:227
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--is-inside-git-dir"
msgstr "--is-inside-git-dir"
@@ -55396,7 +55395,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:231
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--is-inside-work-tree"
msgstr "--is-inside-work-tree"
@@ -55409,7 +55408,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:235
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--is-bare-repository"
msgstr "--is-bare-repository"
@@ -55450,7 +55449,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:251
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-cdup"
msgstr "--show-cdup"
@@ -55464,7 +55463,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:256
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-prefix"
msgstr "--show-prefix"
@@ -55477,7 +55476,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:261
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-toplevel"
msgstr "--show-toplevel"
@@ -55499,7 +55498,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:270
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--shared-index-path"
msgstr "--shared-index-path"
@@ -55882,7 +55881,7 @@ msgstr ""
#. type: Title =
#: en/git-rm.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-rm(1)"
msgstr "git-rm(1)"
@@ -56000,7 +55999,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rm.txt:63
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
@@ -56271,7 +56270,7 @@ msgstr ""
#. type: Title =
#: en/git-send-email.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-send-email(1)"
msgstr "git-send-email(1)"
@@ -56344,7 +56343,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:48 en/git-tag.txt:60
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--annotate"
msgstr "--annotate"
@@ -56389,7 +56388,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--compose"
msgstr "--compose"
@@ -56563,13 +56562,13 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:145
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--xmailer"
msgstr "--xmailer"
#. type: Labeled list
#: en/git-send-email.txt:146
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-xmailer"
msgstr "--no-xmailer"
@@ -56743,7 +56742,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:227
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--smtp-ssl"
msgstr "--smtp-ssl"
@@ -56754,7 +56753,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:230
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--smtp-ssl-cert-path"
msgstr "--smtp-ssl-cert-path"
@@ -56837,7 +56836,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:266
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]chain-reply-to"
msgstr "--[no-]chain-reply-to"
@@ -56860,7 +56859,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:280
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]signed-off-by-cc"
msgstr "--[no-]signed-off-by-cc"
@@ -56874,7 +56873,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:285
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]cc-cover"
msgstr "--[no-]cc-cover"
@@ -56889,7 +56888,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:291
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]to-cover"
msgstr "--[no-]to-cover"
@@ -56974,7 +56973,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:319
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]suppress-from"
msgstr "--[no-]suppress-from"
@@ -56988,7 +56987,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:324
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]thread"
msgstr "--[no-]thread"
@@ -57081,7 +57080,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:365
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]format-patch"
msgstr "--[no-]format-patch"
@@ -57103,7 +57102,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:375
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]validate"
msgstr "--[no-]validate"
@@ -57147,7 +57146,7 @@ msgstr "Configuration"
#. type: Labeled list
#: en/git-send-email.txt:394
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--dump-aliases"
msgstr "--dump-aliases"
@@ -57321,7 +57320,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-same
+#, ignore-same, no-wrap
msgid "git-send-pack(1)"
msgstr "git-send-pack(1)"
@@ -57375,7 +57374,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-pack.txt:68
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--atomic"
msgstr "--atomic"
@@ -57452,7 +57451,7 @@ msgstr ""
#. type: Title =
#: en/git-shell.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-shell(1)"
msgstr "git-shell(1)"
@@ -57642,7 +57641,7 @@ msgstr ""
#. type: Title =
#: en/git-sh-i18n.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-sh-i18n(1)"
msgstr "git-sh-i18n(1)"
@@ -57698,7 +57697,7 @@ msgstr ""
#. type: Title =
#: en/git-shortlog.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-shortlog(1)"
msgstr "git-shortlog(1)"
@@ -57750,7 +57749,7 @@ msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:39
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--email"
msgstr "--email"
@@ -57781,7 +57780,7 @@ msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:51
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--committer"
msgstr "--committer"
@@ -57849,7 +57848,7 @@ msgstr ""
#. type: Title =
#: en/git-show-branch.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-show-branch(1)"
msgstr "git-show-branch(1)"
@@ -57935,7 +57934,7 @@ msgstr "Zeige sowohl lokale wie auch remote-tracking Entwicklungszweige an."
#. type: Labeled list
#: en/git-show-branch.txt:51
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--current"
msgstr "--current"
@@ -57954,7 +57953,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:56 en/rev-list-options.txt:635
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--topo-order"
msgstr "--topo-order"
@@ -57968,7 +57967,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:62 en/rev-list-options.txt:627
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--date-order"
msgstr "--date-order"
@@ -57983,7 +57982,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-same
+#, ignore-same, no-wrap
msgid "--sparse"
msgstr "--sparse"
@@ -58016,7 +58015,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:83
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--merge-base"
msgstr "--merge-base"
@@ -58038,7 +58037,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:94
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-name"
msgstr "--no-name"
@@ -58049,7 +58048,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:97
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--sha1-name"
msgstr "--sha1-name"
@@ -58063,7 +58062,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:103
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--topics"
msgstr "--topics"
@@ -58223,7 +58222,7 @@ msgstr ""
#. type: Title =
#: en/git-show-index.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-show-index(1)"
msgstr "git-show-index(1)"
@@ -58255,7 +58254,7 @@ msgstr ""
#. type: Title =
#: en/git-show-ref.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-show-ref(1)"
msgstr "git-show-ref(1)"
@@ -58305,7 +58304,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:36
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--head"
msgstr "--head"
@@ -58324,7 +58323,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--dereference"
msgstr "--dereference"
@@ -58567,7 +58566,7 @@ msgstr ""
#. type: Title =
#: en/git-show.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-show(1)"
msgstr "git-show(1)"
@@ -58711,7 +58710,7 @@ msgstr ""
#. type: Title =
#: en/git-sh-setup.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-sh-setup(1)"
msgstr "git-sh-setup(1)"
@@ -58903,7 +58902,7 @@ msgstr ""
#. type: Title =
#: en/git-stage.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-stage(1)"
msgstr "git-stage(1)"
@@ -58936,7 +58935,7 @@ msgstr ""
#. type: Title =
#: en/git-stash.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-stash(1)"
msgstr "git-stash(1)"
@@ -59432,7 +59431,7 @@ msgstr ""
#. type: Title =
#: en/git-status.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-status(1)"
msgstr "git-status(1)"
@@ -60013,7 +60012,7 @@ msgstr ""
#. type: Title =
#: en/git-stripspace.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-stripspace(1)"
msgstr "git-stripspace(1)"
@@ -60083,7 +60082,7 @@ msgstr ""
#. type: Labeled list
#: en/git-stripspace.txt:39
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--strip-comments"
msgstr "--strip-comments"
@@ -60095,7 +60094,7 @@ msgstr ""
#. type: Labeled list
#: en/git-stripspace.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--comment-lines"
msgstr "--comment-lines"
@@ -60168,7 +60167,7 @@ msgstr ""
#. type: Title =
#: en/git-submodule.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-submodule(1)"
msgstr "git-submodule(1)"
@@ -60724,7 +60723,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:305
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--files"
msgstr "--files"
@@ -60738,7 +60737,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:311
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--summary-limit"
msgstr "--summary-limit"
@@ -60754,7 +60753,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:318
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--remote"
msgstr "--remote"
@@ -60805,7 +60804,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:350
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-fetch"
msgstr "--no-fetch"
@@ -60818,7 +60817,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:354
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--checkout"
msgstr "--checkout"
@@ -60847,7 +60846,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:373
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--rebase"
msgstr "--rebase"
@@ -60864,7 +60863,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:382
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--init"
msgstr "--init"
@@ -60878,7 +60877,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:387
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--name"
msgstr "--name"
@@ -60923,7 +60922,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:406
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--depth"
msgstr "--depth"
@@ -60937,7 +60936,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:411
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
@@ -60977,7 +60976,7 @@ msgstr ""
#. type: Title =
#: en/git-svn.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-svn(1)"
msgstr "git-svn(1)"
@@ -61072,7 +61071,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stdlayout"
msgstr "--stdlayout"
@@ -61091,7 +61090,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-metadata"
msgstr "--no-metadata"
@@ -61105,7 +61104,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:62
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-svm-props"
msgstr "--use-svm-props"
@@ -61116,7 +61115,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:64
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-svnsync-props"
msgstr "--use-svnsync-props"
@@ -61223,7 +61222,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:106
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-minimize-url"
msgstr "--no-minimize-url"
@@ -61263,7 +61262,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:127
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--localtime"
msgstr "--localtime"
@@ -61286,7 +61285,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:138 en/git-svn.txt:505
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--parent"
msgstr "--parent"
@@ -61395,7 +61394,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:199
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--preserve-empty-dirs"
msgstr "--preserve-empty-dirs"
@@ -61601,7 +61600,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:293
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--message"
msgstr "--message"
@@ -61615,7 +61614,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:297
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--tag"
msgstr "--tag"
@@ -61666,7 +61665,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:317
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--username"
msgstr "--username"
@@ -61679,7 +61678,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:321
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--commit-url"
msgstr "--commit-url"
@@ -61700,7 +61699,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-same
+#, ignore-same, no-wrap
msgid "--parents"
msgstr "--parents"
@@ -61790,7 +61789,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:364
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-commit"
msgstr "--show-commit"
@@ -61803,7 +61802,7 @@ msgstr "Zeigt die Geschichte des Projekts"
#. type: Labeled list
#: en/git-svn.txt:366 en/pretty-options.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--oneline"
msgstr "--oneline"
@@ -61843,7 +61842,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:384
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--git-format"
msgstr "--git-format"
@@ -61879,7 +61878,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:397
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--before"
msgstr "--before"
@@ -61893,7 +61892,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:403
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--after"
msgstr "--after"
@@ -62250,7 +62249,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:571
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--rmdir"
msgstr "--rmdir"
@@ -62420,7 +62419,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:663
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-log-author"
msgstr "--use-log-author"
@@ -62440,7 +62439,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:671
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--add-author-from"
msgstr "--add-author-from"
@@ -62510,7 +62509,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:697
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--follow-parent"
msgstr "--follow-parent"
@@ -63232,7 +63231,7 @@ msgstr ""
#. type: Title =
#: en/git-symbolic-ref.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-symbolic-ref(1)"
msgstr "git-symbolic-ref(1)"
@@ -63327,7 +63326,7 @@ msgstr ""
#. type: Title =
#: en/git-tag.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-tag(1)"
msgstr "git-tag(1)"
@@ -63417,7 +63416,7 @@ msgstr ""
#. type: Labeled list
#: en/git-tag.txt:64
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--sign"
msgstr "--sign"
@@ -64748,7 +64747,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:579
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--html-path"
msgstr "--html-path"
@@ -64761,7 +64760,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:583
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--man-path"
msgstr "--man-path"
@@ -64774,7 +64773,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:587
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--info-path"
msgstr "--info-path"
@@ -64787,7 +64786,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:592
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--paginate"
msgstr "--paginate"
@@ -64801,7 +64800,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:598
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-pager"
msgstr "--no-pager"
@@ -64877,7 +64876,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:629
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
@@ -64890,7 +64889,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:633
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
@@ -64904,7 +64903,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:638
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
@@ -64918,7 +64917,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:644
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
@@ -64932,7 +64931,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:650
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
@@ -65322,7 +65321,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:858
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
@@ -65335,7 +65334,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:863
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
@@ -65350,7 +65349,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:869
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
@@ -65364,7 +65363,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:875
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
@@ -65389,7 +65388,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:888
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
@@ -65403,7 +65402,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:894
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
@@ -65417,7 +65416,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:899
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
@@ -65430,7 +65429,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:903
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
@@ -65451,7 +65450,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:918
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
@@ -65469,7 +65468,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:928
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
@@ -65493,37 +65492,37 @@ msgstr "$ git commit\n"
#. type: Labeled list
#: en/git.txt:939
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
#. type: Labeled list
#: en/git.txt:940
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
#. type: Labeled list
#: en/git.txt:941
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
#. type: Labeled list
#: en/git.txt:942
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
#. type: Labeled list
#: en/git.txt:943
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
#. type: Labeled list
#: en/git.txt:944
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
@@ -65548,7 +65547,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:950
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
@@ -65563,7 +65562,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:956
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
@@ -65651,7 +65650,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:983
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
@@ -65662,7 +65661,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:986
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
@@ -65673,7 +65672,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:991
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
@@ -65686,7 +65685,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:996
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
@@ -65700,7 +65699,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1002
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
@@ -65715,13 +65714,13 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1008
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
#: en/git.txt:1009
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
@@ -65756,7 +65755,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1029
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
@@ -65771,7 +65770,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1035
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
@@ -65787,7 +65786,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1042
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
@@ -65800,7 +65799,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1046
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
@@ -65817,7 +65816,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1054
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
@@ -65838,7 +65837,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1065
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
@@ -65881,7 +65880,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1086
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
@@ -65896,7 +65895,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1093
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
@@ -65912,7 +65911,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
@@ -65935,7 +65934,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1111
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
@@ -65948,7 +65947,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1116
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
@@ -65962,7 +65961,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1121
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
@@ -65975,7 +65974,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1126
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
@@ -65991,7 +65990,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1134
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
@@ -66008,7 +66007,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1143
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
@@ -66021,7 +66020,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1147
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
@@ -66034,7 +66033,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1151
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
@@ -66047,7 +66046,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1155
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
@@ -66065,7 +66064,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1165
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
@@ -66084,7 +66083,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1176
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
@@ -66101,7 +66100,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1185
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
@@ -66307,7 +66306,7 @@ msgstr ""
#. type: Title =
#: en/git-unpack-file.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-unpack-file(1)"
msgstr "git-unpack-file(1)"
@@ -66338,7 +66337,7 @@ msgstr ""
#. type: Title =
#: en/git-unpack-objects.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-unpack-objects(1)"
msgstr "git-unpack-objects(1)"
@@ -66407,7 +66406,7 @@ msgstr ""
#. type: Title =
#: en/git-update-index.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-update-index(1)"
msgstr "git-update-index(1)"
@@ -66471,7 +66470,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--remove"
msgstr "--remove"
@@ -66503,7 +66502,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:61
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-submodules"
msgstr "--ignore-submodules"
@@ -66557,7 +66556,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:80
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--index-info"
msgstr "--index-info"
@@ -66573,7 +66572,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:86
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]assume-unchanged"
msgstr "--[no-]assume-unchanged"
@@ -66600,7 +66599,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:104
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--really-refresh"
msgstr "--really-refresh"
@@ -66613,7 +66612,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:108
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]skip-worktree"
msgstr "--[no-]skip-worktree"
@@ -66628,7 +66627,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:115
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--again"
msgstr "--again"
@@ -66641,7 +66640,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:119
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unresolve"
msgstr "--unresolve"
@@ -66654,7 +66653,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:123
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--info-only"
msgstr "--info-only"
@@ -66667,7 +66666,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:128
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--force-remove"
msgstr "--force-remove"
@@ -66680,7 +66679,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:132
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--replace"
msgstr "--replace"
@@ -66731,13 +66730,13 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:164
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--split-index"
msgstr "--split-index"
#. type: Labeled list
#: en/git-update-index.txt:165
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-split-index"
msgstr "--no-split-index"
@@ -66761,13 +66760,13 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:177
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--untracked-cache"
msgstr "--untracked-cache"
#. type: Labeled list
#: en/git-update-index.txt:178
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-untracked-cache"
msgstr "--no-untracked-cache"
@@ -66790,7 +66789,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:188
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--test-untracked-cache"
msgstr "--test-untracked-cache"
@@ -66807,7 +66806,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:198
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--force-untracked-cache"
msgstr "--force-untracked-cache"
@@ -67311,7 +67310,7 @@ msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
#. type: Title =
#: en/git-update-ref.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-update-ref(1)"
msgstr "git-update-ref(1)"
@@ -67601,7 +67600,7 @@ msgstr ""
#. type: Title =
#: en/git-update-server-info.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-update-server-info(1)"
msgstr "git-update-server-info(1)"
@@ -67650,7 +67649,7 @@ msgstr ""
#. type: Title =
#: en/git-upload-archive.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-upload-archive(1)"
msgstr "git-upload-archive(1)"
@@ -67744,7 +67743,7 @@ msgstr ""
#. type: Title =
#: en/git-upload-pack.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-upload-pack(1)"
msgstr "git-upload-pack(1)"
@@ -67779,7 +67778,7 @@ msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:29
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]strict"
msgstr "--[no-]strict"
@@ -67795,7 +67794,7 @@ msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:35
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stateless-rpc"
msgstr "--stateless-rpc"
@@ -67809,7 +67808,7 @@ msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--advertise-refs"
msgstr "--advertise-refs"
@@ -67834,7 +67833,7 @@ msgstr "linkgit:gitnamespaces[7]"
#. type: Title =
#: en/git-var.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-var(1)"
msgstr "git-var(1)"
@@ -67879,9 +67878,9 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:34
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_AUTHOR_IDENT"
-msgstr ""
+msgstr "GIT_AUTHOR_IDENT"
#. type: Plain text
#: en/git-var.txt:36
@@ -67890,9 +67889,9 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:37
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_COMMITTER_IDENT"
-msgstr ""
+msgstr "GIT_COMMITTER_IDENT"
#. type: Plain text
#: en/git-var.txt:39
@@ -67901,9 +67900,9 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:40
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_EDITOR"
-msgstr ""
+msgstr "GIT_EDITOR"
#. type: Plain text
#: en/git-var.txt:48
@@ -67925,9 +67924,9 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:52
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_PAGER"
-msgstr ""
+msgstr "GIT_PAGER"
#. type: Plain text
#: en/git-var.txt:60
@@ -67944,7 +67943,7 @@ 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-same
+#, ignore-same, no-wrap
msgid "git-verify-commit(1)"
msgstr "git-verify-commit(1)"
@@ -67990,7 +67989,7 @@ msgstr "SHA1 eines git-Markierungobjektes."
#. type: Title =
#: en/git-verify-pack.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-verify-pack(1)"
msgstr "git-verify-pack(1)"
@@ -68032,7 +68031,7 @@ msgstr ""
#. type: Labeled list
#: en/git-verify-pack.txt:32
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stat-only"
msgstr "--stat-only"
@@ -68078,7 +68077,7 @@ msgstr ""
#. type: Title =
#: en/git-verify-tag.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-verify-tag(1)"
msgstr "git-verify-tag(1)"
@@ -68378,7 +68377,7 @@ msgstr "% git config --get-all core.gitproxy\n"
#. type: Title =
#: en/git-whatchanged.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-whatchanged(1)"
msgstr "git-whatchanged(1)"
@@ -68454,7 +68453,7 @@ msgstr ""
#. type: Title =
#: en/git-worktree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-worktree(1)"
msgstr "git-worktree(1)"
@@ -68627,7 +68626,7 @@ msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:104
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]checkout"
msgstr "--[no-]checkout"
@@ -68892,7 +68891,7 @@ msgstr ""
#. type: Title =
#: en/git-write-tree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-write-tree(1)"
msgstr "git-write-tree(1)"
@@ -68941,7 +68940,7 @@ msgstr ""
#. type: Labeled list
#: en/git-write-tree.txt:30
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--missing-ok"
msgstr "--missing-ok"
@@ -69284,7 +69283,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.conflictStyle"
msgstr "merge.conflictStyle"
@@ -69301,7 +69300,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:9
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.defaultToUpstream"
msgstr "merge.defaultToUpstream"
@@ -69319,7 +69318,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.ff"
msgstr "merge.ff"
@@ -69337,7 +69336,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.renameLimit"
msgstr "merge.renameLimit"
@@ -69350,7 +69349,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:36
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.renormalize"
msgstr "merge.renormalize"
@@ -69368,7 +69367,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.stat"
msgstr "merge.stat"
@@ -69381,7 +69380,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:50
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.tool"
msgstr "merge.tool"
@@ -69396,7 +69395,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.verbosity"
msgstr "merge.verbosity"
@@ -69508,7 +69507,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ff-only"
msgstr "--ff-only"
@@ -69548,13 +69547,13 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:64
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
#: en/merge-options.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-squash"
msgstr "--no-squash"
@@ -69598,13 +69597,13 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:90
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
#: en/merge-options.txt:91
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
@@ -69619,7 +69618,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:99
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-summary"
msgstr "--no-summary"
@@ -69645,7 +69644,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:121
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
@@ -70764,7 +70763,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:17
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--abbrev-commit"
msgstr "--abbrev-commit"
@@ -70785,7 +70784,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:26
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-abbrev-commit"
msgstr "--no-abbrev-commit"
@@ -70823,13 +70822,13 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--expand-tabs"
msgstr "--expand-tabs"
#. type: Labeled list
#: en/pretty-options.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-expand-tabs"
msgstr "--no-expand-tabs"
@@ -70893,7 +70892,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:81
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-notes"
msgstr "--no-notes"
@@ -70914,7 +70913,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:89
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]standard-notes"
msgstr "--[no-]standard-notes"
@@ -70927,7 +70926,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:94
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-signature"
msgstr "--show-signature"
@@ -71962,7 +71961,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:71
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--invert-grep"
msgstr "--invert-grep"
@@ -71975,7 +71974,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:76
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--regexp-ignore-case"
msgstr "--regexp-ignore-case"
@@ -72016,7 +72015,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:98
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--remove-empty"
msgstr "--remove-empty"
@@ -72027,7 +72026,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:101
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--merges"
msgstr "--merges"
@@ -72039,7 +72038,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:104
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-merges"
msgstr "--no-merges"
@@ -72064,13 +72063,13 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:110
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-min-parents"
msgstr "--no-min-parents"
#. type: Labeled list
#: en/rev-list-options.txt:111
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-max-parents"
msgstr "--no-max-parents"
@@ -72178,7 +72177,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:178
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--reflog"
msgstr "--reflog"
@@ -72198,7 +72197,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:187 en/rev-list-options.txt:569
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--bisect"
msgstr "--bisect"
@@ -72229,7 +72228,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:209
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--cherry-mark"
msgstr "--cherry-mark"
@@ -72242,7 +72241,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:213
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--cherry-pick"
msgstr "--cherry-pick"
@@ -72267,13 +72266,13 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:226
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--left-only"
msgstr "--left-only"
#. type: Labeled list
#: en/rev-list-options.txt:227
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--right-only"
msgstr "--right-only"
@@ -72295,7 +72294,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:238
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--cherry"
msgstr "--cherry"
@@ -72310,7 +72309,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:246
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--walk-reflogs"
msgstr "--walk-reflogs"
@@ -72376,7 +72375,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:282
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--boundary"
msgstr "--boundary"
@@ -72388,7 +72387,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:287
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-bitmap-index"
msgstr "--use-bitmap-index"
@@ -72447,7 +72446,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:313
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--simplify-by-decoration"
msgstr "--simplify-by-decoration"
@@ -72482,7 +72481,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:326
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--full-history"
msgstr "--full-history"
@@ -72493,7 +72492,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:329 en/rev-list-options.txt:462
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--dense"
msgstr "--dense"
@@ -72510,7 +72509,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:336 en/rev-list-options.txt:473
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--simplify-merges"
msgstr "--simplify-merges"
@@ -72524,7 +72523,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:341 en/rev-list-options.txt:520
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ancestry-path"
msgstr "--ancestry-path"
@@ -72975,7 +72974,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:593
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--bisect-vars"
msgstr "--bisect-vars"
@@ -72995,7 +72994,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:605
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--bisect-all"
msgstr "--bisect-all"
@@ -73044,7 +73043,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:631
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--author-date-order"
msgstr "--author-date-order"
@@ -73112,7 +73111,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:670
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--objects"
msgstr "--objects"
@@ -73126,7 +73125,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:676
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--objects-edge"
msgstr "--objects-edge"
@@ -73141,7 +73140,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:683
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
@@ -73155,7 +73154,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:688
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--indexed-objects"
msgstr "--indexed-objects"
@@ -73191,7 +73190,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:707
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--do-walk"
msgstr "--do-walk"
@@ -73216,7 +73215,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:721
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--relative-date"
msgstr "--relative-date"
@@ -73345,7 +73344,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:781
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--header"
msgstr "--header"
@@ -73365,7 +73364,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:790
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--children"
msgstr "--children"
@@ -73378,7 +73377,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:795
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--timestamp"
msgstr "--timestamp"
@@ -73389,7 +73388,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:799
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--left-right"
msgstr "--left-right"
@@ -73443,7 +73442,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:828
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--graph"
msgstr "--graph"
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index 32d683d..41a47cd 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -24506,9 +24506,9 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:282
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_CONFIG"
-msgstr ""
+msgstr "GIT_CONFIG"
#. type: Plain text
#: en/git-config.txt:286
@@ -24520,9 +24520,9 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:287
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_CONFIG_NOSYSTEM"
-msgstr ""
+msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
#: en/git-config.txt:290
@@ -35985,9 +35985,9 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:148
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_OBJECT_DIRECTORY"
-msgstr ""
+msgstr "GIT_OBJECT_DIRECTORY"
#. type: Plain text
#: en/git-fsck.txt:150
@@ -35996,9 +35996,9 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:151
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_INDEX_FILE"
-msgstr ""
+msgstr "GIT_INDEX_FILE"
#. type: Plain text
#: en/git-fsck.txt:153
@@ -36007,7 +36007,7 @@ msgstr "utilis챕 pour sp챕cifier le fichier d'index de l'index"
#. type: Labeled list
#: en/git-fsck.txt:154
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_ALTERNATE_OBJECT_DIRECTORIES"
msgstr "GIT_ALTERNATE_OBJECT_DIRECTORIES"
@@ -50903,9 +50903,9 @@ msgstr "VARIABLES D'ENVIRONNEMENT :"
#. type: Labeled list
#: en/git-remote-ext.txt:61 en/git-remote-fd.txt:33
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_TRANSLOOP_DEBUG"
-msgstr ""
+msgstr "GIT_TRANSLOOP_DEBUG"
#. type: Plain text
#: en/git-remote-ext.txt:63 en/git-remote-fd.txt:35
@@ -50920,9 +50920,9 @@ msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:67
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_EXT_SERVICE"
-msgstr ""
+msgstr "GIT_EXT_SERVICE"
#. type: Plain text
#: en/git-remote-ext.txt:70
@@ -50933,9 +50933,9 @@ msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:71
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_EXT_SERVICE_NOPREFIX"
-msgstr ""
+msgstr "GIT_EXT_SERVICE_NOPREFIX"
#. type: Plain text
#: en/git-remote-ext.txt:74
@@ -66396,9 +66396,9 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:34
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_AUTHOR_IDENT"
-msgstr ""
+msgstr "GIT_AUTHOR_IDENT"
#. type: Plain text
#: en/git-var.txt:36
@@ -66407,9 +66407,9 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:37
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_COMMITTER_IDENT"
-msgstr ""
+msgstr "GIT_COMMITTER_IDENT"
#. type: Plain text
#: en/git-var.txt:39
@@ -66418,9 +66418,9 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:40
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_EDITOR"
-msgstr ""
+msgstr "GIT_EDITOR"
#. type: Plain text
#: en/git-var.txt:48
@@ -66442,9 +66442,9 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:52
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_PAGER"
-msgstr ""
+msgstr "GIT_PAGER"
#. type: Plain text
#: en/git-var.txt:60
diff --git a/po/documentation.nl.po b/po/documentation.nl.po
index 1ea3eab..5700e03 100644
--- a/po/documentation.nl.po
+++ b/po/documentation.nl.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-same
+#, ignore-same, no-wrap
msgid "-b"
msgstr "-b"
@@ -37,7 +37,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-same
+#, ignore-same, no-wrap
msgid "--root"
msgstr "--root"
@@ -52,7 +52,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:9
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-stats"
msgstr "--show-stats"
@@ -92,7 +92,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-same
+#, ignore-same, no-wrap
msgid "-l"
msgstr "-l"
@@ -106,7 +106,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-same
+#, ignore-same, no-wrap
msgid "-t"
msgstr "-t"
@@ -150,14 +150,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-same
+#, ignore-same, no-wrap
msgid "-p"
msgstr "-p"
#. type: Labeled list
#: en/blame-options.txt:40 en/git-commit.txt:109 en/git-push.txt:121
#: en/git-worktree.txt:115
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--porcelain"
msgstr "--porcelain"
@@ -168,7 +168,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--line-porcelain"
msgstr "--line-porcelain"
@@ -181,7 +181,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:48 en/git-pack-objects.txt:123 en/git-svn.txt:357
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--incremental"
msgstr "--incremental"
@@ -238,7 +238,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:73 en/git-checkout.txt:110 en/git-fsck.txt:92
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]progress"
msgstr "--[no-]progress"
@@ -307,7 +307,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-same
+#, ignore-same, no-wrap
msgid "-h"
msgstr "-h"
@@ -318,7 +318,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:234
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-annotate[1]"
msgstr "linkgit:git-annotate[1]"
@@ -329,7 +329,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:4 en/git-annotate.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-blame[1]"
msgstr "linkgit:git-blame[1]"
@@ -340,7 +340,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-cherry[1]"
msgstr "linkgit:git-cherry[1]"
@@ -351,7 +351,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
@@ -362,7 +362,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
@@ -373,7 +373,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
@@ -384,7 +384,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-get-tar-commit-id[1]"
msgstr "linkgit:git-get-tar-commit-id[1]"
@@ -395,7 +395,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:22
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
@@ -406,7 +406,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
@@ -417,7 +417,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
@@ -428,7 +428,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
@@ -439,7 +439,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:34
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-rev-parse[1]"
msgstr "linkgit:git-rev-parse[1]"
@@ -450,7 +450,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:37
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
@@ -461,7 +461,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
@@ -472,7 +472,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
@@ -483,7 +483,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
@@ -494,7 +494,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:49 en/git-instaweb.txt:90
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
@@ -505,7 +505,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:142
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
@@ -516,7 +516,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1472
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -527,7 +527,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:215
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -538,7 +538,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-filter-branch[1]"
msgstr "linkgit:git-filter-branch[1]"
@@ -549,7 +549,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:139
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-mergetool[1]"
msgstr "linkgit:git-mergetool[1]"
@@ -560,7 +560,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-pack-refs[1]"
msgstr "linkgit:git-pack-refs[1]"
@@ -571,7 +571,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-prune[1]"
msgstr "linkgit:git-prune[1]"
@@ -582,7 +582,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:22
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-reflog[1]"
msgstr "linkgit:git-reflog[1]"
@@ -593,7 +593,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-remote[1]"
msgstr "linkgit:git-remote[1]"
@@ -604,7 +604,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-repack[1]"
msgstr "linkgit:git-repack[1]"
@@ -615,7 +615,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-replace[1]"
msgstr "linkgit:git-replace[1]"
@@ -626,7 +626,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-archimport[1]"
msgstr "linkgit:git-archimport[1]"
@@ -637,7 +637,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-cvsexportcommit[1]"
msgstr "linkgit:git-cvsexportcommit[1]"
@@ -648,7 +648,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-cvsimport[1]"
msgstr "linkgit:git-cvsimport[1]"
@@ -659,7 +659,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-cvsserver[1]"
msgstr "linkgit:git-cvsserver[1]"
@@ -670,7 +670,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-imap-send[1]"
msgstr "linkgit:git-imap-send[1]"
@@ -681,7 +681,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-p4[1]"
msgstr "linkgit:git-p4[1]"
@@ -692,7 +692,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-quiltimport[1]"
msgstr "linkgit:git-quiltimport[1]"
@@ -703,7 +703,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:22
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-request-pull[1]"
msgstr "linkgit:git-request-pull[1]"
@@ -714,7 +714,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-send-email[1]"
msgstr "linkgit:git-send-email[1]"
@@ -725,7 +725,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-svn[1]"
msgstr "linkgit:git-svn[1]"
@@ -736,7 +736,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:185
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -747,7 +747,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-am[1]"
msgstr "linkgit:git-am[1]"
@@ -758,7 +758,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-archive[1]"
msgstr "linkgit:git-archive[1]"
@@ -769,7 +769,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-bisect[1]"
msgstr "linkgit:git-bisect[1]"
@@ -780,7 +780,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-branch[1]"
msgstr "linkgit:git-branch[1]"
@@ -791,7 +791,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-bundle[1]"
msgstr "linkgit:git-bundle[1]"
@@ -802,7 +802,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-checkout[1]"
msgstr "linkgit:git-checkout[1]"
@@ -813,7 +813,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:22 en/git-revert.txt:126
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-cherry-pick[1]"
msgstr "linkgit:git-cherry-pick[1]"
@@ -824,7 +824,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-citool[1]"
msgstr "linkgit:git-citool[1]"
@@ -835,7 +835,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-clean[1]"
msgstr "linkgit:git-clean[1]"
@@ -846,7 +846,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-clone[1]"
msgstr "linkgit:git-clone[1]"
@@ -857,7 +857,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:34
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-commit[1]"
msgstr "linkgit:git-commit[1]"
@@ -868,7 +868,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:37
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-describe[1]"
msgstr "linkgit:git-describe[1]"
@@ -879,7 +879,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:136
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-diff[1]"
msgstr "linkgit:git-diff[1]"
@@ -890,7 +890,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-fetch[1]"
msgstr "linkgit:git-fetch[1]"
@@ -901,7 +901,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-format-patch[1]"
msgstr "linkgit:git-format-patch[1]"
@@ -912,7 +912,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:49
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-gc[1]"
msgstr "linkgit:git-gc[1]"
@@ -923,7 +923,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:52
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-grep[1]"
msgstr "linkgit:git-grep[1]"
@@ -934,7 +934,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:55
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-gui[1]"
msgstr "linkgit:git-gui[1]"
@@ -945,7 +945,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-init[1]"
msgstr "linkgit:git-init[1]"
@@ -956,7 +956,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:61
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-log[1]"
msgstr "linkgit:git-log[1]"
@@ -967,7 +967,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:64 en/git-fmt-merge-msg.txt:75
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-merge[1]"
msgstr "linkgit:git-merge[1]"
@@ -978,7 +978,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:67
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-mv[1]"
msgstr "linkgit:git-mv[1]"
@@ -989,7 +989,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:70
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-notes[1]"
msgstr "linkgit:git-notes[1]"
@@ -1000,7 +1000,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:73 en/git-fetch.txt:209
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-pull[1]"
msgstr "linkgit:git-pull[1]"
@@ -1011,7 +1011,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:76
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-push[1]"
msgstr "linkgit:git-push[1]"
@@ -1022,7 +1022,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:79 en/git-svn.txt:1133
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-rebase[1]"
msgstr "linkgit:git-rebase[1]"
@@ -1033,7 +1033,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:82
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-reset[1]"
msgstr "linkgit:git-reset[1]"
@@ -1044,7 +1044,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:85 en/git-cherry-pick.txt:230
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-revert[1]"
msgstr "linkgit:git-revert[1]"
@@ -1055,7 +1055,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:88
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-rm[1]"
msgstr "linkgit:git-rm[1]"
@@ -1066,7 +1066,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:91
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-shortlog[1]"
msgstr "linkgit:git-shortlog[1]"
@@ -1077,7 +1077,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:94
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-show[1]"
msgstr "linkgit:git-show[1]"
@@ -1088,7 +1088,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:97
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
@@ -1099,7 +1099,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
@@ -1110,7 +1110,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
@@ -1121,7 +1121,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:106
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
@@ -1132,7 +1132,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:109
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
@@ -1143,7 +1143,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:112 en/git-gui.txt:104
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
@@ -1154,7 +1154,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-cat-file[1]"
msgstr "linkgit:git-cat-file[1]"
@@ -1165,7 +1165,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-diff-files[1]"
msgstr "linkgit:git-diff-files[1]"
@@ -1176,7 +1176,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-diff-index[1]"
msgstr "linkgit:git-diff-index[1]"
@@ -1187,7 +1187,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-diff-tree[1]"
msgstr "linkgit:git-diff-tree[1]"
@@ -1198,7 +1198,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-for-each-ref[1]"
msgstr "linkgit:git-for-each-ref[1]"
@@ -1209,7 +1209,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-ls-files[1]"
msgstr "linkgit:git-ls-files[1]"
@@ -1220,7 +1220,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-ls-remote[1]"
msgstr "linkgit:git-ls-remote[1]"
@@ -1231,7 +1231,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:22
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-ls-tree[1]"
msgstr "linkgit:git-ls-tree[1]"
@@ -1242,7 +1242,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-merge-base[1]"
msgstr "linkgit:git-merge-base[1]"
@@ -1253,7 +1253,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-name-rev[1]"
msgstr "linkgit:git-name-rev[1]"
@@ -1264,7 +1264,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-pack-redundant[1]"
msgstr "linkgit:git-pack-redundant[1]"
@@ -1275,7 +1275,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:34
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-rev-list[1]"
msgstr "linkgit:git-rev-list[1]"
@@ -1286,7 +1286,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:37
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-show-index[1]"
msgstr "linkgit:git-show-index[1]"
@@ -1297,7 +1297,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:40 en/git-for-each-ref.txt:341
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-show-ref[1]"
msgstr "linkgit:git-show-ref[1]"
@@ -1308,7 +1308,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-unpack-file[1]"
msgstr "linkgit:git-unpack-file[1]"
@@ -1319,7 +1319,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-var[1]"
msgstr "linkgit:git-var[1]"
@@ -1330,7 +1330,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:49
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-verify-pack[1]"
msgstr "linkgit:git-verify-pack[1]"
@@ -1341,7 +1341,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-apply[1]"
msgstr "linkgit:git-apply[1]"
@@ -1352,7 +1352,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-checkout-index[1]"
msgstr "linkgit:git-checkout-index[1]"
@@ -1363,7 +1363,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-commit-tree[1]"
msgstr "linkgit:git-commit-tree[1]"
@@ -1374,7 +1374,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-hash-object[1]"
msgstr "linkgit:git-hash-object[1]"
@@ -1385,7 +1385,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-index-pack[1]"
msgstr "linkgit:git-index-pack[1]"
@@ -1396,7 +1396,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-merge-file[1]"
msgstr "linkgit:git-merge-file[1]"
@@ -1407,7 +1407,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-merge-index[1]"
msgstr "linkgit:git-merge-index[1]"
@@ -1418,7 +1418,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:22
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-mktag[1]"
msgstr "linkgit:git-mktag[1]"
@@ -1429,7 +1429,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-mktree[1]"
msgstr "linkgit:git-mktree[1]"
@@ -1440,7 +1440,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-pack-objects[1]"
msgstr "linkgit:git-pack-objects[1]"
@@ -1451,7 +1451,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-prune-packed[1]"
msgstr "linkgit:git-prune-packed[1]"
@@ -1462,7 +1462,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:34
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-read-tree[1]"
msgstr "linkgit:git-read-tree[1]"
@@ -1473,7 +1473,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:37
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-symbolic-ref[1]"
msgstr "linkgit:git-symbolic-ref[1]"
@@ -1484,7 +1484,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-unpack-objects[1]"
msgstr "linkgit:git-unpack-objects[1]"
@@ -1495,7 +1495,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-update-index[1]"
msgstr "linkgit:git-update-index[1]"
@@ -1506,7 +1506,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-update-ref[1]"
msgstr "linkgit:git-update-ref[1]"
@@ -1517,7 +1517,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:49 en/git-commit-tree.txt:115
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -1528,7 +1528,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-check-attr[1]"
msgstr "linkgit:git-check-attr[1]"
@@ -1539,7 +1539,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-check-ignore[1]"
msgstr "linkgit:git-check-ignore[1]"
@@ -1550,7 +1550,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-check-mailmap[1]"
msgstr "linkgit:git-check-mailmap[1]"
@@ -1561,7 +1561,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-check-ref-format[1]"
msgstr "linkgit:git-check-ref-format[1]"
@@ -1572,7 +1572,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-column[1]"
msgstr "linkgit:git-column[1]"
@@ -1583,7 +1583,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-credential[1]"
msgstr "linkgit:git-credential[1]"
@@ -1594,7 +1594,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-credential-cache[1]"
msgstr "linkgit:git-credential-cache[1]"
@@ -1605,7 +1605,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:22
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-credential-store[1]"
msgstr "linkgit:git-credential-store[1]"
@@ -1616,7 +1616,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-fmt-merge-msg[1]"
msgstr "linkgit:git-fmt-merge-msg[1]"
@@ -1627,7 +1627,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-interpret-trailers[1]"
msgstr "linkgit:git-interpret-trailers[1]"
@@ -1638,7 +1638,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-mailinfo[1]"
msgstr "linkgit:git-mailinfo[1]"
@@ -1649,7 +1649,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:34
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-mailsplit[1]"
msgstr "linkgit:git-mailsplit[1]"
@@ -1660,7 +1660,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:37
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-merge-one-file[1]"
msgstr "linkgit:git-merge-one-file[1]"
@@ -1671,7 +1671,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-patch-id[1]"
msgstr "linkgit:git-patch-id[1]"
@@ -1682,7 +1682,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-sh-i18n[1]"
msgstr "linkgit:git-sh-i18n[1]"
@@ -1693,7 +1693,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-sh-setup[1]"
msgstr "linkgit:git-sh-setup[1]"
@@ -1704,7 +1704,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:49
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-stripspace[1]"
msgstr "linkgit:git-stripspace[1]"
@@ -1715,7 +1715,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-http-fetch[1]"
msgstr "linkgit:git-http-fetch[1]"
@@ -1726,7 +1726,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-http-push[1]"
msgstr "linkgit:git-http-push[1]"
@@ -1737,7 +1737,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-parse-remote[1]"
msgstr "linkgit:git-parse-remote[1]"
@@ -1748,7 +1748,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-receive-pack[1]"
msgstr "linkgit:git-receive-pack[1]"
@@ -1759,7 +1759,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-shell[1]"
msgstr "linkgit:git-shell[1]"
@@ -1770,7 +1770,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-upload-archive[1]"
msgstr "linkgit:git-upload-archive[1]"
@@ -1781,7 +1781,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-upload-pack[1]"
msgstr "linkgit:git-upload-pack[1]"
@@ -1792,7 +1792,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-daemon[1]"
msgstr "linkgit:git-daemon[1]"
@@ -1803,7 +1803,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-fetch-pack[1]"
msgstr "linkgit:git-fetch-pack[1]"
@@ -1814,7 +1814,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-http-backend[1]"
msgstr "linkgit:git-http-backend[1]"
@@ -1825,7 +1825,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-send-pack[1]"
msgstr "linkgit:git-send-pack[1]"
@@ -1836,7 +1836,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-update-server-info[1]"
msgstr "linkgit:git-update-server-info[1]"
@@ -2019,7 +2019,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:105
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`gitdir`"
msgstr "`gitdir`"
@@ -2602,7 +2602,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:332
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.fileMode"
msgstr "core.fileMode"
@@ -2643,7 +2643,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:354
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.hideDotFiles"
msgstr "core.hideDotFiles"
@@ -2658,7 +2658,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:360
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.ignoreCase"
msgstr "core.ignoreCase"
@@ -2682,7 +2682,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:372
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.precomposeUnicode"
msgstr "core.precomposeUnicode"
@@ -2699,7 +2699,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:381
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.protectHFS"
msgstr "core.protectHFS"
@@ -2713,7 +2713,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:386
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.protectNTFS"
msgstr "core.protectNTFS"
@@ -2727,7 +2727,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:392
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.trustctime"
msgstr "core.trustctime"
@@ -2742,7 +2742,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:399
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.splitIndex"
msgstr "core.splitIndex"
@@ -2755,7 +2755,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:403
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.untrackedCache"
msgstr "core.untrackedCache"
@@ -2772,7 +2772,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:412
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.checkStat"
msgstr "core.checkStat"
@@ -2787,7 +2787,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:418
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.quotePath"
msgstr "core.quotePath"
@@ -2809,7 +2809,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:433
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.eol"
msgstr "core.eol"
@@ -2825,7 +2825,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:441
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.safecrlf"
msgstr "core.safecrlf"
@@ -2890,7 +2890,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:486
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.autocrlf"
msgstr "core.autocrlf"
@@ -2906,7 +2906,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:494
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.symlinks"
msgstr "core.symlinks"
@@ -2929,7 +2929,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:505
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.gitProxy"
msgstr "core.gitProxy"
@@ -2962,7 +2962,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:523
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.sshCommand"
msgstr "core.sshCommand"
@@ -2977,7 +2977,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:530
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.ignoreStat"
msgstr "core.ignoreStat"
@@ -3011,7 +3011,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:545
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.preferSymlinkRefs"
msgstr "core.preferSymlinkRefs"
@@ -3025,7 +3025,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:551
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.bare"
msgstr "core.bare"
@@ -3055,7 +3055,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:563
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.worktree"
msgstr "core.worktree"
@@ -3088,7 +3088,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:587
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.logAllRefUpdates"
msgstr "core.logAllRefUpdates"
@@ -3121,7 +3121,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:606
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.repositoryFormatVersion"
msgstr "core.repositoryFormatVersion"
@@ -3133,7 +3133,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:610
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.sharedRepository"
msgstr "core.sharedRepository"
@@ -3156,7 +3156,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:625
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.warnAmbiguousRefs"
msgstr "core.warnAmbiguousRefs"
@@ -3169,7 +3169,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:629
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.compression"
msgstr "core.compression"
@@ -3184,7 +3184,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:636
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.looseCompression"
msgstr "core.looseCompression"
@@ -3199,7 +3199,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:643
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.packedGitWindowSize"
msgstr "core.packedGitWindowSize"
@@ -3229,7 +3229,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:659
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.packedGitLimit"
msgstr "core.packedGitLimit"
@@ -3252,7 +3252,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:671
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.deltaBaseCacheLimit"
msgstr "core.deltaBaseCacheLimit"
@@ -3275,7 +3275,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:684
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.bigFileThreshold"
msgstr "core.bigFileThreshold"
@@ -3298,7 +3298,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:697
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.excludesFile"
msgstr "core.excludesFile"
@@ -3314,7 +3314,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:705
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.askPass"
msgstr "core.askPass"
@@ -3332,7 +3332,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:714
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.attributesFile"
msgstr "core.attributesFile"
@@ -3348,7 +3348,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:722
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.hooksPath"
msgstr "core.hooksPath"
@@ -3380,7 +3380,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:739
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.editor"
msgstr "core.editor"
@@ -3394,7 +3394,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:745
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.commentChar"
msgstr "core.commentChar"
@@ -3415,7 +3415,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:754
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.packedRefsTimeout"
msgstr "core.packedRefsTimeout"
@@ -3444,7 +3444,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:766
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.pager"
msgstr "core.pager"
@@ -3484,7 +3484,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:791
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.whitespace"
msgstr "core.whitespace"
@@ -3558,7 +3558,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:820
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.fsyncObjectFiles"
msgstr "core.fsyncObjectFiles"
@@ -3578,7 +3578,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:828
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.preloadIndex"
msgstr "core.preloadIndex"
@@ -3598,7 +3598,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:837
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.createObject"
msgstr "core.createObject"
@@ -3620,7 +3620,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:846 en/git-notes.txt:313
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.notesRef"
msgstr "core.notesRef"
@@ -3641,7 +3641,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:855
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.sparseCheckout"
msgstr "core.sparseCheckout"
@@ -3654,7 +3654,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:859
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.abbrev"
msgstr "core.abbrev"
@@ -3751,7 +3751,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:908 en/git-apply.txt:246
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "apply.ignoreWhitespace"
msgstr "apply.ignoreWhitespace"
@@ -3766,7 +3766,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:916 en/git-apply.txt:250
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "apply.whitespace"
msgstr "apply.whitespace"
@@ -3779,7 +3779,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:920
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "branch.autoSetupMerge"
msgstr "branch.autoSetupMerge"
@@ -3798,7 +3798,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:932
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "branch.autoSetupRebase"
msgstr "branch.autoSetupRebase"
@@ -3984,7 +3984,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1027
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.branch"
msgstr "color.branch"
@@ -4014,7 +4014,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1041
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.diff"
msgstr "color.diff"
@@ -4069,7 +4069,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1068
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.grep"
msgstr "color.grep"
@@ -4097,7 +4097,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1079
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`context`"
msgstr "`context`"
@@ -4108,7 +4108,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1081
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`filename`"
msgstr "`filename`"
@@ -4119,7 +4119,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1083
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`function`"
msgstr "`function`"
@@ -4130,7 +4130,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1085
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`linenumber`"
msgstr "`linenumber`"
@@ -4141,7 +4141,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1087
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`match`"
msgstr "`match`"
@@ -4152,7 +4152,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1089
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`matchContext`"
msgstr "`matchContext`"
@@ -4163,7 +4163,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1091
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`matchSelected`"
msgstr "`matchSelected`"
@@ -4174,7 +4174,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1093
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`selected`"
msgstr "`selected`"
@@ -4185,7 +4185,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1095
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`separator`"
msgstr "`separator`"
@@ -4198,7 +4198,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.interactive"
msgstr "color.interactive"
@@ -4228,7 +4228,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1114
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.pager"
msgstr "color.pager"
@@ -4241,7 +4241,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1118
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.showBranch"
msgstr "color.showBranch"
@@ -4257,7 +4257,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1125
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.status"
msgstr "color.status"
@@ -4290,7 +4290,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1143
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.ui"
msgstr "color.ui"
@@ -4310,7 +4310,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1155
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "column.ui"
msgstr "column.ui"
@@ -4330,7 +4330,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1164
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`always`"
msgstr "`always`"
@@ -4341,7 +4341,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1166
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`never`"
msgstr "`never`"
@@ -4352,7 +4352,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1168
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`auto`"
msgstr "`auto`"
@@ -4370,7 +4370,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1177
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`column`"
msgstr "`column`"
@@ -4381,7 +4381,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1179
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`row`"
msgstr "`row`"
@@ -4392,7 +4392,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1181
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`plain`"
msgstr "`plain`"
@@ -4410,7 +4410,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1189
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`dense`"
msgstr "`dense`"
@@ -4421,7 +4421,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1191
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`nodense`"
msgstr "`nodense`"
@@ -4432,7 +4432,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1195
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "column.branch"
msgstr "column.branch"
@@ -4445,7 +4445,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1199
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "column.clean"
msgstr "column.clean"
@@ -4458,7 +4458,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1203
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "column.status"
msgstr "column.status"
@@ -4471,7 +4471,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1207
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "column.tag"
msgstr "column.tag"
@@ -4484,7 +4484,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1211
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "commit.cleanup"
msgstr "commit.cleanup"
@@ -4501,7 +4501,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1220
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "commit.gpgSign"
msgstr "commit.gpgSign"
@@ -4516,7 +4516,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1228
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "commit.status"
msgstr "commit.status"
@@ -4530,7 +4530,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1233
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "commit.template"
msgstr "commit.template"
@@ -4543,7 +4543,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1237
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "commit.verbose"
msgstr "commit.verbose"
@@ -4556,7 +4556,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1241
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "credential.helper"
msgstr "credential.helper"
@@ -4571,7 +4571,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1248
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "credential.useHttpPath"
msgstr "credential.useHttpPath"
@@ -4585,7 +4585,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1253
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "credential.username"
msgstr "credential.username"
@@ -4654,7 +4654,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1282 en/git-difftool.txt:126
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "difftool.prompt"
msgstr "difftool.prompt"
@@ -4665,7 +4665,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1285 en/git-fast-import.txt:139
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
@@ -4682,7 +4682,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1294
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "fetch.recurseSubmodules"
msgstr "fetch.recurseSubmodules"
@@ -4699,7 +4699,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1303
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "fetch.fsckObjects"
msgstr "fetch.fsckObjects"
@@ -4714,7 +4714,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1310
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "fetch.unpackLimit"
msgstr "fetch.unpackLimit"
@@ -4732,7 +4732,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1321
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "fetch.prune"
msgstr "fetch.prune"
@@ -4745,7 +4745,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1325
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "fetch.output"
msgstr "fetch.output"
@@ -4759,7 +4759,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1330
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.attach"
msgstr "format.attach"
@@ -4774,7 +4774,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1337
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.from"
msgstr "format.from"
@@ -4793,7 +4793,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1347
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.numbered"
msgstr "format.numbered"
@@ -4809,7 +4809,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1354
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.headers"
msgstr "format.headers"
@@ -4822,13 +4822,13 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1358
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.to"
msgstr "format.to"
#. type: Labeled list
#: en/config.txt:1359
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.cc"
msgstr "format.cc"
@@ -4841,7 +4841,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1364
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.subjectPrefix"
msgstr "format.subjectPrefix"
@@ -4854,7 +4854,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1368
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.signature"
msgstr "format.signature"
@@ -4868,7 +4868,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1374
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.signatureFile"
msgstr "format.signatureFile"
@@ -4881,7 +4881,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1378
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.suffix"
msgstr "format.suffix"
@@ -4895,7 +4895,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1383 en/git-log.txt:175
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.pretty"
msgstr "format.pretty"
@@ -4908,7 +4908,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1388
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.thread"
msgstr "format.thread"
@@ -4925,7 +4925,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1398
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.signOff"
msgstr "format.signOff"
@@ -4941,7 +4941,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1405
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.coverLetter"
msgstr "format.coverLetter"
@@ -4955,7 +4955,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1410
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.outputDirectory"
msgstr "format.outputDirectory"
@@ -4968,7 +4968,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1414
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.useAutoBase"
msgstr "format.useAutoBase"
@@ -5399,25 +5399,25 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1602
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.category"
msgstr "gitweb.category"
#. type: Labeled list
#: en/config.txt:1603
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.description"
msgstr "gitweb.description"
#. type: Labeled list
#: en/config.txt:1604
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.owner"
msgstr "gitweb.owner"
#. type: Labeled list
#: en/config.txt:1605
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.url"
msgstr "gitweb.url"
@@ -5428,55 +5428,55 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1608
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.avatar"
msgstr "gitweb.avatar"
#. type: Labeled list
#: en/config.txt:1609
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.blame"
msgstr "gitweb.blame"
#. type: Labeled list
#: en/config.txt:1610
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.grep"
msgstr "gitweb.grep"
#. type: Labeled list
#: en/config.txt:1611
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.highlight"
msgstr "gitweb.highlight"
#. type: Labeled list
#: en/config.txt:1612
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.patches"
msgstr "gitweb.patches"
#. type: Labeled list
#: en/config.txt:1613
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.pickaxe"
msgstr "gitweb.pickaxe"
#. type: Labeled list
#: en/config.txt:1614
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.remote_heads"
msgstr "gitweb.remote_heads"
#. type: Labeled list
#: en/config.txt:1615
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.showSizes"
msgstr "gitweb.showSizes"
#. type: Labeled list
#: en/config.txt:1616
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.snapshot"
msgstr "gitweb.snapshot"
@@ -5572,7 +5572,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1652
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.commitMsgWidth"
msgstr "gui.commitMsgWidth"
@@ -5585,7 +5585,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1656
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.diffContext"
msgstr "gui.diffContext"
@@ -5598,7 +5598,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1660
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.displayUntracked"
msgstr "gui.displayUntracked"
@@ -5611,7 +5611,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1664
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.encoding"
msgstr "gui.encoding"
@@ -5626,7 +5626,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1672
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.matchTrackingBranch"
msgstr "gui.matchTrackingBranch"
@@ -5639,7 +5639,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1677
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.newBranchTemplate"
msgstr "gui.newBranchTemplate"
@@ -5652,7 +5652,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1681
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.pruneDuringFetch"
msgstr "gui.pruneDuringFetch"
@@ -5665,7 +5665,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1685
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.trustmtime"
msgstr "gui.trustmtime"
@@ -5678,7 +5678,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1689
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.spellingDictionary"
msgstr "gui.spellingDictionary"
@@ -5691,7 +5691,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1694
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.fastCopyBlame"
msgstr "gui.fastCopyBlame"
@@ -5705,7 +5705,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1699
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.copyBlameThreshold"
msgstr "gui.copyBlameThreshold"
@@ -5719,7 +5719,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1704
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.blamehistoryctx"
msgstr "gui.blamehistoryctx"
@@ -5872,7 +5872,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1761
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "help.browser"
msgstr "help.browser"
@@ -5885,7 +5885,7 @@ msgstr ""
#. type: Title ~
#: en/config.txt:1765 en/git-help.txt:81
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "help.format"
msgstr "help.format"
@@ -5899,7 +5899,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1770
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "help.autoCorrect"
msgstr "help.autoCorrect"
@@ -5916,7 +5916,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1779
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "help.htmlPath"
msgstr "help.htmlPath"
@@ -6503,7 +6503,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2046
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "i18n.commitEncoding"
msgstr "i18n.commitEncoding"
@@ -6519,7 +6519,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2053 en/git-log.txt:179
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "i18n.logOutputEncoding"
msgstr "i18n.logOutputEncoding"
@@ -6571,7 +6571,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2069
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "instaweb.browser"
msgstr "instaweb.browser"
@@ -6584,7 +6584,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2073
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "instaweb.httpd"
msgstr "instaweb.httpd"
@@ -6597,7 +6597,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2077
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "instaweb.local"
msgstr "instaweb.local"
@@ -6610,7 +6610,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2081
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "instaweb.modulePath"
msgstr "instaweb.modulePath"
@@ -6623,7 +6623,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2086
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "instaweb.port"
msgstr "instaweb.port"
@@ -6635,7 +6635,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2090
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "interactive.singleKey"
msgstr "interactive.singleKey"
@@ -6652,7 +6652,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2099
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "interactive.diffFilter"
msgstr "interactive.diffFilter"
@@ -6668,7 +6668,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2107
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.abbrevCommit"
msgstr "log.abbrevCommit"
@@ -6682,7 +6682,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2112 en/git-log.txt:184
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.date"
msgstr "log.date"
@@ -6696,7 +6696,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2117
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.decorate"
msgstr "log.decorate"
@@ -6714,7 +6714,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2127 en/git-log.txt:189
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.follow"
msgstr "log.follow"
@@ -6729,7 +6729,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2133
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.graphColors"
msgstr "log.graphColors"
@@ -6742,7 +6742,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2137 en/git-log.txt:195
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.showRoot"
msgstr "log.showRoot"
@@ -6757,7 +6757,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2143
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.mailmap"
msgstr "log.mailmap"
@@ -6770,7 +6770,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2147
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "mailinfo.scissors"
msgstr "mailinfo.scissors"
@@ -6898,7 +6898,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2208
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "mergetool.meld.hasOutput"
msgstr "mergetool.meld.hasOutput"
@@ -6915,7 +6915,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2217
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "mergetool.keepBackup"
msgstr "mergetool.keepBackup"
@@ -6930,7 +6930,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2223
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "mergetool.keepTemporaries"
msgstr "mergetool.keepTemporaries"
@@ -6945,7 +6945,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2230
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "mergetool.writeToTemp"
msgstr "mergetool.writeToTemp"
@@ -6959,7 +6959,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2236
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "mergetool.prompt"
msgstr "mergetool.prompt"
@@ -7483,7 +7483,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2501
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "push.default"
msgstr "push.default"
@@ -7578,7 +7578,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2558
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "push.followTags"
msgstr "push.followTags"
@@ -7591,7 +7591,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2563
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "push.gpgSign"
msgstr "push.gpgSign"
@@ -7608,7 +7608,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2572
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "push.recurseSubmodules"
msgstr "push.recurseSubmodules"
@@ -7701,7 +7701,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2617
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.advertiseAtomic"
msgstr "receive.advertiseAtomic"
@@ -7715,7 +7715,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2622
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.advertisePushOptions"
msgstr "receive.advertisePushOptions"
@@ -7729,7 +7729,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2627
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.autogc"
msgstr "receive.autogc"
@@ -7743,7 +7743,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2632
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.certNonceSeed"
msgstr "receive.certNonceSeed"
@@ -7757,7 +7757,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2638
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.certNonceSlop"
msgstr "receive.certNonceSlop"
@@ -7777,7 +7777,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2651
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.fsckObjects"
msgstr "receive.fsckObjects"
@@ -7819,13 +7819,13 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2672
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.fsck.skipList"
msgstr "receive.fsck.skipList"
#. type: Labeled list
#: en/config.txt:2680
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.keepAlive"
msgstr "receive.keepAlive"
@@ -7842,7 +7842,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2689
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.unpackLimit"
msgstr "receive.unpackLimit"
@@ -7860,7 +7860,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2699
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.maxInputSize"
msgstr "receive.maxInputSize"
@@ -7874,7 +7874,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2705
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.denyDeletes"
msgstr "receive.denyDeletes"
@@ -7887,7 +7887,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2709
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.denyDeleteCurrent"
msgstr "receive.denyDeleteCurrent"
@@ -7900,7 +7900,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2713
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.denyCurrentBranch"
msgstr "receive.denyCurrentBranch"
@@ -7936,7 +7936,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2733
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.denyNonFastForwards"
msgstr "receive.denyNonFastForwards"
@@ -7951,7 +7951,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2739
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.hideRefs"
msgstr "receive.hideRefs"
@@ -7965,7 +7965,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2745
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.updateServerInfo"
msgstr "receive.updateServerInfo"
@@ -7978,7 +7978,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2749
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.shallowUpdate"
msgstr "receive.shallowUpdate"
@@ -7991,7 +7991,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2753
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "remote.pushDefault"
msgstr "remote.pushDefault"
@@ -8198,7 +8198,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2827
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "repack.useDeltaBaseOffset"
msgstr "repack.useDeltaBaseOffset"
@@ -8214,7 +8214,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2835
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "repack.packKeptObjects"
msgstr "repack.packKeptObjects"
@@ -8229,7 +8229,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2842
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "repack.writeBitmaps"
msgstr "repack.writeBitmaps"
@@ -8275,7 +8275,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2864
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.identity"
msgstr "sendemail.identity"
@@ -8290,7 +8290,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2870
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpEncryption"
msgstr "sendemail.smtpEncryption"
@@ -8314,7 +8314,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2877
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpsslcertpath"
msgstr "sendemail.smtpsslcertpath"
@@ -8341,151 +8341,151 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2887 en/git-send-email.txt:404
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.aliasesFile"
msgstr "sendemail.aliasesFile"
#. type: Labeled list
#: en/config.txt:2888 en/git-send-email.txt:408
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.aliasFileType"
msgstr "sendemail.aliasFileType"
#. type: Labeled list
#: en/config.txt:2889
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.annotate"
msgstr "sendemail.annotate"
#. type: Labeled list
#: en/config.txt:2890
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.bcc"
msgstr "sendemail.bcc"
#. type: Labeled list
#: en/config.txt:2891
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.cc"
msgstr "sendemail.cc"
#. type: Labeled list
#: en/config.txt:2892
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.ccCmd"
msgstr "sendemail.ccCmd"
#. type: Labeled list
#: en/config.txt:2893
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.chainReplyTo"
msgstr "sendemail.chainReplyTo"
#. type: Labeled list
#: en/config.txt:2894 en/git-send-email.txt:435
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.confirm"
msgstr "sendemail.confirm"
#. type: Labeled list
#: en/config.txt:2895
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.envelopeSender"
msgstr "sendemail.envelopeSender"
#. type: Labeled list
#: en/config.txt:2896
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.from"
msgstr "sendemail.from"
#. type: Labeled list
#: en/config.txt:2897 en/git-send-email.txt:429
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.multiEdit"
msgstr "sendemail.multiEdit"
#. type: Labeled list
#: en/config.txt:2898
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.signedoffbycc"
msgstr "sendemail.signedoffbycc"
#. type: Labeled list
#: en/config.txt:2899
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpPass"
msgstr "sendemail.smtpPass"
#. type: Labeled list
#: en/config.txt:2900
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.suppresscc"
msgstr "sendemail.suppresscc"
#. type: Labeled list
#: en/config.txt:2901
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.suppressFrom"
msgstr "sendemail.suppressFrom"
#. type: Labeled list
#: en/config.txt:2902
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.to"
msgstr "sendemail.to"
#. type: Labeled list
#: en/config.txt:2903
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpDomain"
msgstr "sendemail.smtpDomain"
#. type: Labeled list
#: en/config.txt:2904
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpServer"
msgstr "sendemail.smtpServer"
#. type: Labeled list
#: en/config.txt:2905
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpServerPort"
msgstr "sendemail.smtpServerPort"
#. type: Labeled list
#: en/config.txt:2906
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpServerOption"
msgstr "sendemail.smtpServerOption"
#. type: Labeled list
#: en/config.txt:2907
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpUser"
msgstr "sendemail.smtpUser"
#. type: Labeled list
#: en/config.txt:2908
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.thread"
msgstr "sendemail.thread"
#. type: Labeled list
#: en/config.txt:2909
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.transferEncoding"
msgstr "sendemail.transferEncoding"
#. type: Labeled list
#: en/config.txt:2910
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.validate"
msgstr "sendemail.validate"
#. type: Labeled list
#: en/config.txt:2911
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.xmailer"
msgstr "sendemail.xmailer"
@@ -8507,7 +8507,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2917
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "showbranch.default"
msgstr "showbranch.default"
@@ -8520,7 +8520,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2921
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "splitIndex.maxPercentChange"
msgstr "splitIndex.maxPercentChange"
@@ -8539,7 +8539,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2934
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "splitIndex.sharedIndexExpire"
msgstr "splitIndex.sharedIndexExpire"
@@ -8558,7 +8558,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2946
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "status.relativePaths"
msgstr "status.relativePaths"
@@ -8572,7 +8572,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2952
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "status.short"
msgstr "status.short"
@@ -8585,7 +8585,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2956
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "status.branch"
msgstr "status.branch"
@@ -8598,7 +8598,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2960
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "status.displayCommentPrefix"
msgstr "status.displayCommentPrefix"
@@ -8613,7 +8613,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2967
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "status.showUntrackedFiles"
msgstr "status.showUntrackedFiles"
@@ -8653,7 +8653,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2986
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "status.submoduleSummary"
msgstr "status.submoduleSummary"
@@ -8675,7 +8675,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3002
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "stash.showPatch"
msgstr "stash.showPatch"
@@ -8689,7 +8689,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3007
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "stash.showStat"
msgstr "stash.showStat"
@@ -8787,7 +8787,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3055
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "submodule.fetchJobs"
msgstr "submodule.fetchJobs"
@@ -8802,7 +8802,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3061
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "submodule.alternateLocation"
msgstr "submodule.alternateLocation"
@@ -8818,7 +8818,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3068
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "submodule.alternateErrorStrategy"
msgstr "submodule.alternateErrorStrategy"
@@ -8875,7 +8875,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3090
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "transfer.fsckObjects"
msgstr "transfer.fsckObjects"
@@ -8888,7 +8888,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3095
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "transfer.hideRefs"
msgstr "transfer.hideRefs"
@@ -8936,7 +8936,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3123
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "transfer.unpackLimit"
msgstr "transfer.unpackLimit"
@@ -9110,7 +9110,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3214
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "user.email"
msgstr "user.email"
@@ -9124,7 +9124,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3219
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "user.name"
msgstr "user.name"
@@ -9138,7 +9138,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3224
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "user.useConfigOnly"
msgstr "user.useConfigOnly"
@@ -9156,7 +9156,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3234
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "user.signingKey"
msgstr "user.signingKey"
@@ -9313,7 +9313,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.autoRefreshIndex"
msgstr "diff.autoRefreshIndex"
@@ -9330,7 +9330,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:11
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.dirstat"
msgstr "diff.dirstat"
@@ -9347,7 +9347,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:20 en/diff-options.txt:137
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`changes`"
msgstr "`changes`"
@@ -9363,7 +9363,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:26 en/diff-options.txt:143
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`lines`"
msgstr "`lines`"
@@ -9381,7 +9381,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:34 en/diff-options.txt:151
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`files`"
msgstr "`files`"
@@ -9396,7 +9396,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:39 en/diff-options.txt:156
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`cumulative`"
msgstr "`cumulative`"
@@ -9433,7 +9433,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:55
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.statGraphWidth"
msgstr "diff.statGraphWidth"
@@ -9446,7 +9446,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:59
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.context"
msgstr "diff.context"
@@ -9459,7 +9459,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:63
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.interHunkContext"
msgstr "diff.interHunkContext"
@@ -9473,7 +9473,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:69
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.external"
msgstr "diff.external"
@@ -9490,7 +9490,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:78
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.ignoreSubmodules"
msgstr "diff.ignoreSubmodules"
@@ -9508,7 +9508,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:88
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.mnemonicPrefix"
msgstr "diff.mnemonicPrefix"
@@ -9578,7 +9578,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:104
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.noprefix"
msgstr "diff.noprefix"
@@ -9589,7 +9589,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:107
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.orderFile"
msgstr "diff.orderFile"
@@ -9603,7 +9603,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:113
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.renameLimit"
msgstr "diff.renameLimit"
@@ -9616,7 +9616,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:117
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.renames"
msgstr "diff.renames"
@@ -9633,7 +9633,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:126
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.suppressBlankEmpty"
msgstr "diff.suppressBlankEmpty"
@@ -9646,7 +9646,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:130
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.submodule"
msgstr "diff.submodule"
@@ -9662,7 +9662,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:138
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.wordRegex"
msgstr "diff.wordRegex"
@@ -9756,7 +9756,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:172 en/git-difftool.txt:111
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.tool"
msgstr "diff.tool"
@@ -9771,7 +9771,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:181
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.indentHeuristic"
msgstr "diff.indentHeuristic"
@@ -9784,7 +9784,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:185
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.algorithm"
msgstr "diff.algorithm"
@@ -9806,7 +9806,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:191 en/diff-options.txt:84
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`minimal`"
msgstr "`minimal`"
@@ -9817,7 +9817,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:194 en/diff-options.txt:87
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`patience`"
msgstr "`patience`"
@@ -9828,7 +9828,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:196 en/diff-options.txt:89
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`histogram`"
msgstr "`histogram`"
@@ -9841,7 +9841,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:202
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.wsErrorHighlight"
msgstr "diff.wsErrorHighlight"
@@ -10602,7 +10602,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:17 en/git-rebase.txt:319 en/merge-options.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-stat"
msgstr "--no-stat"
@@ -10616,14 +10616,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-same
+#, ignore-same, no-wrap
msgid "-u"
msgstr "-u"
#. type: Labeled list
#: en/diff-options.txt:24 en/git-add.txt:86 en/git-checkout.txt:243
#: en/git-commit.txt:67
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--patch"
msgstr "--patch"
@@ -10645,13 +10645,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-same
+#, ignore-same, no-wrap
msgid "-s"
msgstr "-s"
#. type: Labeled list
#: en/diff-options.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-patch"
msgstr "--no-patch"
@@ -10688,7 +10688,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-same
+#, ignore-same, no-wrap
msgid "--raw"
msgstr "--raw"
@@ -10711,7 +10711,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:62
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--patch-with-raw"
msgstr "--patch-with-raw"
@@ -10722,13 +10722,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:68
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--minimal"
msgstr "--minimal"
#. type: Labeled list
#: en/diff-options.txt:72
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--patience"
msgstr "--patience"
@@ -10739,7 +10739,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:75
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--histogram"
msgstr "--histogram"
@@ -10797,7 +10797,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:116 en/git-apply.txt:45
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--numstat"
msgstr "--numstat"
@@ -10811,7 +10811,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:123
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--shortstat"
msgstr "--shortstat"
@@ -10850,7 +10850,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-same
+#, ignore-same, no-wrap
msgid "--summary"
msgstr "--summary"
@@ -10863,7 +10863,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:177
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--patch-with-stat"
msgstr "--patch-with-stat"
@@ -10878,7 +10878,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-same
+#, ignore-same, no-wrap
msgid "-z"
msgstr "-z"
@@ -10914,7 +10914,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-same
+#, ignore-same, no-wrap
msgid "--name-only"
msgstr "--name-only"
@@ -10925,7 +10925,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:202 en/git-ls-tree.txt:60
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--name-status"
msgstr "--name-status"
@@ -10981,7 +10981,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-same
+#, ignore-same, no-wrap
msgid "--no-color"
msgstr "--no-color"
@@ -11124,7 +11124,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:287
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-renames"
msgstr "--no-renames"
@@ -11137,7 +11137,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:292 en/git-apply.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--check"
msgstr "--check"
@@ -11173,7 +11173,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:315
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--full-index"
msgstr "--full-index"
@@ -11187,7 +11187,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:320 en/git-apply.txt:150
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--binary"
msgstr "--binary"
@@ -11322,7 +11322,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:380 en/git-svn.txt:595
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--find-copies-harder"
msgstr "--find-copies-harder"
@@ -11344,7 +11344,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:390
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--irreversible-delete"
msgstr "--irreversible-delete"
@@ -11475,7 +11475,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:457
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--pickaxe-all"
msgstr "--pickaxe-all"
@@ -11488,7 +11488,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:462
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--pickaxe-regex"
msgstr "--pickaxe-regex"
@@ -11596,13 +11596,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-same
+#, ignore-same, no-wrap
msgid "-a"
msgstr "-a"
#. type: Labeled list
#: en/diff-options.txt:519 en/git-grep.txt:106
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--text"
msgstr "--text"
@@ -11613,7 +11613,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:522
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-space-at-eol"
msgstr "--ignore-space-at-eol"
@@ -11624,7 +11624,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:526 en/git-am.txt:102 en/git-apply.txt:172
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-space-change"
msgstr "--ignore-space-change"
@@ -11639,13 +11639,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-same
+#, ignore-same, no-wrap
msgid "-w"
msgstr "-w"
#. type: Labeled list
#: en/diff-options.txt:532
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-all-space"
msgstr "--ignore-all-space"
@@ -11658,7 +11658,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:537
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-blank-lines"
msgstr "--ignore-blank-lines"
@@ -11689,7 +11689,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:547 en/git-grep.txt:247
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--function-context"
msgstr "--function-context"
@@ -11700,7 +11700,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:552 en/git-ls-remote.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--exit-code"
msgstr "--exit-code"
@@ -11724,7 +11724,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-same
+#, ignore-same, no-wrap
msgid "--quiet"
msgstr "--quiet"
@@ -11735,7 +11735,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:562
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ext-diff"
msgstr "--ext-diff"
@@ -11749,7 +11749,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:567
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-ext-diff"
msgstr "--no-ext-diff"
@@ -11760,13 +11760,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:570 en/git-cat-file.txt:59 en/git-grep.txt:109
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
#: en/diff-options.txt:571 en/git-grep.txt:112
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -11828,7 +11828,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:600
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-prefix"
msgstr "--no-prefix"
@@ -11850,7 +11850,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:606
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ita-invisible-in-index"
msgstr "--ita-invisible-in-index"
@@ -11880,7 +11880,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-same
+#, ignore-same, no-wrap
msgid "--all"
msgstr "--all"
@@ -11891,7 +11891,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:5
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--append"
msgstr "--append"
@@ -11962,7 +11962,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unshallow"
msgstr "--unshallow"
@@ -11982,7 +11982,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:39
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--update-shallow"
msgstr "--update-shallow"
@@ -12002,7 +12002,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-same
+#, ignore-same, no-wrap
msgid "--dry-run"
msgstr "--dry-run"
@@ -12019,7 +12019,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-same
+#, ignore-same, no-wrap
msgid "-f"
msgstr "-f"
@@ -12031,7 +12031,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-same
+#, ignore-same, no-wrap
msgid "--force"
msgstr "--force"
@@ -12048,14 +12048,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-same
+#, ignore-same, no-wrap
msgid "-k"
msgstr "-k"
#. type: Labeled list
#: en/fetch-options.txt:59 en/git-am.txt:41 en/git-fetch-pack.txt:54
#: en/git-index-pack.txt:54 en/git-reset.txt:82
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep"
msgstr "--keep"
@@ -12066,7 +12066,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:63
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--multiple"
msgstr "--multiple"
@@ -12079,7 +12079,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:68 en/git-push.txt:98
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--prune"
msgstr "--prune"
@@ -12106,13 +12106,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-same
+#, ignore-same, no-wrap
msgid "-n"
msgstr "-n"
#. type: Labeled list
#: en/fetch-options.txt:82
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-tags"
msgstr "--no-tags"
@@ -12145,7 +12145,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-same
+#, ignore-same, no-wrap
msgid "--tags"
msgstr "--tags"
@@ -12180,7 +12180,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:118
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-j"
msgstr "-j"
@@ -12200,7 +12200,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:125 en/git-push.txt:274
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -12243,7 +12243,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:144
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--update-head-ok"
msgstr "--update-head-ok"
@@ -12283,7 +12283,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-same
+#, ignore-same, no-wrap
msgid "-q"
msgstr "-q"
@@ -12308,7 +12308,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-same
+#, ignore-same, no-wrap
msgid "-v"
msgstr "-v"
@@ -12324,7 +12324,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-same
+#, ignore-same, no-wrap
msgid "--verbose"
msgstr "--verbose"
@@ -12337,7 +12337,7 @@ msgstr ""
#. 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-same
+#, ignore-same, no-wrap
msgid "--progress"
msgstr "--progress"
@@ -12352,13 +12352,13 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:176 en/git-push.txt:295
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-4"
msgstr "-4"
#. type: Labeled list
#: en/fetch-options.txt:177 en/git-push.txt:296
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ipv4"
msgstr "--ipv4"
@@ -12369,13 +12369,13 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:180 en/git-push.txt:299
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-6"
msgstr "-6"
#. type: Labeled list
#: en/fetch-options.txt:181 en/git-push.txt:300
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ipv6"
msgstr "--ipv6"
@@ -12386,7 +12386,7 @@ msgstr ""
#. type: Labeled list
#: en/fmt-merge-msg-config.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.branchdesc"
msgstr "merge.branchdesc"
@@ -12399,7 +12399,7 @@ msgstr ""
#. type: Labeled list
#: en/fmt-merge-msg-config.txt:6
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.log"
msgstr "merge.log"
@@ -12413,7 +12413,7 @@ msgstr ""
#. type: Title =
#: en/git-add.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-add(1)"
msgstr "git-add(1)"
@@ -12751,14 +12751,14 @@ msgstr ""
#: 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-same
+#, ignore-same, no-wrap
msgid "-i"
msgstr "-i"
#. type: Labeled list
#: en/git-add.txt:79 en/git-am.txt:123 en/git-clean.txt:43
#: en/git-rebase.txt:374 en/git-svn.txt:281
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--interactive"
msgstr "--interactive"
@@ -12791,7 +12791,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-same
+#, ignore-same, no-wrap
msgid "-e"
msgstr "-e"
@@ -12799,7 +12799,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-same
+#, ignore-same, no-wrap
msgid "--edit"
msgstr "--edit"
@@ -12823,7 +12823,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:109
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--update"
msgstr "--update"
@@ -12851,7 +12851,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:121
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-ignore-removal"
msgstr "--no-ignore-removal"
@@ -12873,13 +12873,13 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:132
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-all"
msgstr "--no-all"
#. type: Labeled list
#: en/git-add.txt:133
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-removal"
msgstr "--ignore-removal"
@@ -12907,7 +12907,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:144
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--intent-to-add"
msgstr "--intent-to-add"
@@ -12922,7 +12922,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:151 en/git-update-index.txt:52
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--refresh"
msgstr "--refresh"
@@ -12935,7 +12935,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:155
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-errors"
msgstr "--ignore-errors"
@@ -12951,7 +12951,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-same
+#, ignore-same, no-wrap
msgid "--ignore-missing"
msgstr "--ignore-missing"
@@ -13586,7 +13586,7 @@ msgstr ""
#. type: Title =
#: en/git-am.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-am(1)"
msgstr "git-am(1)"
@@ -13633,7 +13633,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-same
+#, ignore-same, no-wrap
msgid "--signoff"
msgstr "--signoff"
@@ -13652,7 +13652,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-non-patch"
msgstr "--keep-non-patch"
@@ -13663,7 +13663,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]keep-cr"
msgstr "--[no-]keep-cr"
@@ -13681,13 +13681,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-same
+#, ignore-same, no-wrap
msgid "-c"
msgstr "-c"
#. type: Labeled list
#: en/git-am.txt:54 en/git-mailinfo.txt:74
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--scissors"
msgstr "--scissors"
@@ -13701,7 +13701,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:59 en/git-mailinfo.txt:90
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-scissors"
msgstr "--no-scissors"
@@ -13717,13 +13717,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-same
+#, ignore-same, no-wrap
msgid "-m"
msgstr "-m"
#. type: Labeled list
#: en/git-am.txt:63 en/git-mailinfo.txt:70
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--message-id"
msgstr "--message-id"
@@ -13737,7 +13737,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:69
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-message-id"
msgstr "--no-message-id"
@@ -13755,7 +13755,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:78
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--utf8"
msgstr "--utf8"
@@ -13778,7 +13778,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:88
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-utf8"
msgstr "--no-utf8"
@@ -13789,19 +13789,19 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:92 en/git-apply.txt:77
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-3"
msgstr "-3"
#. type: Labeled list
#: en/git-am.txt:93 en/git-apply.txt:78
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--3way"
msgstr "--3way"
#. type: Labeled list
#: en/git-am.txt:94
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-3way"
msgstr "--no-3way"
@@ -13817,7 +13817,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:103 en/git-apply.txt:173 en/git-rebase.txt:361
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
@@ -13859,7 +13859,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:110 en/git-apply.txt:100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--reject"
msgstr "--reject"
@@ -13872,7 +13872,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:115
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--patch-format"
msgstr "--patch-format"
@@ -13892,7 +13892,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:126 en/git-rebase.txt:367
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -13907,7 +13907,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:133 en/git-rebase.txt:368
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -13922,7 +13922,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:140 en/git-rebase.txt:264
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--skip"
msgstr "--skip"
@@ -13961,7 +13961,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-same
+#, ignore-same, no-wrap
msgid "--continue"
msgstr "--continue"
@@ -13970,13 +13970,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-same
+#, ignore-same, no-wrap
msgid "-r"
msgstr "-r"
#. type: Labeled list
#: en/git-am.txt:152
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--resolved"
msgstr "--resolved"
@@ -14007,7 +14007,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-same
+#, ignore-same, no-wrap
msgid "--abort"
msgstr "--abort"
@@ -14139,7 +14139,7 @@ msgstr ""
#. type: Title =
#: en/git-annotate.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-annotate(1)"
msgstr "git-annotate(1)"
@@ -14172,7 +14172,7 @@ msgstr ""
#. type: Title =
#: en/git-apply.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-apply(1)"
msgstr "git-apply(1)"
@@ -14229,7 +14229,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:41 en/git-rebase.txt:314 en/merge-options.txt:55
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stat"
msgstr "--stat"
@@ -14267,7 +14267,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--index"
msgstr "--index"
@@ -14285,7 +14285,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-same
+#, ignore-same, no-wrap
msgid "--cached"
msgstr "--cached"
@@ -14332,7 +14332,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:97 en/rev-list-options.txt:659
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--reverse"
msgstr "--reverse"
@@ -14373,7 +14373,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:125
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unidiff-zero"
msgstr "--unidiff-zero"
@@ -14395,7 +14395,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:135
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--apply"
msgstr "--apply"
@@ -14409,7 +14409,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:142
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-add"
msgstr "--no-add"
@@ -14424,7 +14424,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:149
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--allow-binary-replacement"
msgstr "--allow-binary-replacement"
@@ -14548,7 +14548,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:207
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--inaccurate-eof"
msgstr "--inaccurate-eof"
@@ -14571,7 +14571,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:220
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--recount"
msgstr "--recount"
@@ -14606,7 +14606,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:233
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unsafe-paths"
msgstr "--unsafe-paths"
@@ -14680,7 +14680,7 @@ msgstr ""
#. type: Title =
#: en/git-archimport.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-archimport(1)"
msgstr "git-archimport(1)"
@@ -14818,7 +14818,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-same
+#, ignore-same, no-wrap
msgid "-o"
msgstr "-o"
@@ -14876,7 +14876,7 @@ msgstr ""
#. type: Title =
#: en/git-archive.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-archive(1)"
msgstr "git-archive(1)"
@@ -14933,7 +14933,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-same
+#, ignore-same, no-wrap
msgid "--list"
msgstr "--list"
@@ -14977,7 +14977,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--worktree-attributes"
msgstr "--worktree-attributes"
@@ -15069,7 +15069,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:90 en/git-diff-files.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-0"
msgstr "-0"
@@ -15080,7 +15080,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:92
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-9"
msgstr "-9"
@@ -15312,7 +15312,7 @@ msgstr "linkgit:gitattributes[5]"
#. type: Title =
#: en/git-bisect.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-bisect(1)"
msgstr "git-bisect(1)"
@@ -15927,7 +15927,7 @@ msgstr ""
#. type: Labeled list
#: en/git-bisect.txt:358 en/git-clone.txt:134
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-checkout"
msgstr "--no-checkout"
@@ -16170,7 +16170,7 @@ msgstr ""
#. type: Title =
#: en/git-blame.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-blame(1)"
msgstr "git-blame(1)"
@@ -16249,7 +16249,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:55
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--score-debug"
msgstr "--score-debug"
@@ -16266,7 +16266,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-name"
msgstr "--show-name"
@@ -16280,7 +16280,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:71
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-number"
msgstr "--show-number"
@@ -16296,7 +16296,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:78
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-email"
msgstr "--show-email"
@@ -16603,7 +16603,7 @@ msgstr ""
#. type: Title =
#: en/git-branch.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-branch(1)"
msgstr "git-branch(1)"
@@ -16714,14 +16714,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-same
+#, ignore-same, no-wrap
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:79 en/git-push.txt:126 en/git-replace.txt:65
#: en/git-symbolic-ref.txt:36 en/git-tag.txt:76
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--delete"
msgstr "--delete"
@@ -16739,7 +16739,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:88 en/git-tag.txt:152
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--create-reflog"
msgstr "--create-reflog"
@@ -16767,7 +16767,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:108
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--move"
msgstr "--move"
@@ -16804,7 +16804,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-same
+#, ignore-same, no-wrap
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -16821,7 +16821,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-status.txt:105 en/git-tag.txt:116
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-column"
msgstr "--no-column"
@@ -16840,7 +16840,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:137 en/git-show-branch.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--remotes"
msgstr "--remotes"
@@ -16863,7 +16863,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:149
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-vv"
msgstr "-vv"
@@ -16897,7 +16897,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:167
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-abbrev"
msgstr "--no-abbrev"
@@ -16909,7 +16909,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:171 en/git-checkout.txt:156
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--track"
msgstr "--track"
@@ -16936,7 +16936,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:186 en/git-checkout.txt:170
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-track"
msgstr "--no-track"
@@ -16949,7 +16949,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:190 en/git-push.txt:246
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -16984,7 +16984,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:202
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unset-upstream"
msgstr "--unset-upstream"
@@ -16997,7 +16997,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:206
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--edit-description"
msgstr "--edit-description"
@@ -17260,7 +17260,7 @@ msgstr ""
#. type: Title =
#: en/git-bundle.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-bundle(1)"
msgstr "git-bundle(1)"
@@ -17609,7 +17609,7 @@ msgstr ""
#. type: Title =
#: en/git-cat-file.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-cat-file(1)"
msgstr "git-cat-file(1)"
@@ -17710,7 +17710,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--filters"
msgstr "--filters"
@@ -17739,7 +17739,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:76 en/git-mktree.txt:32
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--batch"
msgstr "--batch"
@@ -17761,7 +17761,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:84
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--batch-check"
msgstr "--batch-check"
@@ -17782,7 +17782,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:92
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--batch-all-objects"
msgstr "--batch-all-objects"
@@ -17798,7 +17798,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:99
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--buffer"
msgstr "--buffer"
@@ -17813,7 +17813,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:106
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--allow-unknown-type"
msgstr "--allow-unknown-type"
@@ -17824,7 +17824,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:109
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--follow-symlinks"
msgstr "--follow-symlinks"
@@ -17987,7 +17987,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:191
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`objectname`"
msgstr "`objectname`"
@@ -17998,7 +17998,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:194
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`objecttype`"
msgstr "`objecttype`"
@@ -18009,7 +18009,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:197
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`objectsize`"
msgstr "`objectsize`"
@@ -18033,7 +18033,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:205
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`deltabase`"
msgstr "`deltabase`"
@@ -18047,7 +18047,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:210
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`rest`"
msgstr "`rest`"
@@ -18219,7 +18219,7 @@ msgstr ""
#. type: Title =
#: en/git-check-attr.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-check-attr(1)"
msgstr "git-check-attr(1)"
@@ -18270,7 +18270,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-same
+#, ignore-same, no-wrap
msgid "--stdin"
msgstr "--stdin"
@@ -18465,7 +18465,7 @@ msgstr ""
#. type: Title =
#: en/git-check-ignore.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-check-ignore(1)"
msgstr "git-check-ignore(1)"
@@ -18548,7 +18548,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ignore.txt:52 en/git-grep.txt:76
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-index"
msgstr "--no-index"
@@ -18666,7 +18666,7 @@ msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
#. type: Title =
#: en/git-check-mailmap.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-check-mailmap(1)"
msgstr "git-check-mailmap(1)"
@@ -18708,7 +18708,7 @@ msgstr ""
#. type: Title =
#: en/git-checkout-index.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-checkout-index(1)"
msgstr "git-checkout-index(1)"
@@ -18759,7 +18759,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-create"
msgstr "--no-create"
@@ -18797,7 +18797,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--temp"
msgstr "--temp"
@@ -19019,7 +19019,7 @@ msgstr ""
#. type: Title =
#: en/git-checkout.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-checkout(1)"
msgstr "git-checkout(1)"
@@ -19226,13 +19226,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:125 en/git-merge-file.txt:73
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:126 en/git-merge-file.txt:74
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--theirs"
msgstr "--theirs"
@@ -19319,7 +19319,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:178 en/git-daemon.txt:134 en/git-worktree.txt:100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--detach"
msgstr "--detach"
@@ -19378,7 +19378,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:210
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -19393,7 +19393,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-same
+#, ignore-same, no-wrap
msgid "--merge"
msgstr "--merge"
@@ -19458,7 +19458,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:253
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-other-worktrees"
msgstr "--ignore-other-worktrees"
@@ -19921,7 +19921,7 @@ msgstr ""
#. type: Title =
#: en/git-check-ref-format.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-check-ref-format(1)"
msgstr "git-check-ref-format(1)"
@@ -20074,7 +20074,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:88
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]allow-onelevel"
msgstr "--[no-]allow-onelevel"
@@ -20088,7 +20088,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:93
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--refspec-pattern"
msgstr "--refspec-pattern"
@@ -20103,7 +20103,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--normalize"
msgstr "--normalize"
@@ -20143,7 +20143,7 @@ msgstr ""
#. type: Title =
#: en/git-cherry-pick.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-cherry-pick(1)"
msgstr "git-cherry-pick(1)"
@@ -20244,7 +20244,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:60 en/git-clean.txt:62
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-x"
msgstr "-x"
@@ -20293,7 +20293,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:88 en/git-revert.txt:70 en/merge-options.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-commit"
msgstr "--no-commit"
@@ -20323,7 +20323,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:111 en/merge-options.txt:30
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ff"
msgstr "--ff"
@@ -20336,7 +20336,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:116 en/git-commit.txt:173 en/git-notes.txt:158
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--allow-empty"
msgstr "--allow-empty"
@@ -20356,7 +20356,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:129 en/git-commit.txt:179
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -20370,7 +20370,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:134
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-redundant-commits"
msgstr "--keep-redundant-commits"
@@ -20579,7 +20579,7 @@ msgstr ""
#. type: Title =
#: en/git-cherry.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-cherry(1)"
msgstr "git-cherry(1)"
@@ -20801,7 +20801,7 @@ msgstr ""
#. type: Title =
#: en/git-citool.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-citool(1)"
msgstr "git-citool(1)"
@@ -20834,7 +20834,7 @@ msgstr ""
#. type: Title =
#: en/git-clean.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-clean(1)"
msgstr "git-clean(1)"
@@ -21071,7 +21071,7 @@ msgstr "linkgit:gitignore[5]"
#. type: Title =
#: en/git-clone.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-clone(1)"
msgstr "git-clone(1)"
@@ -21122,7 +21122,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-same
+#, ignore-same, no-wrap
msgid "--local"
msgstr "--local"
@@ -21148,7 +21148,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:59
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-hardlinks"
msgstr "--no-hardlinks"
@@ -21163,7 +21163,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--shared"
msgstr "--shared"
@@ -21236,7 +21236,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:107
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--dissociate"
msgstr "--dissociate"
@@ -21272,7 +21272,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-same
+#, ignore-same, no-wrap
msgid "--bare"
msgstr "--bare"
@@ -21291,7 +21291,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:150 en/git-push.txt:106
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--mirror"
msgstr "--mirror"
@@ -21427,7 +21427,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:208
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -21444,13 +21444,13 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:218 en/git-submodule.txt:400
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--recursive"
msgstr "--recursive"
#. type: Labeled list
#: en/git-clone.txt:219 en/git-grep.txt:92 en/git-ls-files.txt:142
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -21466,7 +21466,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:227
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]shallow-submodules"
msgstr "--[no-]shallow-submodules"
@@ -21598,7 +21598,7 @@ msgstr ""
#. type: Title =
#: en/git-column.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-column(1)"
msgstr "git-column(1)"
@@ -21707,7 +21707,7 @@ msgstr ""
#. type: Title =
#: en/git-commit-tree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-commit-tree(1)"
msgstr "git-commit-tree(1)"
@@ -21815,7 +21815,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit-tree.txt:63 en/git-commit.txt:332
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
@@ -21917,7 +21917,7 @@ msgstr ""
#. type: Title =
#: en/git-commit.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-commit(1)"
msgstr "git-commit(1)"
@@ -22090,7 +22090,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:96
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--reset-author"
msgstr "--reset-author"
@@ -22105,7 +22105,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-same
+#, ignore-same, no-wrap
msgid "--short"
msgstr "--short"
@@ -22118,7 +22118,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:106 en/git-status.txt:32 en/git-submodule.txt:280
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--branch"
msgstr "--branch"
@@ -22137,7 +22137,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-same
+#, ignore-same, no-wrap
msgid "--long"
msgstr "--long"
@@ -22150,7 +22150,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:119 en/git-config.txt:184 en/git-grep.txt:197
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--null"
msgstr "--null"
@@ -22260,7 +22260,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:169 en/git-rebase.txt:322
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-verify"
msgstr "--no-verify"
@@ -22382,7 +22382,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:219 en/git-revert.txt:65 en/merge-options.txt:12
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-edit"
msgstr "--no-edit"
@@ -22396,7 +22396,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:224
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--amend"
msgstr "--amend"
@@ -22441,7 +22441,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:250
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-post-rewrite"
msgstr "--no-post-rewrite"
@@ -22452,7 +22452,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:254
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--include"
msgstr "--include"
@@ -22466,7 +22466,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:261
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--only"
msgstr "--only"
@@ -22573,7 +22573,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:315
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--status"
msgstr "--status"
@@ -22587,7 +22587,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:321
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-status"
msgstr "--no-status"
@@ -22814,7 +22814,7 @@ msgstr ""
#. type: Title =
#: en/git-config.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-config(1)"
msgstr "git-config(1)"
@@ -22942,7 +22942,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:74
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--replace-all"
msgstr "--replace-all"
@@ -22955,7 +22955,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:78 en/git-update-index.txt:42
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--add"
msgstr "--add"
@@ -22968,7 +22968,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:83
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--get"
msgstr "--get"
@@ -22982,7 +22982,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:88
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--get-all"
msgstr "--get-all"
@@ -22993,7 +22993,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:91
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--get-regexp"
msgstr "--get-regexp"
@@ -23024,7 +23024,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:106
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--global"
msgstr "--global"
@@ -23051,7 +23051,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:117
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--system"
msgstr "--system"
@@ -23118,7 +23118,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:147
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--remove-section"
msgstr "--remove-section"
@@ -23129,7 +23129,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:150
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--rename-section"
msgstr "--rename-section"
@@ -23140,7 +23140,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:153
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unset"
msgstr "--unset"
@@ -23151,7 +23151,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:156
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unset-all"
msgstr "--unset-all"
@@ -23167,7 +23167,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:163
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--bool"
msgstr "--bool"
@@ -23178,7 +23178,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:166
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--int"
msgstr "--int"
@@ -23192,7 +23192,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:172
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--bool-or-int"
msgstr "--bool-or-int"
@@ -23205,7 +23205,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:176 en/git-hash-object.txt:41
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--path"
msgstr "--path"
@@ -23235,7 +23235,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:196
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-origin"
msgstr "--show-origin"
@@ -23289,7 +23289,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]includes"
msgstr "--[no-]includes"
@@ -23410,9 +23410,9 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:282
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_CONFIG"
-msgstr ""
+msgstr "GIT_CONFIG"
#. type: Plain text
#: en/git-config.txt:286
@@ -23424,9 +23424,9 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:287
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_CONFIG_NOSYSTEM"
-msgstr ""
+msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
#: en/git-config.txt:290
@@ -23672,7 +23672,7 @@ msgstr ""
#. type: Title =
#: en/git-count-objects.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-count-objects(1)"
msgstr "git-count-objects(1)"
@@ -23761,7 +23761,7 @@ msgstr ""
#. type: Labeled list
#: en/git-count-objects.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--human-readable"
msgstr "--human-readable"
@@ -23772,7 +23772,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-cache--daemon.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-credential-cache--daemon(1)"
msgstr "git-credential-cache--daemon(1)"
@@ -23814,7 +23814,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-cache.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-credential-cache(1)"
msgstr "git-credential-cache(1)"
@@ -23932,7 +23932,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-store.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-credential-store(1)"
msgstr "git-credential-store(1)"
@@ -24096,7 +24096,7 @@ msgstr ""
#. type: Title =
#: en/git-credential.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-credential(1)"
msgstr "git-credential(1)"
@@ -24286,7 +24286,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:120
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`protocol`"
msgstr "`protocol`"
@@ -24297,7 +24297,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:125
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`host`"
msgstr "`host`"
@@ -24308,7 +24308,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:129
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`path`"
msgstr "`path`"
@@ -24321,7 +24321,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:135
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`username`"
msgstr "`username`"
@@ -24334,7 +24334,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:140
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`password`"
msgstr "`password`"
@@ -24345,7 +24345,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:144
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`url`"
msgstr "`url`"
@@ -24364,7 +24364,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsexportcommit.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-cvsexportcommit(1)"
msgstr "git-cvsexportcommit(1)"
@@ -24562,7 +24562,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsimport.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-cvsimport(1)"
msgstr "git-cvsimport(1)"
@@ -25036,7 +25036,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsserver.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-cvsserver(1)"
msgstr "git-cvsserver(1)"
@@ -25103,7 +25103,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:37 en/git-daemon.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--strict-paths"
msgstr "--strict-paths"
@@ -25114,7 +25114,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:40 en/git-daemon.txt:77
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--export-all"
msgstr "--export-all"
@@ -25133,7 +25133,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:45 en/git.txt:534
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--version"
msgstr "--version"
@@ -25144,7 +25144,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:50 en/git.txt:537
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--help"
msgstr "--help"
@@ -25877,7 +25877,7 @@ msgstr ""
#. type: Title =
#: en/git-daemon.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-daemon(1)"
msgstr "git-daemon(1)"
@@ -25969,7 +25969,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:61
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--base-path-relaxed"
msgstr "--base-path-relaxed"
@@ -26009,7 +26009,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:82
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--inetd"
msgstr "--inetd"
@@ -26090,7 +26090,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:112
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--syslog"
msgstr "--syslog"
@@ -26103,7 +26103,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:116
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--user-path"
msgstr "--user-path"
@@ -26130,7 +26130,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:129
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--reuseaddr"
msgstr "--reuseaddr"
@@ -26240,7 +26240,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:174
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]informative-errors"
msgstr "--[no-]informative-errors"
@@ -26489,7 +26489,7 @@ msgstr ""
#. type: Title =
#: en/git-describe.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-describe(1)"
msgstr "git-describe(1)"
@@ -26565,7 +26565,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--contains"
msgstr "--contains"
@@ -26601,7 +26601,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--exact-match"
msgstr "--exact-match"
@@ -26614,7 +26614,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:69 en/git-ls-files.txt:151
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--debug"
msgstr "--debug"
@@ -26673,7 +26673,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-same
+#, ignore-same, no-wrap
msgid "--always"
msgstr "--always"
@@ -26684,7 +26684,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:104 en/rev-list-options.txt:121
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--first-parent"
msgstr "--first-parent"
@@ -26829,7 +26829,7 @@ msgstr ""
#. type: Title =
#: en/git-diff-files.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-diff-files(1)"
msgstr "git-diff-files(1)"
@@ -26891,7 +26891,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-same
+#, ignore-same, no-wrap
msgid "--cc"
msgstr "--cc"
@@ -26910,7 +26910,7 @@ msgstr ""
#. type: Title =
#: en/git-diff-index.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-diff-index(1)"
msgstr "git-diff-index(1)"
@@ -27121,7 +27121,7 @@ msgstr ""
#. type: Title =
#: en/git-difftool.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-difftool(1)"
msgstr "git-difftool(1)"
@@ -27147,7 +27147,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:23
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--dir-diff"
msgstr "--dir-diff"
@@ -27160,13 +27160,13 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:28 en/git-mergetool.txt:70
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-y"
msgstr "-y"
#. type: Labeled list
#: en/git-difftool.txt:29 en/git-mergetool.txt:71
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-prompt"
msgstr "--no-prompt"
@@ -27177,7 +27177,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:32 en/git-mergetool.txt:78
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--prompt"
msgstr "--prompt"
@@ -27248,7 +27248,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:69 en/git-mergetool.txt:67
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--tool-help"
msgstr "--tool-help"
@@ -27259,7 +27259,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:72
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]symlinks"
msgstr "--[no-]symlinks"
@@ -27301,13 +27301,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-same
+#, ignore-same, no-wrap
msgid "-g"
msgstr "-g"
#. type: Labeled list
#: en/git-difftool.txt:89
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]gui"
msgstr "--[no-]gui"
@@ -27321,7 +27321,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:95
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]trust-exit-code"
msgstr "--[no-]trust-exit-code"
@@ -27366,7 +27366,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:114
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.guitool"
msgstr "diff.guitool"
@@ -27387,7 +27387,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:129
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "difftool.trustExitCode"
msgstr "difftool.trustExitCode"
@@ -27418,7 +27418,7 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
@@ -27551,7 +27551,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:87
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-commit-id"
msgstr "--no-commit-id"
@@ -27694,7 +27694,7 @@ msgstr ""
#. type: Title =
#: en/git-diff.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-diff(1)"
msgstr "git-diff(1)"
@@ -28026,7 +28026,7 @@ msgstr ""
#. type: Title =
#: en/git-fast-export.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
@@ -28180,7 +28180,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:84
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
@@ -28194,7 +28194,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:90
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-done-feature"
msgstr "--use-done-feature"
@@ -28207,7 +28207,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:94
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-data"
msgstr "--no-data"
@@ -28223,7 +28223,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--full-tree"
msgstr "--full-tree"
@@ -28238,7 +28238,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:108
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--anonymize"
msgstr "--anonymize"
@@ -28251,7 +28251,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:113
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--refspec"
msgstr "--refspec"
@@ -28419,7 +28419,7 @@ msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
@@ -28478,7 +28478,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stats"
msgstr "--stats"
@@ -28527,7 +28527,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:68
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--done"
msgstr "--done"
@@ -28580,7 +28580,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:98
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
@@ -28847,7 +28847,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:238
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`raw`"
msgstr "`raw`"
@@ -28949,7 +28949,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:291
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`now`"
msgstr "`now`"
@@ -29002,7 +29002,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:318 en/git-fast-import.txt:380
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`commit`"
msgstr "`commit`"
@@ -29015,7 +29015,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:323 en/git-fast-import.txt:744
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`tag`"
msgstr "`tag`"
@@ -29029,7 +29029,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:329 en/git-fast-import.txt:787
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`reset`"
msgstr "`reset`"
@@ -29043,7 +29043,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:334 en/git-fast-import.txt:816
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`blob`"
msgstr "`blob`"
@@ -29056,7 +29056,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:339 en/git-fast-import.txt:888
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`checkpoint`"
msgstr "`checkpoint`"
@@ -29070,7 +29070,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:345 en/git-fast-import.txt:916
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`progress`"
msgstr "`progress`"
@@ -29083,7 +29083,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:350 en/git-fast-import.txt:1126
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`done`"
msgstr "`done`"
@@ -29097,7 +29097,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:355 en/git-fast-import.txt:941
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`get-mark`"
msgstr "`get-mark`"
@@ -29110,7 +29110,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:360 en/git-fast-import.txt:960
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`cat-blob`"
msgstr "`cat-blob`"
@@ -29123,7 +29123,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:365 en/git-fast-import.txt:990
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`ls`"
msgstr "`ls`"
@@ -29137,7 +29137,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:370 en/git-fast-import.txt:1043
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`feature`"
msgstr "`feature`"
@@ -29150,7 +29150,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:374 en/git-fast-import.txt:1098
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`option`"
msgstr "`option`"
@@ -29235,7 +29235,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:426
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`author`"
msgstr "`author`"
@@ -29251,7 +29251,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:434
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`committer`"
msgstr "`committer`"
@@ -29284,7 +29284,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:452
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`from`"
msgstr "`from`"
@@ -29394,7 +29394,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`merge`"
msgstr "`merge`"
@@ -29418,7 +29418,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:522
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`filemodify`"
msgstr "`filemodify`"
@@ -29590,7 +29590,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:594
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`filedelete`"
msgstr "`filedelete`"
@@ -29620,7 +29620,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:610
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`filecopy`"
msgstr "`filecopy`"
@@ -29658,7 +29658,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:631
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`filerename`"
msgstr "`filerename`"
@@ -29699,7 +29699,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:660
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
@@ -29739,7 +29739,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:684
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`notemodify`"
msgstr "`notemodify`"
@@ -29800,7 +29800,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:723
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`mark`"
msgstr "`mark`"
@@ -29986,7 +29986,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:834
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`data`"
msgstr "`data`"
@@ -31143,7 +31143,7 @@ msgstr ""
#. type: Title =
#: en/git-fetch-pack.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fetch-pack(1)"
msgstr "git-fetch-pack(1)"
@@ -31225,7 +31225,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-same
+#, ignore-same, no-wrap
msgid "--thin"
msgstr "--thin"
@@ -31238,7 +31238,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:64 en/git-pack-objects.txt:81
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--include-tag"
msgstr "--include-tag"
@@ -31298,7 +31298,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:99
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--deepen-relative"
msgstr "--deepen-relative"
@@ -31311,7 +31311,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:104 en/merge-options.txt:113
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-progress"
msgstr "--no-progress"
@@ -31322,7 +31322,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:107 en/git-index-pack.txt:77
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--check-self-contained-and-connected"
msgstr "--check-self-contained-and-connected"
@@ -31367,7 +31367,7 @@ msgstr ""
#. type: Title =
#: en/git-fetch.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fetch(1)"
msgstr "git-fetch(1)"
@@ -31570,7 +31570,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:128 en/git-push.txt:332
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`-`"
msgstr "`-`"
@@ -31581,7 +31581,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:129
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`t`"
msgstr "`t`"
@@ -31767,7 +31767,7 @@ msgstr ""
#. type: Title =
#: en/git-filter-branch.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-filter-branch(1)"
msgstr "git-filter-branch(1)"
@@ -32059,7 +32059,7 @@ msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:169
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--prune-empty"
msgstr "--prune-empty"
@@ -32550,7 +32550,7 @@ msgstr ""
#. type: Title =
#: en/git-fmt-merge-msg.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fmt-merge-msg(1)"
msgstr "git-fmt-merge-msg(1)"
@@ -32599,7 +32599,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-log"
msgstr "--no-log"
@@ -32611,7 +32611,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:38
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]summary"
msgstr "--[no-]summary"
@@ -32648,7 +32648,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:56
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.summary"
msgstr "merge.summary"
@@ -32676,7 +32676,7 @@ msgstr ""
#. type: Title =
#: en/git-for-each-ref.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-for-each-ref(1)"
msgstr "git-for-each-ref(1)"
@@ -32767,25 +32767,25 @@ msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--shell"
msgstr "--shell"
#. type: Labeled list
#: en/git-for-each-ref.txt:59
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--perl"
msgstr "--perl"
#. type: Labeled list
#: en/git-for-each-ref.txt:60
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--python"
msgstr "--python"
#. type: Labeled list
#: en/git-for-each-ref.txt:61
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--tcl"
msgstr "--tcl"
@@ -33290,7 +33290,7 @@ msgstr ""
#. type: Title =
#: en/git-format-patch.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-format-patch(1)"
msgstr "git-format-patch(1)"
@@ -33438,7 +33438,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:94 en/git-shortlog.txt:30
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--numbered"
msgstr "--numbered"
@@ -33449,7 +33449,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:98
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-numbered"
msgstr "--no-numbered"
@@ -33471,7 +33471,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:104
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--numbered-files"
msgstr "--numbered-files"
@@ -33484,7 +33484,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:109
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-subject"
msgstr "--keep-subject"
@@ -33504,7 +33504,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:119 en/git-pack-objects.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stdout"
msgstr "--stdout"
@@ -33531,7 +33531,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:128
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-attach"
msgstr "--no-attach"
@@ -33563,7 +33563,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:138
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-thread"
msgstr "--no-thread"
@@ -33617,7 +33617,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:163
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
@@ -33646,7 +33646,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:176
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--rfc"
msgstr "--rfc"
@@ -33710,7 +33710,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:202
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--from"
msgstr "--from"
@@ -33757,7 +33757,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:225
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
@@ -33847,7 +33847,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:264
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-binary"
msgstr "--no-binary"
@@ -33861,7 +33861,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:270
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--zero-commit"
msgstr "--zero-commit"
@@ -34540,7 +34540,7 @@ msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
#. type: Title =
#: en/git-fsck-objects.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fsck-objects(1)"
msgstr "git-fsck-objects(1)"
@@ -34566,7 +34566,7 @@ msgstr ""
#. type: Title =
#: en/git-fsck.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fsck(1)"
msgstr "git-fsck(1)"
@@ -34602,7 +34602,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:30
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unreachable"
msgstr "--unreachable"
@@ -34615,7 +34615,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:34
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]dangling"
msgstr "--[no-]dangling"
@@ -34638,7 +34638,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--cache"
msgstr "--cache"
@@ -34651,7 +34651,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-reflogs"
msgstr "--no-reflogs"
@@ -34665,7 +34665,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:54
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--full"
msgstr "--full"
@@ -34682,7 +34682,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:64
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--connectivity-only"
msgstr "--connectivity-only"
@@ -34696,7 +34696,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-same
+#, ignore-same, no-wrap
msgid "--strict"
msgstr "--strict"
@@ -34717,7 +34717,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:80
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--lost-found"
msgstr "--lost-found"
@@ -34731,7 +34731,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:86
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--name-objects"
msgstr "--name-objects"
@@ -34865,9 +34865,9 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:148
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_OBJECT_DIRECTORY"
-msgstr ""
+msgstr "GIT_OBJECT_DIRECTORY"
#. type: Plain text
#: en/git-fsck.txt:150
@@ -34876,9 +34876,9 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:151
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_INDEX_FILE"
-msgstr ""
+msgstr "GIT_INDEX_FILE"
#. type: Plain text
#: en/git-fsck.txt:153
@@ -34887,9 +34887,9 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:154
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_ALTERNATE_OBJECT_DIRECTORIES"
-msgstr ""
+msgstr "GIT_ALTERNATE_OBJECT_DIRECTORIES"
#. type: Plain text
#: en/git-fsck.txt:156
@@ -34898,7 +34898,7 @@ msgstr ""
#. type: Title =
#: en/git-gc.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-gc(1)"
msgstr "git-gc(1)"
@@ -34948,7 +34948,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:36 en/git-read-tree.txt:71
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--aggressive"
msgstr "--aggressive"
@@ -34964,7 +34964,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--auto"
msgstr "--auto"
@@ -35013,7 +35013,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:71 en/git-pack-refs.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-prune"
msgstr "--no-prune"
@@ -35188,7 +35188,7 @@ msgstr ""
#. type: Title =
#: en/git-get-tar-commit-id.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-get-tar-commit-id(1)"
msgstr "git-get-tar-commit-id(1)"
@@ -35225,7 +35225,7 @@ msgstr ""
#. type: Title =
#: en/git-grep.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-grep(1)"
msgstr "git-grep(1)"
@@ -35301,7 +35301,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:79
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--untracked"
msgstr "--untracked"
@@ -35314,7 +35314,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:83
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-exclude-standard"
msgstr "--no-exclude-standard"
@@ -35327,7 +35327,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:87 en/git-ls-files.txt:97
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--exclude-standard"
msgstr "--exclude-standard"
@@ -35412,7 +35412,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:132
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--word-regexp"
msgstr "--word-regexp"
@@ -35426,7 +35426,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:138
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--invert-match"
msgstr "--invert-match"
@@ -35445,7 +35445,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-same
+#, ignore-same, no-wrap
msgid "--full-name"
msgstr "--full-name"
@@ -35465,7 +35465,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:156 en/rev-list-options.txt:85
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--extended-regexp"
msgstr "--extended-regexp"
@@ -35477,7 +35477,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:158 en/rev-list-options.txt:80
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--basic-regexp"
msgstr "--basic-regexp"
@@ -35490,7 +35490,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:163 en/rev-list-options.txt:94
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--perl-regexp"
msgstr "--perl-regexp"
@@ -35508,7 +35508,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:168 en/rev-list-options.txt:90
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--fixed-strings"
msgstr "--fixed-strings"
@@ -35519,7 +35519,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:173
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--line-number"
msgstr "--line-number"
@@ -35530,7 +35530,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:177
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--files-with-matches"
msgstr "--files-with-matches"
@@ -35542,7 +35542,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:180
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--files-without-match"
msgstr "--files-without-match"
@@ -35584,7 +35584,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:202 en/rev-list-options.txt:848
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--count"
msgstr "--count"
@@ -35610,7 +35610,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:215
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--break"
msgstr "--break"
@@ -35621,7 +35621,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:218
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--heading"
msgstr "--heading"
@@ -35634,7 +35634,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:223
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-function"
msgstr "--show-function"
@@ -35752,19 +35752,19 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:266
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--and"
msgstr "--and"
#. type: Labeled list
#: en/git-grep.txt:267
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--or"
msgstr "--or"
#. type: Labeled list
#: en/git-grep.txt:268 en/git-rev-parse.txt:129 en/rev-list-options.txt:131
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--not"
msgstr "--not"
@@ -35784,7 +35784,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:275 en/rev-list-options.txt:67
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--all-match"
msgstr "--all-match"
@@ -35869,7 +35869,7 @@ msgstr ""
#. type: Title =
#: en/git-gui.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-gui(1)"
msgstr "git-gui(1)"
@@ -36123,7 +36123,7 @@ msgstr ""
#. type: Title =
#: en/git-hash-object.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-hash-object(1)"
msgstr "git-hash-object(1)"
@@ -36176,7 +36176,7 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:37
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stdin-paths"
msgstr "--stdin-paths"
@@ -36201,7 +36201,7 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:51
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-filters"
msgstr "--no-filters"
@@ -36216,7 +36216,7 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--literally"
msgstr "--literally"
@@ -36231,7 +36231,7 @@ msgstr ""
#. type: Title =
#: en/git-help.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-help(1)"
msgstr "git-help(1)"
@@ -36304,7 +36304,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--guides"
msgstr "--guides"
@@ -36317,7 +36317,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:52
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--info"
msgstr "--info"
@@ -36330,7 +36330,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--man"
msgstr "--man"
@@ -36351,7 +36351,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:67
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--web"
msgstr "--web"
@@ -36582,7 +36582,7 @@ msgstr ""
#. type: Title =
#: en/git-http-backend.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-http-backend(1)"
msgstr "git-http-backend(1)"
@@ -37059,7 +37059,7 @@ msgstr ""
#. type: Title =
#: en/git-http-fetch.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-http-fetch(1)"
msgstr "git-http-fetch(1)"
@@ -37148,7 +37148,7 @@ msgstr ""
#. type: Labeled list
#: en/git-http-fetch.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--recover"
msgstr "--recover"
@@ -37161,7 +37161,7 @@ msgstr ""
#. type: Title =
#: en/git-http-push.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-http-push(1)"
msgstr "git-http-push(1)"
@@ -37328,7 +37328,7 @@ msgstr ""
#. type: Title =
#: en/git-imap-send.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-imap-send(1)"
msgstr "git-imap-send(1)"
@@ -37371,7 +37371,7 @@ msgstr ""
#. type: Labeled list
#: en/git-imap-send.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--curl"
msgstr "--curl"
@@ -37384,7 +37384,7 @@ msgstr ""
#. type: Labeled list
#: en/git-imap-send.txt:45
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-curl"
msgstr "--no-curl"
@@ -37650,7 +37650,7 @@ msgstr ""
#. type: Title =
#: en/git-index-pack.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-index-pack(1)"
msgstr "git-index-pack(1)"
@@ -37709,7 +37709,7 @@ msgstr ""
#. type: Labeled list
#: en/git-index-pack.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--fix-thin"
msgstr "--fix-thin"
@@ -37827,7 +37827,7 @@ msgstr ""
#. type: Title =
#: en/git-init-db.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-init-db(1)"
msgstr "git-init-db(1)"
@@ -37853,7 +37853,7 @@ msgstr ""
#. type: Title =
#: en/git-init.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-init(1)"
msgstr "git-init(1)"
@@ -38128,7 +38128,7 @@ msgstr ""
#. type: Title =
#: en/git-instaweb.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-instaweb(1)"
msgstr "git-instaweb(1)"
@@ -38160,7 +38160,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--httpd"
msgstr "--httpd"
@@ -38175,7 +38175,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:36
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--module-path"
msgstr "--module-path"
@@ -38188,7 +38188,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:41
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--port"
msgstr "--port"
@@ -38199,7 +38199,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:45
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--browser"
msgstr "--browser"
@@ -38220,7 +38220,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:53
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--start"
msgstr "--start"
@@ -38239,7 +38239,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stop"
msgstr "--stop"
@@ -38259,7 +38259,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:64
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--restart"
msgstr "--restart"
@@ -38297,7 +38297,7 @@ msgstr ""
#. type: Title =
#: en/git-interpret-trailers.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-interpret-trailers(1)"
msgstr "git-interpret-trailers(1)"
@@ -38407,7 +38407,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:70
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--in-place"
msgstr "--in-place"
@@ -38418,7 +38418,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:73
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--trim-empty"
msgstr "--trim-empty"
@@ -38929,7 +38929,7 @@ msgstr ""
#. type: Title =
#: en/git-log.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-log(1)"
msgstr "git-log(1)"
@@ -38959,7 +38959,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:27
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--follow"
msgstr "--follow"
@@ -38972,7 +38972,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-decorate"
msgstr "--no-decorate"
@@ -38995,7 +38995,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:41
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--source"
msgstr "--source"
@@ -39008,7 +39008,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:45
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-mailmap"
msgstr "--use-mailmap"
@@ -39021,7 +39021,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:50
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--full-diff"
msgstr "--full-diff"
@@ -39044,7 +39044,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:60
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--log-size"
msgstr "--log-size"
@@ -39290,7 +39290,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:201
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.showSignature"
msgstr "log.showSignature"
@@ -39338,7 +39338,7 @@ msgstr ""
#. type: Title =
#: en/git-ls-files.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-ls-files(1)"
msgstr "git-ls-files(1)"
@@ -39386,7 +39386,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--deleted"
msgstr "--deleted"
@@ -39397,7 +39397,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--modified"
msgstr "--modified"
@@ -39408,7 +39408,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--others"
msgstr "--others"
@@ -39419,7 +39419,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:52 en/git-status.txt:97
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignored"
msgstr "--ignored"
@@ -39433,7 +39433,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:59
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stage"
msgstr "--stage"
@@ -39445,7 +39445,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:62
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--directory"
msgstr "--directory"
@@ -39458,7 +39458,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:66
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-empty-directory"
msgstr "--no-empty-directory"
@@ -39469,7 +39469,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:70 en/git-update-index.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unmerged"
msgstr "--unmerged"
@@ -39480,7 +39480,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:74
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--killed"
msgstr "--killed"
@@ -39550,7 +39550,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:101
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--error-unmatch"
msgstr "--error-unmatch"
@@ -39703,7 +39703,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:157
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--eol"
msgstr "--eol"
@@ -39858,7 +39858,7 @@ msgstr "linkgit:git-read-tree[1], linkgit:gitignore[5]"
#. type: Title =
#: en/git-ls-remote.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-ls-remote(1)"
msgstr "git-ls-remote(1)"
@@ -39885,7 +39885,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:25 en/git-show-ref.txt:41
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--heads"
msgstr "--heads"
@@ -39899,7 +39899,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:33
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--refs"
msgstr "--refs"
@@ -39938,7 +39938,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:52
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--get-url"
msgstr "--get-url"
@@ -39952,7 +39952,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--symref"
msgstr "--symref"
@@ -40003,7 +40003,7 @@ msgstr ""
#. type: Title =
#: en/git-ls-tree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-ls-tree(1)"
msgstr "git-ls-tree(1)"
@@ -40157,7 +40157,7 @@ msgstr ""
#. type: Title =
#: en/git-mailinfo.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-mailinfo(1)"
msgstr "git-mailinfo(1)"
@@ -40328,7 +40328,7 @@ msgstr ""
#. type: Title =
#: en/git-mailsplit.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-mailsplit(1)"
msgstr "git-mailsplit(1)"
@@ -40430,7 +40430,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-cr"
msgstr "--keep-cr"
@@ -40441,7 +40441,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:51
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--mboxrd"
msgstr "--mboxrd"
@@ -40452,7 +40452,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-base.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-merge-base(1)"
msgstr "git-merge-base(1)"
@@ -40516,7 +40516,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--octopus"
msgstr "--octopus"
@@ -40530,7 +40530,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:48 en/git-show-branch.txt:90
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--independent"
msgstr "--independent"
@@ -40545,7 +40545,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:55
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--is-ancestor"
msgstr "--is-ancestor"
@@ -40559,7 +40559,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:60 en/git-rebase.txt:346
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--fork-point"
msgstr "--fork-point"
@@ -40784,7 +40784,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-file.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-merge-file(1)"
msgstr "git-merge-file(1)"
@@ -40888,7 +40888,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:70
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--diff3"
msgstr "--diff3"
@@ -40899,7 +40899,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:75
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--union"
msgstr "--union"
@@ -40938,7 +40938,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-index.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-merge-index(1)"
msgstr "git-merge-index(1)"
@@ -41051,7 +41051,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-one-file.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-merge-one-file(1)"
msgstr "git-merge-one-file(1)"
@@ -41170,7 +41170,7 @@ msgstr ""
#. type: Title =
#: en/git-mergetool.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-mergetool(1)"
msgstr "git-mergetool(1)"
@@ -41314,7 +41314,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-tree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-merge-tree(1)"
msgstr "git-merge-tree(1)"
@@ -41349,7 +41349,7 @@ msgstr ""
#. type: Title =
#: en/git-merge.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-merge(1)"
msgstr "git-merge(1)"
@@ -41482,7 +41482,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge.txt:89
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]rerere-autoupdate"
msgstr "--[no-]rerere-autoupdate"
@@ -41945,7 +41945,7 @@ msgstr ""
#. type: Title =
#: en/git-mktag.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-mktag(1)"
msgstr "git-mktag(1)"
@@ -42006,7 +42006,7 @@ msgstr ""
#. type: Title =
#: en/git-mktree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-mktree(1)"
msgstr "git-mktree(1)"
@@ -42037,7 +42037,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mktree.txt:26
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--missing"
msgstr "--missing"
@@ -42060,7 +42060,7 @@ msgstr ""
#. type: Title =
#: en/git-mv.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-mv(1)"
msgstr "git-mv(1)"
@@ -42158,7 +42158,7 @@ msgstr ""
#. type: Title =
#: en/git-name-rev.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-name-rev(1)"
msgstr "git-name-rev(1)"
@@ -42237,7 +42237,7 @@ msgstr ""
#. type: Labeled list
#: en/git-name-rev.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-undefined"
msgstr "--no-undefined"
@@ -42290,7 +42290,7 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-notes(1)"
msgstr "git-notes(1)"
@@ -42661,7 +42661,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--commit"
msgstr "--commit"
@@ -42926,7 +42926,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
@@ -42939,7 +42939,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
@@ -42960,7 +42960,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:389
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
@@ -42974,7 +42974,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
@@ -42994,7 +42994,7 @@ msgstr ""
#. type: Title =
#: en/git-p4.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4(1)"
msgstr "git-p4(1)"
@@ -43344,7 +43344,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:199
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--detect-branches"
msgstr "--detect-branches"
@@ -43371,7 +43371,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:208
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--silent"
msgstr "--silent"
@@ -43382,7 +43382,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:211
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--detect-labels"
msgstr "--detect-labels"
@@ -43396,7 +43396,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:216 en/git-p4.txt:331
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--import-labels"
msgstr "--import-labels"
@@ -43407,7 +43407,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:219
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--import-local"
msgstr "--import-local"
@@ -43455,7 +43455,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:243
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-path"
msgstr "--keep-path"
@@ -43471,7 +43471,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:251
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-client-spec"
msgstr "--use-client-spec"
@@ -43558,7 +43558,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:286
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--preserve-user"
msgstr "--preserve-user"
@@ -43571,7 +43571,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:290
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--export-labels"
msgstr "--export-labels"
@@ -43591,7 +43591,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:299
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--prepare-p4-only"
msgstr "--prepare-p4-only"
@@ -43607,7 +43607,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:306
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--shelve"
msgstr "--shelve"
@@ -43916,7 +43916,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:456
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.user"
msgstr "git-p4.user"
@@ -43929,7 +43929,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:460
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.password"
msgstr "git-p4.password"
@@ -43942,7 +43942,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:465
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.port"
msgstr "git-p4.port"
@@ -43955,7 +43955,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:470
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.host"
msgstr "git-p4.host"
@@ -43968,7 +43968,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:475
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.client"
msgstr "git-p4.client"
@@ -43981,7 +43981,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:479
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.retries"
msgstr "git-p4.retries"
@@ -44001,7 +44001,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:487
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.syncFromOrigin"
msgstr "git-p4.syncFromOrigin"
@@ -44017,7 +44017,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:494
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.branchUser"
msgstr "git-p4.branchUser"
@@ -44031,7 +44031,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:500
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.branchList"
msgstr "git-p4.branchList"
@@ -44066,7 +44066,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:515
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.importLabels"
msgstr "git-p4.importLabels"
@@ -44077,7 +44077,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:518
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.labelImportRegexp"
msgstr "git-p4.labelImportRegexp"
@@ -44090,7 +44090,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:522
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.useClientSpec"
msgstr "git-p4.useClientSpec"
@@ -44105,7 +44105,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:528
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.pathEncoding"
msgstr "git-p4.pathEncoding"
@@ -44121,7 +44121,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:535
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.largeFileSystem"
msgstr "git-p4.largeFileSystem"
@@ -44143,7 +44143,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:546
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.largeFileExtensions"
msgstr "git-p4.largeFileExtensions"
@@ -44156,7 +44156,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:550
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.largeFileThreshold"
msgstr "git-p4.largeFileThreshold"
@@ -44170,7 +44170,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:555
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.largeFileCompressedThreshold"
msgstr "git-p4.largeFileCompressedThreshold"
@@ -44185,7 +44185,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:561
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.largeFilePush"
msgstr "git-p4.largeFilePush"
@@ -44198,7 +44198,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:565
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.keepEmptyCommits"
msgstr "git-p4.keepEmptyCommits"
@@ -44211,7 +44211,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:569
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.mapUser"
msgstr "git-p4.mapUser"
@@ -44243,7 +44243,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:582
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.detectRenames"
msgstr "git-p4.detectRenames"
@@ -44256,7 +44256,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:586
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.detectCopies"
msgstr "git-p4.detectCopies"
@@ -44269,7 +44269,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:590
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.detectCopiesHarder"
msgstr "git-p4.detectCopiesHarder"
@@ -44280,7 +44280,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:593
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.preserveUser"
msgstr "git-p4.preserveUser"
@@ -44306,7 +44306,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:602
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.skipSubmitEdit"
msgstr "git-p4.skipSubmitEdit"
@@ -44319,7 +44319,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:607
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.skipSubmitEditCheck"
msgstr "git-p4.skipSubmitEditCheck"
@@ -44333,7 +44333,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:612
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.allowSubmit"
msgstr "git-p4.allowSubmit"
@@ -44349,7 +44349,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:619
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.skipUserNameCheck"
msgstr "git-p4.skipUserNameCheck"
@@ -44362,7 +44362,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:624
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.attemptRCSCleanup"
msgstr "git-p4.attemptRCSCleanup"
@@ -44376,7 +44376,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:630
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.exportLabels"
msgstr "git-p4.exportLabels"
@@ -44387,7 +44387,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:633
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.labelExportRegexp"
msgstr "git-p4.labelExportRegexp"
@@ -44400,7 +44400,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:637
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.conflict"
msgstr "git-p4.conflict"
@@ -44447,7 +44447,7 @@ msgstr ""
#. type: Title =
#: en/git-pack-objects.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-pack-objects(1)"
msgstr "git-pack-objects(1)"
@@ -44534,7 +44534,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:61
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--revs"
msgstr "--revs"
@@ -44550,7 +44550,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:70 en/rev-list-options.txt:693
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unpacked"
msgstr "--unpacked"
@@ -44628,7 +44628,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:118
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--honor-pack-keep"
msgstr "--honor-pack-keep"
@@ -44655,7 +44655,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:132
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--non-empty"
msgstr "--non-empty"
@@ -44666,7 +44666,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:142
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--all-progress"
msgstr "--all-progress"
@@ -44684,7 +44684,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:153
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--all-progress-implied"
msgstr "--all-progress-implied"
@@ -44705,7 +44705,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:162
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-reuse-delta"
msgstr "--no-reuse-delta"
@@ -44720,7 +44720,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:169
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-reuse-object"
msgstr "--no-reuse-object"
@@ -44768,7 +44768,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:194
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--shallow"
msgstr "--shallow"
@@ -44782,7 +44782,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:199
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--delta-base-offset"
msgstr "--delta-base-offset"
@@ -44821,7 +44821,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:230
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-true-parents"
msgstr "--keep-true-parents"
@@ -44841,7 +44841,7 @@ msgstr ""
#. type: Title =
#: en/git-pack-redundant.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-pack-redundant(1)"
msgstr "git-pack-redundant(1)"
@@ -44889,7 +44889,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-redundant.txt:35
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--alt-odb"
msgstr "--alt-odb"
@@ -44917,7 +44917,7 @@ msgstr ""
#. type: Title =
#: en/git-pack-refs.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-pack-refs(1)"
msgstr "git-pack-refs(1)"
@@ -44997,7 +44997,7 @@ msgstr ""
#. type: Title =
#: en/git-parse-remote.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-parse-remote(1)"
msgstr "git-parse-remote(1)"
@@ -45024,7 +45024,7 @@ msgstr ""
#. type: Title =
#: en/git-patch-id.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-patch-id(1)"
msgstr "git-patch-id(1)"
@@ -45071,7 +45071,7 @@ msgstr ""
#. type: Labeled list
#: en/git-patch-id.txt:33
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stable"
msgstr "--stable"
@@ -45108,7 +45108,7 @@ msgstr ""
#. type: Labeled list
#: en/git-patch-id.txt:50
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unstable"
msgstr "--unstable"
@@ -45134,7 +45134,7 @@ msgstr ""
#. type: Title =
#: en/git-prune-packed.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-prune-packed(1)"
msgstr "git-prune-packed(1)"
@@ -45196,7 +45196,7 @@ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Title =
#: en/git-prune.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-prune(1)"
msgstr "git-prune(1)"
@@ -45306,7 +45306,7 @@ msgstr "linkgit:git-fsck[1], linkgit:git-gc[1], linkgit:git-reflog[1]"
#. type: Title =
#: en/git-pull.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-pull(1)"
msgstr "git-pull(1)"
@@ -45498,7 +45498,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pull.txt:128 en/git-svn.txt:245
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-rebase"
msgstr "--no-rebase"
@@ -45509,13 +45509,13 @@ msgstr ""
#. type: Labeled list
#: en/git-pull.txt:131 en/git-rebase.txt:442
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
#: en/git-pull.txt:132 en/git-rebase.txt:443
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -45693,7 +45693,7 @@ msgstr "linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]"
#. type: Title =
#: en/git-push.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-push(1)"
msgstr "git-push(1)"
@@ -45894,7 +45894,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:135
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--follow-tags"
msgstr "--follow-tags"
@@ -45910,7 +45910,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:143 en/git-send-pack.txt:73
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]signed"
msgstr "--[no-]signed"
@@ -45934,7 +45934,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:154
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]atomic"
msgstr "--[no-]atomic"
@@ -45948,7 +45948,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:160
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--push-option"
msgstr "--push-option"
@@ -45982,7 +45982,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:172
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]force-with-lease"
msgstr "--[no-]force-with-lease"
@@ -46130,7 +46130,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:252
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]thin"
msgstr "--[no-]thin"
@@ -46174,7 +46174,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:290
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]verify"
msgstr "--[no-]verify"
@@ -46681,7 +46681,7 @@ msgstr ""
#. type: Title =
#: en/git-quiltimport.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-quiltimport(1)"
msgstr "git-quiltimport(1)"
@@ -46782,7 +46782,7 @@ msgstr ""
#. type: Title =
#: en/git-read-tree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-read-tree(1)"
msgstr "git-read-tree(1)"
@@ -46835,7 +46835,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--reset"
msgstr "--reset"
@@ -46876,7 +46876,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--trivial"
msgstr "--trivial"
@@ -46965,7 +46965,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:118
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-sparse-checkout"
msgstr "--no-sparse-checkout"
@@ -46976,7 +46976,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:122
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--empty"
msgstr "--empty"
@@ -47519,7 +47519,7 @@ msgstr ""
#. type: Title =
#: en/git-rebase.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-rebase(1)"
msgstr "git-rebase(1)"
@@ -47930,7 +47930,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:255 en/sequencer.txt:6
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--quit"
msgstr "--quit"
@@ -47943,7 +47943,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:260
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-empty"
msgstr "--keep-empty"
@@ -47960,7 +47960,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:267
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--edit-todo"
msgstr "--edit-todo"
@@ -48053,7 +48053,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-same
+#, ignore-same, no-wrap
msgid "--verify"
msgstr "--verify"
@@ -48066,7 +48066,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:336
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--force-rebase"
msgstr "--force-rebase"
@@ -48089,7 +48089,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:347
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-fork-point"
msgstr "--no-fork-point"
@@ -48150,7 +48150,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:384 en/git-svn.txt:642
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--preserve-merges"
msgstr "--preserve-merges"
@@ -48241,13 +48241,13 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:425
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
#: en/git-rebase.txt:426
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-autosquash"
msgstr "--no-autosquash"
@@ -48287,7 +48287,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:450 en/merge-options.txt:35
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-ff"
msgstr "--no-ff"
@@ -48959,7 +48959,7 @@ msgstr ""
#. type: Title =
#: en/git-receive-pack.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-receive-pack(1)"
msgstr "git-receive-pack(1)"
@@ -49069,7 +49069,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:66
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PUSH_CERT_SIGNER`"
msgstr "`GIT_PUSH_CERT_SIGNER`"
@@ -49082,7 +49082,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:70
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PUSH_CERT_KEY`"
msgstr "`GIT_PUSH_CERT_KEY`"
@@ -49093,7 +49093,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:73
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PUSH_CERT_STATUS`"
msgstr "`GIT_PUSH_CERT_STATUS`"
@@ -49107,7 +49107,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:78
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PUSH_CERT_NONCE`"
msgstr "`GIT_PUSH_CERT_NONCE`"
@@ -49122,13 +49122,13 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:85
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PUSH_CERT_NONCE_STATUS`"
msgstr "`GIT_PUSH_CERT_NONCE_STATUS`"
#. type: Labeled list
#: en/git-receive-pack.txt:86
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`UNSOLICITED`"
msgstr "`UNSOLICITED`"
@@ -49139,7 +49139,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:89
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`MISSING`"
msgstr "`MISSING`"
@@ -49150,7 +49150,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:91
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`BAD`"
msgstr "`BAD`"
@@ -49161,7 +49161,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:93
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`OK`"
msgstr "`OK`"
@@ -49172,7 +49172,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:95
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`SLOP`"
msgstr "`SLOP`"
@@ -49186,7 +49186,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PUSH_CERT_NONCE_SLOP`"
msgstr "`GIT_PUSH_CERT_NONCE_SLOP`"
@@ -49394,7 +49394,7 @@ msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
#. type: Title =
#: en/git-reflog.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-reflog(1)"
msgstr "git-reflog(1)"
@@ -49531,7 +49531,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:93
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--updateref"
msgstr "--updateref"
@@ -49545,7 +49545,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:98
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--rewrite"
msgstr "--rewrite"
@@ -49558,7 +49558,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:103
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stale-fix"
msgstr "--stale-fix"
@@ -49606,7 +49606,7 @@ msgstr ""
#. type: Title =
#: en/git-remote-ext.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-remote-ext(1)"
msgstr "git-remote-ext(1)"
@@ -49738,9 +49738,9 @@ msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:61 en/git-remote-fd.txt:33
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_TRANSLOOP_DEBUG"
-msgstr ""
+msgstr "GIT_TRANSLOOP_DEBUG"
#. type: Plain text
#: en/git-remote-ext.txt:63 en/git-remote-fd.txt:35
@@ -49755,9 +49755,9 @@ msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:67
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_EXT_SERVICE"
-msgstr ""
+msgstr "GIT_EXT_SERVICE"
#. type: Plain text
#: en/git-remote-ext.txt:70
@@ -49768,9 +49768,9 @@ msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:71
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_EXT_SERVICE_NOPREFIX"
-msgstr ""
+msgstr "GIT_EXT_SERVICE_NOPREFIX"
#. type: Plain text
#: en/git-remote-ext.txt:74
@@ -49886,7 +49886,7 @@ msgstr "linkgit:gitremote-helpers[1]"
#. type: Title =
#: en/git-remote-fd.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-remote-fd(1)"
msgstr "git-remote-fd(1)"
@@ -49978,7 +49978,7 @@ msgstr ""
#. type: Title =
#: en/git-remote-testgit.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-remote-testgit(1)"
msgstr "git-remote-testgit(1)"
@@ -50010,7 +50010,7 @@ msgstr ""
#. type: Title =
#: en/git-remote.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-remote(1)"
msgstr "git-remote(1)"
@@ -50437,7 +50437,7 @@ msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-repack.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-repack(1)"
msgstr "git-repack(1)"
@@ -50565,7 +50565,7 @@ msgstr ""
#. type: Labeled list
#: en/git-repack.txt:117
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--write-bitmap-index"
msgstr "--write-bitmap-index"
@@ -50581,7 +50581,7 @@ msgstr ""
#. type: Labeled list
#: en/git-repack.txt:124
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--pack-kept-objects"
msgstr "--pack-kept-objects"
@@ -50612,7 +50612,7 @@ msgstr ""
#. type: Labeled list
#: en/git-repack.txt:140
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-unreachable"
msgstr "--keep-unreachable"
@@ -50646,7 +50646,7 @@ msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
#. type: Title =
#: en/git-replace.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-replace(1)"
msgstr "git-replace(1)"
@@ -50926,7 +50926,7 @@ msgstr ""
#. type: Title =
#: en/git-request-pull.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-request-pull(1)"
msgstr "git-request-pull(1)"
@@ -51068,7 +51068,7 @@ msgstr ""
#. type: Title =
#: en/git-rerere.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-rerere(1)"
msgstr "git-rerere(1)"
@@ -51422,7 +51422,7 @@ msgstr ""
#. type: Title =
#: en/git-reset.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-reset(1)"
msgstr "git-reset(1)"
@@ -51517,7 +51517,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:53
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--soft"
msgstr "--soft"
@@ -51531,7 +51531,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:59
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--mixed"
msgstr "--mixed"
@@ -51552,7 +51552,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:67
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--hard"
msgstr "--hard"
@@ -52249,7 +52249,7 @@ msgstr ""
#. type: Title =
#: en/git-revert.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-revert(1)"
msgstr "git-revert(1)"
@@ -52386,7 +52386,7 @@ msgstr ""
#. type: Title =
#: en/git-rev-list.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-rev-list(1)"
msgstr "git-rev-list(1)"
@@ -52532,7 +52532,7 @@ msgstr ""
#. type: Title =
#: en/git-rev-parse.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-rev-parse(1)"
msgstr "git-rev-parse(1)"
@@ -52570,7 +52570,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:33
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--parseopt"
msgstr "--parseopt"
@@ -52582,7 +52582,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:36
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--sq-quote"
msgstr "--sq-quote"
@@ -52602,7 +52602,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-dashdash"
msgstr "--keep-dashdash"
@@ -52615,7 +52615,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stop-at-non-option"
msgstr "--stop-at-non-option"
@@ -52629,7 +52629,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:53
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stuck-long"
msgstr "--stuck-long"
@@ -52648,7 +52648,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:60
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--revs-only"
msgstr "--revs-only"
@@ -52660,7 +52660,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:64
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-revs"
msgstr "--no-revs"
@@ -52671,7 +52671,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:68
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--flags"
msgstr "--flags"
@@ -52682,7 +52682,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:71
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-flags"
msgstr "--no-flags"
@@ -52770,7 +52770,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:120
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--sq"
msgstr "--sq"
@@ -52820,7 +52820,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:145
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--symbolic"
msgstr "--symbolic"
@@ -52834,7 +52834,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:150
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--symbolic-full-name"
msgstr "--symbolic-full-name"
@@ -52955,7 +52955,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:205
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--local-env-vars"
msgstr "--local-env-vars"
@@ -52969,7 +52969,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:211
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--git-dir"
msgstr "--git-dir"
@@ -52990,7 +52990,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:220
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--absolute-git-dir"
msgstr "--absolute-git-dir"
@@ -53002,7 +53002,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:224
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--git-common-dir"
msgstr "--git-common-dir"
@@ -53013,7 +53013,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:227
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--is-inside-git-dir"
msgstr "--is-inside-git-dir"
@@ -53026,7 +53026,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:231
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--is-inside-work-tree"
msgstr "--is-inside-work-tree"
@@ -53039,7 +53039,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:235
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--is-bare-repository"
msgstr "--is-bare-repository"
@@ -53079,7 +53079,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:251
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-cdup"
msgstr "--show-cdup"
@@ -53093,7 +53093,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:256
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-prefix"
msgstr "--show-prefix"
@@ -53106,7 +53106,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:261
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-toplevel"
msgstr "--show-toplevel"
@@ -53128,7 +53128,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:270
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--shared-index-path"
msgstr "--shared-index-path"
@@ -53507,7 +53507,7 @@ msgstr ""
#. type: Title =
#: en/git-rm.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-rm(1)"
msgstr "git-rm(1)"
@@ -53575,7 +53575,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rm.txt:63
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
@@ -53787,7 +53787,7 @@ msgstr ""
#. type: Title =
#: en/git-send-email.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-send-email(1)"
msgstr "git-send-email(1)"
@@ -53860,7 +53860,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:48 en/git-tag.txt:60
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--annotate"
msgstr "--annotate"
@@ -53905,7 +53905,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--compose"
msgstr "--compose"
@@ -54079,13 +54079,13 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:145
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--xmailer"
msgstr "--xmailer"
#. type: Labeled list
#: en/git-send-email.txt:146
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-xmailer"
msgstr "--no-xmailer"
@@ -54259,7 +54259,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:227
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--smtp-ssl"
msgstr "--smtp-ssl"
@@ -54270,7 +54270,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:230
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--smtp-ssl-cert-path"
msgstr "--smtp-ssl-cert-path"
@@ -54353,7 +54353,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:266
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]chain-reply-to"
msgstr "--[no-]chain-reply-to"
@@ -54376,7 +54376,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:280
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]signed-off-by-cc"
msgstr "--[no-]signed-off-by-cc"
@@ -54390,7 +54390,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:285
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]cc-cover"
msgstr "--[no-]cc-cover"
@@ -54405,7 +54405,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:291
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]to-cover"
msgstr "--[no-]to-cover"
@@ -54490,7 +54490,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:319
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]suppress-from"
msgstr "--[no-]suppress-from"
@@ -54504,7 +54504,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:324
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]thread"
msgstr "--[no-]thread"
@@ -54596,7 +54596,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:365
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]format-patch"
msgstr "--[no-]format-patch"
@@ -54618,7 +54618,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:375
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]validate"
msgstr "--[no-]validate"
@@ -54661,7 +54661,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:394
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--dump-aliases"
msgstr "--dump-aliases"
@@ -54832,7 +54832,7 @@ msgstr ""
#. type: Title =
#: en/git-send-pack.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-send-pack(1)"
msgstr "git-send-pack(1)"
@@ -54886,7 +54886,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-pack.txt:68
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--atomic"
msgstr "--atomic"
@@ -54963,7 +54963,7 @@ msgstr ""
#. type: Title =
#: en/git-shell.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-shell(1)"
msgstr "git-shell(1)"
@@ -55152,7 +55152,7 @@ msgstr ""
#. type: Title =
#: en/git-sh-i18n.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-sh-i18n(1)"
msgstr "git-sh-i18n(1)"
@@ -55208,7 +55208,7 @@ msgstr ""
#. type: Title =
#: en/git-shortlog.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-shortlog(1)"
msgstr "git-shortlog(1)"
@@ -55260,7 +55260,7 @@ msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:39
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--email"
msgstr "--email"
@@ -55291,7 +55291,7 @@ msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:51
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--committer"
msgstr "--committer"
@@ -55357,7 +55357,7 @@ msgstr ""
#. type: Title =
#: en/git-show-branch.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-show-branch(1)"
msgstr "git-show-branch(1)"
@@ -55436,7 +55436,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:51
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--current"
msgstr "--current"
@@ -55449,7 +55449,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:56 en/rev-list-options.txt:635
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--topo-order"
msgstr "--topo-order"
@@ -55463,7 +55463,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:62 en/rev-list-options.txt:627
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--date-order"
msgstr "--date-order"
@@ -55478,7 +55478,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-same
+#, ignore-same, no-wrap
msgid "--sparse"
msgstr "--sparse"
@@ -55511,7 +55511,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:83
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--merge-base"
msgstr "--merge-base"
@@ -55533,7 +55533,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:94
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-name"
msgstr "--no-name"
@@ -55544,7 +55544,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:97
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--sha1-name"
msgstr "--sha1-name"
@@ -55558,7 +55558,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:103
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--topics"
msgstr "--topics"
@@ -55712,7 +55712,7 @@ msgstr ""
#. type: Title =
#: en/git-show-index.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-show-index(1)"
msgstr "git-show-index(1)"
@@ -55744,7 +55744,7 @@ msgstr ""
#. type: Title =
#: en/git-show-ref.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-show-ref(1)"
msgstr "git-show-ref(1)"
@@ -55794,7 +55794,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:36
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--head"
msgstr "--head"
@@ -55813,7 +55813,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--dereference"
msgstr "--dereference"
@@ -56056,7 +56056,7 @@ msgstr ""
#. type: Title =
#: en/git-show.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-show(1)"
msgstr "git-show(1)"
@@ -56187,7 +56187,7 @@ msgstr ""
#. type: Title =
#: en/git-sh-setup.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-sh-setup(1)"
msgstr "git-sh-setup(1)"
@@ -56378,7 +56378,7 @@ msgstr ""
#. type: Title =
#: en/git-stage.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-stage(1)"
msgstr "git-stage(1)"
@@ -56402,7 +56402,7 @@ msgstr ""
#. type: Title =
#: en/git-stash.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-stash(1)"
msgstr "git-stash(1)"
@@ -56890,7 +56890,7 @@ msgstr ""
#. type: Title =
#: en/git-status.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-status(1)"
msgstr "git-status(1)"
@@ -57458,7 +57458,7 @@ msgstr ""
#. type: Title =
#: en/git-stripspace.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-stripspace(1)"
msgstr "git-stripspace(1)"
@@ -57525,7 +57525,7 @@ msgstr ""
#. type: Labeled list
#: en/git-stripspace.txt:39
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--strip-comments"
msgstr "--strip-comments"
@@ -57537,7 +57537,7 @@ msgstr ""
#. type: Labeled list
#: en/git-stripspace.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--comment-lines"
msgstr "--comment-lines"
@@ -57610,7 +57610,7 @@ msgstr ""
#. type: Title =
#: en/git-submodule.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-submodule(1)"
msgstr "git-submodule(1)"
@@ -58153,7 +58153,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:305
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--files"
msgstr "--files"
@@ -58167,7 +58167,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:311
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--summary-limit"
msgstr "--summary-limit"
@@ -58183,7 +58183,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:318
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--remote"
msgstr "--remote"
@@ -58234,7 +58234,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:350
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-fetch"
msgstr "--no-fetch"
@@ -58247,7 +58247,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:354
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--checkout"
msgstr "--checkout"
@@ -58276,7 +58276,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:373
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--rebase"
msgstr "--rebase"
@@ -58293,7 +58293,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:382
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--init"
msgstr "--init"
@@ -58307,7 +58307,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:387
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--name"
msgstr "--name"
@@ -58352,7 +58352,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:406
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--depth"
msgstr "--depth"
@@ -58366,7 +58366,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:411
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
@@ -58406,7 +58406,7 @@ msgstr ""
#. type: Title =
#: en/git-svn.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-svn(1)"
msgstr "git-svn(1)"
@@ -58501,7 +58501,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stdlayout"
msgstr "--stdlayout"
@@ -58520,7 +58520,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-metadata"
msgstr "--no-metadata"
@@ -58534,7 +58534,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:62
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-svm-props"
msgstr "--use-svm-props"
@@ -58545,7 +58545,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:64
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-svnsync-props"
msgstr "--use-svnsync-props"
@@ -58650,7 +58650,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:106
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-minimize-url"
msgstr "--no-minimize-url"
@@ -58690,7 +58690,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:127
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--localtime"
msgstr "--localtime"
@@ -58713,7 +58713,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:138 en/git-svn.txt:505
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--parent"
msgstr "--parent"
@@ -58820,7 +58820,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:199
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--preserve-empty-dirs"
msgstr "--preserve-empty-dirs"
@@ -59021,7 +59021,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:293
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--message"
msgstr "--message"
@@ -59032,7 +59032,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:297
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--tag"
msgstr "--tag"
@@ -59082,7 +59082,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:317
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--username"
msgstr "--username"
@@ -59095,7 +59095,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:321
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--commit-url"
msgstr "--commit-url"
@@ -59114,7 +59114,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:330 en/rev-list-options.txt:786
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--parents"
msgstr "--parents"
@@ -59204,7 +59204,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:364
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-commit"
msgstr "--show-commit"
@@ -59215,7 +59215,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:366 en/pretty-options.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--oneline"
msgstr "--oneline"
@@ -59255,7 +59255,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:384
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--git-format"
msgstr "--git-format"
@@ -59291,7 +59291,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:397
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--before"
msgstr "--before"
@@ -59305,7 +59305,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:403
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--after"
msgstr "--after"
@@ -59659,7 +59659,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:571
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--rmdir"
msgstr "--rmdir"
@@ -59827,7 +59827,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:663
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-log-author"
msgstr "--use-log-author"
@@ -59847,7 +59847,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:671
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--add-author-from"
msgstr "--add-author-from"
@@ -59915,7 +59915,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:697
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--follow-parent"
msgstr "--follow-parent"
@@ -60636,7 +60636,7 @@ msgstr ""
#. type: Title =
#: en/git-symbolic-ref.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-symbolic-ref(1)"
msgstr "git-symbolic-ref(1)"
@@ -60731,7 +60731,7 @@ msgstr ""
#. type: Title =
#: en/git-tag.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-tag(1)"
msgstr "git-tag(1)"
@@ -60821,7 +60821,7 @@ msgstr ""
#. type: Labeled list
#: en/git-tag.txt:64
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--sign"
msgstr "--sign"
@@ -62099,7 +62099,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:579
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--html-path"
msgstr "--html-path"
@@ -62112,7 +62112,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:583
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--man-path"
msgstr "--man-path"
@@ -62125,7 +62125,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:587
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--info-path"
msgstr "--info-path"
@@ -62138,7 +62138,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:592
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--paginate"
msgstr "--paginate"
@@ -62152,7 +62152,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:598
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-pager"
msgstr "--no-pager"
@@ -62227,7 +62227,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:629
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
@@ -62240,7 +62240,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:633
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
@@ -62254,7 +62254,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:638
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
@@ -62268,7 +62268,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:644
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
@@ -62282,7 +62282,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:650
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
@@ -62648,7 +62648,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:858
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
@@ -62661,7 +62661,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:863
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
@@ -62676,7 +62676,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:869
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
@@ -62690,7 +62690,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:875
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
@@ -62715,7 +62715,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:888
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
@@ -62729,7 +62729,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:894
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
@@ -62743,7 +62743,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:899
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
@@ -62756,7 +62756,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:903
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
@@ -62777,7 +62777,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:918
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
@@ -62795,7 +62795,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:928
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
@@ -62818,37 +62818,37 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:939
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
#. type: Labeled list
#: en/git.txt:940
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
#. type: Labeled list
#: en/git.txt:941
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
#. type: Labeled list
#: en/git.txt:942
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
#. type: Labeled list
#: en/git.txt:943
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
#. type: Labeled list
#: en/git.txt:944
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
@@ -62871,7 +62871,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:950
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
@@ -62886,7 +62886,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:956
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
@@ -62974,7 +62974,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:983
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
@@ -62985,7 +62985,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:986
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
@@ -62996,7 +62996,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:991
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
@@ -63009,7 +63009,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:996
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
@@ -63023,7 +63023,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1002
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
@@ -63038,13 +63038,13 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1008
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
#: en/git.txt:1009
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
@@ -63079,7 +63079,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1029
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
@@ -63094,7 +63094,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1035
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
@@ -63110,7 +63110,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1042
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
@@ -63123,7 +63123,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1046
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
@@ -63140,7 +63140,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1054
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
@@ -63161,7 +63161,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1065
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
@@ -63204,7 +63204,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1086
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
@@ -63219,7 +63219,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1093
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
@@ -63235,7 +63235,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
@@ -63258,7 +63258,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1111
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
@@ -63271,7 +63271,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1116
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
@@ -63285,7 +63285,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1121
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
@@ -63298,7 +63298,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1126
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
@@ -63314,7 +63314,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1134
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
@@ -63331,7 +63331,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1143
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
@@ -63344,7 +63344,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1147
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
@@ -63357,7 +63357,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1151
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
@@ -63370,7 +63370,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1155
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
@@ -63388,7 +63388,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1165
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
@@ -63407,7 +63407,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1176
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
@@ -63424,7 +63424,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1185
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
@@ -63623,7 +63623,7 @@ msgstr ""
#. type: Title =
#: en/git-unpack-file.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-unpack-file(1)"
msgstr "git-unpack-file(1)"
@@ -63654,7 +63654,7 @@ msgstr ""
#. type: Title =
#: en/git-unpack-objects.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-unpack-objects(1)"
msgstr "git-unpack-objects(1)"
@@ -63723,7 +63723,7 @@ msgstr ""
#. type: Title =
#: en/git-update-index.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-update-index(1)"
msgstr "git-update-index(1)"
@@ -63784,7 +63784,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--remove"
msgstr "--remove"
@@ -63816,7 +63816,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:61
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-submodules"
msgstr "--ignore-submodules"
@@ -63870,7 +63870,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:80
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--index-info"
msgstr "--index-info"
@@ -63886,7 +63886,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:86
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]assume-unchanged"
msgstr "--[no-]assume-unchanged"
@@ -63913,7 +63913,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:104
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--really-refresh"
msgstr "--really-refresh"
@@ -63926,7 +63926,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:108
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]skip-worktree"
msgstr "--[no-]skip-worktree"
@@ -63941,7 +63941,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:115
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--again"
msgstr "--again"
@@ -63954,7 +63954,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:119
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unresolve"
msgstr "--unresolve"
@@ -63967,7 +63967,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:123
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--info-only"
msgstr "--info-only"
@@ -63980,7 +63980,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:128
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--force-remove"
msgstr "--force-remove"
@@ -63993,7 +63993,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:132
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--replace"
msgstr "--replace"
@@ -64044,13 +64044,13 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:164
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--split-index"
msgstr "--split-index"
#. type: Labeled list
#: en/git-update-index.txt:165
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-split-index"
msgstr "--no-split-index"
@@ -64074,13 +64074,13 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:177
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--untracked-cache"
msgstr "--untracked-cache"
#. type: Labeled list
#: en/git-update-index.txt:178
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-untracked-cache"
msgstr "--no-untracked-cache"
@@ -64103,7 +64103,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:188
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--test-untracked-cache"
msgstr "--test-untracked-cache"
@@ -64120,7 +64120,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:198
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--force-untracked-cache"
msgstr "--force-untracked-cache"
@@ -64614,7 +64614,7 @@ msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
#. type: Title =
#: en/git-update-ref.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-update-ref(1)"
msgstr "git-update-ref(1)"
@@ -64903,7 +64903,7 @@ msgstr ""
#. type: Title =
#: en/git-update-server-info.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-update-server-info(1)"
msgstr "git-update-server-info(1)"
@@ -64952,7 +64952,7 @@ msgstr ""
#. type: Title =
#: en/git-upload-archive.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-upload-archive(1)"
msgstr "git-upload-archive(1)"
@@ -65046,7 +65046,7 @@ msgstr ""
#. type: Title =
#: en/git-upload-pack.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-upload-pack(1)"
msgstr "git-upload-pack(1)"
@@ -65081,7 +65081,7 @@ msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:29
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]strict"
msgstr "--[no-]strict"
@@ -65097,7 +65097,7 @@ msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:35
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stateless-rpc"
msgstr "--stateless-rpc"
@@ -65111,7 +65111,7 @@ msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--advertise-refs"
msgstr "--advertise-refs"
@@ -65136,7 +65136,7 @@ msgstr "linkgit:gitnamespaces[7]"
#. type: Title =
#: en/git-var.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-var(1)"
msgstr "git-var(1)"
@@ -65181,9 +65181,9 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:34
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_AUTHOR_IDENT"
-msgstr ""
+msgstr "GIT_AUTHOR_IDENT"
#. type: Plain text
#: en/git-var.txt:36
@@ -65192,9 +65192,9 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:37
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_COMMITTER_IDENT"
-msgstr ""
+msgstr "GIT_COMMITTER_IDENT"
#. type: Plain text
#: en/git-var.txt:39
@@ -65203,9 +65203,9 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:40
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_EDITOR"
-msgstr ""
+msgstr "GIT_EDITOR"
#. type: Plain text
#: en/git-var.txt:48
@@ -65227,9 +65227,9 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:52
-#, no-wrap
+#, ignore-same, no-wrap
msgid "GIT_PAGER"
-msgstr ""
+msgstr "GIT_PAGER"
#. type: Plain text
#: en/git-var.txt:60
@@ -65246,7 +65246,7 @@ 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-same
+#, ignore-same, no-wrap
msgid "git-verify-commit(1)"
msgstr "git-verify-commit(1)"
@@ -65285,7 +65285,7 @@ msgstr ""
#. type: Title =
#: en/git-verify-pack.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-verify-pack(1)"
msgstr "git-verify-pack(1)"
@@ -65327,7 +65327,7 @@ msgstr ""
#. type: Labeled list
#: en/git-verify-pack.txt:32
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stat-only"
msgstr "--stat-only"
@@ -65373,7 +65373,7 @@ msgstr ""
#. type: Title =
#: en/git-verify-tag.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-verify-tag(1)"
msgstr "git-verify-tag(1)"
@@ -65665,7 +65665,7 @@ msgstr ""
#. type: Title =
#: en/git-whatchanged.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-whatchanged(1)"
msgstr "git-whatchanged(1)"
@@ -65729,7 +65729,7 @@ msgstr ""
#. type: Title =
#: en/git-worktree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-worktree(1)"
msgstr "git-worktree(1)"
@@ -65895,7 +65895,7 @@ msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:104
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]checkout"
msgstr "--[no-]checkout"
@@ -66160,7 +66160,7 @@ msgstr ""
#. type: Title =
#: en/git-write-tree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-write-tree(1)"
msgstr "git-write-tree(1)"
@@ -66198,7 +66198,7 @@ msgstr ""
#. type: Labeled list
#: en/git-write-tree.txt:30
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--missing-ok"
msgstr "--missing-ok"
@@ -66531,7 +66531,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.conflictStyle"
msgstr "merge.conflictStyle"
@@ -66548,7 +66548,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:9
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.defaultToUpstream"
msgstr "merge.defaultToUpstream"
@@ -66566,7 +66566,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.ff"
msgstr "merge.ff"
@@ -66584,7 +66584,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.renameLimit"
msgstr "merge.renameLimit"
@@ -66597,7 +66597,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:36
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.renormalize"
msgstr "merge.renormalize"
@@ -66615,7 +66615,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.stat"
msgstr "merge.stat"
@@ -66628,7 +66628,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:50
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.tool"
msgstr "merge.tool"
@@ -66643,7 +66643,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.verbosity"
msgstr "merge.verbosity"
@@ -66755,7 +66755,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ff-only"
msgstr "--ff-only"
@@ -66795,13 +66795,13 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:64
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
#: en/merge-options.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-squash"
msgstr "--no-squash"
@@ -66845,13 +66845,13 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:90
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
#: en/merge-options.txt:91
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
@@ -66866,7 +66866,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:99
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-summary"
msgstr "--no-summary"
@@ -66892,7 +66892,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:121
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
@@ -67970,7 +67970,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:17
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--abbrev-commit"
msgstr "--abbrev-commit"
@@ -67991,7 +67991,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:26
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-abbrev-commit"
msgstr "--no-abbrev-commit"
@@ -68029,13 +68029,13 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--expand-tabs"
msgstr "--expand-tabs"
#. type: Labeled list
#: en/pretty-options.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-expand-tabs"
msgstr "--no-expand-tabs"
@@ -68099,7 +68099,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:81
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-notes"
msgstr "--no-notes"
@@ -68120,7 +68120,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:89
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]standard-notes"
msgstr "--[no-]standard-notes"
@@ -68133,7 +68133,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:94
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-signature"
msgstr "--show-signature"
@@ -69147,7 +69147,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:71
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--invert-grep"
msgstr "--invert-grep"
@@ -69160,7 +69160,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:76
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--regexp-ignore-case"
msgstr "--regexp-ignore-case"
@@ -69201,7 +69201,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:98
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--remove-empty"
msgstr "--remove-empty"
@@ -69212,7 +69212,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:101
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--merges"
msgstr "--merges"
@@ -69224,7 +69224,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:104
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-merges"
msgstr "--no-merges"
@@ -69249,13 +69249,13 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:110
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-min-parents"
msgstr "--no-min-parents"
#. type: Labeled list
#: en/rev-list-options.txt:111
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-max-parents"
msgstr "--no-max-parents"
@@ -69363,7 +69363,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:178
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--reflog"
msgstr "--reflog"
@@ -69383,7 +69383,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:187 en/rev-list-options.txt:569
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--bisect"
msgstr "--bisect"
@@ -69414,7 +69414,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:209
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--cherry-mark"
msgstr "--cherry-mark"
@@ -69427,7 +69427,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:213
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--cherry-pick"
msgstr "--cherry-pick"
@@ -69452,13 +69452,13 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:226
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--left-only"
msgstr "--left-only"
#. type: Labeled list
#: en/rev-list-options.txt:227
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--right-only"
msgstr "--right-only"
@@ -69480,7 +69480,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:238
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--cherry"
msgstr "--cherry"
@@ -69495,7 +69495,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:246
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--walk-reflogs"
msgstr "--walk-reflogs"
@@ -69561,7 +69561,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:282
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--boundary"
msgstr "--boundary"
@@ -69573,7 +69573,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:287
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-bitmap-index"
msgstr "--use-bitmap-index"
@@ -69631,7 +69631,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:313
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--simplify-by-decoration"
msgstr "--simplify-by-decoration"
@@ -69666,7 +69666,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:326
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--full-history"
msgstr "--full-history"
@@ -69677,7 +69677,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:329 en/rev-list-options.txt:462
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--dense"
msgstr "--dense"
@@ -69694,7 +69694,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:336 en/rev-list-options.txt:473
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--simplify-merges"
msgstr "--simplify-merges"
@@ -69708,7 +69708,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:341 en/rev-list-options.txt:520
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ancestry-path"
msgstr "--ancestry-path"
@@ -70159,7 +70159,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:593
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--bisect-vars"
msgstr "--bisect-vars"
@@ -70179,7 +70179,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:605
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--bisect-all"
msgstr "--bisect-all"
@@ -70228,7 +70228,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:631
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--author-date-order"
msgstr "--author-date-order"
@@ -70296,7 +70296,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:670
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--objects"
msgstr "--objects"
@@ -70310,7 +70310,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:676
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--objects-edge"
msgstr "--objects-edge"
@@ -70325,7 +70325,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:683
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
@@ -70339,7 +70339,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:688
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--indexed-objects"
msgstr "--indexed-objects"
@@ -70375,7 +70375,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:707
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--do-walk"
msgstr "--do-walk"
@@ -70400,7 +70400,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:721
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--relative-date"
msgstr "--relative-date"
@@ -70529,7 +70529,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:781
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--header"
msgstr "--header"
@@ -70549,7 +70549,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:790
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--children"
msgstr "--children"
@@ -70562,7 +70562,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:795
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--timestamp"
msgstr "--timestamp"
@@ -70573,7 +70573,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:799
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--left-right"
msgstr "--left-right"
@@ -70627,7 +70627,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:828
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--graph"
msgstr "--graph"
diff --git a/scripts/pre-translate-po b/scripts/pre-translate-po
index db01a9f..aee20f6 100755
--- a/scripts/pre-translate-po
+++ b/scripts/pre-translate-po
@@ -10,7 +10,8 @@ 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[\]]+|mail)(\[[157]\]|\([157]\))(,|;)?(\n| )?)+', entry.msgid) \
- or re.fullmatch(r'`[a-zA-Z-_]+`|(user|transfer|submodule|stash|status|splitIndex|showbranch|sendemail|repack|remote|receive|push|merge(tool)?|mailinfo|log|interactive|instaweb|i18n|help|gui|gitweb|fastimport|format|fetch|diff(tool)?|credential|commit|column|core|branch|apply|color|git-p4)\.[a-zA-Z_.]+', entry.msgid):
+ or re.fullmatch(r'`[a-zA-Z-_]+`|(user|transfer|submodule|stash|status|splitIndex|showbranch|sendemail|repack|remote|receive|push|merge(tool)?|mailinfo|log|interactive|instaweb|i18n|help|gui|gitweb|fastimport|format|fetch|diff(tool)?|credential|commit|column|core|branch|apply|color|git-p4)\.[a-zA-Z_.]+', entry.msgid)\
+ or re.fullmatch(r'`?GIT_[A-Z_]+`?', entry.msgid):
entry.msgstr = entry.msgid
entry.flags.append("ignore-same")
flags = set(entry.flags)
--
GitLab