diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index 80259daa1c88983883c5b11abd9551d69b85c227..06766e54d68a8cc2e4bfe829744833e8f6b85e2a 100644
--- a/po/documentation.pt_PT.po
+++ b/po/documentation.pt_PT.po
@@ -17,9 +17,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "-b"
-msgstr ""
+msgstr "-b"
 
 #. type: Plain text
 #: en/blame-options.txt:4
@@ -29,9 +29,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:319 en/git-fsck.txt:38 en/git-rebase.txt:471
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--root"
-msgstr ""
+msgstr "--root"
 
 #. type: Plain text
 #: en/blame-options.txt:8
@@ -41,9 +41,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/blame-options.txt:9
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--show-stats"
-msgstr ""
+msgstr "--show-stats"
 
 #. type: Plain text
 #: en/blame-options.txt:11
@@ -77,9 +77,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:198 en/git-clone.txt:44 en/git-config.txt:164 en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "-l"
-msgstr ""
+msgstr "-l"
 
 #. type: Plain text
 #: en/blame-options.txt:24
@@ -89,9 +89,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/blame-options.txt:25 en/fetch-options.txt:141 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:158 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1000
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "-t"
-msgstr ""
+msgstr "-t"
 
 #. type: Plain text
 #: en/blame-options.txt:27
@@ -125,15 +125,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:95 en/git-add.txt:88 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41 en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:433 en/git-request-pull.txt:29 en/git-restore.txt:46 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "-p"
-msgstr ""
+msgstr "-p"
 
 #. type: Labeled list
 #: en/blame-options.txt:40 en/git-commit.txt:113 en/git-push.txt:176 en/git-worktree.txt:179
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--porcelain"
-msgstr ""
+msgstr "--porcelain"
 
 #. type: Plain text
 #: en/blame-options.txt:42
@@ -143,9 +143,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/blame-options.txt:43
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--line-porcelain"
-msgstr ""
+msgstr "--line-porcelain"
 
 #. type: Plain text
 #: en/blame-options.txt:47
@@ -155,9 +155,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/blame-options.txt:48 en/git-pack-objects.txt:138 en/git-svn.txt:373
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--incremental"
-msgstr ""
+msgstr "--incremental"
 
 #. type: Plain text
 #: en/blame-options.txt:51
@@ -203,9 +203,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/blame-options.txt:73 en/git-fsck.txt:100
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]progress"
-msgstr ""
+msgstr "--[no-]progress"
 
 #. type: Plain text
 #: en/blame-options.txt:79
@@ -275,9 +275,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "-h"
-msgstr ""
+msgstr "-h"
 
 #. type: Plain text
 #: en/blame-options.txt:133
@@ -287,9 +287,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:233
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-annotate[1]"
-msgstr ""
+msgstr "linkgit:git-annotate[1]"
 
 #. type: Plain text
 #: en/cmds-ancillaryinterrogators.txt:3
@@ -299,9 +299,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/cmds-ancillaryinterrogators.txt:4 en/git-annotate.txt:30
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-blame[1]"
-msgstr ""
+msgstr "linkgit:git-blame[1]"
 
 #. type: Plain text
 #: en/cmds-ancillaryinterrogators.txt:6
@@ -311,9 +311,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-ancillaryinterrogators.txt:7
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-count-objects[1]"
-msgstr ""
+msgstr "linkgit:git-count-objects[1]"
 
 #. type: Plain text
 #: en/cmds-ancillaryinterrogators.txt:9
@@ -323,9 +323,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-ancillaryinterrogators.txt:10
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-difftool[1]"
-msgstr ""
+msgstr "linkgit:git-difftool[1]"
 
 #. type: Plain text
 #: en/cmds-ancillaryinterrogators.txt:12
@@ -335,9 +335,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-ancillaryinterrogators.txt:13
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fsck[1]"
-msgstr ""
+msgstr "linkgit:git-fsck[1]"
 
 #. type: Plain text
 #: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
@@ -347,9 +347,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-ancillaryinterrogators.txt:16
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-help[1]"
-msgstr ""
+msgstr "linkgit:git-help[1]"
 
 #. type: Plain text
 #: en/cmds-ancillaryinterrogators.txt:18
@@ -359,9 +359,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-ancillaryinterrogators.txt:19
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-instaweb[1]"
-msgstr ""
+msgstr "linkgit:git-instaweb[1]"
 
 #. type: Plain text
 #: en/cmds-ancillaryinterrogators.txt:21
@@ -371,9 +371,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-ancillaryinterrogators.txt:22
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-merge-tree[1]"
-msgstr ""
+msgstr "linkgit:git-merge-tree[1]"
 
 #. type: Plain text
 #: en/cmds-ancillaryinterrogators.txt:24
@@ -383,9 +383,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-ancillaryinterrogators.txt:25
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-rerere[1]"
-msgstr ""
+msgstr "linkgit:git-rerere[1]"
 
 #. type: Plain text
 #: en/cmds-ancillaryinterrogators.txt:27
@@ -395,9 +395,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-ancillaryinterrogators.txt:28
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-show-branch[1]"
-msgstr ""
+msgstr "linkgit:git-show-branch[1]"
 
 #. type: Plain text
 #: en/cmds-ancillaryinterrogators.txt:30
@@ -407,9 +407,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-ancillaryinterrogators.txt:31
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-verify-commit[1]"
-msgstr ""
+msgstr "linkgit:git-verify-commit[1]"
 
 #. type: Plain text
 #: en/cmds-ancillaryinterrogators.txt:33
@@ -419,9 +419,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-ancillaryinterrogators.txt:34
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-verify-tag[1]"
-msgstr ""
+msgstr "linkgit:git-verify-tag[1]"
 
 #. type: Plain text
 #: en/cmds-ancillaryinterrogators.txt:36
@@ -431,9 +431,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-ancillaryinterrogators.txt:37
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-whatchanged[1]"
-msgstr ""
+msgstr "linkgit:git-whatchanged[1]"
 
 #. type: Plain text
 #: en/cmds-ancillaryinterrogators.txt:39
@@ -443,9 +443,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:gitweb[1]"
-msgstr ""
+msgstr "linkgit:gitweb[1]"
 
 #. type: Plain text
 #: en/cmds-ancillaryinterrogators.txt:42
@@ -455,9 +455,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:144
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-config[1]"
-msgstr ""
+msgstr "linkgit:git-config[1]"
 
 #. type: Plain text
 #: en/cmds-ancillarymanipulators.txt:3
@@ -467,9 +467,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1505
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-export[1]"
-msgstr ""
+msgstr "linkgit:git-fast-export[1]"
 
 #. type: Plain text
 #: en/cmds-ancillarymanipulators.txt:6
@@ -479,9 +479,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:243
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-import[1]"
-msgstr ""
+msgstr "linkgit:git-fast-import[1]"
 
 #. type: Plain text
 #: en/cmds-ancillarymanipulators.txt:9
@@ -491,9 +491,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-ancillarymanipulators.txt:10
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-filter-branch[1]"
-msgstr ""
+msgstr "linkgit:git-filter-branch[1]"
 
 #. type: Plain text
 #: en/cmds-ancillarymanipulators.txt:12
@@ -503,9 +503,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:141
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-mergetool[1]"
-msgstr ""
+msgstr "linkgit:git-mergetool[1]"
 
 #. type: Plain text
 #: en/cmds-ancillarymanipulators.txt:15
@@ -515,9 +515,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-ancillarymanipulators.txt:16
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-pack-refs[1]"
-msgstr ""
+msgstr "linkgit:git-pack-refs[1]"
 
 #. type: Plain text
 #: en/cmds-ancillarymanipulators.txt:18
@@ -527,9 +527,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-ancillarymanipulators.txt:19
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-prune[1]"
-msgstr ""
+msgstr "linkgit:git-prune[1]"
 
 #. type: Plain text
 #: en/cmds-ancillarymanipulators.txt:21
@@ -539,9 +539,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-ancillarymanipulators.txt:22
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-reflog[1]"
-msgstr ""
+msgstr "linkgit:git-reflog[1]"
 
 #. type: Plain text
 #: en/cmds-ancillarymanipulators.txt:24
@@ -551,9 +551,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-ancillarymanipulators.txt:25
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-remote[1]"
-msgstr ""
+msgstr "linkgit:git-remote[1]"
 
 #. type: Plain text
 #: en/cmds-ancillarymanipulators.txt:27
@@ -563,9 +563,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-ancillarymanipulators.txt:28
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-repack[1]"
-msgstr ""
+msgstr "linkgit:git-repack[1]"
 
 #. type: Plain text
 #: en/cmds-ancillarymanipulators.txt:30
@@ -575,9 +575,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-ancillarymanipulators.txt:31
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-replace[1]"
-msgstr ""
+msgstr "linkgit:git-replace[1]"
 
 #. type: Plain text
 #: en/cmds-ancillarymanipulators.txt:33
@@ -587,9 +587,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-foreignscminterface.txt:1
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-archimport[1]"
-msgstr ""
+msgstr "linkgit:git-archimport[1]"
 
 #. type: Plain text
 #: en/cmds-foreignscminterface.txt:3
@@ -599,9 +599,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-foreignscminterface.txt:4
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-cvsexportcommit[1]"
-msgstr ""
+msgstr "linkgit:git-cvsexportcommit[1]"
 
 #. type: Plain text
 #: en/cmds-foreignscminterface.txt:6
@@ -611,9 +611,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-foreignscminterface.txt:7
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-cvsimport[1]"
-msgstr ""
+msgstr "linkgit:git-cvsimport[1]"
 
 #. type: Plain text
 #: en/cmds-foreignscminterface.txt:9
@@ -623,9 +623,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-foreignscminterface.txt:10
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-cvsserver[1]"
-msgstr ""
+msgstr "linkgit:git-cvsserver[1]"
 
 #. type: Plain text
 #: en/cmds-foreignscminterface.txt:12
@@ -635,9 +635,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-foreignscminterface.txt:13
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-imap-send[1]"
-msgstr ""
+msgstr "linkgit:git-imap-send[1]"
 
 #. type: Plain text
 #: en/cmds-foreignscminterface.txt:15
@@ -647,9 +647,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-foreignscminterface.txt:16
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-p4[1]"
-msgstr ""
+msgstr "linkgit:git-p4[1]"
 
 #. type: Plain text
 #: en/cmds-foreignscminterface.txt:18
@@ -659,9 +659,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-foreignscminterface.txt:19
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-quiltimport[1]"
-msgstr ""
+msgstr "linkgit:git-quiltimport[1]"
 
 #. type: Plain text
 #: en/cmds-foreignscminterface.txt:21
@@ -671,9 +671,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-foreignscminterface.txt:22
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-request-pull[1]"
-msgstr ""
+msgstr "linkgit:git-request-pull[1]"
 
 #. type: Plain text
 #: en/cmds-foreignscminterface.txt:24
@@ -683,9 +683,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-foreignscminterface.txt:25
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-send-email[1]"
-msgstr ""
+msgstr "linkgit:git-send-email[1]"
 
 #. type: Plain text
 #: en/cmds-foreignscminterface.txt:27
@@ -695,9 +695,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-foreignscminterface.txt:28
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-svn[1]"
-msgstr ""
+msgstr "linkgit:git-svn[1]"
 
 #. type: Plain text
 #: en/cmds-foreignscminterface.txt:30
@@ -707,9 +707,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "linkgit:git-add[1]"
-msgstr ""
+msgstr "linkgit:git-add[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:3
@@ -719,9 +719,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:4
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-am[1]"
-msgstr ""
+msgstr "linkgit:git-am[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:6
@@ -731,9 +731,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:7
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-archive[1]"
-msgstr ""
+msgstr "linkgit:git-archive[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:9
@@ -743,9 +743,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:10
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-bisect[1]"
-msgstr ""
+msgstr "linkgit:git-bisect[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:12
@@ -755,9 +755,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:13
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-branch[1]"
-msgstr ""
+msgstr "linkgit:git-branch[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:15
@@ -767,9 +767,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:16
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-bundle[1]"
-msgstr ""
+msgstr "linkgit:git-bundle[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:18
@@ -779,9 +779,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:19
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-checkout[1]"
-msgstr ""
+msgstr "linkgit:git-checkout[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:21
@@ -791,9 +791,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:22 en/git-revert.txt:139
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-cherry-pick[1]"
-msgstr ""
+msgstr "linkgit:git-cherry-pick[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:24
@@ -803,9 +803,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:25
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-citool[1]"
-msgstr ""
+msgstr "linkgit:git-citool[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:27
@@ -815,9 +815,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:28
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-clean[1]"
-msgstr ""
+msgstr "linkgit:git-clean[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:30
@@ -827,9 +827,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:31
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-clone[1]"
-msgstr ""
+msgstr "linkgit:git-clone[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:33
@@ -839,9 +839,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:34
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-commit[1]"
-msgstr ""
+msgstr "linkgit:git-commit[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:36
@@ -851,9 +851,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:37
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-describe[1]"
-msgstr ""
+msgstr "linkgit:git-describe[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:39
@@ -863,9 +863,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:138
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-diff[1]"
-msgstr ""
+msgstr "linkgit:git-diff[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:42
@@ -875,9 +875,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fetch[1]"
-msgstr ""
+msgstr "linkgit:git-fetch[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:45
@@ -887,9 +887,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:46
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-format-patch[1]"
-msgstr ""
+msgstr "linkgit:git-format-patch[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:48
@@ -899,9 +899,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:49
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-gc[1]"
-msgstr ""
+msgstr "linkgit:git-gc[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:51
@@ -911,9 +911,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:52
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-grep[1]"
-msgstr ""
+msgstr "linkgit:git-grep[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:54
@@ -923,9 +923,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:55
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-gui[1]"
-msgstr ""
+msgstr "linkgit:git-gui[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:57
@@ -935,9 +935,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:58
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-init[1]"
-msgstr ""
+msgstr "linkgit:git-init[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:60
@@ -947,9 +947,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:61
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-log[1]"
-msgstr ""
+msgstr "linkgit:git-log[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:63
@@ -959,9 +959,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:64 en/git-fmt-merge-msg.txt:75
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-merge[1]"
-msgstr ""
+msgstr "linkgit:git-merge[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:66
@@ -971,9 +971,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:67
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-mv[1]"
-msgstr ""
+msgstr "linkgit:git-mv[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:69
@@ -983,9 +983,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:70
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-notes[1]"
-msgstr ""
+msgstr "linkgit:git-notes[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:72
@@ -995,9 +995,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:73 en/git-fetch.txt:296
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "linkgit:git-pull[1]"
-msgstr ""
+msgstr "linkgit:git-pull[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:75
@@ -1007,9 +1007,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:76
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-push[1]"
-msgstr ""
+msgstr "linkgit:git-push[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:78
@@ -1019,9 +1019,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:79
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-range-diff[1]"
-msgstr ""
+msgstr "linkgit:git-range-diff[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:81
@@ -1031,9 +1031,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:82 en/git-svn.txt:1171
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-rebase[1]"
-msgstr ""
+msgstr "linkgit:git-rebase[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:84
@@ -1043,9 +1043,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:85
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-reset[1]"
-msgstr ""
+msgstr "linkgit:git-reset[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:87
@@ -1055,9 +1055,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:88
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-restore[1]"
-msgstr ""
+msgstr "linkgit:git-restore[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:90
@@ -1067,9 +1067,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:91 en/git-cherry-pick.txt:240
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-revert[1]"
-msgstr ""
+msgstr "linkgit:git-revert[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:93
@@ -1079,9 +1079,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:94
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-rm[1]"
-msgstr ""
+msgstr "linkgit:git-rm[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:96
@@ -1091,9 +1091,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:97
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-shortlog[1]"
-msgstr ""
+msgstr "linkgit:git-shortlog[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:99
@@ -1103,9 +1103,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:100
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-show[1]"
-msgstr ""
+msgstr "linkgit:git-show[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:102
@@ -1115,9 +1115,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:103
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-stash[1]"
-msgstr ""
+msgstr "linkgit:git-stash[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:105
@@ -1127,9 +1127,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:106
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-status[1]"
-msgstr ""
+msgstr "linkgit:git-status[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:108
@@ -1139,9 +1139,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:109
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-submodule[1]"
-msgstr ""
+msgstr "linkgit:git-submodule[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:111
@@ -1151,9 +1151,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:112
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-switch[1]"
-msgstr ""
+msgstr "linkgit:git-switch[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:114
@@ -1163,9 +1163,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:115
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-tag[1]"
-msgstr ""
+msgstr "linkgit:git-tag[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:117
@@ -1175,9 +1175,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:118
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-worktree[1]"
-msgstr ""
+msgstr "linkgit:git-worktree[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:120
@@ -1187,9 +1187,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:gitk[1]"
-msgstr ""
+msgstr "linkgit:gitk[1]"
 
 #. type: Plain text
 #: en/cmds-mainporcelain.txt:123
@@ -1199,9 +1199,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbinginterrogators.txt:1
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-cat-file[1]"
-msgstr ""
+msgstr "linkgit:git-cat-file[1]"
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:3
@@ -1211,9 +1211,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbinginterrogators.txt:4
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-cherry[1]"
-msgstr ""
+msgstr "linkgit:git-cherry[1]"
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:6
@@ -1223,9 +1223,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbinginterrogators.txt:7
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-diff-files[1]"
-msgstr ""
+msgstr "linkgit:git-diff-files[1]"
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:9
@@ -1235,9 +1235,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbinginterrogators.txt:10
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-diff-index[1]"
-msgstr ""
+msgstr "linkgit:git-diff-index[1]"
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:12
@@ -1247,9 +1247,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbinginterrogators.txt:13
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-diff-tree[1]"
-msgstr ""
+msgstr "linkgit:git-diff-tree[1]"
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:15
@@ -1259,9 +1259,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbinginterrogators.txt:16
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-for-each-ref[1]"
-msgstr ""
+msgstr "linkgit:git-for-each-ref[1]"
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:18
@@ -1271,9 +1271,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbinginterrogators.txt:19
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-get-tar-commit-id[1]"
-msgstr ""
+msgstr "linkgit:git-get-tar-commit-id[1]"
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:21
@@ -1283,9 +1283,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbinginterrogators.txt:22
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-ls-files[1]"
-msgstr ""
+msgstr "linkgit:git-ls-files[1]"
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:24
@@ -1295,9 +1295,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbinginterrogators.txt:25
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-ls-remote[1]"
-msgstr ""
+msgstr "linkgit:git-ls-remote[1]"
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:27
@@ -1307,9 +1307,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbinginterrogators.txt:28
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-ls-tree[1]"
-msgstr ""
+msgstr "linkgit:git-ls-tree[1]"
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:30
@@ -1319,9 +1319,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbinginterrogators.txt:31
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-merge-base[1]"
-msgstr ""
+msgstr "linkgit:git-merge-base[1]"
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:33
@@ -1331,9 +1331,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbinginterrogators.txt:34
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-name-rev[1]"
-msgstr ""
+msgstr "linkgit:git-name-rev[1]"
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:36
@@ -1343,9 +1343,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbinginterrogators.txt:37
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-pack-redundant[1]"
-msgstr ""
+msgstr "linkgit:git-pack-redundant[1]"
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:39
@@ -1355,9 +1355,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbinginterrogators.txt:40
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-rev-list[1]"
-msgstr ""
+msgstr "linkgit:git-rev-list[1]"
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:42
@@ -1367,9 +1367,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbinginterrogators.txt:43
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-rev-parse[1]"
-msgstr ""
+msgstr "linkgit:git-rev-parse[1]"
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:45
@@ -1379,9 +1379,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbinginterrogators.txt:46
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-show-index[1]"
-msgstr ""
+msgstr "linkgit:git-show-index[1]"
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:48
@@ -1391,9 +1391,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:49 en/git-for-each-ref.txt:391
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-show-ref[1]"
-msgstr ""
+msgstr "linkgit:git-show-ref[1]"
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:51
@@ -1403,9 +1403,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbinginterrogators.txt:52
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-unpack-file[1]"
-msgstr ""
+msgstr "linkgit:git-unpack-file[1]"
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:54
@@ -1415,9 +1415,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbinginterrogators.txt:55
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-var[1]"
-msgstr ""
+msgstr "linkgit:git-var[1]"
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:57
@@ -1427,9 +1427,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbinginterrogators.txt:58
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-verify-pack[1]"
-msgstr ""
+msgstr "linkgit:git-verify-pack[1]"
 
 #. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:60
@@ -1439,9 +1439,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbingmanipulators.txt:1
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-apply[1]"
-msgstr ""
+msgstr "linkgit:git-apply[1]"
 
 #. type: Plain text
 #: en/cmds-plumbingmanipulators.txt:3
@@ -1451,9 +1451,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbingmanipulators.txt:4
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-checkout-index[1]"
-msgstr ""
+msgstr "linkgit:git-checkout-index[1]"
 
 #. type: Plain text
 #: en/cmds-plumbingmanipulators.txt:6
@@ -1463,9 +1463,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbingmanipulators.txt:7
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-commit-graph[1]"
-msgstr ""
+msgstr "linkgit:git-commit-graph[1]"
 
 #. type: Plain text
 #: en/cmds-plumbingmanipulators.txt:9
@@ -1475,9 +1475,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbingmanipulators.txt:10
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-commit-tree[1]"
-msgstr ""
+msgstr "linkgit:git-commit-tree[1]"
 
 #. type: Plain text
 #: en/cmds-plumbingmanipulators.txt:12
@@ -1487,9 +1487,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbingmanipulators.txt:13
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-hash-object[1]"
-msgstr ""
+msgstr "linkgit:git-hash-object[1]"
 
 #. type: Plain text
 #: en/cmds-plumbingmanipulators.txt:15
@@ -1499,9 +1499,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbingmanipulators.txt:16
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-index-pack[1]"
-msgstr ""
+msgstr "linkgit:git-index-pack[1]"
 
 #. type: Plain text
 #: en/cmds-plumbingmanipulators.txt:18
@@ -1511,9 +1511,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbingmanipulators.txt:19
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-merge-file[1]"
-msgstr ""
+msgstr "linkgit:git-merge-file[1]"
 
 #. type: Plain text
 #: en/cmds-plumbingmanipulators.txt:21
@@ -1523,9 +1523,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbingmanipulators.txt:22
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-merge-index[1]"
-msgstr ""
+msgstr "linkgit:git-merge-index[1]"
 
 #. type: Plain text
 #: en/cmds-plumbingmanipulators.txt:24
@@ -1535,9 +1535,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbingmanipulators.txt:25
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-mktag[1]"
-msgstr ""
+msgstr "linkgit:git-mktag[1]"
 
 #. type: Plain text
 #: en/cmds-plumbingmanipulators.txt:27
@@ -1547,9 +1547,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbingmanipulators.txt:28
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-mktree[1]"
-msgstr ""
+msgstr "linkgit:git-mktree[1]"
 
 #. type: Plain text
 #: en/cmds-plumbingmanipulators.txt:30
@@ -1559,9 +1559,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbingmanipulators.txt:31
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-multi-pack-index[1]"
-msgstr ""
+msgstr "linkgit:git-multi-pack-index[1]"
 
 #. type: Plain text
 #: en/cmds-plumbingmanipulators.txt:33
@@ -1571,9 +1571,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbingmanipulators.txt:34
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-pack-objects[1]"
-msgstr ""
+msgstr "linkgit:git-pack-objects[1]"
 
 #. type: Plain text
 #: en/cmds-plumbingmanipulators.txt:36
@@ -1583,9 +1583,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbingmanipulators.txt:37
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-prune-packed[1]"
-msgstr ""
+msgstr "linkgit:git-prune-packed[1]"
 
 #. type: Plain text
 #: en/cmds-plumbingmanipulators.txt:39
@@ -1595,9 +1595,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbingmanipulators.txt:40
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-read-tree[1]"
-msgstr ""
+msgstr "linkgit:git-read-tree[1]"
 
 #. type: Plain text
 #: en/cmds-plumbingmanipulators.txt:42
@@ -1607,9 +1607,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbingmanipulators.txt:43
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-symbolic-ref[1]"
-msgstr ""
+msgstr "linkgit:git-symbolic-ref[1]"
 
 #. type: Plain text
 #: en/cmds-plumbingmanipulators.txt:45
@@ -1619,9 +1619,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbingmanipulators.txt:46
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-unpack-objects[1]"
-msgstr ""
+msgstr "linkgit:git-unpack-objects[1]"
 
 #. type: Plain text
 #: en/cmds-plumbingmanipulators.txt:48
@@ -1631,9 +1631,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbingmanipulators.txt:49
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-update-index[1]"
-msgstr ""
+msgstr "linkgit:git-update-index[1]"
 
 #. type: Plain text
 #: en/cmds-plumbingmanipulators.txt:51
@@ -1643,9 +1643,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-plumbingmanipulators.txt:52
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-update-ref[1]"
-msgstr ""
+msgstr "linkgit:git-update-ref[1]"
 
 #. type: Plain text
 #: en/cmds-plumbingmanipulators.txt:54
@@ -1655,9 +1655,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:120
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-write-tree[1]"
-msgstr ""
+msgstr "linkgit:git-write-tree[1]"
 
 #. type: Plain text
 #: en/cmds-plumbingmanipulators.txt:57
@@ -1667,9 +1667,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-purehelpers.txt:1
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-check-attr[1]"
-msgstr ""
+msgstr "linkgit:git-check-attr[1]"
 
 #. type: Plain text
 #: en/cmds-purehelpers.txt:3
@@ -1679,9 +1679,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-purehelpers.txt:4
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-check-ignore[1]"
-msgstr ""
+msgstr "linkgit:git-check-ignore[1]"
 
 #. type: Plain text
 #: en/cmds-purehelpers.txt:6
@@ -1691,9 +1691,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-purehelpers.txt:7
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-check-mailmap[1]"
-msgstr ""
+msgstr "linkgit:git-check-mailmap[1]"
 
 #. type: Plain text
 #: en/cmds-purehelpers.txt:9
@@ -1703,9 +1703,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-purehelpers.txt:10
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-check-ref-format[1]"
-msgstr ""
+msgstr "linkgit:git-check-ref-format[1]"
 
 #. type: Plain text
 #: en/cmds-purehelpers.txt:12
@@ -1715,9 +1715,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-purehelpers.txt:13
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-column[1]"
-msgstr ""
+msgstr "linkgit:git-column[1]"
 
 #. type: Plain text
 #: en/cmds-purehelpers.txt:15
@@ -1727,9 +1727,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-purehelpers.txt:16
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-credential[1]"
-msgstr ""
+msgstr "linkgit:git-credential[1]"
 
 #. type: Plain text
 #: en/cmds-purehelpers.txt:18
@@ -1739,9 +1739,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-purehelpers.txt:19
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-credential-cache[1]"
-msgstr ""
+msgstr "linkgit:git-credential-cache[1]"
 
 #. type: Plain text
 #: en/cmds-purehelpers.txt:21
@@ -1751,9 +1751,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-purehelpers.txt:22
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-credential-store[1]"
-msgstr ""
+msgstr "linkgit:git-credential-store[1]"
 
 #. type: Plain text
 #: en/cmds-purehelpers.txt:24
@@ -1763,9 +1763,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-purehelpers.txt:25
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fmt-merge-msg[1]"
-msgstr ""
+msgstr "linkgit:git-fmt-merge-msg[1]"
 
 #. type: Plain text
 #: en/cmds-purehelpers.txt:27
@@ -1775,9 +1775,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-purehelpers.txt:28
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-interpret-trailers[1]"
-msgstr ""
+msgstr "linkgit:git-interpret-trailers[1]"
 
 #. type: Plain text
 #: en/cmds-purehelpers.txt:30
@@ -1787,9 +1787,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-purehelpers.txt:31
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-mailinfo[1]"
-msgstr ""
+msgstr "linkgit:git-mailinfo[1]"
 
 #. type: Plain text
 #: en/cmds-purehelpers.txt:33
@@ -1799,9 +1799,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-purehelpers.txt:34
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-mailsplit[1]"
-msgstr ""
+msgstr "linkgit:git-mailsplit[1]"
 
 #. type: Plain text
 #: en/cmds-purehelpers.txt:36
@@ -1811,9 +1811,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-purehelpers.txt:37
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-merge-one-file[1]"
-msgstr ""
+msgstr "linkgit:git-merge-one-file[1]"
 
 #. type: Plain text
 #: en/cmds-purehelpers.txt:39
@@ -1823,9 +1823,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-patch-id[1]"
-msgstr ""
+msgstr "linkgit:git-patch-id[1]"
 
 #. type: Plain text
 #: en/cmds-purehelpers.txt:42
@@ -1835,9 +1835,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-purehelpers.txt:43
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-sh-i18n[1]"
-msgstr ""
+msgstr "linkgit:git-sh-i18n[1]"
 
 #. type: Plain text
 #: en/cmds-purehelpers.txt:45
@@ -1847,9 +1847,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-purehelpers.txt:46
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-sh-setup[1]"
-msgstr ""
+msgstr "linkgit:git-sh-setup[1]"
 
 #. type: Plain text
 #: en/cmds-purehelpers.txt:48
@@ -1859,9 +1859,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-purehelpers.txt:49
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-stripspace[1]"
-msgstr ""
+msgstr "linkgit:git-stripspace[1]"
 
 #. type: Plain text
 #: en/cmds-purehelpers.txt:51
@@ -1871,9 +1871,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-synchelpers.txt:1
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-http-fetch[1]"
-msgstr ""
+msgstr "linkgit:git-http-fetch[1]"
 
 #. type: Plain text
 #: en/cmds-synchelpers.txt:3
@@ -1883,9 +1883,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-synchelpers.txt:4
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-http-push[1]"
-msgstr ""
+msgstr "linkgit:git-http-push[1]"
 
 #. type: Plain text
 #: en/cmds-synchelpers.txt:6
@@ -1895,9 +1895,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-synchelpers.txt:7
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-parse-remote[1]"
-msgstr ""
+msgstr "linkgit:git-parse-remote[1]"
 
 #. type: Plain text
 #: en/cmds-synchelpers.txt:9
@@ -1907,9 +1907,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-synchelpers.txt:10
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-receive-pack[1]"
-msgstr ""
+msgstr "linkgit:git-receive-pack[1]"
 
 #. type: Plain text
 #: en/cmds-synchelpers.txt:12
@@ -1919,9 +1919,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-synchelpers.txt:13
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-shell[1]"
-msgstr ""
+msgstr "linkgit:git-shell[1]"
 
 #. type: Plain text
 #: en/cmds-synchelpers.txt:15
@@ -1931,9 +1931,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-synchelpers.txt:16
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-upload-archive[1]"
-msgstr ""
+msgstr "linkgit:git-upload-archive[1]"
 
 #. type: Plain text
 #: en/cmds-synchelpers.txt:18
@@ -1943,9 +1943,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-synchelpers.txt:19
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-upload-pack[1]"
-msgstr ""
+msgstr "linkgit:git-upload-pack[1]"
 
 #. type: Plain text
 #: en/cmds-synchelpers.txt:21
@@ -1955,9 +1955,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-synchingrepositories.txt:1
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-daemon[1]"
-msgstr ""
+msgstr "linkgit:git-daemon[1]"
 
 #. type: Plain text
 #: en/cmds-synchingrepositories.txt:3
@@ -1967,9 +1967,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-synchingrepositories.txt:4
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fetch-pack[1]"
-msgstr ""
+msgstr "linkgit:git-fetch-pack[1]"
 
 #. type: Plain text
 #: en/cmds-synchingrepositories.txt:6
@@ -1979,9 +1979,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-synchingrepositories.txt:7
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-http-backend[1]"
-msgstr ""
+msgstr "linkgit:git-http-backend[1]"
 
 #. type: Plain text
 #: en/cmds-synchingrepositories.txt:9
@@ -1991,9 +1991,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-synchingrepositories.txt:10
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-send-pack[1]"
-msgstr ""
+msgstr "linkgit:git-send-pack[1]"
 
 #. type: Plain text
 #: en/cmds-synchingrepositories.txt:12
@@ -2003,9 +2003,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/cmds-synchingrepositories.txt:13
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-update-server-info[1]"
-msgstr ""
+msgstr "linkgit:git-update-server-info[1]"
 
 #. type: Plain text
 #: en/cmds-synchingrepositories.txt:15
@@ -2141,9 +2141,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/config.txt:113
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`gitdir`"
-msgstr ""
+msgstr "`gitdir`"
 
 #. type: Plain text
 #: en/config.txt:118
@@ -2207,9 +2207,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/config.txt:147
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`onbranch`"
-msgstr ""
+msgstr "`onbranch`"
 
 #. type: Plain text
 #: en/config.txt:154
@@ -2510,9 +2510,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/config/merge.txt:1
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "merge.conflictStyle"
-msgstr ""
+msgstr "merge.conflictStyle"
 
 #. type: Plain text
 #: en/config/merge.txt:8
@@ -2522,9 +2522,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/config/merge.txt:9
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "merge.defaultToUpstream"
-msgstr ""
+msgstr "merge.defaultToUpstream"
 
 #. type: Plain text
 #: en/config/merge.txt:18
@@ -2534,9 +2534,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/config/merge.txt:19
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "merge.ff"
-msgstr ""
+msgstr "merge.ff"
 
 #. type: Plain text
 #: en/config/merge.txt:28
@@ -2546,9 +2546,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/config/merge.txt:29
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "merge.verifySignatures"
-msgstr ""
+msgstr "merge.verifySignatures"
 
 #. type: Plain text
 #: en/config/merge.txt:32
@@ -2558,9 +2558,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/config/merge.txt:35
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "merge.renameLimit"
-msgstr ""
+msgstr "merge.renameLimit"
 
 #. type: Plain text
 #: en/config/merge.txt:40
@@ -2570,9 +2570,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/config/merge.txt:41
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "merge.renames"
-msgstr ""
+msgstr "merge.renames"
 
 #. type: Plain text
 #: en/config/merge.txt:45
@@ -2582,9 +2582,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/config/merge.txt:46
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "merge.directoryRenames"
-msgstr ""
+msgstr "merge.directoryRenames"
 
 #. type: Plain text
 #: en/config/merge.txt:58
@@ -2594,9 +2594,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/config/merge.txt:59
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "merge.renormalize"
-msgstr ""
+msgstr "merge.renormalize"
 
 #. type: Plain text
 #: en/config/merge.txt:68
@@ -2606,9 +2606,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/config/merge.txt:69
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "merge.stat"
-msgstr ""
+msgstr "merge.stat"
 
 #. type: Plain text
 #: en/config/merge.txt:72
@@ -2618,9 +2618,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/config/merge.txt:73
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "merge.tool"
-msgstr ""
+msgstr "merge.tool"
 
 #. type: Plain text
 #: en/config/merge.txt:78
@@ -2630,9 +2630,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/config/merge.txt:79
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "merge.guitool"
-msgstr ""
+msgstr "merge.guitool"
 
 #. type: Plain text
 #: en/config/merge.txt:84
@@ -2642,9 +2642,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/config/merge.txt:87
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "merge.verbosity"
-msgstr ""
+msgstr "merge.verbosity"
 
 #. type: Plain text
 #: en/config/merge.txt:94
@@ -2690,9 +2690,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/config/fmt-merge-msg.txt:1
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "merge.branchdesc"
-msgstr ""
+msgstr "merge.branchdesc"
 
 #. type: Plain text
 #: en/config/fmt-merge-msg.txt:5
@@ -2702,9 +2702,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/config/fmt-merge-msg.txt:6
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "merge.log"
-msgstr ""
+msgstr "merge.log"
 
 #. type: Plain text
 #: en/config/fmt-merge-msg.txt:10
@@ -3538,9 +3538,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:17 en/git-rebase.txt:327 en/merge-options.txt:86
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--no-stat"
-msgstr ""
+msgstr "--no-stat"
 
 #. type: Plain text
 #: en/diff-options.txt:19
@@ -3550,15 +3550,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:23 en/fetch-options.txt:186 en/git-add.txt:111 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:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "-u"
-msgstr ""
+msgstr "-u"
 
 #. type: Labeled list
 #: en/diff-options.txt:24 en/git-add.txt:89 en/git-checkout.txt:269 en/git-commit.txt:71 en/git-restore.txt:47
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--patch"
-msgstr ""
+msgstr "--patch"
 
 #. type: Plain text
 #: en/diff-options.txt:26
@@ -3574,15 +3574,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:30 en/git-am.txt:34 en/git-blame.txt:75 en/git-cat-file.txt:40 en/git-cherry-pick.txt:105 en/git-clone.txt:66 en/git-commit.txt:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:117 en/git-ls-files.txt:59 en/git-revert.txt:97 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:64 en/git-verify-pack.txt:31
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "-s"
-msgstr ""
+msgstr "-s"
 
 #. type: Labeled list
 #: en/diff-options.txt:31
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--no-patch"
-msgstr ""
+msgstr "--no-patch"
 
 #. type: Plain text
 #: en/diff-options.txt:34
@@ -3652,9 +3652,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:55 en/git-replace.txt:78 en/git-verify-commit.txt:19 en/git-verify-tag.txt:19
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--raw"
-msgstr ""
+msgstr "--raw"
 
 #. type: Plain text
 #: en/diff-options.txt:58
@@ -3675,9 +3675,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:72
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--patch-with-raw"
-msgstr ""
+msgstr "--patch-with-raw"
 
 #. type: Plain text
 #: en/diff-options.txt:74
@@ -3687,9 +3687,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:76
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--indent-heuristic"
-msgstr ""
+msgstr "--indent-heuristic"
 
 #. type: Plain text
 #: en/diff-options.txt:79
@@ -3699,9 +3699,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:80
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--no-indent-heuristic"
-msgstr ""
+msgstr "--no-indent-heuristic"
 
 #. type: Plain text
 #: en/diff-options.txt:82
@@ -3711,9 +3711,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:83
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--minimal"
-msgstr ""
+msgstr "--minimal"
 
 #. type: Plain text
 #: en/diff-options.txt:86 en/diff-options.txt:112
@@ -3723,9 +3723,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:87
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--patience"
-msgstr ""
+msgstr "--patience"
 
 #. type: Plain text
 #: en/diff-options.txt:89
@@ -3735,9 +3735,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:90
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--histogram"
-msgstr ""
+msgstr "--histogram"
 
 #. type: Plain text
 #: en/diff-options.txt:92
@@ -3795,15 +3795,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:109
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "`minimal`"
-msgstr ""
+msgstr "`minimal`"
 
 #. type: Labeled list
 #: en/diff-options.txt:112
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "`patience`"
-msgstr ""
+msgstr "`patience`"
 
 #. type: Plain text
 #: en/diff-options.txt:114
@@ -3813,9 +3813,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:114
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "`histogram`"
-msgstr ""
+msgstr "`histogram`"
 
 #. type: Plain text
 #: en/diff-options.txt:117
@@ -3849,9 +3849,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:141
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--compact-summary"
-msgstr ""
+msgstr "--compact-summary"
 
 #. type: Plain text
 #: en/diff-options.txt:148
@@ -3861,9 +3861,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:149 en/git-apply.txt:45
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--numstat"
-msgstr ""
+msgstr "--numstat"
 
 #. type: Plain text
 #: en/diff-options.txt:155
@@ -3873,9 +3873,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:156
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--shortstat"
-msgstr ""
+msgstr "--shortstat"
 
 #. type: Plain text
 #: en/diff-options.txt:160
@@ -3903,9 +3903,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:171
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "`changes`"
-msgstr ""
+msgstr "`changes`"
 
 #. type: Plain text
 #: en/diff-options.txt:177
@@ -3915,9 +3915,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:177
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "`lines`"
-msgstr ""
+msgstr "`lines`"
 
 #. type: Plain text
 #: en/diff-options.txt:185
@@ -3927,9 +3927,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:185
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "`files`"
-msgstr ""
+msgstr "`files`"
 
 #. type: Plain text
 #: en/diff-options.txt:190
@@ -3939,9 +3939,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:190
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "`cumulative`"
-msgstr ""
+msgstr "`cumulative`"
 
 #. type: Plain text
 #: en/diff-options.txt:195
@@ -3969,9 +3969,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:206
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--cumulative"
-msgstr ""
+msgstr "--cumulative"
 
 #. type: Plain text
 #: en/diff-options.txt:208
@@ -3993,9 +3993,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:129
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--summary"
-msgstr ""
+msgstr "--summary"
 
 #. type: Plain text
 #: en/diff-options.txt:215
@@ -4005,9 +4005,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:217
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--patch-with-stat"
-msgstr ""
+msgstr "--patch-with-stat"
 
 #. type: Plain text
 #: en/diff-options.txt:219
@@ -4017,9 +4017,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:122 en/git-update-index.txt:168
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "-z"
-msgstr ""
+msgstr "-z"
 
 #. type: Plain text
 #: en/diff-options.txt:226
@@ -4049,9 +4049,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:188 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--name-only"
-msgstr ""
+msgstr "--name-only"
 
 #. type: Plain text
 #: en/diff-options.txt:241
@@ -4061,9 +4061,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:242 en/git-ls-tree.txt:60
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--name-status"
-msgstr ""
+msgstr "--name-status"
 
 #. type: Plain text
 #: en/diff-options.txt:245
@@ -4105,9 +4105,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:225 en/git-show-branch.txt:124
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--no-color"
-msgstr ""
+msgstr "--no-color"
 
 #. type: Plain text
 #: en/diff-options.txt:269
@@ -4228,9 +4228,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:313
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--no-color-moved"
-msgstr ""
+msgstr "--no-color-moved"
 
 #. type: Plain text
 #: en/diff-options.txt:316
@@ -4318,9 +4318,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:344
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--no-color-moved-ws"
-msgstr ""
+msgstr "--no-color-moved-ws"
 
 #. type: Plain text
 #: en/diff-options.txt:348
@@ -4426,9 +4426,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:402 en/git-status.txt:139
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--no-renames"
-msgstr ""
+msgstr "--no-renames"
 
 #. type: Plain text
 #: en/diff-options.txt:405
@@ -4438,9 +4438,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:406
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--[no-]rename-empty"
-msgstr ""
+msgstr "--[no-]rename-empty"
 
 #. type: Plain text
 #: en/diff-options.txt:408
@@ -4450,9 +4450,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:410 en/git-apply.txt:58
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--check"
-msgstr ""
+msgstr "--check"
 
 #. type: Plain text
 #: en/diff-options.txt:419
@@ -4474,9 +4474,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:432
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--full-index"
-msgstr ""
+msgstr "--full-index"
 
 #. type: Plain text
 #: en/diff-options.txt:436
@@ -4486,9 +4486,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:437 en/git-apply.txt:160
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--binary"
-msgstr ""
+msgstr "--binary"
 
 #. type: Plain text
 #: en/diff-options.txt:440
@@ -4600,9 +4600,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:497 en/git-svn.txt:626
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--find-copies-harder"
-msgstr ""
+msgstr "--find-copies-harder"
 
 #. type: Plain text
 #: en/diff-options.txt:505
@@ -4618,9 +4618,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:507
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--irreversible-delete"
-msgstr ""
+msgstr "--irreversible-delete"
 
 #. type: Plain text
 #: en/diff-options.txt:515
@@ -4759,9 +4759,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:594
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-all"
-msgstr ""
+msgstr "--pickaxe-all"
 
 #. type: Plain text
 #: en/diff-options.txt:598
@@ -4771,9 +4771,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:599
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--pickaxe-regex"
-msgstr ""
+msgstr "--pickaxe-regex"
 
 #. type: Plain text
 #: en/diff-options.txt:602
@@ -4855,15 +4855,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:64 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101 en/git-help.txt:45 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:60
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "-a"
-msgstr ""
+msgstr "-a"
 
 #. type: Labeled list
 #: en/diff-options.txt:657 en/git-grep.txt:102
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--text"
-msgstr ""
+msgstr "--text"
 
 #. type: Plain text
 #: en/diff-options.txt:659
@@ -4873,9 +4873,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:660
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
-msgstr ""
+msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
 #: en/diff-options.txt:662
@@ -4885,27 +4885,27 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:663
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
-msgstr ""
+msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
 #: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
-msgstr ""
+msgstr "--ignore-space-change"
 
 #. type: Labeled list
 #: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:134 en/git-hash-object.txt:29 en/git-help.txt:79
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "-w"
-msgstr ""
+msgstr "-w"
 
 #. type: Labeled list
 #: en/diff-options.txt:673
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
-msgstr ""
+msgstr "--ignore-all-space"
 
 #. type: Plain text
 #: en/diff-options.txt:677
@@ -4915,9 +4915,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:678
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
-msgstr ""
+msgstr "--ignore-blank-lines"
 
 #. type: Plain text
 #: en/diff-options.txt:680
@@ -4945,9 +4945,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:688 en/git-grep.txt:262
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--function-context"
-msgstr ""
+msgstr "--function-context"
 
 #. type: Plain text
 #: en/diff-options.txt:690
@@ -4957,9 +4957,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:693 en/git-ls-remote.txt:46
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
-msgstr ""
+msgstr "--exit-code"
 
 #. type: Plain text
 #: en/diff-options.txt:697
@@ -4969,9 +4969,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:698 en/fetch-options.txt:203 en/git-am.txt:74 en/git-branch.txt:193 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:52 en/git-clone.txt:120 en/git-commit.txt:314 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:301 en/git-gc.txt:68 en/git-grep.txt:296 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:315 en/git-reset.txt:98 en/git-restore.txt:65 en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-submodule.txt:255 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:136 en/rev-list-options.txt:220
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--quiet"
-msgstr ""
+msgstr "--quiet"
 
 #. type: Plain text
 #: en/diff-options.txt:700
@@ -4981,9 +4981,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:703
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
-msgstr ""
+msgstr "--ext-diff"
 
 #. type: Plain text
 #: en/diff-options.txt:707
@@ -4993,9 +4993,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:708
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
-msgstr ""
+msgstr "--no-ext-diff"
 
 #. type: Plain text
 #: en/diff-options.txt:710
@@ -5005,15 +5005,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:105
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--textconv"
-msgstr ""
+msgstr "--textconv"
 
 #. type: Labeled list
 #: en/diff-options.txt:712 en/git-grep.txt:108
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
-msgstr ""
+msgstr "--no-textconv"
 
 #. type: Plain text
 #: en/diff-options.txt:721
@@ -5059,9 +5059,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:741
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
-msgstr ""
+msgstr "--no-prefix"
 
 #. type: Plain text
 #: en/diff-options.txt:743
@@ -5083,9 +5083,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:747
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
-msgstr ""
+msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
 #: en/diff-options.txt:754
@@ -5101,9 +5101,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 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:265 en/rev-list-options.txt:138
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--all"
-msgstr ""
+msgstr "--all"
 
 #. type: Plain text
 #: en/fetch-options.txt:3
@@ -5113,9 +5113,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:5
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--append"
-msgstr ""
+msgstr "--append"
 
 #. type: Plain text
 #: en/fetch-options.txt:9
@@ -5173,9 +5173,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:31
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--unshallow"
-msgstr ""
+msgstr "--unshallow"
 
 #. type: Plain text
 #: en/fetch-options.txt:35
@@ -5191,9 +5191,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:39
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--update-shallow"
-msgstr ""
+msgstr "--update-shallow"
 
 #. type: Plain text
 #: en/fetch-options.txt:44
@@ -5233,9 +5233,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:48 en/git-commit.txt:317 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:44 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:687 en/git-worktree.txt:175
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
-msgstr ""
+msgstr "--dry-run"
 
 #. type: Plain text
 #: en/fetch-options.txt:67
@@ -5245,15 +5245,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:69 en/git-add.txt:77 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:119 en/git-clean.txt:34 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:195 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:347 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39 en/git-submodule.txt:278 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "-f"
-msgstr ""
+msgstr "-f"
 
 #. type: Labeled list
 #: en/fetch-options.txt:70 en/git-add.txt:78 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:35 en/git-fast-import.txt:37 en/git-filter-branch.txt:196 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:279 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--force"
-msgstr ""
+msgstr "--force"
 
 #. type: Plain text
 #: en/fetch-options.txt:73
@@ -5283,15 +5283,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:112 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "-k"
-msgstr ""
+msgstr "-k"
 
 #. type: Labeled list
 #: en/fetch-options.txt:83 en/git-am.txt:41 en/git-fetch-pack.txt:54 en/git-index-pack.txt:54 en/git-reset.txt:83
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--keep"
-msgstr ""
+msgstr "--keep"
 
 #. type: Plain text
 #: en/fetch-options.txt:85
@@ -5301,9 +5301,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:87
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--multiple"
-msgstr ""
+msgstr "--multiple"
 
 #. type: Plain text
 #: en/fetch-options.txt:90
@@ -5313,9 +5313,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:91
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--[no-]auto-gc"
-msgstr ""
+msgstr "--[no-]auto-gc"
 
 #. type: Plain text
 #: en/fetch-options.txt:94
@@ -5325,9 +5325,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:96 en/git-push.txt:153
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--prune"
-msgstr ""
+msgstr "--prune"
 
 #. type: Plain text
 #: en/fetch-options.txt:106
@@ -5349,9 +5349,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:110
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--prune-tags"
-msgstr ""
+msgstr "--prune-tags"
 
 #. type: Plain text
 #: en/fetch-options.txt:117
@@ -5361,15 +5361,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:123 en/git-add.txt:68 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:47 en/git-clone.txt:143 en/git-commit.txt:174 en/git-format-patch.txt:97 en/git-grep.txt:178 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:326 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:43 en/git-shortlog.txt:29 en/git-submodule.txt:301 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:85
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "-n"
-msgstr ""
+msgstr "-n"
 
 #. type: Labeled list
 #: en/fetch-options.txt:125 en/git-clone.txt:233
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--no-tags"
-msgstr ""
+msgstr "--no-tags"
 
 #. type: Plain text
 #: en/fetch-options.txt:131
@@ -5391,9 +5391,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:142 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--tags"
-msgstr ""
+msgstr "--tags"
 
 #. type: Plain text
 #: en/fetch-options.txt:149
@@ -5415,9 +5415,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:161
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "-j"
-msgstr ""
+msgstr "-j"
 
 #. type: Labeled list
 #: en/fetch-options.txt:162
@@ -5433,9 +5433,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:168 en/git-checkout.txt:295 en/git-push.txt:377 en/git-switch.txt:182
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--no-recurse-submodules"
-msgstr ""
+msgstr "--no-recurse-submodules"
 
 #. type: Plain text
 #: en/fetch-options.txt:171
@@ -5469,9 +5469,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:187
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--update-head-ok"
-msgstr ""
+msgstr "--update-head-ok"
 
 #. type: Plain text
 #: en/fetch-options.txt:194
@@ -5493,9 +5493,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:202 en/git-am.txt:73 en/git-branch.txt:192 en/git-checkout-index.txt:30 en/git-checkout.txt:108 en/git-clean.txt:51 en/git-clone.txt:119 en/git-commit.txt:313 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:300 en/git-grep.txt:295 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:36 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:314 en/git-repack.txt:78 en/git-reset.txt:97 en/git-restore.txt:64 en/git-rev-parse.txt:113 en/git-rm.txt:66 en/git-show-ref.txt:70 en/git-submodule.txt:254 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:135
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "-q"
-msgstr ""
+msgstr "-q"
 
 #. type: Plain text
 #: en/fetch-options.txt:207
@@ -5505,15 +5505,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:208 en/git-add.txt:73 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:298 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:140 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:318 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:139
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "-v"
-msgstr ""
+msgstr "-v"
 
 #. type: Labeled list
 #: en/fetch-options.txt:209 en/git-add.txt:74 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:125 en/git-commit.txt:299 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:319 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:140
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--verbose"
-msgstr ""
+msgstr "--verbose"
 
 #. type: Plain text
 #: en/fetch-options.txt:211 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:142
@@ -5523,9 +5523,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:213 en/git-checkout.txt:112 en/git-clone.txt:129 en/git-format-patch.txt:326 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:68 en/git-submodule.txt:258 en/git-switch.txt:144 en/merge-options.txt:143
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--progress"
-msgstr ""
+msgstr "--progress"
 
 #. type: Plain text
 #: en/fetch-options.txt:218 en/git-pack-objects.txt:156 en/git-push.txt:376
@@ -5553,9 +5553,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:228
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--show-forced-updates"
-msgstr ""
+msgstr "--show-forced-updates"
 
 #. type: Plain text
 #: en/fetch-options.txt:233
@@ -5565,9 +5565,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:234
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--no-show-forced-updates"
-msgstr ""
+msgstr "--no-show-forced-updates"
 
 #. type: Plain text
 #: en/fetch-options.txt:240
@@ -5577,15 +5577,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:241 en/git-push.txt:398
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "-4"
-msgstr ""
+msgstr "-4"
 
 #. type: Labeled list
 #: en/fetch-options.txt:242 en/git-push.txt:399
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--ipv4"
-msgstr ""
+msgstr "--ipv4"
 
 #. type: Plain text
 #: en/fetch-options.txt:244 en/git-push.txt:401
@@ -5595,15 +5595,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/fetch-options.txt:245 en/git-push.txt:402
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "-6"
-msgstr ""
+msgstr "-6"
 
 #. type: Labeled list
 #: en/fetch-options.txt:246 en/git-push.txt:403
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--ipv6"
-msgstr ""
+msgstr "--ipv6"
 
 #. type: Plain text
 #: en/fetch-options.txt:247 en/git-push.txt:405
@@ -5613,9 +5613,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-add.txt:2
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "git-add(1)"
-msgstr ""
+msgstr "git-add(1)"
 
 #. type: Title -
 #: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5
@@ -5725,15 +5725,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:81 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:42 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:394 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "-i"
-msgstr ""
+msgstr "-i"
 
 #. type: Labeled list
 #: en/git-add.txt:82 en/git-am.txt:128 en/git-clean.txt:43 en/git-rebase.txt:395 en/git-rebase.txt:536 en/git-svn.txt:297
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--interactive"
-msgstr ""
+msgstr "--interactive"
 
 #. type: Plain text
 #: en/git-add.txt:87
@@ -5755,15 +5755,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:99 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:219 en/git-config.txt:247 en/git-grep.txt:275 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "-e"
-msgstr ""
+msgstr "-e"
 
 #. type: Labeled list
 #: en/git-add.txt:100 en/git-cherry-pick.txt:54 en/git-commit.txt:220 en/git-config.txt:248 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--edit"
-msgstr ""
+msgstr "--edit"
 
 #. type: Plain text
 #: en/git-add.txt:104
@@ -5779,9 +5779,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:112
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--update"
-msgstr ""
+msgstr "--update"
 
 #. type: Plain text
 #: en/git-add.txt:116
@@ -5803,9 +5803,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:124
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--no-ignore-removal"
-msgstr ""
+msgstr "--no-ignore-removal"
 
 #. type: Plain text
 #: en/git-add.txt:129
@@ -5821,15 +5821,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:135
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--no-all"
-msgstr ""
+msgstr "--no-all"
 
 #. type: Labeled list
 #: en/git-add.txt:136
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--ignore-removal"
-msgstr ""
+msgstr "--ignore-removal"
 
 #. type: Plain text
 #: en/git-add.txt:141
@@ -5851,9 +5851,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:147 en/git-apply.txt:77
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--intent-to-add"
-msgstr ""
+msgstr "--intent-to-add"
 
 #. type: Plain text
 #: en/git-add.txt:153
@@ -5863,9 +5863,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:154 en/git-update-index.txt:54
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--refresh"
-msgstr ""
+msgstr "--refresh"
 
 #. type: Plain text
 #: en/git-add.txt:157
@@ -5875,9 +5875,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:158
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--ignore-errors"
-msgstr ""
+msgstr "--ignore-errors"
 
 #. type: Plain text
 #: en/git-add.txt:164
@@ -5887,9 +5887,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:165 en/git-notes.txt:169 en/git-update-index.txt:72 en/rev-list-options.txt:201
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--ignore-missing"
-msgstr ""
+msgstr "--ignore-missing"
 
 #. type: Plain text
 #: en/git-add.txt:170
@@ -5899,9 +5899,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:171
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--no-warn-embedded-repo"
-msgstr ""
+msgstr "--no-warn-embedded-repo"
 
 #. type: Plain text
 #: en/git-add.txt:177
@@ -5911,9 +5911,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:178
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--renormalize"
-msgstr ""
+msgstr "--renormalize"
 
 #. type: Plain text
 #: en/git-add.txt:184
@@ -6169,9 +6169,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:336
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "diff"
-msgstr ""
+msgstr "diff"
 
 #. type: Plain text
 #: en/git-add.txt:340
@@ -6307,9 +6307,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-add.txt:421
-#, priority:300
+#, ignore-same, priority:300
 msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
-msgstr ""
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title -
 #: en/git-add.txt:423 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:204 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:583 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:139 en/git-clone.txt:336 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:495 en/git-config.txt:492 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:245 en/git-fast-import.txt:1507 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:480 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:683 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:334 en/git-gui.txt:126 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:234 en/git-ls-files.txt:249 en/git-ls-remote.txt:116 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:230 en/git-merge-file.txt:94 en/git-merge-index.txt:78 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1052 en/git-receive-pack.txt:251 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:474 en/git-restore.txt:184 en/git-revert.txt:141 en/git-rev-list.txt:123 en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:523 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:300 en/git-status.txt:438 en/git-stripspace.txt:93 en/git-submodule.txt:440 en/git-svn.txt:1173 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:946 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:553 en/git-update-ref.txt:151 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
@@ -6325,9 +6325,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-am.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-am(1)"
-msgstr ""
+msgstr "git-am(1)"
 
 #. type: Plain text
 #: en/git-am.txt:7
@@ -6369,9 +6369,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:166 en/git-format-patch.txt:118 en/git-rebase.txt:387 en/git-revert.txt:98 en/merge-options.txt:73
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--signoff"
-msgstr ""
+msgstr "--signoff"
 
 #. type: Plain text
 #: en/git-am.txt:39
@@ -6387,9 +6387,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-am.txt:44 en/git-quiltimport.txt:59
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--keep-non-patch"
-msgstr ""
+msgstr "--keep-non-patch"
 
 #. type: Plain text
 #: en/git-am.txt:46 en/git-quiltimport.txt:61
@@ -6399,9 +6399,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-am.txt:47
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]keep-cr"
-msgstr ""
+msgstr "--[no-]keep-cr"
 
 #. type: Plain text
 #: en/git-am.txt:52
@@ -6411,15 +6411,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:969
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "-c"
-msgstr ""
+msgstr "-c"
 
 #. type: Labeled list
 #: en/git-am.txt:54 en/git-mailinfo.txt:74
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--scissors"
-msgstr ""
+msgstr "--scissors"
 
 #. type: Plain text
 #: en/git-am.txt:58
@@ -6429,9 +6429,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-am.txt:59 en/git-mailinfo.txt:90
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-scissors"
-msgstr ""
+msgstr "--no-scissors"
 
 #. type: Plain text
 #: en/git-am.txt:61
@@ -6441,15 +6441,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:267 en/git-restore.txt:84 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:989
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "-m"
-msgstr ""
+msgstr "-m"
 
 #. type: Labeled list
 #: en/git-am.txt:63 en/git-mailinfo.txt:70
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--message-id"
-msgstr ""
+msgstr "--message-id"
 
 #. type: Plain text
 #: en/git-am.txt:68
@@ -6459,9 +6459,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-am.txt:69
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-message-id"
-msgstr ""
+msgstr "--no-message-id"
 
 #. type: Plain text
 #: en/git-am.txt:72
@@ -6477,9 +6477,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-am.txt:78
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--utf8"
-msgstr ""
+msgstr "--utf8"
 
 #. type: Plain text
 #: en/git-am.txt:84
@@ -6497,9 +6497,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-am.txt:88
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-utf8"
-msgstr ""
+msgstr "--no-utf8"
 
 #. type: Plain text
 #: en/git-am.txt:91
@@ -6509,21 +6509,21 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-am.txt:92 en/git-apply.txt:85
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "-3"
-msgstr ""
+msgstr "-3"
 
 #. type: Labeled list
 #: en/git-am.txt:93 en/git-apply.txt:86
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--3way"
-msgstr ""
+msgstr "--3way"
 
 #. type: Labeled list
 #: en/git-am.txt:94
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-3way"
-msgstr ""
+msgstr "--no-3way"
 
 #. type: Plain text
 #: en/git-am.txt:101
@@ -6533,15 +6533,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-am.txt:102 en/git-cherry-pick.txt:156 en/git-merge.txt:85 en/git-rebase.txt:303 en/git-revert.txt:112
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--rerere-autoupdate"
-msgstr ""
+msgstr "--rerere-autoupdate"
 
 #. type: Labeled list
 #: en/git-am.txt:103 en/git-cherry-pick.txt:157 en/git-merge.txt:86 en/git-rebase.txt:304 en/git-revert.txt:113
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--no-rerere-autoupdate"
-msgstr ""
+msgstr "--no-rerere-autoupdate"
 
 #. type: Plain text
 #: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:307 en/git-revert.txt:116
@@ -6551,9 +6551,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:373 en/git-rebase.txt:524
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--ignore-whitespace"
-msgstr ""
+msgstr "--ignore-whitespace"
 
 #. type: Labeled list
 #: en/git-am.txt:109 en/git-rebase.txt:374
@@ -6593,9 +6593,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-am.txt:115 en/git-apply.txt:108
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--reject"
-msgstr ""
+msgstr "--reject"
 
 #. type: Plain text
 #: en/git-am.txt:119
@@ -6605,9 +6605,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-am.txt:120
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--patch-format"
-msgstr ""
+msgstr "--patch-format"
 
 #. type: Plain text
 #: en/git-am.txt:126
@@ -6623,9 +6623,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-am.txt:131 en/git-rebase.txt:380 en/git-rebase.txt:521
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--committer-date-is-author-date"
-msgstr ""
+msgstr "--committer-date-is-author-date"
 
 #. type: Plain text
 #: en/git-am.txt:137
@@ -6635,9 +6635,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-am.txt:138 en/git-rebase.txt:381 en/git-rebase.txt:522
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--ignore-date"
-msgstr ""
+msgstr "--ignore-date"
 
 #. type: Plain text
 #: en/git-am.txt:144
@@ -6647,9 +6647,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-am.txt:145 en/git-rebase.txt:256 en/sequencer.txt:6
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--skip"
-msgstr ""
+msgstr "--skip"
 
 #. type: Plain text
 #: en/git-am.txt:148
@@ -6677,21 +6677,21 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-am.txt:155 en/git-merge.txt:111 en/git-rebase.txt:228 en/sequencer.txt:1
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--continue"
-msgstr ""
+msgstr "--continue"
 
 #. type: Labeled list
 #: en/git-am.txt:156 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:127 en/git-ls-tree.txt:44 en/git-pull.txt:103 en/git-rebase.txt:406 en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:997
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "-r"
-msgstr ""
+msgstr "-r"
 
 #. type: Labeled list
 #: en/git-am.txt:157
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--resolved"
-msgstr ""
+msgstr "--resolved"
 
 #. type: Plain text
 #: en/git-am.txt:164
@@ -6713,9 +6713,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-am.txt:172 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:231 en/sequencer.txt:15
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--abort"
-msgstr ""
+msgstr "--abort"
 
 #. type: Plain text
 #: en/git-am.txt:174
@@ -6725,9 +6725,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-am.txt:175 en/git-merge.txt:107 en/git-rebase.txt:238 en/sequencer.txt:10
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--quit"
-msgstr ""
+msgstr "--quit"
 
 #. type: Plain text
 #: en/git-am.txt:178
@@ -6737,9 +6737,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-am.txt:179 en/git-rebase.txt:262
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--show-current-patch"
-msgstr ""
+msgstr "--show-current-patch"
 
 #. type: Plain text
 #: en/git-am.txt:182
@@ -6851,9 +6851,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-annotate.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-annotate(1)"
-msgstr ""
+msgstr "git-annotate(1)"
 
 #. type: Plain text
 #: en/git-annotate.txt:7
@@ -6881,9 +6881,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-apply.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-apply(1)"
-msgstr ""
+msgstr "git-apply(1)"
 
 #. type: Plain text
 #: en/git-apply.txt:7
@@ -6931,9 +6931,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-apply.txt:41 en/git-rebase.txt:322 en/merge-options.txt:84
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--stat"
-msgstr ""
+msgstr "--stat"
 
 #. type: Plain text
 #: en/git-apply.txt:44
@@ -6961,9 +6961,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--index"
-msgstr ""
+msgstr "--index"
 
 #. type: Plain text
 #: en/git-apply.txt:71
@@ -6973,9 +6973,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58 en/git-submodule.txt:291
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--cached"
-msgstr ""
+msgstr "--cached"
 
 #. type: Plain text
 #: en/git-apply.txt:76
@@ -7015,9 +7015,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-apply.txt:105 en/rev-list-options.txt:676
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--reverse"
-msgstr ""
+msgstr "--reverse"
 
 #. type: Plain text
 #: en/git-apply.txt:107
@@ -7051,9 +7051,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-apply.txt:135
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--unidiff-zero"
-msgstr ""
+msgstr "--unidiff-zero"
 
 #. type: Plain text
 #: en/git-apply.txt:141
@@ -7069,9 +7069,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-apply.txt:145
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--apply"
-msgstr ""
+msgstr "--apply"
 
 #. type: Plain text
 #: en/git-apply.txt:151
@@ -7081,9 +7081,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-apply.txt:152
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-add"
-msgstr ""
+msgstr "--no-add"
 
 #. type: Plain text
 #: en/git-apply.txt:158
@@ -7093,9 +7093,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-apply.txt:159
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--allow-binary-replacement"
-msgstr ""
+msgstr "--allow-binary-replacement"
 
 #. type: Plain text
 #: en/git-apply.txt:165
@@ -7195,9 +7195,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-apply.txt:217
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--inaccurate-eof"
-msgstr ""
+msgstr "--inaccurate-eof"
 
 #. type: Plain text
 #: en/git-apply.txt:223
@@ -7213,9 +7213,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-apply.txt:230
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--recount"
-msgstr ""
+msgstr "--recount"
 
 #. type: Plain text
 #: en/git-apply.txt:234
@@ -7243,9 +7243,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-apply.txt:243
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--unsafe-paths"
-msgstr ""
+msgstr "--unsafe-paths"
 
 #. type: Plain text
 #: en/git-apply.txt:248
@@ -7267,9 +7267,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-apply.txt:256
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "apply.ignoreWhitespace"
-msgstr ""
+msgstr "apply.ignoreWhitespace"
 
 #. type: Plain text
 #: en/git-apply.txt:260
@@ -7279,9 +7279,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-apply.txt:260
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "apply.whitespace"
-msgstr ""
+msgstr "apply.whitespace"
 
 #. type: Plain text
 #: en/git-apply.txt:263
@@ -7321,9 +7321,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-archimport.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-archimport(1)"
-msgstr ""
+msgstr "git-archimport(1)"
 
 #. type: Plain text
 #: en/git-archimport.txt:7
@@ -7431,9 +7431,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-archimport.txt:86 en/git-commit.txt:267 en/git-grep.txt:211 en/git-ls-files.txt:47 en/git-merge-index.txt:29
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "-o"
-msgstr ""
+msgstr "-o"
 
 #. type: Plain text
 #: en/git-archimport.txt:93
@@ -7485,9 +7485,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-archive.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-archive(1)"
-msgstr ""
+msgstr "git-archive(1)"
 
 #. type: Plain text
 #: en/git-archive.txt:7
@@ -7531,9 +7531,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:165 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--list"
-msgstr ""
+msgstr "--list"
 
 #. type: Plain text
 #: en/git-archive.txt:46
@@ -7573,9 +7573,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-archive.txt:58
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--worktree-attributes"
-msgstr ""
+msgstr "--worktree-attributes"
 
 #. type: Plain text
 #: en/git-archive.txt:61
@@ -7657,9 +7657,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "-0"
-msgstr ""
+msgstr "-0"
 
 #. type: Plain text
 #: en/git-archive.txt:92
@@ -7669,9 +7669,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-archive.txt:92
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "-9"
-msgstr ""
+msgstr "-9"
 
 #. type: Plain text
 #: en/git-archive.txt:95
@@ -7855,15 +7855,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-archive.txt:194
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:gitattributes[5]"
-msgstr ""
+msgstr "linkgit:gitattributes[5]"
 
 #. type: Title =
 #: en/git-bisect.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-bisect(1)"
-msgstr ""
+msgstr "git-bisect(1)"
 
 #. type: Plain text
 #: en/git-bisect.txt:7
@@ -8390,9 +8390,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-bisect.txt:357 en/git-clone.txt:144
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--no-checkout"
-msgstr ""
+msgstr "--no-checkout"
 
 #. type: Plain text
 #: en/git-bisect.txt:362
@@ -8624,9 +8624,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-blame.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-blame(1)"
-msgstr ""
+msgstr "git-blame(1)"
 
 #. type: Plain text
 #: en/git-blame.txt:7
@@ -8692,9 +8692,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-blame.txt:56
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--score-debug"
-msgstr ""
+msgstr "--score-debug"
 
 #. type: Plain text
 #: en/git-blame.txt:64
@@ -8704,9 +8704,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-blame.txt:66
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--show-name"
-msgstr ""
+msgstr "--show-name"
 
 #. type: Plain text
 #: en/git-blame.txt:70
@@ -8716,9 +8716,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-blame.txt:72
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--show-number"
-msgstr ""
+msgstr "--show-number"
 
 #. type: Plain text
 #: en/git-blame.txt:74
@@ -8734,9 +8734,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-blame.txt:79
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--show-email"
-msgstr ""
+msgstr "--show-email"
 
 #. type: Plain text
 #: en/git-blame.txt:83
@@ -9006,9 +9006,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-branch.txt:2
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "git-branch(1)"
-msgstr ""
+msgstr "git-branch(1)"
 
 #. type: Plain text
 #: en/git-branch.txt:7
@@ -9105,15 +9105,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-branch.txt:97 en/git-clean.txt:28 en/git-cvsexportcommit.txt:49 en/git-difftool.txt:22 en/git-http-push.txt:44 en/git-instaweb.txt:27 en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-push.txt:181 en/git-repack.txt:60 en/git-replace.txt:65 en/git-show-ref.txt:47 en/git-switch.txt:81 en/git-symbolic-ref.txt:35 en/git-tag.txt:83
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "-d"
-msgstr ""
+msgstr "-d"
 
 #. type: Labeled list
 #: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--delete"
-msgstr ""
+msgstr "--delete"
 
 #. type: Plain text
 #: en/git-branch.txt:102
@@ -9129,9 +9129,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-branch.txt:106 en/git-tag.txt:190
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--create-reflog"
-msgstr ""
+msgstr "--create-reflog"
 
 #. type: Plain text
 #: en/git-branch.txt:115
@@ -9147,9 +9147,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-branch.txt:126
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--move"
-msgstr ""
+msgstr "--move"
 
 #. type: Plain text
 #: en/git-branch.txt:128
@@ -9171,9 +9171,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-branch.txt:133
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--copy"
-msgstr ""
+msgstr "--copy"
 
 #. type: Plain text
 #: en/git-branch.txt:135
@@ -9207,9 +9207,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:113 en/git-tag.txt:131
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--ignore-case"
-msgstr ""
+msgstr "--ignore-case"
 
 #. type: Plain text
 #: en/git-branch.txt:152
@@ -9225,9 +9225,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-branch.txt:154 en/git-status.txt:127 en/git-tag.txt:135
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--no-column"
-msgstr ""
+msgstr "--no-column"
 
 #. type: Plain text
 #: en/git-branch.txt:158
@@ -9243,9 +9243,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--remotes"
-msgstr ""
+msgstr "--remotes"
 
 #. type: Plain text
 #: en/git-branch.txt:165
@@ -9267,9 +9267,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-branch.txt:177
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--show-current"
-msgstr ""
+msgstr "--show-current"
 
 #. type: Plain text
 #: en/git-branch.txt:180
@@ -9279,9 +9279,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-branch.txt:182
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "-vv"
-msgstr ""
+msgstr "-vv"
 
 #. type: Plain text
 #: en/git-branch.txt:191
@@ -9309,9 +9309,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-branch.txt:202
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--no-abbrev"
-msgstr ""
+msgstr "--no-abbrev"
 
 #. type: Plain text
 #: en/git-branch.txt:204
@@ -9321,9 +9321,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-branch.txt:206 en/git-checkout.txt:159 en/git-switch.txt:152
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--track"
-msgstr ""
+msgstr "--track"
 
 #. type: Plain text
 #: en/git-branch.txt:214
@@ -9339,9 +9339,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-branch.txt:221 en/git-checkout.txt:173 en/git-switch.txt:167
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--no-track"
-msgstr ""
+msgstr "--no-track"
 
 #. type: Plain text
 #: en/git-branch.txt:224
@@ -9351,9 +9351,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-branch.txt:225 en/git-push.txt:349
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--set-upstream"
-msgstr ""
+msgstr "--set-upstream"
 
 #. type: Plain text
 #: en/git-branch.txt:228
@@ -9381,9 +9381,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-branch.txt:235
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--unset-upstream"
-msgstr ""
+msgstr "--unset-upstream"
 
 #. type: Plain text
 #: en/git-branch.txt:238
@@ -9393,9 +9393,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-branch.txt:239
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--edit-description"
-msgstr ""
+msgstr "--edit-description"
 
 #. type: Plain text
 #: en/git-branch.txt:244
@@ -9673,9 +9673,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-bundle.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-bundle(1)"
-msgstr ""
+msgstr "git-bundle(1)"
 
 #. type: Plain text
 #: en/git-bundle.txt:7
@@ -9958,9 +9958,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-cat-file.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-cat-file(1)"
-msgstr ""
+msgstr "git-cat-file(1)"
 
 #. type: Plain text
 #: en/git-cat-file.txt:7
@@ -10044,9 +10044,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cat-file.txt:66
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--filters"
-msgstr ""
+msgstr "--filters"
 
 #. type: Plain text
 #: en/git-cat-file.txt:71
@@ -10068,9 +10068,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cat-file.txt:77 en/git-mktree.txt:32
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--batch"
-msgstr ""
+msgstr "--batch"
 
 #. type: Labeled list
 #: en/git-cat-file.txt:78
@@ -10086,9 +10086,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cat-file.txt:85
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--batch-check"
-msgstr ""
+msgstr "--batch-check"
 
 #. type: Labeled list
 #: en/git-cat-file.txt:86
@@ -10104,9 +10104,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cat-file.txt:93
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--batch-all-objects"
-msgstr ""
+msgstr "--batch-all-objects"
 
 #. type: Plain text
 #: en/git-cat-file.txt:99
@@ -10116,9 +10116,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cat-file.txt:100
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--buffer"
-msgstr ""
+msgstr "--buffer"
 
 #. type: Plain text
 #: en/git-cat-file.txt:106
@@ -10128,9 +10128,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cat-file.txt:107
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--unordered"
-msgstr ""
+msgstr "--unordered"
 
 #. type: Plain text
 #: en/git-cat-file.txt:116
@@ -10140,9 +10140,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cat-file.txt:117
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--allow-unknown-type"
-msgstr ""
+msgstr "--allow-unknown-type"
 
 #. type: Plain text
 #: en/git-cat-file.txt:119
@@ -10152,9 +10152,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cat-file.txt:120
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--follow-symlinks"
-msgstr ""
+msgstr "--follow-symlinks"
 
 #. type: Plain text
 #: en/git-cat-file.txt:129
@@ -10299,9 +10299,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cat-file.txt:202
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`objectname`"
-msgstr ""
+msgstr "`objectname`"
 
 #. type: Plain text
 #: en/git-cat-file.txt:204
@@ -10311,9 +10311,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cat-file.txt:205
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`objecttype`"
-msgstr ""
+msgstr "`objecttype`"
 
 #. type: Plain text
 #: en/git-cat-file.txt:207
@@ -10323,9 +10323,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cat-file.txt:208
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`objectsize`"
-msgstr ""
+msgstr "`objectsize`"
 
 #. type: Plain text
 #: en/git-cat-file.txt:211
@@ -10347,9 +10347,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cat-file.txt:216
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`deltabase`"
-msgstr ""
+msgstr "`deltabase`"
 
 #. type: Plain text
 #: en/git-cat-file.txt:220
@@ -10359,9 +10359,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cat-file.txt:221
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`rest`"
-msgstr ""
+msgstr "`rest`"
 
 #. type: Plain text
 #: en/git-cat-file.txt:227
@@ -10525,9 +10525,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-check-attr.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-check-attr(1)"
-msgstr ""
+msgstr "git-check-attr(1)"
 
 #. type: Plain text
 #: en/git-check-attr.txt:7
@@ -10569,9 +10569,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:30 en/git-check-ignore.txt:37 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 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:595 en/git-update-index.txt:148 en/rev-list-options.txt:213
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--stdin"
-msgstr ""
+msgstr "--stdin"
 
 #. type: Plain text
 #: en/git-check-attr.txt:33 en/git-check-ignore.txt:40
@@ -10766,9 +10766,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-check-ignore.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-check-ignore(1)"
-msgstr ""
+msgstr "git-check-ignore(1)"
 
 #. type: Plain text
 #: en/git-check-ignore.txt:7
@@ -10840,9 +10840,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-ignore.txt:52 en/git-grep.txt:79
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-index"
-msgstr ""
+msgstr "--no-index"
 
 #. type: Plain text
 #: en/git-check-ignore.txt:58
@@ -10936,15 +10936,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-check-ignore.txt:117
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
-msgstr ""
+msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
 
 #. type: Title =
 #: en/git-check-mailmap.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-check-mailmap(1)"
-msgstr ""
+msgstr "git-check-mailmap(1)"
 
 #. type: Plain text
 #: en/git-check-mailmap.txt:7
@@ -10978,9 +10978,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-checkout-index.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-checkout-index(1)"
-msgstr ""
+msgstr "git-checkout-index(1)"
 
 #. type: Plain text
 #: en/git-checkout-index.txt:7
@@ -11031,9 +11031,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-checkout-index.txt:44
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-create"
-msgstr ""
+msgstr "--no-create"
 
 #. type: Plain text
 #: en/git-checkout-index.txt:47
@@ -11067,9 +11067,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-checkout-index.txt:57
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--temp"
-msgstr ""
+msgstr "--temp"
 
 #. type: Plain text
 #: en/git-checkout-index.txt:61
@@ -11253,9 +11253,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-checkout.txt:2
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "git-checkout(1)"
-msgstr ""
+msgstr "git-checkout(1)"
 
 #. type: Plain text
 #: en/git-checkout.txt:7
@@ -11412,9 +11412,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-checkout.txt:113 en/git-fetch-pack.txt:104 en/git-restore.txt:69 en/git-switch.txt:145 en/merge-options.txt:144
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--no-progress"
-msgstr ""
+msgstr "--no-progress"
 
 #. type: Plain text
 #: en/git-checkout.txt:118 en/git-restore.txt:74 en/git-switch.txt:150
@@ -11436,15 +11436,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-checkout.txt:128 en/git-merge-file.txt:73 en/git-restore.txt:75
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--ours"
-msgstr ""
+msgstr "--ours"
 
 #. type: Labeled list
 #: en/git-checkout.txt:129 en/git-merge-file.txt:74 en/git-restore.txt:76
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--theirs"
-msgstr ""
+msgstr "--theirs"
 
 #. type: Plain text
 #: en/git-checkout.txt:132
@@ -11508,15 +11508,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-checkout.txt:177 en/git-switch.txt:87
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--guess"
-msgstr ""
+msgstr "--guess"
 
 #. type: Labeled list
 #: en/git-checkout.txt:178 en/git-switch.txt:88
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--no-guess"
-msgstr ""
+msgstr "--no-guess"
 
 #. type: Plain text
 #: en/git-checkout.txt:182 en/git-switch.txt:92
@@ -11544,9 +11544,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-checkout.txt:202 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--detach"
-msgstr ""
+msgstr "--detach"
 
 #. type: Plain text
 #: en/git-checkout.txt:208
@@ -11586,9 +11586,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-checkout.txt:234 en/git-restore.txt:102
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--ignore-skip-worktree-bits"
-msgstr ""
+msgstr "--ignore-skip-worktree-bits"
 
 #. type: Plain text
 #: en/git-checkout.txt:239
@@ -11598,9 +11598,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-checkout.txt:241 en/git-rebase.txt:268 en/git-rebase.txt:529 en/git-reset.txt:72 en/git-restore.txt:85 en/git-submodule.txt:354 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:297
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--merge"
-msgstr ""
+msgstr "--merge"
 
 #. type: Plain text
 #: en/git-checkout.txt:250
@@ -11658,9 +11658,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-checkout.txt:282 en/git-switch.txt:175
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--ignore-other-worktrees"
-msgstr ""
+msgstr "--ignore-other-worktrees"
 
 #. type: Plain text
 #: en/git-checkout.txt:287
@@ -11670,15 +11670,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-checkout.txt:288 en/git-merge.txt:90
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--overwrite-ignore"
-msgstr ""
+msgstr "--overwrite-ignore"
 
 #. type: Labeled list
 #: en/git-checkout.txt:289 en/git-merge.txt:91
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--no-overwrite-ignore"
-msgstr ""
+msgstr "--no-overwrite-ignore"
 
 #. type: Plain text
 #: en/git-checkout.txt:293
@@ -11688,9 +11688,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-checkout.txt:294 en/git-grep.txt:95 en/git-ls-files.txt:150 en/git-switch.txt:181
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--recurse-submodules"
-msgstr ""
+msgstr "--recurse-submodules"
 
 #. type: Plain text
 #: en/git-checkout.txt:303
@@ -11700,15 +11700,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-checkout.txt:304 en/git-restore.txt:109
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--overlay"
-msgstr ""
+msgstr "--overlay"
 
 #. type: Labeled list
 #: en/git-checkout.txt:305 en/git-restore.txt:110
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--no-overlay"
-msgstr ""
+msgstr "--no-overlay"
 
 #. type: Plain text
 #: en/git-checkout.txt:311
@@ -12121,15 +12121,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-checkout.txt:581
-#, priority:240
+#, ignore-same, priority:240
 msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
-msgstr ""
+msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
 
 #. type: Title =
 #: en/git-check-ref-format.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-check-ref-format(1)"
-msgstr ""
+msgstr "git-check-ref-format(1)"
 
 #. type: Plain text
 #: en/git-check-ref-format.txt:7
@@ -12263,9 +12263,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-ref-format.txt:101
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]allow-onelevel"
-msgstr ""
+msgstr "--[no-]allow-onelevel"
 
 #. type: Plain text
 #: en/git-check-ref-format.txt:105
@@ -12275,9 +12275,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-ref-format.txt:106
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--refspec-pattern"
-msgstr ""
+msgstr "--refspec-pattern"
 
 #. type: Plain text
 #: en/git-check-ref-format.txt:112
@@ -12287,9 +12287,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-ref-format.txt:113
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--normalize"
-msgstr ""
+msgstr "--normalize"
 
 #. type: Plain text
 #: en/git-check-ref-format.txt:120
@@ -12325,9 +12325,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-cherry-pick.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-cherry-pick(1)"
-msgstr ""
+msgstr "git-cherry-pick(1)"
 
 #. type: Plain text
 #: en/git-cherry-pick.txt:7
@@ -12424,9 +12424,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cherry-pick.txt:65 en/git-clean.txt:61
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "-x"
-msgstr ""
+msgstr "-x"
 
 #. type: Plain text
 #: en/git-cherry-pick.txt:78
@@ -12460,9 +12460,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cherry-pick.txt:93 en/git-revert.txt:78 en/merge-options.txt:2
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--no-commit"
-msgstr ""
+msgstr "--no-commit"
 
 #. type: Plain text
 #: en/git-cherry-pick.txt:101
@@ -12484,9 +12484,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cherry-pick.txt:116 en/merge-options.txt:42
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--ff"
-msgstr ""
+msgstr "--ff"
 
 #. type: Plain text
 #: en/git-cherry-pick.txt:120
@@ -12496,9 +12496,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cherry-pick.txt:121 en/git-commit.txt:179 en/git-notes.txt:158
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--allow-empty"
-msgstr ""
+msgstr "--allow-empty"
 
 #. type: Plain text
 #: en/git-cherry-pick.txt:133
@@ -12508,9 +12508,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-cherry-pick.txt:134 en/git-commit.txt:185 en/git-rebase.txt:249 en/git-rebase.txt:532
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--allow-empty-message"
-msgstr ""
+msgstr "--allow-empty-message"
 
 #. type: Plain text
 #: en/git-cherry-pick.txt:138
@@ -12520,9 +12520,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cherry-pick.txt:139
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--keep-redundant-commits"
-msgstr ""
+msgstr "--keep-redundant-commits"
 
 #. type: Plain text
 #: en/git-cherry-pick.txt:145
@@ -12704,9 +12704,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-cherry.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-cherry(1)"
-msgstr ""
+msgstr "git-cherry(1)"
 
 #. type: Plain text
 #: en/git-cherry.txt:7
@@ -12911,9 +12911,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-citool.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-citool(1)"
-msgstr ""
+msgstr "git-citool(1)"
 
 #. type: Plain text
 #: en/git-citool.txt:7
@@ -12941,9 +12941,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-clean.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-clean(1)"
-msgstr ""
+msgstr "git-clean(1)"
 
 #. type: Plain text
 #: en/git-clean.txt:7
@@ -13149,15 +13149,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-clean.txt:137 en/git-status.txt:436
-#, priority:280
+#, ignore-same, priority:280
 msgid "linkgit:gitignore[5]"
-msgstr ""
+msgstr "linkgit:gitignore[5]"
 
 #. type: Title =
 #: en/git-clone.txt:2
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "git-clone(1)"
-msgstr ""
+msgstr "git-clone(1)"
 
 #. type: Plain text
 #: en/git-clone.txt:7
@@ -13199,9 +13199,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:45 en/git-config.txt:127 en/git-instaweb.txt:24 en/git-pack-objects.txt:142 en/git-svn.txt:245
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--local"
-msgstr ""
+msgstr "--local"
 
 #. type: Plain text
 #: en/git-clone.txt:52
@@ -13217,9 +13217,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:60
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--no-hardlinks"
-msgstr ""
+msgstr "--no-hardlinks"
 
 #. type: Plain text
 #: en/git-clone.txt:65
@@ -13229,9 +13229,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:67
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--shared"
-msgstr ""
+msgstr "--shared"
 
 #. type: Plain text
 #: en/git-clone.txt:73
@@ -13288,9 +13288,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:108 en/git-submodule.txt:392
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--dissociate"
-msgstr ""
+msgstr "--dissociate"
 
 #. type: Plain text
 #: en/git-clone.txt:118
@@ -13324,9 +13324,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:135
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--bare"
-msgstr ""
+msgstr "--bare"
 
 #. type: Plain text
 #: en/git-clone.txt:158
@@ -13336,9 +13336,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:159 en/git-push.txt:161
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--mirror"
-msgstr ""
+msgstr "--mirror"
 
 #. type: Plain text
 #: en/git-clone.txt:166
@@ -13456,9 +13456,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:223
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--[no-]single-branch"
-msgstr ""
+msgstr "--[no-]single-branch"
 
 #. type: Plain text
 #: en/git-clone.txt:232
@@ -13498,9 +13498,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:261
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--[no-]shallow-submodules"
-msgstr ""
+msgstr "--[no-]shallow-submodules"
 
 #. type: Plain text
 #: en/git-clone.txt:263
@@ -13510,9 +13510,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:264
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "--[no-]remote-submodules"
-msgstr ""
+msgstr "--[no-]remote-submodules"
 
 #. type: Plain text
 #: en/git-clone.txt:269
@@ -13634,9 +13634,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-column.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-column(1)"
-msgstr ""
+msgstr "git-column(1)"
 
 #. type: Plain text
 #: en/git-column.txt:7
@@ -13793,9 +13793,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-commit-tree.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-commit-tree(1)"
-msgstr ""
+msgstr "git-commit-tree(1)"
 
 #. type: Plain text
 #: en/git-commit-tree.txt:7
@@ -13898,9 +13898,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-commit-tree.txt:68 en/git-commit.txt:339
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--no-gpg-sign"
-msgstr ""
+msgstr "--no-gpg-sign"
 
 #. type: Plain text
 #: en/git-commit-tree.txt:71
@@ -13994,9 +13994,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-commit.txt:2
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "git-commit(1)"
-msgstr ""
+msgstr "git-commit(1)"
 
 #. type: Plain text
 #: en/git-commit.txt:7
@@ -14144,9 +14144,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-commit.txt:100
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--reset-author"
-msgstr ""
+msgstr "--reset-author"
 
 #. type: Plain text
 #: en/git-commit.txt:105
@@ -14156,9 +14156,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-commit.txt:106 en/git-status.txt:28 en/git-symbolic-ref.txt:45
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--short"
-msgstr ""
+msgstr "--short"
 
 #. type: Plain text
 #: en/git-commit.txt:109
@@ -14168,9 +14168,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-commit.txt:110 en/git-status.txt:32
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--branch"
-msgstr ""
+msgstr "--branch"
 
 #. type: Plain text
 #: en/git-commit.txt:112 en/git-status.txt:34
@@ -14186,9 +14186,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-commit.txt:118 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--long"
-msgstr ""
+msgstr "--long"
 
 #. type: Plain text
 #: en/git-commit.txt:121
@@ -14198,9 +14198,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-commit.txt:123 en/git-config.txt:207 en/git-grep.txt:207
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--null"
-msgstr ""
+msgstr "--null"
 
 #. type: Plain text
 #: en/git-commit.txt:130
@@ -14294,9 +14294,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-commit.txt:175 en/git-rebase.txt:330
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--no-verify"
-msgstr ""
+msgstr "--no-verify"
 
 #. type: Plain text
 #: en/git-commit.txt:178
@@ -14396,9 +14396,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-commit.txt:226 en/git-revert.txt:66 en/merge-options.txt:17
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--no-edit"
-msgstr ""
+msgstr "--no-edit"
 
 #. type: Plain text
 #: en/git-commit.txt:230
@@ -14408,9 +14408,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-commit.txt:231
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--amend"
-msgstr ""
+msgstr "--amend"
 
 #. type: Plain text
 #: en/git-commit.txt:241
@@ -14447,9 +14447,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-commit.txt:257
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--no-post-rewrite"
-msgstr ""
+msgstr "--no-post-rewrite"
 
 #. type: Plain text
 #: en/git-commit.txt:259
@@ -14459,9 +14459,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-commit.txt:261
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--include"
-msgstr ""
+msgstr "--include"
 
 #. type: Plain text
 #: en/git-commit.txt:266
@@ -14471,9 +14471,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-commit.txt:268
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--only"
-msgstr ""
+msgstr "--only"
 
 #. type: Plain text
 #: en/git-commit.txt:280
@@ -14561,9 +14561,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-commit.txt:322
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--status"
-msgstr ""
+msgstr "--status"
 
 #. type: Plain text
 #: en/git-commit.txt:327
@@ -14573,9 +14573,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-commit.txt:328
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--no-status"
-msgstr ""
+msgstr "--no-status"
 
 #. type: Plain text
 #: en/git-commit.txt:332
@@ -14738,15 +14738,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-commit.txt:493
-#, priority:280
+#, ignore-same, priority:280
 msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
-msgstr ""
+msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
 
 #. type: Title =
 #: en/git-config.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-config(1)"
-msgstr ""
+msgstr "git-config(1)"
 
 #. type: Plain text
 #: en/git-config.txt:7
@@ -14861,9 +14861,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-config.txt:74
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--replace-all"
-msgstr ""
+msgstr "--replace-all"
 
 #. type: Plain text
 #: en/git-config.txt:77
@@ -14873,9 +14873,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-config.txt:78 en/git-update-index.txt:44
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--add"
-msgstr ""
+msgstr "--add"
 
 #. type: Plain text
 #: en/git-config.txt:82
@@ -14885,9 +14885,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-config.txt:83
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--get"
-msgstr ""
+msgstr "--get"
 
 #. type: Plain text
 #: en/git-config.txt:87
@@ -14897,9 +14897,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-config.txt:88
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--get-all"
-msgstr ""
+msgstr "--get-all"
 
 #. type: Plain text
 #: en/git-config.txt:90
@@ -14909,9 +14909,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-config.txt:91
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--get-regexp"
-msgstr ""
+msgstr "--get-regexp"
 
 #. type: Plain text
 #: en/git-config.txt:97
@@ -14933,9 +14933,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-config.txt:106
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--global"
-msgstr ""
+msgstr "--global"
 
 #. type: Plain text
 #: en/git-config.txt:111
@@ -14957,9 +14957,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-config.txt:117
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--system"
-msgstr ""
+msgstr "--system"
 
 #. type: Plain text
 #: en/git-config.txt:121
@@ -14987,9 +14987,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-config.txt:136 en/git-restore.txt:57
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--worktree"
-msgstr ""
+msgstr "--worktree"
 
 #. type: Plain text
 #: en/git-config.txt:140
@@ -15029,9 +15029,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-config.txt:152
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--remove-section"
-msgstr ""
+msgstr "--remove-section"
 
 #. type: Plain text
 #: en/git-config.txt:154
@@ -15041,9 +15041,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-config.txt:155
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--rename-section"
-msgstr ""
+msgstr "--rename-section"
 
 #. type: Plain text
 #: en/git-config.txt:157
@@ -15053,9 +15053,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-config.txt:158
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--unset"
-msgstr ""
+msgstr "--unset"
 
 #. type: Plain text
 #: en/git-config.txt:160
@@ -15065,9 +15065,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-config.txt:161
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--unset-all"
-msgstr ""
+msgstr "--unset-all"
 
 #. type: Plain text
 #: en/git-config.txt:163
@@ -15137,33 +15137,33 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-config.txt:193
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--bool"
-msgstr ""
+msgstr "--bool"
 
 #. type: Labeled list
 #: en/git-config.txt:194
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--int"
-msgstr ""
+msgstr "--int"
 
 #. type: Labeled list
 #: en/git-config.txt:195
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--bool-or-int"
-msgstr ""
+msgstr "--bool-or-int"
 
 #. type: Labeled list
 #: en/git-config.txt:196 en/git-hash-object.txt:39
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--path"
-msgstr ""
+msgstr "--path"
 
 #. type: Labeled list
 #: en/git-config.txt:197
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--expiry-date"
-msgstr ""
+msgstr "--expiry-date"
 
 #. type: Plain text
 #: en/git-config.txt:200
@@ -15173,9 +15173,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-config.txt:201
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-type"
-msgstr ""
+msgstr "--no-type"
 
 #. type: Plain text
 #: en/git-config.txt:205
@@ -15197,9 +15197,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-config.txt:219
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--show-origin"
-msgstr ""
+msgstr "--show-origin"
 
 #. type: Plain text
 #: en/git-config.txt:224
@@ -15245,9 +15245,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-config.txt:252
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]includes"
-msgstr ""
+msgstr "--[no-]includes"
 
 #. type: Plain text
 #: en/git-config.txt:257
@@ -15377,9 +15377,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-config.txt:324
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "GIT_CONFIG"
-msgstr ""
+msgstr "GIT_CONFIG"
 
 #. type: Plain text
 #: en/git-config.txt:328
@@ -15389,9 +15389,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-config.txt:329
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "GIT_CONFIG_NOSYSTEM"
-msgstr ""
+msgstr "GIT_CONFIG_NOSYSTEM"
 
 #. type: Plain text
 #: en/git-config.txt:332
@@ -15674,9 +15674,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-count-objects.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-count-objects(1)"
-msgstr ""
+msgstr "git-count-objects(1)"
 
 #. type: Plain text
 #: en/git-count-objects.txt:7
@@ -15758,9 +15758,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-count-objects.txt:48
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--human-readable"
-msgstr ""
+msgstr "--human-readable"
 
 #. type: Plain text
 #: en/git-count-objects.txt:51
@@ -15770,9 +15770,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-credential-cache--daemon.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-credential-cache--daemon(1)"
-msgstr ""
+msgstr "git-credential-cache--daemon(1)"
 
 #. type: Plain text
 #: en/git-credential-cache--daemon.txt:7
@@ -15806,9 +15806,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-credential-cache.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-credential-cache(1)"
-msgstr ""
+msgstr "git-credential-cache(1)"
 
 #. type: Plain text
 #: en/git-credential-cache.txt:7
@@ -15915,9 +15915,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-credential-store.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-credential-store(1)"
-msgstr ""
+msgstr "git-credential-store(1)"
 
 #. type: Plain text
 #: en/git-credential-store.txt:7
@@ -16054,9 +16054,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-credential.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-credential(1)"
-msgstr ""
+msgstr "git-credential(1)"
 
 #. type: Plain text
 #: en/git-credential.txt:7
@@ -16199,9 +16199,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-credential.txt:120
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`protocol`"
-msgstr ""
+msgstr "`protocol`"
 
 #. type: Plain text
 #: en/git-credential.txt:124
@@ -16211,9 +16211,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-credential.txt:125
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`host`"
-msgstr ""
+msgstr "`host`"
 
 #. type: Plain text
 #: en/git-credential.txt:128
@@ -16223,9 +16223,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-credential.txt:129
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`path`"
-msgstr ""
+msgstr "`path`"
 
 #. type: Plain text
 #: en/git-credential.txt:134
@@ -16235,9 +16235,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-credential.txt:135
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`username`"
-msgstr ""
+msgstr "`username`"
 
 #. type: Plain text
 #: en/git-credential.txt:139
@@ -16247,9 +16247,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-credential.txt:140
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`password`"
-msgstr ""
+msgstr "`password`"
 
 #. type: Plain text
 #: en/git-credential.txt:143
@@ -16259,9 +16259,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-credential.txt:144
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`url`"
-msgstr ""
+msgstr "`url`"
 
 #. type: Plain text
 #: en/git-credential.txt:154
@@ -16271,9 +16271,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-cvsexportcommit.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-cvsexportcommit(1)"
-msgstr ""
+msgstr "git-cvsexportcommit(1)"
 
 #. type: Plain text
 #: en/git-cvsexportcommit.txt:7
@@ -16448,9 +16448,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-cvsimport.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-cvsimport(1)"
-msgstr ""
+msgstr "git-cvsimport(1)"
 
 #. type: Plain text
 #: en/git-cvsimport.txt:7
@@ -16882,9 +16882,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-cvsserver.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-cvsserver(1)"
-msgstr ""
+msgstr "git-cvsserver(1)"
 
 #. type: Plain text
 #: en/git-cvsserver.txt:7
@@ -16950,9 +16950,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cvsserver.txt:37 en/git-daemon.txt:49
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--strict-paths"
-msgstr ""
+msgstr "--strict-paths"
 
 #. type: Plain text
 #: en/git-cvsserver.txt:39
@@ -16962,9 +16962,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cvsserver.txt:40 en/git-daemon.txt:78
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--export-all"
-msgstr ""
+msgstr "--export-all"
 
 #. type: Plain text
 #: en/git-cvsserver.txt:43
@@ -16980,9 +16980,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cvsserver.txt:45 en/git.txt:42
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--version"
-msgstr ""
+msgstr "--version"
 
 #. type: Plain text
 #: en/git-cvsserver.txt:47
@@ -16992,9 +16992,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cvsserver.txt:50 en/git.txt:45
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--help"
-msgstr ""
+msgstr "--help"
 
 #. type: Plain text
 #: en/git-cvsserver.txt:52
@@ -17612,9 +17612,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-daemon.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-daemon(1)"
-msgstr ""
+msgstr "git-daemon(1)"
 
 #. type: Plain text
 #: en/git-daemon.txt:7
@@ -17692,9 +17692,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-daemon.txt:62
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--base-path-relaxed"
-msgstr ""
+msgstr "--base-path-relaxed"
 
 #. type: Plain text
 #: en/git-daemon.txt:67
@@ -17722,9 +17722,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-daemon.txt:83
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--inetd"
-msgstr ""
+msgstr "--inetd"
 
 #. type: Plain text
 #: en/git-daemon.txt:88
@@ -17794,9 +17794,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-daemon.txt:114
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--syslog"
-msgstr ""
+msgstr "--syslog"
 
 #. type: Plain text
 #: en/git-daemon.txt:116
@@ -17854,9 +17854,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-daemon.txt:138
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--user-path"
-msgstr ""
+msgstr "--user-path"
 
 #. type: Labeled list
 #: en/git-daemon.txt:139
@@ -17878,9 +17878,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-daemon.txt:151
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--reuseaddr"
-msgstr ""
+msgstr "--reuseaddr"
 
 #. type: Plain text
 #: en/git-daemon.txt:155
@@ -17974,9 +17974,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-daemon.txt:196
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]informative-errors"
-msgstr ""
+msgstr "--[no-]informative-errors"
 
 #. type: Plain text
 #: en/git-daemon.txt:204
@@ -18178,9 +18178,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-describe.txt:2
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "git-describe(1)"
-msgstr ""
+msgstr "git-describe(1)"
 
 #. type: Plain text
 #: en/git-describe.txt:7
@@ -18259,9 +18259,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-describe.txt:60
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--contains"
-msgstr ""
+msgstr "--contains"
 
 #. type: Plain text
 #: en/git-describe.txt:64
@@ -18289,9 +18289,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-describe.txt:78
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--exact-match"
-msgstr ""
+msgstr "--exact-match"
 
 #. type: Plain text
 #: en/git-describe.txt:81
@@ -18301,9 +18301,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-describe.txt:82 en/git-ls-files.txt:159
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--debug"
-msgstr ""
+msgstr "--debug"
 
 #. type: Plain text
 #: en/git-describe.txt:86
@@ -18343,9 +18343,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-describe.txt:118 en/git-diff-tree.txt:115 en/git-name-rev.txt:61
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--always"
-msgstr ""
+msgstr "--always"
 
 #. type: Plain text
 #: en/git-describe.txt:120 en/git-name-rev.txt:63
@@ -18355,9 +18355,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-describe.txt:121 en/rev-list-options.txt:124
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--first-parent"
-msgstr ""
+msgstr "--first-parent"
 
 #. type: Plain text
 #: en/git-describe.txt:125
@@ -18479,9 +18479,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-diff-files.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-diff-files(1)"
-msgstr ""
+msgstr "git-diff-files(1)"
 
 #. type: Plain text
 #: en/git-diff-files.txt:7
@@ -18533,9 +18533,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:976
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--cc"
-msgstr ""
+msgstr "--cc"
 
 #. type: Plain text
 #: en/git-diff-files.txt:43
@@ -18551,9 +18551,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-diff-index.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-diff-index(1)"
-msgstr ""
+msgstr "git-diff-index(1)"
 
 #. type: Plain text
 #: en/git-diff-index.txt:7
@@ -18728,9 +18728,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-difftool.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-difftool(1)"
-msgstr ""
+msgstr "git-difftool(1)"
 
 #. type: Plain text
 #: en/git-difftool.txt:7
@@ -18752,9 +18752,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-difftool.txt:23
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--dir-diff"
-msgstr ""
+msgstr "--dir-diff"
 
 #. type: Plain text
 #: en/git-difftool.txt:27
@@ -18764,15 +18764,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-difftool.txt:28 en/git-mergetool.txt:70
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "-y"
-msgstr ""
+msgstr "-y"
 
 #. type: Labeled list
 #: en/git-difftool.txt:29 en/git-mergetool.txt:71
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--no-prompt"
-msgstr ""
+msgstr "--no-prompt"
 
 #. type: Plain text
 #: en/git-difftool.txt:31
@@ -18782,9 +18782,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-difftool.txt:32 en/git-mergetool.txt:78
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--prompt"
-msgstr ""
+msgstr "--prompt"
 
 #. type: Plain text
 #: en/git-difftool.txt:36
@@ -18836,9 +18836,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-difftool.txt:69 en/git-mergetool.txt:67
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--tool-help"
-msgstr ""
+msgstr "--tool-help"
 
 #. type: Plain text
 #: en/git-difftool.txt:71
@@ -18848,9 +18848,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-difftool.txt:72
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]symlinks"
-msgstr ""
+msgstr "--[no-]symlinks"
 
 #. type: Plain text
 #: en/git-difftool.txt:77
@@ -18884,15 +18884,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-difftool.txt:88 en/git-help.txt:59 en/git-mergetool.txt:82 en/git-show-branch.txt:111 en/git-update-index.txt:122 en/rev-list-options.txt:264
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "-g"
-msgstr ""
+msgstr "-g"
 
 #. type: Labeled list
 #: en/git-difftool.txt:89
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]gui"
-msgstr ""
+msgstr "--[no-]gui"
 
 #. type: Plain text
 #: en/git-difftool.txt:96
@@ -18902,9 +18902,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-difftool.txt:97
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]trust-exit-code"
-msgstr ""
+msgstr "--[no-]trust-exit-code"
 
 #. type: Plain text
 #: en/git-difftool.txt:102
@@ -18938,9 +18938,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-difftool.txt:113
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "diff.tool"
-msgstr ""
+msgstr "diff.tool"
 
 #. type: Plain text
 #: en/git-difftool.txt:115
@@ -18950,9 +18950,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-difftool.txt:116
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "diff.guitool"
-msgstr ""
+msgstr "diff.guitool"
 
 #. type: Plain text
 #: en/git-difftool.txt:118
@@ -18992,9 +18992,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-difftool.txt:128
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "difftool.prompt"
-msgstr ""
+msgstr "difftool.prompt"
 
 #. type: Plain text
 #: en/git-difftool.txt:130
@@ -19004,9 +19004,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-difftool.txt:131
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "difftool.trustExitCode"
-msgstr ""
+msgstr "difftool.trustExitCode"
 
 #. type: Plain text
 #: en/git-difftool.txt:133
@@ -19040,9 +19040,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-diff-tree.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-diff-tree(1)"
-msgstr ""
+msgstr "git-diff-tree(1)"
 
 #. type: Plain text
 #: en/git-diff-tree.txt:7
@@ -19157,9 +19157,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-diff-tree.txt:84
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-commit-id"
-msgstr ""
+msgstr "--no-commit-id"
 
 #. type: Plain text
 #: en/git-diff-tree.txt:87
@@ -19181,9 +19181,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-diff-tree.txt:108 en/rev-list-options.txt:982
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--combined-all-paths"
-msgstr ""
+msgstr "--combined-all-paths"
 
 #. type: Plain text
 #: en/git-diff-tree.txt:114 en/rev-list-options.txt:988
@@ -19199,9 +19199,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-diff.txt:2
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "git-diff(1)"
-msgstr ""
+msgstr "git-diff(1)"
 
 #. type: Plain text
 #: en/git-diff.txt:7
@@ -19518,9 +19518,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-fast-export.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-fast-export(1)"
-msgstr ""
+msgstr "git-fast-export(1)"
 
 #. type: Plain text
 #: en/git-fast-export.txt:7
@@ -19638,9 +19638,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:84
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--fake-missing-tagger"
-msgstr ""
+msgstr "--fake-missing-tagger"
 
 #. type: Plain text
 #: en/git-fast-export.txt:89
@@ -19650,9 +19650,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:90
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--use-done-feature"
-msgstr ""
+msgstr "--use-done-feature"
 
 #. type: Plain text
 #: en/git-fast-export.txt:93
@@ -19662,9 +19662,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:94
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-data"
-msgstr ""
+msgstr "--no-data"
 
 #. type: Plain text
 #: en/git-fast-export.txt:101
@@ -19674,9 +19674,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--full-tree"
-msgstr ""
+msgstr "--full-tree"
 
 #. type: Plain text
 #: en/git-fast-export.txt:107
@@ -19686,9 +19686,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:108
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--anonymize"
-msgstr ""
+msgstr "--anonymize"
 
 #. type: Plain text
 #: en/git-fast-export.txt:112
@@ -19698,9 +19698,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:113
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--reference-excluded-parents"
-msgstr ""
+msgstr "--reference-excluded-parents"
 
 #. type: Plain text
 #: en/git-fast-export.txt:124
@@ -19710,9 +19710,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:125
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--show-original-ids"
-msgstr ""
+msgstr "--show-original-ids"
 
 #. type: Plain text
 #: en/git-fast-export.txt:131
@@ -19734,9 +19734,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:139
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--refspec"
-msgstr ""
+msgstr "--refspec"
 
 #. type: Plain text
 #: en/git-fast-export.txt:142
@@ -19861,9 +19861,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-fast-import.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-fast-import(1)"
-msgstr ""
+msgstr "git-fast-import(1)"
 
 #. type: Plain text
 #: en/git-fast-import.txt:7
@@ -19909,9 +19909,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-import.txt:48
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--stats"
-msgstr ""
+msgstr "--stats"
 
 #. type: Plain text
 #: en/git-fast-import.txt:53
@@ -19951,9 +19951,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-import.txt:69
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--done"
-msgstr ""
+msgstr "--done"
 
 #. type: Plain text
 #: en/git-fast-import.txt:74
@@ -19993,9 +19993,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-import.txt:99
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]relative-marks"
-msgstr ""
+msgstr "--[no-]relative-marks"
 
 #. type: Plain text
 #: en/git-fast-import.txt:106
@@ -20077,9 +20077,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-import.txt:140
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "fastimport.unpackLimit"
-msgstr ""
+msgstr "fastimport.unpackLimit"
 
 #. type: Plain text
 #: en/git-fast-import.txt:142
@@ -20203,9 +20203,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-import.txt:239
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`raw`"
-msgstr ""
+msgstr "`raw`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:243
@@ -20281,9 +20281,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-import.txt:292
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`now`"
-msgstr ""
+msgstr "`now`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:295
@@ -20323,9 +20323,9 @@ msgstr ""
 
 #. type: Title ~
 #: en/git-fast-import.txt:319 en/git-fast-import.txt:381
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`commit`"
-msgstr ""
+msgstr "`commit`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:323
@@ -20335,9 +20335,9 @@ msgstr ""
 
 #. type: Title ~
 #: en/git-fast-import.txt:324 en/git-fast-import.txt:771
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`tag`"
-msgstr ""
+msgstr "`tag`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:329
@@ -20347,9 +20347,9 @@ msgstr ""
 
 #. type: Title ~
 #: en/git-fast-import.txt:330 en/git-fast-import.txt:815
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`reset`"
-msgstr ""
+msgstr "`reset`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:334
@@ -20359,9 +20359,9 @@ msgstr ""
 
 #. type: Title ~
 #: en/git-fast-import.txt:335 en/git-fast-import.txt:844
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`blob`"
-msgstr ""
+msgstr "`blob`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:339
@@ -20371,9 +20371,9 @@ msgstr ""
 
 #. type: Title ~
 #: en/git-fast-import.txt:340 en/git-fast-import.txt:917
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`checkpoint`"
-msgstr ""
+msgstr "`checkpoint`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:345
@@ -20383,9 +20383,9 @@ msgstr ""
 
 #. type: Title ~
 #: en/git-fast-import.txt:346 en/git-fast-import.txt:945
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`progress`"
-msgstr ""
+msgstr "`progress`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:350
@@ -20395,9 +20395,9 @@ msgstr ""
 
 #. type: Title ~
 #: en/git-fast-import.txt:351 en/git-fast-import.txt:1152
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`done`"
-msgstr ""
+msgstr "`done`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:355
@@ -20407,9 +20407,9 @@ msgstr ""
 
 #. type: Title ~
 #: en/git-fast-import.txt:356 en/git-fast-import.txt:970
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`get-mark`"
-msgstr ""
+msgstr "`get-mark`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:360
@@ -20419,9 +20419,9 @@ msgstr ""
 
 #. type: Title ~
 #: en/git-fast-import.txt:361 en/git-fast-import.txt:985
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`cat-blob`"
-msgstr ""
+msgstr "`cat-blob`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:365
@@ -20431,9 +20431,9 @@ msgstr ""
 
 #. type: Title ~
 #: en/git-fast-import.txt:366 en/git-fast-import.txt:1016
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`ls`"
-msgstr ""
+msgstr "`ls`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:370
@@ -20443,9 +20443,9 @@ msgstr ""
 
 #. type: Title ~
 #: en/git-fast-import.txt:371 en/git-fast-import.txt:1069
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`feature`"
-msgstr ""
+msgstr "`feature`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:374
@@ -20455,9 +20455,9 @@ msgstr ""
 
 #. type: Title ~
 #: en/git-fast-import.txt:375 en/git-fast-import.txt:1124
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`option`"
-msgstr ""
+msgstr "`option`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:379
@@ -20520,9 +20520,9 @@ msgstr ""
 
 #. type: Title ^
 #: en/git-fast-import.txt:434
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`author`"
-msgstr ""
+msgstr "`author`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:440
@@ -20532,9 +20532,9 @@ msgstr ""
 
 #. type: Title ^
 #: en/git-fast-import.txt:442
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`committer`"
-msgstr ""
+msgstr "`committer`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:445
@@ -20556,9 +20556,9 @@ msgstr ""
 
 #. type: Title ^
 #: en/git-fast-import.txt:460
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`encoding`"
-msgstr ""
+msgstr "`encoding`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:464
@@ -20568,9 +20568,9 @@ msgstr ""
 
 #. type: Title ^
 #: en/git-fast-import.txt:466
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`from`"
-msgstr ""
+msgstr "`from`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:472
@@ -20658,9 +20658,9 @@ msgstr ""
 
 #. type: Title ^
 #: en/git-fast-import.txt:523
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`merge`"
-msgstr ""
+msgstr "`merge`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:531
@@ -20676,9 +20676,9 @@ msgstr ""
 
 #. type: Title ^
 #: en/git-fast-import.txt:536
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`filemodify`"
-msgstr ""
+msgstr "`filemodify`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:540
@@ -20834,9 +20834,9 @@ msgstr ""
 
 #. type: Title ^
 #: en/git-fast-import.txt:608
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`filedelete`"
-msgstr ""
+msgstr "`filedelete`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:614
@@ -20858,9 +20858,9 @@ msgstr ""
 
 #. type: Title ^
 #: en/git-fast-import.txt:624
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`filecopy`"
-msgstr ""
+msgstr "`filecopy`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:629
@@ -20888,9 +20888,9 @@ msgstr ""
 
 #. type: Title ^
 #: en/git-fast-import.txt:645
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`filerename`"
-msgstr ""
+msgstr "`filerename`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:649
@@ -20918,9 +20918,9 @@ msgstr ""
 
 #. type: Title ^
 #: en/git-fast-import.txt:674
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`filedeleteall`"
-msgstr ""
+msgstr "`filedeleteall`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:679
@@ -20948,9 +20948,9 @@ msgstr ""
 
 #. type: Title ^
 #: en/git-fast-import.txt:698
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`notemodify`"
-msgstr ""
+msgstr "`notemodify`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:707
@@ -20998,9 +20998,9 @@ msgstr ""
 
 #. type: Title ~
 #: en/git-fast-import.txt:737
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`mark`"
-msgstr ""
+msgstr "`mark`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:743
@@ -21028,9 +21028,9 @@ msgstr ""
 
 #. type: Title ~
 #: en/git-fast-import.txt:758
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`original-oid`"
-msgstr ""
+msgstr "`original-oid`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:763
@@ -21180,9 +21180,9 @@ msgstr ""
 
 #. type: Title ~
 #: en/git-fast-import.txt:863
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`data`"
-msgstr ""
+msgstr "`data`"
 
 #. type: Plain text
 #: en/git-fast-import.txt:870
@@ -22125,9 +22125,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-fetch-pack.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-fetch-pack(1)"
-msgstr ""
+msgstr "git-fetch-pack(1)"
 
 #. type: Plain text
 #: en/git-fetch-pack.txt:7
@@ -22195,9 +22195,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fetch-pack.txt:60 en/git-pack-objects.txt:208 en/git-send-pack.txt:64
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--thin"
-msgstr ""
+msgstr "--thin"
 
 #. type: Plain text
 #: en/git-fetch-pack.txt:63
@@ -22207,9 +22207,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fetch-pack.txt:64 en/git-pack-objects.txt:83
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--include-tag"
-msgstr ""
+msgstr "--include-tag"
 
 #. type: Plain text
 #: en/git-fetch-pack.txt:69
@@ -22249,9 +22249,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fetch-pack.txt:99
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--deepen-relative"
-msgstr ""
+msgstr "--deepen-relative"
 
 #. type: Plain text
 #: en/git-fetch-pack.txt:103
@@ -22267,9 +22267,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fetch-pack.txt:107 en/git-index-pack.txt:77
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--check-self-contained-and-connected"
-msgstr ""
+msgstr "--check-self-contained-and-connected"
 
 #. type: Plain text
 #: en/git-fetch-pack.txt:110
@@ -22309,9 +22309,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-fetch.txt:2
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "git-fetch(1)"
-msgstr ""
+msgstr "git-fetch(1)"
 
 #. type: Plain text
 #: en/git-fetch.txt:7
@@ -22596,9 +22596,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fetch.txt:215 en/git-push.txt:435
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "`-`"
-msgstr ""
+msgstr "`-`"
 
 #. type: Plain text
 #: en/git-fetch.txt:216
@@ -22608,9 +22608,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fetch.txt:216
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "`t`"
-msgstr ""
+msgstr "`t`"
 
 #. type: Plain text
 #: en/git-fetch.txt:217
@@ -22772,9 +22772,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-filter-branch.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-filter-branch(1)"
-msgstr ""
+msgstr "git-filter-branch(1)"
 
 #. type: Plain text
 #: en/git-filter-branch.txt:7
@@ -23007,9 +23007,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-filter-branch.txt:175
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--prune-empty"
-msgstr ""
+msgstr "--prune-empty"
 
 #. type: Plain text
 #: en/git-filter-branch.txt:182
@@ -23443,9 +23443,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-fmt-merge-msg.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-fmt-merge-msg(1)"
-msgstr ""
+msgstr "git-fmt-merge-msg(1)"
 
 #. type: Plain text
 #: en/git-fmt-merge-msg.txt:7
@@ -23487,9 +23487,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:65
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--no-log"
-msgstr ""
+msgstr "--no-log"
 
 #. type: Plain text
 #: en/git-fmt-merge-msg.txt:37
@@ -23499,9 +23499,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fmt-merge-msg.txt:38
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]summary"
-msgstr ""
+msgstr "--[no-]summary"
 
 #. type: Plain text
 #: en/git-fmt-merge-msg.txt:41
@@ -23535,9 +23535,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fmt-merge-msg.txt:56
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "merge.summary"
-msgstr ""
+msgstr "merge.summary"
 
 #. type: Plain text
 #: en/git-fmt-merge-msg.txt:59
@@ -23561,9 +23561,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-for-each-ref.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-for-each-ref(1)"
-msgstr ""
+msgstr "git-for-each-ref(1)"
 
 #. type: Plain text
 #: en/git-for-each-ref.txt:7
@@ -23638,27 +23638,27 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-for-each-ref.txt:65
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--shell"
-msgstr ""
+msgstr "--shell"
 
 #. type: Labeled list
 #: en/git-for-each-ref.txt:66
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--perl"
-msgstr ""
+msgstr "--perl"
 
 #. type: Labeled list
 #: en/git-for-each-ref.txt:67
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--python"
-msgstr ""
+msgstr "--python"
 
 #. type: Labeled list
 #: en/git-for-each-ref.txt:68
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--tcl"
-msgstr ""
+msgstr "--tcl"
 
 #. type: Plain text
 #: en/git-for-each-ref.txt:73
@@ -24134,9 +24134,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-format-patch.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-format-patch(1)"
-msgstr ""
+msgstr "git-format-patch(1)"
 
 #. type: Plain text
 #: en/git-format-patch.txt:7
@@ -24262,9 +24262,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-format-patch.txt:98 en/git-shortlog.txt:30
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--numbered"
-msgstr ""
+msgstr "--numbered"
 
 #. type: Plain text
 #: en/git-format-patch.txt:100
@@ -24274,9 +24274,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-format-patch.txt:102
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-numbered"
-msgstr ""
+msgstr "--no-numbered"
 
 #. type: Plain text
 #: en/git-format-patch.txt:104
@@ -24298,9 +24298,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-format-patch.txt:108
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--numbered-files"
-msgstr ""
+msgstr "--numbered-files"
 
 #. type: Plain text
 #: en/git-format-patch.txt:111
@@ -24310,9 +24310,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-format-patch.txt:113
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--keep-subject"
-msgstr ""
+msgstr "--keep-subject"
 
 #. type: Plain text
 #: en/git-format-patch.txt:116
@@ -24328,9 +24328,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-format-patch.txt:123 en/git-pack-objects.txt:59
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--stdout"
-msgstr ""
+msgstr "--stdout"
 
 #. type: Plain text
 #: en/git-format-patch.txt:126
@@ -24352,9 +24352,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-format-patch.txt:132
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-attach"
-msgstr ""
+msgstr "--no-attach"
 
 #. type: Plain text
 #: en/git-format-patch.txt:135
@@ -24382,9 +24382,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-format-patch.txt:142
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-thread"
-msgstr ""
+msgstr "--no-thread"
 
 #. type: Plain text
 #: en/git-format-patch.txt:147
@@ -24424,9 +24424,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-format-patch.txt:167
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--ignore-if-in-upstream"
-msgstr ""
+msgstr "--ignore-if-in-upstream"
 
 #. type: Plain text
 #: en/git-format-patch.txt:173
@@ -24448,9 +24448,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-format-patch.txt:180
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--rfc"
-msgstr ""
+msgstr "--rfc"
 
 #. type: Plain text
 #: en/git-format-patch.txt:184
@@ -24502,9 +24502,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-format-patch.txt:206
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--from"
-msgstr ""
+msgstr "--from"
 
 #. type: Labeled list
 #: en/git-format-patch.txt:207
@@ -24538,9 +24538,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-format-patch.txt:229
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]cover-letter"
-msgstr ""
+msgstr "--[no-]cover-letter"
 
 #. type: Plain text
 #: en/git-format-patch.txt:233
@@ -24598,9 +24598,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-format-patch.txt:267 en/pretty-options.txt:81
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--no-notes"
-msgstr ""
+msgstr "--no-notes"
 
 #. type: Plain text
 #: en/git-format-patch.txt:270
@@ -24670,9 +24670,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-format-patch.txt:304
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-binary"
-msgstr ""
+msgstr "--no-binary"
 
 #. type: Plain text
 #: en/git-format-patch.txt:309
@@ -24682,9 +24682,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-format-patch.txt:310
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--zero-commit"
-msgstr ""
+msgstr "--zero-commit"
 
 #. type: Plain text
 #: en/git-format-patch.txt:313
@@ -25278,15 +25278,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-format-patch.txt:681
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
-msgstr ""
+msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
 
 #. type: Title =
 #: en/git-fsck-objects.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-fsck-objects(1)"
-msgstr ""
+msgstr "git-fsck-objects(1)"
 
 #. type: Plain text
 #: en/git-fsck-objects.txt:7
@@ -25308,9 +25308,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-fsck.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-fsck(1)"
-msgstr ""
+msgstr "git-fsck(1)"
 
 #. type: Plain text
 #: en/git-fsck.txt:7
@@ -25342,9 +25342,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fsck.txt:30
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--unreachable"
-msgstr ""
+msgstr "--unreachable"
 
 #. type: Plain text
 #: en/git-fsck.txt:33
@@ -25354,9 +25354,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fsck.txt:34
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]dangling"
-msgstr ""
+msgstr "--[no-]dangling"
 
 #. type: Plain text
 #: en/git-fsck.txt:37
@@ -25378,9 +25378,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fsck.txt:44
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--cache"
-msgstr ""
+msgstr "--cache"
 
 #. type: Plain text
 #: en/git-fsck.txt:47
@@ -25390,9 +25390,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fsck.txt:48
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-reflogs"
-msgstr ""
+msgstr "--no-reflogs"
 
 #. type: Plain text
 #: en/git-fsck.txt:53
@@ -25402,9 +25402,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fsck.txt:54
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--full"
-msgstr ""
+msgstr "--full"
 
 #. type: Plain text
 #: en/git-fsck.txt:63
@@ -25414,9 +25414,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fsck.txt:64
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--connectivity-only"
-msgstr ""
+msgstr "--connectivity-only"
 
 #. type: Plain text
 #: en/git-fsck.txt:72
@@ -25432,9 +25432,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fsck.txt:77 en/git-index-pack.txt:74 en/git-unpack-objects.txt:44
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--strict"
-msgstr ""
+msgstr "--strict"
 
 #. type: Plain text
 #: en/git-fsck.txt:84
@@ -25450,9 +25450,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fsck.txt:88
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--lost-found"
-msgstr ""
+msgstr "--lost-found"
 
 #. type: Plain text
 #: en/git-fsck.txt:93
@@ -25462,9 +25462,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fsck.txt:94
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--name-objects"
-msgstr ""
+msgstr "--name-objects"
 
 #. type: Plain text
 #: en/git-fsck.txt:99
@@ -25582,9 +25582,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fsck.txt:164
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "GIT_OBJECT_DIRECTORY"
-msgstr ""
+msgstr "GIT_OBJECT_DIRECTORY"
 
 #. type: Plain text
 #: en/git-fsck.txt:166
@@ -25594,9 +25594,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fsck.txt:167
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "GIT_INDEX_FILE"
-msgstr ""
+msgstr "GIT_INDEX_FILE"
 
 #. type: Plain text
 #: en/git-fsck.txt:169
@@ -25606,9 +25606,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fsck.txt:170
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "GIT_ALTERNATE_OBJECT_DIRECTORIES"
-msgstr ""
+msgstr "GIT_ALTERNATE_OBJECT_DIRECTORIES"
 
 #. type: Plain text
 #: en/git-fsck.txt:172
@@ -25618,9 +25618,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-gc.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-gc(1)"
-msgstr ""
+msgstr "git-gc(1)"
 
 #. type: Plain text
 #: en/git-gc.txt:7
@@ -25654,9 +25654,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-gc.txt:37 en/git-read-tree.txt:72
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--aggressive"
-msgstr ""
+msgstr "--aggressive"
 
 #. type: Plain text
 #: en/git-gc.txt:43
@@ -25666,9 +25666,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-gc.txt:44
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--auto"
-msgstr ""
+msgstr "--auto"
 
 #. type: Plain text
 #: en/git-gc.txt:47
@@ -25702,9 +25702,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-gc.txt:65 en/git-pack-refs.txt:57
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-prune"
-msgstr ""
+msgstr "--no-prune"
 
 #. type: Plain text
 #: en/git-gc.txt:67
@@ -25726,9 +25726,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-gc.txt:75
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--keep-largest-pack"
-msgstr ""
+msgstr "--keep-largest-pack"
 
 #. type: Plain text
 #: en/git-gc.txt:79
@@ -25810,15 +25810,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-gc.txt:159
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
-msgstr ""
+msgstr "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]"
 
 #. type: Title =
 #: en/git-get-tar-commit-id.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-get-tar-commit-id(1)"
-msgstr ""
+msgstr "git-get-tar-commit-id(1)"
 
 #. type: Plain text
 #: en/git-get-tar-commit-id.txt:7
@@ -25846,9 +25846,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-grep.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-grep(1)"
-msgstr ""
+msgstr "git-grep(1)"
 
 #. type: Plain text
 #: en/git-grep.txt:7
@@ -25986,9 +25986,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:82
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--untracked"
-msgstr ""
+msgstr "--untracked"
 
 #. type: Plain text
 #: en/git-grep.txt:85
@@ -25998,9 +25998,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:86
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-exclude-standard"
-msgstr ""
+msgstr "--no-exclude-standard"
 
 #. type: Plain text
 #: en/git-grep.txt:89
@@ -26010,9 +26010,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:90 en/git-ls-files.txt:98
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--exclude-standard"
-msgstr ""
+msgstr "--exclude-standard"
 
 #. type: Plain text
 #: en/git-grep.txt:94
@@ -26076,9 +26076,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:128 en/git-submodule.txt:399
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--recursive"
-msgstr ""
+msgstr "--recursive"
 
 #. type: Plain text
 #: en/git-grep.txt:130
@@ -26088,9 +26088,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:131
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-recursive"
-msgstr ""
+msgstr "--no-recursive"
 
 #. type: Plain text
 #: en/git-grep.txt:133
@@ -26100,9 +26100,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:135
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--word-regexp"
-msgstr ""
+msgstr "--word-regexp"
 
 #. type: Plain text
 #: en/git-grep.txt:139
@@ -26112,9 +26112,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:141
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--invert-match"
-msgstr ""
+msgstr "--invert-match"
 
 #. type: Plain text
 #: en/git-grep.txt:143
@@ -26130,9 +26130,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:152 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--full-name"
-msgstr ""
+msgstr "--full-name"
 
 #. type: Plain text
 #: en/git-grep.txt:157 en/git-ls-files.txt:149
@@ -26148,9 +26148,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:159 en/rev-list-options.txt:83
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--extended-regexp"
-msgstr ""
+msgstr "--extended-regexp"
 
 #. type: Labeled list
 #: en/git-grep.txt:160
@@ -26160,9 +26160,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:161 en/rev-list-options.txt:78
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--basic-regexp"
-msgstr ""
+msgstr "--basic-regexp"
 
 #. type: Plain text
 #: en/git-grep.txt:164
@@ -26172,9 +26172,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:166 en/rev-list-options.txt:93
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--perl-regexp"
-msgstr ""
+msgstr "--perl-regexp"
 
 #. type: Plain text
 #: en/git-grep.txt:168
@@ -26196,9 +26196,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:174 en/rev-list-options.txt:88
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--fixed-strings"
-msgstr ""
+msgstr "--fixed-strings"
 
 #. type: Plain text
 #: en/git-grep.txt:177
@@ -26208,9 +26208,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:179
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--line-number"
-msgstr ""
+msgstr "--line-number"
 
 #. type: Plain text
 #: en/git-grep.txt:181
@@ -26220,9 +26220,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:182
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--column"
-msgstr ""
+msgstr "--column"
 
 #. type: Plain text
 #: en/git-grep.txt:185
@@ -26232,9 +26232,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:187
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--files-with-matches"
-msgstr ""
+msgstr "--files-with-matches"
 
 #. type: Labeled list
 #: en/git-grep.txt:189
@@ -26244,9 +26244,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:190
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--files-without-match"
-msgstr ""
+msgstr "--files-without-match"
 
 #. type: Plain text
 #: en/git-grep.txt:195
@@ -26280,9 +26280,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:212
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--only-matching"
-msgstr ""
+msgstr "--only-matching"
 
 #. type: Plain text
 #: en/git-grep.txt:215
@@ -26292,9 +26292,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:217 en/rev-list-options.txt:951
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--count"
-msgstr ""
+msgstr "--count"
 
 #. type: Plain text
 #: en/git-grep.txt:220
@@ -26316,9 +26316,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:230
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--break"
-msgstr ""
+msgstr "--break"
 
 #. type: Plain text
 #: en/git-grep.txt:232
@@ -26328,9 +26328,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:233
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--heading"
-msgstr ""
+msgstr "--heading"
 
 #. type: Plain text
 #: en/git-grep.txt:236
@@ -26340,9 +26340,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:238
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--show-function"
-msgstr ""
+msgstr "--show-function"
 
 #. type: Plain text
 #: en/git-grep.txt:244
@@ -26448,21 +26448,21 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:281
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--and"
-msgstr ""
+msgstr "--and"
 
 #. type: Labeled list
 #: en/git-grep.txt:282
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--or"
-msgstr ""
+msgstr "--or"
 
 #. type: Labeled list
 #: en/git-grep.txt:283 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--not"
-msgstr ""
+msgstr "--not"
 
 #. type: Labeled list
 #: en/git-grep.txt:284
@@ -26478,9 +26478,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-grep.txt:290 en/rev-list-options.txt:65
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--all-match"
-msgstr ""
+msgstr "--all-match"
 
 #. type: Plain text
 #: en/git-grep.txt:294
@@ -26568,9 +26568,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-gui.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-gui(1)"
-msgstr ""
+msgstr "git-gui(1)"
 
 #. type: Plain text
 #: en/git-gui.txt:7
@@ -26802,9 +26802,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-hash-object.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-hash-object(1)"
-msgstr ""
+msgstr "git-hash-object(1)"
 
 #. type: Plain text
 #: en/git-hash-object.txt:7
@@ -26852,9 +26852,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-hash-object.txt:35
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--stdin-paths"
-msgstr ""
+msgstr "--stdin-paths"
 
 #. type: Plain text
 #: en/git-hash-object.txt:38
@@ -26870,9 +26870,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-hash-object.txt:49
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-filters"
-msgstr ""
+msgstr "--no-filters"
 
 #. type: Plain text
 #: en/git-hash-object.txt:54
@@ -26882,9 +26882,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-hash-object.txt:55
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--literally"
-msgstr ""
+msgstr "--literally"
 
 #. type: Plain text
 #: en/git-hash-object.txt:60
@@ -26894,9 +26894,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-help.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-help(1)"
-msgstr ""
+msgstr "git-help(1)"
 
 #. type: Plain text
 #: en/git-help.txt:7
@@ -26974,9 +26974,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-help.txt:55
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--config"
-msgstr ""
+msgstr "--config"
 
 #. type: Plain text
 #: en/git-help.txt:58
@@ -26986,9 +26986,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-help.txt:60
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--guides"
-msgstr ""
+msgstr "--guides"
 
 #. type: Plain text
 #: en/git-help.txt:63
@@ -26998,9 +26998,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-help.txt:65
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--info"
-msgstr ""
+msgstr "--info"
 
 #. type: Plain text
 #: en/git-help.txt:68
@@ -27010,9 +27010,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-help.txt:70
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--man"
-msgstr ""
+msgstr "--man"
 
 #. type: Plain text
 #: en/git-help.txt:74
@@ -27028,9 +27028,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-help.txt:80
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--web"
-msgstr ""
+msgstr "--web"
 
 #. type: Plain text
 #: en/git-help.txt:83
@@ -27052,9 +27052,9 @@ msgstr ""
 
 #. type: Title ~
 #: en/git-help.txt:94
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "help.format"
-msgstr ""
+msgstr "help.format"
 
 #. type: Plain text
 #: en/git-help.txt:100
@@ -27253,9 +27253,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-http-backend.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-http-backend(1)"
-msgstr ""
+msgstr "git-http-backend(1)"
 
 #. type: Plain text
 #: en/git-http-backend.txt:7
@@ -27681,9 +27681,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-http-fetch.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-http-fetch(1)"
-msgstr ""
+msgstr "git-http-fetch(1)"
 
 #. type: Plain text
 #: en/git-http-fetch.txt:7
@@ -27765,9 +27765,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-http-fetch.txt:43
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--recover"
-msgstr ""
+msgstr "--recover"
 
 #. type: Plain text
 #: en/git-http-fetch.txt:46
@@ -27777,9 +27777,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-http-push.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-http-push(1)"
-msgstr ""
+msgstr "git-http-push(1)"
 
 #. type: Plain text
 #: en/git-http-push.txt:7
@@ -27930,9 +27930,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-imap-send.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-imap-send(1)"
-msgstr ""
+msgstr "git-imap-send(1)"
 
 #. type: Plain text
 #: en/git-imap-send.txt:7
@@ -27972,9 +27972,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-imap-send.txt:40
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--curl"
-msgstr ""
+msgstr "--curl"
 
 #. type: Plain text
 #: en/git-imap-send.txt:44
@@ -27984,9 +27984,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-imap-send.txt:45
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-curl"
-msgstr ""
+msgstr "--no-curl"
 
 #. type: Plain text
 #: en/git-imap-send.txt:49
@@ -28122,9 +28122,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-index-pack.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-index-pack(1)"
-msgstr ""
+msgstr "git-index-pack(1)"
 
 #. type: Plain text
 #: en/git-index-pack.txt:7
@@ -28173,9 +28173,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-index-pack.txt:48
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--fix-thin"
-msgstr ""
+msgstr "--fix-thin"
 
 #. type: Plain text
 #: en/git-index-pack.txt:53
@@ -28227,9 +28227,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-index-pack.txt:80
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--fsck-objects"
-msgstr ""
+msgstr "--fsck-objects"
 
 #. type: Plain text
 #: en/git-index-pack.txt:82
@@ -28281,9 +28281,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-init-db.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-init-db(1)"
-msgstr ""
+msgstr "git-init-db(1)"
 
 #. type: Plain text
 #: en/git-init-db.txt:7
@@ -28305,9 +28305,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-init.txt:2
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "git-init(1)"
-msgstr ""
+msgstr "git-init(1)"
 
 #. type: Plain text
 #: en/git-init.txt:7
@@ -28552,9 +28552,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-instaweb.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-instaweb(1)"
-msgstr ""
+msgstr "git-instaweb(1)"
 
 #. type: Plain text
 #: en/git-instaweb.txt:7
@@ -28585,9 +28585,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-instaweb.txt:28
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--httpd"
-msgstr ""
+msgstr "--httpd"
 
 #. type: Plain text
 #: en/git-instaweb.txt:35
@@ -28597,9 +28597,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-instaweb.txt:37
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--module-path"
-msgstr ""
+msgstr "--module-path"
 
 #. type: Plain text
 #: en/git-instaweb.txt:40
@@ -28609,9 +28609,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-instaweb.txt:42
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--port"
-msgstr ""
+msgstr "--port"
 
 #. type: Plain text
 #: en/git-instaweb.txt:44
@@ -28621,9 +28621,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-instaweb.txt:46
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--browser"
-msgstr ""
+msgstr "--browser"
 
 #. type: Plain text
 #: en/git-instaweb.txt:52
@@ -28639,9 +28639,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-instaweb.txt:54
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--start"
-msgstr ""
+msgstr "--start"
 
 #. type: Plain text
 #: en/git-instaweb.txt:57
@@ -28657,9 +28657,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-instaweb.txt:59
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--stop"
-msgstr ""
+msgstr "--stop"
 
 #. type: Plain text
 #: en/git-instaweb.txt:63
@@ -28675,9 +28675,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-instaweb.txt:65
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--restart"
-msgstr ""
+msgstr "--restart"
 
 #. type: Plain text
 #: en/git-instaweb.txt:68
@@ -28711,9 +28711,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-interpret-trailers.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-interpret-trailers(1)"
-msgstr ""
+msgstr "git-interpret-trailers(1)"
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:7
@@ -28797,9 +28797,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:74
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--in-place"
-msgstr ""
+msgstr "--in-place"
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:76
@@ -28809,9 +28809,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:77
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--trim-empty"
-msgstr ""
+msgstr "--trim-empty"
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:81
@@ -28839,9 +28839,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:88
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-where"
-msgstr ""
+msgstr "--no-where"
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:94
@@ -28857,9 +28857,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:96
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-if-exists"
-msgstr ""
+msgstr "--no-if-exists"
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:103
@@ -28875,9 +28875,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:105
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-if-missing"
-msgstr ""
+msgstr "--no-if-missing"
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:112
@@ -28887,9 +28887,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:113
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--only-trailers"
-msgstr ""
+msgstr "--only-trailers"
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:115
@@ -28899,9 +28899,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:116
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--only-input"
-msgstr ""
+msgstr "--only-input"
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:120
@@ -28911,9 +28911,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:121
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--unfold"
-msgstr ""
+msgstr "--unfold"
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:124
@@ -28923,9 +28923,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:125
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--parse"
-msgstr ""
+msgstr "--parse"
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:128
@@ -28935,9 +28935,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:129
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-divider"
-msgstr ""
+msgstr "--no-divider"
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:133
@@ -29375,15 +29375,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:387
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-commit[1], linkgit:git-format-patch[1], linkgit:git-config[1]"
-msgstr ""
+msgstr "linkgit:git-commit[1], linkgit:git-format-patch[1], linkgit:git-config[1]"
 
 #. type: Title =
 #: en/git-log.txt:2
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "git-log(1)"
-msgstr ""
+msgstr "git-log(1)"
 
 #. type: Plain text
 #: en/git-log.txt:7
@@ -29411,9 +29411,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-log.txt:27
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--follow"
-msgstr ""
+msgstr "--follow"
 
 #. type: Plain text
 #: en/git-log.txt:30
@@ -29423,9 +29423,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-log.txt:31
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--no-decorate"
-msgstr ""
+msgstr "--no-decorate"
 
 #. type: Labeled list
 #: en/git-log.txt:32
@@ -29459,9 +29459,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-log.txt:48
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--source"
-msgstr ""
+msgstr "--source"
 
 #. type: Plain text
 #: en/git-log.txt:51
@@ -29471,9 +29471,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-log.txt:52
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--[no-]use-mailmap"
-msgstr ""
+msgstr "--[no-]use-mailmap"
 
 #. type: Plain text
 #: en/git-log.txt:56
@@ -29483,9 +29483,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-log.txt:57
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--full-diff"
-msgstr ""
+msgstr "--full-diff"
 
 #. type: Plain text
 #: en/git-log.txt:63
@@ -29501,9 +29501,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-log.txt:67
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--log-size"
-msgstr ""
+msgstr "--log-size"
 
 #. type: Plain text
 #: en/git-log.txt:72
@@ -29693,9 +29693,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-log.txt:182
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "format.pretty"
-msgstr ""
+msgstr "format.pretty"
 
 #. type: Plain text
 #: en/git-log.txt:185
@@ -29705,9 +29705,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-log.txt:186
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "i18n.logOutputEncoding"
-msgstr ""
+msgstr "i18n.logOutputEncoding"
 
 #. type: Plain text
 #: en/git-log.txt:190
@@ -29717,9 +29717,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-log.txt:191
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "log.date"
-msgstr ""
+msgstr "log.date"
 
 #. type: Plain text
 #: en/git-log.txt:195
@@ -29735,9 +29735,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-log.txt:200
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "log.follow"
-msgstr ""
+msgstr "log.follow"
 
 #. type: Plain text
 #: en/git-log.txt:205
@@ -29747,9 +29747,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-log.txt:206
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "log.showRoot"
-msgstr ""
+msgstr "log.showRoot"
 
 #. type: Plain text
 #: en/git-log.txt:211
@@ -29759,9 +29759,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-log.txt:212
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "log.showSignature"
-msgstr ""
+msgstr "log.showSignature"
 
 #. type: Plain text
 #: en/git-log.txt:215
@@ -29807,9 +29807,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-ls-files.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-ls-files(1)"
-msgstr ""
+msgstr "git-ls-files(1)"
 
 #. type: Plain text
 #: en/git-ls-files.txt:7
@@ -29854,9 +29854,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-ls-files.txt:40
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--deleted"
-msgstr ""
+msgstr "--deleted"
 
 #. type: Plain text
 #: en/git-ls-files.txt:42
@@ -29866,9 +29866,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-ls-files.txt:44
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--modified"
-msgstr ""
+msgstr "--modified"
 
 #. type: Plain text
 #: en/git-ls-files.txt:46
@@ -29878,9 +29878,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-ls-files.txt:48
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--others"
-msgstr ""
+msgstr "--others"
 
 #. type: Plain text
 #: en/git-ls-files.txt:50
@@ -29890,9 +29890,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-ls-files.txt:52
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--ignored"
-msgstr ""
+msgstr "--ignored"
 
 #. type: Plain text
 #: en/git-ls-files.txt:58
@@ -29902,9 +29902,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-ls-files.txt:60
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--stage"
-msgstr ""
+msgstr "--stage"
 
 #. type: Plain text
 #: en/git-ls-files.txt:62
@@ -29914,9 +29914,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-ls-files.txt:63
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--directory"
-msgstr ""
+msgstr "--directory"
 
 #. type: Plain text
 #: en/git-ls-files.txt:66
@@ -29926,9 +29926,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-ls-files.txt:67
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-empty-directory"
-msgstr ""
+msgstr "--no-empty-directory"
 
 #. type: Plain text
 #: en/git-ls-files.txt:69
@@ -29938,9 +29938,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-ls-files.txt:71 en/git-update-index.txt:67
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--unmerged"
-msgstr ""
+msgstr "--unmerged"
 
 #. type: Plain text
 #: en/git-ls-files.txt:73
@@ -29950,9 +29950,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-ls-files.txt:75
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--killed"
-msgstr ""
+msgstr "--killed"
 
 #. type: Plain text
 #: en/git-ls-files.txt:79
@@ -30016,9 +30016,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-ls-files.txt:102
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--error-unmatch"
-msgstr ""
+msgstr "--error-unmatch"
 
 #. type: Plain text
 #: en/git-ls-files.txt:105
@@ -30166,9 +30166,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-ls-files.txt:165
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--eol"
-msgstr ""
+msgstr "--eol"
 
 #. type: Plain text
 #: en/git-ls-files.txt:170
@@ -30282,15 +30282,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-ls-files.txt:247
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-read-tree[1], linkgit:gitignore[5]"
-msgstr ""
+msgstr "linkgit:git-read-tree[1], linkgit:gitignore[5]"
 
 #. type: Title =
 #: en/git-ls-remote.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-ls-remote(1)"
-msgstr ""
+msgstr "git-ls-remote(1)"
 
 #. type: Plain text
 #: en/git-ls-remote.txt:7
@@ -30315,9 +30315,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-ls-remote.txt:25 en/git-show-ref.txt:40
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--heads"
-msgstr ""
+msgstr "--heads"
 
 #. type: Plain text
 #: en/git-ls-remote.txt:32
@@ -30327,9 +30327,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-ls-remote.txt:33
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--refs"
-msgstr ""
+msgstr "--refs"
 
 #. type: Plain text
 #: en/git-ls-remote.txt:35
@@ -30363,9 +30363,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-ls-remote.txt:52
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--get-url"
-msgstr ""
+msgstr "--get-url"
 
 #. type: Plain text
 #: en/git-ls-remote.txt:56
@@ -30375,9 +30375,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-ls-remote.txt:57
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--symref"
-msgstr ""
+msgstr "--symref"
 
 #. type: Plain text
 #: en/git-ls-remote.txt:62
@@ -30438,9 +30438,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-ls-tree.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-ls-tree(1)"
-msgstr ""
+msgstr "git-ls-tree(1)"
 
 #. type: Plain text
 #: en/git-ls-tree.txt:7
@@ -30579,9 +30579,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-mailinfo.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-mailinfo(1)"
-msgstr ""
+msgstr "git-mailinfo(1)"
 
 #. type: Plain text
 #: en/git-mailinfo.txt:7
@@ -30729,9 +30729,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-mailsplit.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-mailsplit(1)"
-msgstr ""
+msgstr "git-mailsplit(1)"
 
 #. type: Plain text
 #: en/git-mailsplit.txt:7
@@ -30827,9 +30827,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-mailsplit.txt:48
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--keep-cr"
-msgstr ""
+msgstr "--keep-cr"
 
 #. type: Plain text
 #: en/git-mailsplit.txt:50
@@ -30839,9 +30839,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-mailsplit.txt:51
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--mboxrd"
-msgstr ""
+msgstr "--mboxrd"
 
 #. type: Plain text
 #: en/git-mailsplit.txt:54
@@ -30851,9 +30851,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-merge-base.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-merge-base(1)"
-msgstr ""
+msgstr "git-merge-base(1)"
 
 #. type: Plain text
 #: en/git-merge-base.txt:7
@@ -30904,9 +30904,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-merge-base.txt:43
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--octopus"
-msgstr ""
+msgstr "--octopus"
 
 #. type: Plain text
 #: en/git-merge-base.txt:47
@@ -30916,9 +30916,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-merge-base.txt:48 en/git-show-branch.txt:90
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--independent"
-msgstr ""
+msgstr "--independent"
 
 #. type: Plain text
 #: en/git-merge-base.txt:54
@@ -30928,9 +30928,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-merge-base.txt:55
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--is-ancestor"
-msgstr ""
+msgstr "--is-ancestor"
 
 #. type: Plain text
 #: en/git-merge-base.txt:59
@@ -30940,9 +30940,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-merge-base.txt:60 en/git-rebase.txt:358
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--fork-point"
-msgstr ""
+msgstr "--fork-point"
 
 #. type: Plain text
 #: en/git-merge-base.txt:68
@@ -31197,15 +31197,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-merge-base.txt:228
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
-msgstr ""
+msgstr "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
 
 #. type: Title =
 #: en/git-merge-file.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-merge-file(1)"
-msgstr ""
+msgstr "git-merge-file(1)"
 
 #. type: Plain text
 #: en/git-merge-file.txt:7
@@ -31289,9 +31289,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-merge-file.txt:70
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--diff3"
-msgstr ""
+msgstr "--diff3"
 
 #. type: Plain text
 #: en/git-merge-file.txt:72
@@ -31301,9 +31301,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-merge-file.txt:75
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--union"
-msgstr ""
+msgstr "--union"
 
 #. type: Plain text
 #: en/git-merge-file.txt:78
@@ -31337,9 +31337,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-merge-index.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-merge-index(1)"
-msgstr ""
+msgstr "git-merge-index(1)"
 
 #. type: Plain text
 #: en/git-merge-index.txt:7
@@ -31438,9 +31438,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-merge-one-file.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-merge-one-file(1)"
-msgstr ""
+msgstr "git-merge-one-file(1)"
 
 #. type: Plain text
 #: en/git-merge-one-file.txt:7
@@ -31552,9 +31552,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-mergetool.txt:2
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "git-mergetool(1)"
-msgstr ""
+msgstr "git-mergetool(1)"
 
 #. type: Plain text
 #: en/git-mergetool.txt:7
@@ -31636,9 +31636,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-mergetool.txt:83
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--gui"
-msgstr ""
+msgstr "--gui"
 
 #. type: Plain text
 #: en/git-mergetool.txt:89
@@ -31648,9 +31648,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-mergetool.txt:90
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--no-gui"
-msgstr ""
+msgstr "--no-gui"
 
 #. type: Plain text
 #: en/git-mergetool.txt:94
@@ -31684,9 +31684,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-merge-tree.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-merge-tree(1)"
-msgstr ""
+msgstr "git-merge-tree(1)"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:7
@@ -31714,9 +31714,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-merge.txt:2
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "git-merge(1)"
-msgstr ""
+msgstr "git-merge(1)"
 
 #. type: Plain text
 #: en/git-merge.txt:7
@@ -32195,15 +32195,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-merge.txt:369
-#, priority:240
+#, ignore-same, priority:240
 msgid "linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
-msgstr ""
+msgstr "linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
 
 #. type: Title =
 #: en/git-mktag.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-mktag(1)"
-msgstr ""
+msgstr "git-mktag(1)"
 
 #. type: Plain text
 #: en/git-mktag.txt:7
@@ -32259,9 +32259,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-mktree.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-mktree(1)"
-msgstr ""
+msgstr "git-mktree(1)"
 
 #. type: Plain text
 #: en/git-mktree.txt:7
@@ -32289,9 +32289,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-mktree.txt:26
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--missing"
-msgstr ""
+msgstr "--missing"
 
 #. type: Plain text
 #: en/git-mktree.txt:31
@@ -32307,9 +32307,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-mv.txt:2
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "git-mv(1)"
-msgstr ""
+msgstr "git-mv(1)"
 
 #. type: Plain text
 #: en/git-mv.txt:7
@@ -32387,9 +32387,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-name-rev.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-name-rev(1)"
-msgstr ""
+msgstr "git-name-rev(1)"
 
 #. type: Plain text
 #: en/git-name-rev.txt:7
@@ -32455,9 +32455,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-name-rev.txt:57
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-undefined"
-msgstr ""
+msgstr "--no-undefined"
 
 #. type: Plain text
 #: en/git-name-rev.txt:60
@@ -32505,9 +32505,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-notes.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-notes(1)"
-msgstr ""
+msgstr "git-notes(1)"
 
 #. type: Plain text
 #: en/git-notes.txt:7
@@ -32823,9 +32823,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:192 en/merge-options.txt:1
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--commit"
-msgstr ""
+msgstr "--commit"
 
 #. type: Plain text
 #: en/git-notes.txt:200
@@ -32958,9 +32958,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:313
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "core.notesRef"
-msgstr ""
+msgstr "core.notesRef"
 
 #. type: Plain text
 #: en/git-notes.txt:318
@@ -33066,9 +33066,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:375
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOTES_REF`"
-msgstr ""
+msgstr "`GIT_NOTES_REF`"
 
 #. type: Plain text
 #: en/git-notes.txt:378
@@ -33078,9 +33078,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:379
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOTES_DISPLAY_REF`"
-msgstr ""
+msgstr "`GIT_NOTES_DISPLAY_REF`"
 
 #. type: Plain text
 #: en/git-notes.txt:385
@@ -33096,9 +33096,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:389
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOTES_REWRITE_MODE`"
-msgstr ""
+msgstr "`GIT_NOTES_REWRITE_MODE`"
 
 #. type: Plain text
 #: en/git-notes.txt:394
@@ -33108,9 +33108,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:395
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOTES_REWRITE_REF`"
-msgstr ""
+msgstr "`GIT_NOTES_REWRITE_REF`"
 
 #. type: Plain text
 #: en/git-notes.txt:399
@@ -33126,9 +33126,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-p4.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4(1)"
-msgstr ""
+msgstr "git-p4(1)"
 
 #. type: Plain text
 #: en/git-p4.txt:7
@@ -33521,9 +33521,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:236
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--detect-branches"
-msgstr ""
+msgstr "--detect-branches"
 
 #. type: Plain text
 #: en/git-p4.txt:239
@@ -33545,9 +33545,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:245
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--silent"
-msgstr ""
+msgstr "--silent"
 
 #. type: Plain text
 #: en/git-p4.txt:247
@@ -33557,9 +33557,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:248
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--detect-labels"
-msgstr ""
+msgstr "--detect-labels"
 
 #. type: Plain text
 #: en/git-p4.txt:252
@@ -33569,9 +33569,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:253 en/git-p4.txt:389
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--import-labels"
-msgstr ""
+msgstr "--import-labels"
 
 #. type: Plain text
 #: en/git-p4.txt:255
@@ -33581,9 +33581,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:256
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--import-local"
-msgstr ""
+msgstr "--import-local"
 
 #. type: Plain text
 #: en/git-p4.txt:263
@@ -33617,9 +33617,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:280
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--keep-path"
-msgstr ""
+msgstr "--keep-path"
 
 #. type: Plain text
 #: en/git-p4.txt:287
@@ -33629,9 +33629,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:288
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--use-client-spec"
-msgstr ""
+msgstr "--use-client-spec"
 
 #. type: Plain text
 #: en/git-p4.txt:291
@@ -33713,9 +33713,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:323
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--preserve-user"
-msgstr ""
+msgstr "--preserve-user"
 
 #. type: Plain text
 #: en/git-p4.txt:326
@@ -33725,9 +33725,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:327
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--export-labels"
-msgstr ""
+msgstr "--export-labels"
 
 #. type: Plain text
 #: en/git-p4.txt:330
@@ -33743,9 +33743,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:336
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--prepare-p4-only"
-msgstr ""
+msgstr "--prepare-p4-only"
 
 #. type: Plain text
 #: en/git-p4.txt:342
@@ -33755,9 +33755,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:343
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--shelve"
-msgstr ""
+msgstr "--shelve"
 
 #. type: Plain text
 #: en/git-p4.txt:347
@@ -33815,9 +33815,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:368
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--disable-rebase"
-msgstr ""
+msgstr "--disable-rebase"
 
 #. type: Plain text
 #: en/git-p4.txt:371
@@ -33827,9 +33827,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:372
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--disable-p4sync"
-msgstr ""
+msgstr "--disable-p4sync"
 
 #. type: Plain text
 #: en/git-p4.txt:376
@@ -33881,9 +33881,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:395
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--origin"
-msgstr ""
+msgstr "--origin"
 
 #. type: Plain text
 #: en/git-p4.txt:398
@@ -34085,9 +34085,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:521
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.user"
-msgstr ""
+msgstr "git-p4.user"
 
 #. type: Plain text
 #: en/git-p4.txt:524
@@ -34097,9 +34097,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:525
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.password"
-msgstr ""
+msgstr "git-p4.password"
 
 #. type: Plain text
 #: en/git-p4.txt:529
@@ -34109,9 +34109,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:530
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.port"
-msgstr ""
+msgstr "git-p4.port"
 
 #. type: Plain text
 #: en/git-p4.txt:534
@@ -34121,9 +34121,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:535
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.host"
-msgstr ""
+msgstr "git-p4.host"
 
 #. type: Plain text
 #: en/git-p4.txt:539
@@ -34133,9 +34133,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:540
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.client"
-msgstr ""
+msgstr "git-p4.client"
 
 #. type: Plain text
 #: en/git-p4.txt:543
@@ -34145,9 +34145,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:544
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.retries"
-msgstr ""
+msgstr "git-p4.retries"
 
 #. type: Plain text
 #: en/git-p4.txt:549
@@ -34163,9 +34163,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:552
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.syncFromOrigin"
-msgstr ""
+msgstr "git-p4.syncFromOrigin"
 
 #. type: Plain text
 #: en/git-p4.txt:558
@@ -34175,9 +34175,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:559
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.branchUser"
-msgstr ""
+msgstr "git-p4.branchUser"
 
 #. type: Plain text
 #: en/git-p4.txt:564
@@ -34187,9 +34187,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:565
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.branchList"
-msgstr ""
+msgstr "git-p4.branchList"
 
 #. type: Plain text
 #: en/git-p4.txt:570
@@ -34219,9 +34219,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:580
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.importLabels"
-msgstr ""
+msgstr "git-p4.importLabels"
 
 #. type: Plain text
 #: en/git-p4.txt:582
@@ -34231,9 +34231,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:583
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.labelImportRegexp"
-msgstr ""
+msgstr "git-p4.labelImportRegexp"
 
 #. type: Plain text
 #: en/git-p4.txt:586
@@ -34243,9 +34243,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:587
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.useClientSpec"
-msgstr ""
+msgstr "git-p4.useClientSpec"
 
 #. type: Plain text
 #: en/git-p4.txt:592
@@ -34255,9 +34255,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:593
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.pathEncoding"
-msgstr ""
+msgstr "git-p4.pathEncoding"
 
 #. type: Plain text
 #: en/git-p4.txt:599
@@ -34267,9 +34267,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:600
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.largeFileSystem"
-msgstr ""
+msgstr "git-p4.largeFileSystem"
 
 #. type: Plain text
 #: en/git-p4.txt:606
@@ -34285,9 +34285,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:611
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.largeFileExtensions"
-msgstr ""
+msgstr "git-p4.largeFileExtensions"
 
 #. type: Plain text
 #: en/git-p4.txt:614
@@ -34297,9 +34297,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:615
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.largeFileThreshold"
-msgstr ""
+msgstr "git-p4.largeFileThreshold"
 
 #. type: Plain text
 #: en/git-p4.txt:619
@@ -34309,9 +34309,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:620
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.largeFileCompressedThreshold"
-msgstr ""
+msgstr "git-p4.largeFileCompressedThreshold"
 
 #. type: Plain text
 #: en/git-p4.txt:625
@@ -34321,9 +34321,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:626
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.largeFilePush"
-msgstr ""
+msgstr "git-p4.largeFilePush"
 
 #. type: Plain text
 #: en/git-p4.txt:629
@@ -34333,9 +34333,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:630
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.keepEmptyCommits"
-msgstr ""
+msgstr "git-p4.keepEmptyCommits"
 
 #. type: Plain text
 #: en/git-p4.txt:633
@@ -34345,9 +34345,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:634
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.mapUser"
-msgstr ""
+msgstr "git-p4.mapUser"
 
 #. type: Plain text
 #: en/git-p4.txt:637
@@ -34375,9 +34375,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:647
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.detectRenames"
-msgstr ""
+msgstr "git-p4.detectRenames"
 
 #. type: Plain text
 #: en/git-p4.txt:650
@@ -34387,9 +34387,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:651
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.detectCopies"
-msgstr ""
+msgstr "git-p4.detectCopies"
 
 #. type: Plain text
 #: en/git-p4.txt:654
@@ -34399,9 +34399,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:655
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.detectCopiesHarder"
-msgstr ""
+msgstr "git-p4.detectCopiesHarder"
 
 #. type: Plain text
 #: en/git-p4.txt:657
@@ -34411,9 +34411,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:658
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.preserveUser"
-msgstr ""
+msgstr "git-p4.preserveUser"
 
 #. type: Plain text
 #: en/git-p4.txt:661
@@ -34435,9 +34435,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:667
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.skipSubmitEdit"
-msgstr ""
+msgstr "git-p4.skipSubmitEdit"
 
 #. type: Plain text
 #: en/git-p4.txt:671
@@ -34447,9 +34447,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:672
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.skipSubmitEditCheck"
-msgstr ""
+msgstr "git-p4.skipSubmitEditCheck"
 
 #. type: Plain text
 #: en/git-p4.txt:676
@@ -34459,9 +34459,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:677
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.allowSubmit"
-msgstr ""
+msgstr "git-p4.allowSubmit"
 
 #. type: Plain text
 #: en/git-p4.txt:683
@@ -34471,9 +34471,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:684
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.skipUserNameCheck"
-msgstr ""
+msgstr "git-p4.skipUserNameCheck"
 
 #. type: Plain text
 #: en/git-p4.txt:688
@@ -34483,9 +34483,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:689
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.attemptRCSCleanup"
-msgstr ""
+msgstr "git-p4.attemptRCSCleanup"
 
 #. type: Plain text
 #: en/git-p4.txt:694
@@ -34495,9 +34495,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:695
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.exportLabels"
-msgstr ""
+msgstr "git-p4.exportLabels"
 
 #. type: Plain text
 #: en/git-p4.txt:697
@@ -34507,9 +34507,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:698
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.labelExportRegexp"
-msgstr ""
+msgstr "git-p4.labelExportRegexp"
 
 #. type: Plain text
 #: en/git-p4.txt:701
@@ -34519,9 +34519,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:702
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.conflict"
-msgstr ""
+msgstr "git-p4.conflict"
 
 #. type: Plain text
 #: en/git-p4.txt:705
@@ -34531,9 +34531,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-p4.txt:706
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-p4.disableRebase"
-msgstr ""
+msgstr "git-p4.disableRebase"
 
 #. type: Plain text
 #: en/git-p4.txt:708
@@ -34585,9 +34585,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-pack-objects.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-pack-objects(1)"
-msgstr ""
+msgstr "git-pack-objects(1)"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:7
@@ -34657,9 +34657,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:63
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--revs"
-msgstr ""
+msgstr "--revs"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:71
@@ -34669,9 +34669,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:72 en/rev-list-options.txt:715
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--unpacked"
-msgstr ""
+msgstr "--unpacked"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:76
@@ -34729,9 +34729,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:126
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--honor-pack-keep"
-msgstr ""
+msgstr "--honor-pack-keep"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:130
@@ -34765,9 +34765,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:147
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--non-empty"
-msgstr ""
+msgstr "--non-empty"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:150
@@ -34777,9 +34777,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:157
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--all-progress"
-msgstr ""
+msgstr "--all-progress"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:167
@@ -34789,9 +34789,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:168
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--all-progress-implied"
-msgstr ""
+msgstr "--all-progress-implied"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:172
@@ -34807,9 +34807,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:177
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-reuse-delta"
-msgstr ""
+msgstr "--no-reuse-delta"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:183
@@ -34819,9 +34819,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:184
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-reuse-object"
-msgstr ""
+msgstr "--no-reuse-object"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:190
@@ -34843,9 +34843,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:199 en/git-show-branch.txt:67 en/rev-list-options.txt:350 en/rev-list-options.txt:483
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--sparse"
-msgstr ""
+msgstr "--sparse"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:207
@@ -34867,9 +34867,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:218
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--shallow"
-msgstr ""
+msgstr "--shallow"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:222
@@ -34879,9 +34879,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:223
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--delta-base-offset"
-msgstr ""
+msgstr "--delta-base-offset"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:233
@@ -34903,9 +34903,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:254
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--keep-true-parents"
-msgstr ""
+msgstr "--keep-true-parents"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:257
@@ -34927,9 +34927,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:263 en/rev-list-options.txt:760
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--no-filter"
-msgstr ""
+msgstr "--no-filter"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:265
@@ -34969,9 +34969,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:281 en/rev-list-options.txt:785
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--exclude-promisor-objects"
-msgstr ""
+msgstr "--exclude-promisor-objects"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:287
@@ -34981,9 +34981,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:288 en/git-repack.txt:157
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--keep-unreachable"
-msgstr ""
+msgstr "--keep-unreachable"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:293
@@ -34993,9 +34993,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:294
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--pack-loose-unreachable"
-msgstr ""
+msgstr "--pack-loose-unreachable"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:297
@@ -35005,9 +35005,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:298
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--unpack-unreachable"
-msgstr ""
+msgstr "--unpack-unreachable"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:300
@@ -35017,9 +35017,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:301 en/git-repack.txt:164
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--delta-islands"
-msgstr ""
+msgstr "--delta-islands"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:304
@@ -35126,15 +35126,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-pack-objects.txt:403
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
-msgstr ""
+msgstr "linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
 
 #. type: Title =
 #: en/git-pack-redundant.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-pack-redundant(1)"
-msgstr ""
+msgstr "git-pack-redundant(1)"
 
 #. type: Plain text
 #: en/git-pack-redundant.txt:7
@@ -35174,9 +35174,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pack-redundant.txt:35
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--alt-odb"
-msgstr ""
+msgstr "--alt-odb"
 
 #. type: Plain text
 #: en/git-pack-redundant.txt:38
@@ -35192,15 +35192,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-pack-redundant.txt:47
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
-msgstr ""
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
 
 #. type: Title =
 #: en/git-pack-refs.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-pack-refs(1)"
-msgstr ""
+msgstr "git-pack-refs(1)"
 
 #. type: Plain text
 #: en/git-pack-refs.txt:7
@@ -35258,9 +35258,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-parse-remote.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-parse-remote(1)"
-msgstr ""
+msgstr "git-parse-remote(1)"
 
 #. type: Plain text
 #: en/git-parse-remote.txt:7
@@ -35282,9 +35282,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-patch-id.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-patch-id(1)"
-msgstr ""
+msgstr "git-patch-id(1)"
 
 #. type: Plain text
 #: en/git-patch-id.txt:7
@@ -35324,9 +35324,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-patch-id.txt:33
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--stable"
-msgstr ""
+msgstr "--stable"
 
 #. type: Plain text
 #: en/git-patch-id.txt:35
@@ -35354,9 +35354,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-patch-id.txt:50
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--unstable"
-msgstr ""
+msgstr "--unstable"
 
 #. type: Plain text
 #: en/git-patch-id.txt:56
@@ -35372,9 +35372,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-prune-packed.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-prune-packed(1)"
-msgstr ""
+msgstr "git-prune-packed(1)"
 
 #. type: Plain text
 #: en/git-prune-packed.txt:7
@@ -35426,15 +35426,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-prune-packed.txt:44
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgstr ""
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
 
 #. type: Title =
 #: en/git-prune.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-prune(1)"
-msgstr ""
+msgstr "git-prune(1)"
 
 #. type: Plain text
 #: en/git-prune.txt:7
@@ -35534,15 +35534,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-prune.txt:86
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-fsck[1], linkgit:git-gc[1], linkgit:git-reflog[1]"
-msgstr ""
+msgstr "linkgit:git-fsck[1], linkgit:git-gc[1], linkgit:git-reflog[1]"
 
 #. type: Title =
 #: en/git-pull.txt:2
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "git-pull(1)"
-msgstr ""
+msgstr "git-pull(1)"
 
 #. type: Plain text
 #: en/git-pull.txt:7
@@ -35716,9 +35716,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pull.txt:133 en/git-svn.txt:261
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--no-rebase"
-msgstr ""
+msgstr "--no-rebase"
 
 #. type: Plain text
 #: en/git-pull.txt:135
@@ -35728,15 +35728,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-pull.txt:136 en/git-rebase.txt:502
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--autostash"
-msgstr ""
+msgstr "--autostash"
 
 #. type: Labeled list
 #: en/git-pull.txt:137 en/git-rebase.txt:503
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--no-autostash"
-msgstr ""
+msgstr "--no-autostash"
 
 #. type: Plain text
 #: en/git-pull.txt:142
@@ -35882,15 +35882,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-pull.txt:260
-#, priority:220
+#, ignore-same, priority:220
 msgid "linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]"
-msgstr ""
+msgstr "linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]"
 
 #. type: Title =
 #: en/git-push.txt:2
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "git-push(1)"
-msgstr ""
+msgstr "git-push(1)"
 
 #. type: Plain text
 #: en/git-push.txt:7
@@ -36098,9 +36098,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-push.txt:191
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--follow-tags"
-msgstr ""
+msgstr "--follow-tags"
 
 #. type: Plain text
 #: en/git-push.txt:198
@@ -36110,9 +36110,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-push.txt:199 en/git-send-pack.txt:73
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--[no-]signed"
-msgstr ""
+msgstr "--[no-]signed"
 
 #. type: Labeled list
 #: en/git-push.txt:200 en/git-send-pack.txt:74
@@ -36128,9 +36128,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-push.txt:210
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--[no-]atomic"
-msgstr ""
+msgstr "--[no-]atomic"
 
 #. type: Plain text
 #: en/git-push.txt:214
@@ -36170,9 +36170,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-push.txt:234
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--[no-]force-with-lease"
-msgstr ""
+msgstr "--[no-]force-with-lease"
 
 #. type: Labeled list
 #: en/git-push.txt:235
@@ -36338,9 +36338,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-push.txt:355
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--[no-]thin"
-msgstr ""
+msgstr "--[no-]thin"
 
 #. type: Plain text
 #: en/git-push.txt:360
@@ -36368,9 +36368,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-push.txt:393
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--[no-]verify"
-msgstr ""
+msgstr "--[no-]verify"
 
 #. type: Plain text
 #: en/git-push.txt:397
@@ -36803,9 +36803,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-quiltimport.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-quiltimport(1)"
-msgstr ""
+msgstr "git-quiltimport(1)"
 
 #. type: Plain text
 #: en/git-quiltimport.txt:7
@@ -36895,9 +36895,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-read-tree.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-read-tree(1)"
-msgstr ""
+msgstr "git-read-tree(1)"
 
 #. type: Plain text
 #: en/git-read-tree.txt:7
@@ -36941,9 +36941,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-read-tree.txt:40
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--reset"
-msgstr ""
+msgstr "--reset"
 
 #. type: Plain text
 #: en/git-read-tree.txt:44
@@ -36977,9 +36977,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-read-tree.txt:66
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--trivial"
-msgstr ""
+msgstr "--trivial"
 
 #. type: Plain text
 #: en/git-read-tree.txt:71
@@ -37049,9 +37049,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-read-tree.txt:118
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]recurse-submodules"
-msgstr ""
+msgstr "--[no-]recurse-submodules"
 
 #. type: Plain text
 #: en/git-read-tree.txt:123
@@ -37061,9 +37061,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-read-tree.txt:124
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-sparse-checkout"
-msgstr ""
+msgstr "--no-sparse-checkout"
 
 #. type: Plain text
 #: en/git-read-tree.txt:127
@@ -37073,9 +37073,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-read-tree.txt:128
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--empty"
-msgstr ""
+msgstr "--empty"
 
 #. type: Plain text
 #: en/git-read-tree.txt:131
@@ -37506,15 +37506,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-read-tree.txt:440
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; linkgit:gitignore[5]"
-msgstr ""
+msgstr "linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; linkgit:gitignore[5]"
 
 #. type: Title =
 #: en/git-rebase.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-rebase(1)"
-msgstr ""
+msgstr "git-rebase(1)"
 
 #. type: Plain text
 #: en/git-rebase.txt:7
@@ -37872,9 +37872,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:243 en/git-rebase.txt:538
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--keep-empty"
-msgstr ""
+msgstr "--keep-empty"
 
 #. type: Plain text
 #: en/git-rebase.txt:246
@@ -37902,9 +37902,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:259 en/git-rebase.txt:539
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--edit-todo"
-msgstr ""
+msgstr "--edit-todo"
 
 #. type: Plain text
 #: en/git-rebase.txt:261
@@ -37992,9 +37992,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rebase.txt:333 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--verify"
-msgstr ""
+msgstr "--verify"
 
 #. type: Plain text
 #: en/git-rebase.txt:336
@@ -38004,15 +38004,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rebase.txt:345 en/merge-options.txt:47
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--no-ff"
-msgstr ""
+msgstr "--no-ff"
 
 #. type: Labeled list
 #: en/git-rebase.txt:346
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--force-rebase"
-msgstr ""
+msgstr "--force-rebase"
 
 #. type: Plain text
 #: en/git-rebase.txt:351
@@ -38028,9 +38028,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rebase.txt:359
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-fork-point"
-msgstr ""
+msgstr "--no-fork-point"
 
 #. type: Plain text
 #: en/git-rebase.txt:363
@@ -38118,9 +38118,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rebase.txt:434 en/git-rebase.txt:535 en/git-svn.txt:680
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--preserve-merges"
-msgstr ""
+msgstr "--preserve-merges"
 
 #. type: Plain text
 #: en/git-rebase.txt:439
@@ -38196,15 +38196,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rebase.txt:483
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--autosquash"
-msgstr ""
+msgstr "--autosquash"
 
 #. type: Labeled list
 #: en/git-rebase.txt:484
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-autosquash"
-msgstr ""
+msgstr "--no-autosquash"
 
 #. type: Plain text
 #: en/git-rebase.txt:495
@@ -38226,15 +38226,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rebase.txt:510
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--reschedule-failed-exec"
-msgstr ""
+msgstr "--reschedule-failed-exec"
 
 #. type: Labeled list
 #: en/git-rebase.txt:511
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-reschedule-failed-exec"
-msgstr ""
+msgstr "--no-reschedule-failed-exec"
 
 #. type: Plain text
 #: en/git-rebase.txt:514
@@ -38256,9 +38256,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:523
-#, priority:100
+#, ignore-same, priority:100
 msgid "--whitespace"
-msgstr ""
+msgstr "--whitespace"
 
 #. type: Plain text
 #: en/git-rebase.txt:527
@@ -38268,33 +38268,33 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:530
-#, priority:100
+#, ignore-same, priority:100
 msgid "--strategy"
-msgstr ""
+msgstr "--strategy"
 
 #. type: Plain text
 #: en/git-rebase.txt:531
-#, priority:100
+#, ignore-same, priority:100
 msgid "--strategy-option"
-msgstr ""
+msgstr "--strategy-option"
 
 #. type: Plain text
 #: en/git-rebase.txt:533
-#, priority:100
+#, ignore-same, priority:100
 msgid "--[no-]autosquash"
-msgstr ""
+msgstr "--[no-]autosquash"
 
 #. type: Plain text
 #: en/git-rebase.txt:534
-#, priority:100
+#, ignore-same, priority:100
 msgid "--rebase-merges"
-msgstr ""
+msgstr "--rebase-merges"
 
 #. type: Plain text
 #: en/git-rebase.txt:537
-#, priority:100
+#, ignore-same, priority:100
 msgid "--exec"
-msgstr ""
+msgstr "--exec"
 
 #. type: Plain text
 #: en/git-rebase.txt:540
@@ -39167,9 +39167,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-receive-pack.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-receive-pack(1)"
-msgstr ""
+msgstr "git-receive-pack(1)"
 
 #. type: Plain text
 #: en/git-receive-pack.txt:7
@@ -39257,9 +39257,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-receive-pack.txt:66
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_PUSH_CERT_SIGNER`"
-msgstr ""
+msgstr "`GIT_PUSH_CERT_SIGNER`"
 
 #. type: Plain text
 #: en/git-receive-pack.txt:69
@@ -39269,9 +39269,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-receive-pack.txt:70
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_PUSH_CERT_KEY`"
-msgstr ""
+msgstr "`GIT_PUSH_CERT_KEY`"
 
 #. type: Plain text
 #: en/git-receive-pack.txt:72
@@ -39281,9 +39281,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-receive-pack.txt:73
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_PUSH_CERT_STATUS`"
-msgstr ""
+msgstr "`GIT_PUSH_CERT_STATUS`"
 
 #. type: Plain text
 #: en/git-receive-pack.txt:77
@@ -39293,9 +39293,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-receive-pack.txt:78
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_PUSH_CERT_NONCE`"
-msgstr ""
+msgstr "`GIT_PUSH_CERT_NONCE`"
 
 #. type: Plain text
 #: en/git-receive-pack.txt:84
@@ -39305,15 +39305,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-receive-pack.txt:85
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_PUSH_CERT_NONCE_STATUS`"
-msgstr ""
+msgstr "`GIT_PUSH_CERT_NONCE_STATUS`"
 
 #. type: Labeled list
 #: en/git-receive-pack.txt:86
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`UNSOLICITED`"
-msgstr ""
+msgstr "`UNSOLICITED`"
 
 #. type: Plain text
 #: en/git-receive-pack.txt:89
@@ -39323,9 +39323,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-receive-pack.txt:89
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`MISSING`"
-msgstr ""
+msgstr "`MISSING`"
 
 #. type: Plain text
 #: en/git-receive-pack.txt:91
@@ -39335,9 +39335,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-receive-pack.txt:91
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`BAD`"
-msgstr ""
+msgstr "`BAD`"
 
 #. type: Plain text
 #: en/git-receive-pack.txt:93
@@ -39347,9 +39347,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-receive-pack.txt:93
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`OK`"
-msgstr ""
+msgstr "`OK`"
 
 #. type: Plain text
 #: en/git-receive-pack.txt:95
@@ -39359,9 +39359,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-receive-pack.txt:95
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`SLOP`"
-msgstr ""
+msgstr "`SLOP`"
 
 #. type: Plain text
 #: en/git-receive-pack.txt:99
@@ -39371,9 +39371,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-receive-pack.txt:100
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_PUSH_CERT_NONCE_SLOP`"
-msgstr ""
+msgstr "`GIT_PUSH_CERT_NONCE_SLOP`"
 
 #. type: Plain text
 #: en/git-receive-pack.txt:108
@@ -39576,15 +39576,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-receive-pack.txt:249
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
-msgstr ""
+msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
 
 #. type: Title =
 #: en/git-reflog.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-reflog(1)"
-msgstr ""
+msgstr "git-reflog(1)"
 
 #. type: Plain text
 #: en/git-reflog.txt:7
@@ -39673,9 +39673,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-reflog.txt:75 en/rev-list-options.txt:193
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--single-worktree"
-msgstr ""
+msgstr "--single-worktree"
 
 #. type: Plain text
 #: en/git-reflog.txt:79
@@ -39709,9 +39709,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-reflog.txt:98
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--updateref"
-msgstr ""
+msgstr "--updateref"
 
 #. type: Plain text
 #: en/git-reflog.txt:102
@@ -39721,9 +39721,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-reflog.txt:103
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--rewrite"
-msgstr ""
+msgstr "--rewrite"
 
 #. type: Plain text
 #: en/git-reflog.txt:107
@@ -39733,9 +39733,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-reflog.txt:108
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--stale-fix"
-msgstr ""
+msgstr "--stale-fix"
 
 #. type: Plain text
 #: en/git-reflog.txt:113
@@ -39775,9 +39775,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-remote-ext.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-remote-ext(1)"
-msgstr ""
+msgstr "git-remote-ext(1)"
 
 #. type: Plain text
 #: en/git-remote-ext.txt:7
@@ -39901,9 +39901,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-remote-ext.txt:61 en/git-remote-fd.txt:33
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "GIT_TRANSLOOP_DEBUG"
-msgstr ""
+msgstr "GIT_TRANSLOOP_DEBUG"
 
 #. type: Plain text
 #: en/git-remote-ext.txt:63 en/git-remote-fd.txt:35
@@ -39919,9 +39919,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-remote-ext.txt:67
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "GIT_EXT_SERVICE"
-msgstr ""
+msgstr "GIT_EXT_SERVICE"
 
 #. type: Plain text
 #: en/git-remote-ext.txt:70
@@ -39931,9 +39931,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-remote-ext.txt:71
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "GIT_EXT_SERVICE_NOPREFIX"
-msgstr ""
+msgstr "GIT_EXT_SERVICE_NOPREFIX"
 
 #. type: Plain text
 #: en/git-remote-ext.txt:74
@@ -40021,15 +40021,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:gitremote-helpers[7]"
-msgstr ""
+msgstr "linkgit:gitremote-helpers[7]"
 
 #. type: Title =
 #: en/git-remote-fd.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-remote-fd(1)"
-msgstr ""
+msgstr "git-remote-fd(1)"
 
 #. type: Plain text
 #: en/git-remote-fd.txt:7
@@ -40105,9 +40105,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-remote.txt:2
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "git-remote(1)"
-msgstr ""
+msgstr "git-remote(1)"
 
 #. type: Plain text
 #: en/git-remote.txt:7
@@ -40482,15 +40482,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-remote.txt:253
-#, priority:220
+#, ignore-same, priority:220
 msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
-msgstr ""
+msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
 
 #. type: Title =
 #: en/git-repack.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-repack(1)"
-msgstr ""
+msgstr "git-repack(1)"
 
 #. type: Plain text
 #: en/git-repack.txt:7
@@ -40596,9 +40596,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-repack.txt:127
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--write-bitmap-index"
-msgstr ""
+msgstr "--write-bitmap-index"
 
 #. type: Plain text
 #: en/git-repack.txt:133
@@ -40608,9 +40608,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-repack.txt:134
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--pack-kept-objects"
-msgstr ""
+msgstr "--pack-kept-objects"
 
 #. type: Plain text
 #: en/git-repack.txt:142
@@ -40662,15 +40662,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-repack.txt:185
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
-msgstr ""
+msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
 
 #. type: Title =
 #: en/git-replace.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-replace(1)"
-msgstr ""
+msgstr "git-replace(1)"
 
 #. type: Plain text
 #: en/git-replace.txt:7
@@ -40812,9 +40812,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-replace.txt:94
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--convert-graft-file"
-msgstr ""
+msgstr "--convert-graft-file"
 
 #. type: Plain text
 #: en/git-replace.txt:98
@@ -40932,9 +40932,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-request-pull.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-request-pull(1)"
-msgstr ""
+msgstr "git-request-pull(1)"
 
 #. type: Plain text
 #: en/git-request-pull.txt:7
@@ -41064,9 +41064,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-rerere.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-rerere(1)"
-msgstr ""
+msgstr "git-rerere(1)"
 
 #. type: Plain text
 #: en/git-rerere.txt:7
@@ -41353,9 +41353,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-reset.txt:2
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "git-reset(1)"
-msgstr ""
+msgstr "git-reset(1)"
 
 #. type: Plain text
 #: en/git-reset.txt:7
@@ -41434,9 +41434,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-reset.txt:54
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--soft"
-msgstr ""
+msgstr "--soft"
 
 #. type: Plain text
 #: en/git-reset.txt:59
@@ -41446,9 +41446,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-reset.txt:60
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--mixed"
-msgstr ""
+msgstr "--mixed"
 
 #. type: Plain text
 #: en/git-reset.txt:64
@@ -41464,9 +41464,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-reset.txt:68
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--hard"
-msgstr ""
+msgstr "--hard"
 
 #. type: Plain text
 #: en/git-reset.txt:71
@@ -41500,9 +41500,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-reset.txt:99
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--no-quiet"
-msgstr ""
+msgstr "--no-quiet"
 
 #. type: Plain text
 #: en/git-reset.txt:103
@@ -42080,9 +42080,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-restore.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-restore(1)"
-msgstr ""
+msgstr "git-restore(1)"
 
 #. type: Plain text
 #: en/git-restore.txt:7
@@ -42166,9 +42166,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-restore.txt:59
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--staged"
-msgstr ""
+msgstr "--staged"
 
 #. type: Plain text
 #: en/git-restore.txt:63
@@ -42202,9 +42202,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-restore.txt:96
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--ignore-unmerged"
-msgstr ""
+msgstr "--ignore-unmerged"
 
 #. type: Plain text
 #: en/git-restore.txt:101
@@ -42326,15 +42326,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-restore.txt:182
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
-msgstr ""
+msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
 
 #. type: Title =
 #: en/git-revert.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-revert(1)"
-msgstr ""
+msgstr "git-revert(1)"
 
 #. type: Plain text
 #: en/git-revert.txt:7
@@ -42436,9 +42436,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-rev-list.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-rev-list(1)"
-msgstr ""
+msgstr "git-rev-list(1)"
 
 #. type: Plain text
 #: en/git-rev-list.txt:7
@@ -42571,9 +42571,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-rev-parse.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-rev-parse(1)"
-msgstr ""
+msgstr "git-rev-parse(1)"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:7
@@ -42607,9 +42607,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:33
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--parseopt"
-msgstr ""
+msgstr "--parseopt"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:35
@@ -42619,9 +42619,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:36
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--sq-quote"
-msgstr ""
+msgstr "--sq-quote"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:40
@@ -42637,9 +42637,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:44
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--keep-dashdash"
-msgstr ""
+msgstr "--keep-dashdash"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:47
@@ -42649,9 +42649,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:48
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--stop-at-non-option"
-msgstr ""
+msgstr "--stop-at-non-option"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:52
@@ -42661,9 +42661,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:53
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--stuck-long"
-msgstr ""
+msgstr "--stuck-long"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:56
@@ -42679,9 +42679,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:60
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--revs-only"
-msgstr ""
+msgstr "--revs-only"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:63
@@ -42691,9 +42691,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:64
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-revs"
-msgstr ""
+msgstr "--no-revs"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:67
@@ -42703,9 +42703,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:68
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--flags"
-msgstr ""
+msgstr "--flags"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:70
@@ -42715,9 +42715,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:71
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-flags"
-msgstr ""
+msgstr "--no-flags"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:73
@@ -42791,9 +42791,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:120
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--sq"
-msgstr ""
+msgstr "--sq"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:128
@@ -42833,9 +42833,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:145
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--symbolic"
-msgstr ""
+msgstr "--symbolic"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:149
@@ -42845,9 +42845,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:150
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--symbolic-full-name"
-msgstr ""
+msgstr "--symbolic-full-name"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:157
@@ -42947,9 +42947,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:205
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--local-env-vars"
-msgstr ""
+msgstr "--local-env-vars"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:210
@@ -42959,9 +42959,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:211
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--git-dir"
-msgstr ""
+msgstr "--git-dir"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:215
@@ -42977,9 +42977,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:220
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--absolute-git-dir"
-msgstr ""
+msgstr "--absolute-git-dir"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:223
@@ -42989,9 +42989,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:224
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--git-common-dir"
-msgstr ""
+msgstr "--git-common-dir"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:226
@@ -43001,9 +43001,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:227
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--is-inside-git-dir"
-msgstr ""
+msgstr "--is-inside-git-dir"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:230
@@ -43013,9 +43013,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:231
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--is-inside-work-tree"
-msgstr ""
+msgstr "--is-inside-work-tree"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:234
@@ -43025,9 +43025,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:235
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--is-bare-repository"
-msgstr ""
+msgstr "--is-bare-repository"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:237
@@ -43037,9 +43037,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:238
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--is-shallow-repository"
-msgstr ""
+msgstr "--is-shallow-repository"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:240
@@ -43073,9 +43073,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:254
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--show-cdup"
-msgstr ""
+msgstr "--show-cdup"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:258
@@ -43085,9 +43085,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:259
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--show-prefix"
-msgstr ""
+msgstr "--show-prefix"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:263
@@ -43097,9 +43097,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:264
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--show-toplevel"
-msgstr ""
+msgstr "--show-toplevel"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:266
@@ -43109,9 +43109,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:267
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--show-superproject-working-tree"
-msgstr ""
+msgstr "--show-superproject-working-tree"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:272
@@ -43121,9 +43121,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:273
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--shared-index-path"
-msgstr ""
+msgstr "--shared-index-path"
 
 #. type: Plain text
 #: en/git-rev-parse.txt:276
@@ -43481,9 +43481,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-rm.txt:2
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "git-rm(1)"
-msgstr ""
+msgstr "git-rm(1)"
 
 #. type: Plain text
 #: en/git-rm.txt:7
@@ -43535,9 +43535,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rm.txt:63
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--ignore-unmatch"
-msgstr ""
+msgstr "--ignore-unmatch"
 
 #. type: Plain text
 #: en/git-rm.txt:65
@@ -43709,9 +43709,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-send-email.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-send-email(1)"
-msgstr ""
+msgstr "git-send-email(1)"
 
 #. type: Plain text
 #: en/git-send-email.txt:7
@@ -43777,9 +43777,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:48 en/git-tag.txt:61
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--annotate"
-msgstr ""
+msgstr "--annotate"
 
 #. type: Plain text
 #: en/git-send-email.txt:52
@@ -43819,9 +43819,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:65
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--compose"
-msgstr ""
+msgstr "--compose"
 
 #. type: Plain text
 #: en/git-send-email.txt:68
@@ -43982,15 +43982,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:152
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--xmailer"
-msgstr ""
+msgstr "--xmailer"
 
 #. type: Labeled list
 #: en/git-send-email.txt:153
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-xmailer"
-msgstr ""
+msgstr "--no-xmailer"
 
 #. type: Plain text
 #: en/git-send-email.txt:157
@@ -44084,9 +44084,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:209
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-smtp-auth"
-msgstr ""
+msgstr "--no-smtp-auth"
 
 #. type: Plain text
 #: en/git-send-email.txt:211
@@ -44138,9 +44138,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:239
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl"
-msgstr ""
+msgstr "--smtp-ssl"
 
 #. type: Plain text
 #: en/git-send-email.txt:241
@@ -44150,9 +44150,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:242
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--smtp-ssl-cert-path"
-msgstr ""
+msgstr "--smtp-ssl-cert-path"
 
 #. type: Plain text
 #: en/git-send-email.txt:252
@@ -44228,9 +44228,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:285
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-identity"
-msgstr ""
+msgstr "--no-identity"
 
 #. type: Plain text
 #: en/git-send-email.txt:288
@@ -44264,9 +44264,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:301
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]chain-reply-to"
-msgstr ""
+msgstr "--[no-]chain-reply-to"
 
 #. type: Plain text
 #: en/git-send-email.txt:308
@@ -44288,9 +44288,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:315
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]signed-off-by-cc"
-msgstr ""
+msgstr "--[no-]signed-off-by-cc"
 
 #. type: Plain text
 #: en/git-send-email.txt:319
@@ -44300,9 +44300,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:320
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]cc-cover"
-msgstr ""
+msgstr "--[no-]cc-cover"
 
 #. type: Plain text
 #: en/git-send-email.txt:325
@@ -44312,9 +44312,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:326
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]to-cover"
-msgstr ""
+msgstr "--[no-]to-cover"
 
 #. type: Plain text
 #: en/git-send-email.txt:331
@@ -44396,9 +44396,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:357
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]suppress-from"
-msgstr ""
+msgstr "--[no-]suppress-from"
 
 #. type: Plain text
 #: en/git-send-email.txt:361
@@ -44408,9 +44408,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:362
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]thread"
-msgstr ""
+msgstr "--[no-]thread"
 
 #. type: Plain text
 #: en/git-send-email.txt:368
@@ -44492,9 +44492,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:403
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]format-patch"
-msgstr ""
+msgstr "--[no-]format-patch"
 
 #. type: Plain text
 #: en/git-send-email.txt:408
@@ -44510,9 +44510,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:413
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]validate"
-msgstr ""
+msgstr "--[no-]validate"
 
 #. type: Plain text
 #: en/git-send-email.txt:416
@@ -44562,9 +44562,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:436
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--dump-aliases"
-msgstr ""
+msgstr "--dump-aliases"
 
 #. type: Plain text
 #: en/git-send-email.txt:441
@@ -44574,9 +44574,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:446
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasesFile"
-msgstr ""
+msgstr "sendemail.aliasesFile"
 
 #. type: Plain text
 #: en/git-send-email.txt:449
@@ -44586,9 +44586,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:450
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "sendemail.aliasFileType"
-msgstr ""
+msgstr "sendemail.aliasFileType"
 
 #. type: Plain text
 #: en/git-send-email.txt:453
@@ -44652,9 +44652,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:471
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "sendemail.multiEdit"
-msgstr ""
+msgstr "sendemail.multiEdit"
 
 #. type: Plain text
 #: en/git-send-email.txt:476
@@ -44664,9 +44664,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:477
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "sendemail.confirm"
-msgstr ""
+msgstr "sendemail.confirm"
 
 #. type: Plain text
 #: en/git-send-email.txt:481
@@ -44738,9 +44738,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-send-pack.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-send-pack(1)"
-msgstr ""
+msgstr "git-send-pack(1)"
 
 #. type: Plain text
 #: en/git-send-pack.txt:7
@@ -44790,9 +44790,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-pack.txt:68
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--atomic"
-msgstr ""
+msgstr "--atomic"
 
 #. type: Plain text
 #: en/git-send-pack.txt:72
@@ -44868,9 +44868,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-shell.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-shell(1)"
-msgstr ""
+msgstr "git-shell(1)"
 
 #. type: Plain text
 #: en/git-shell.txt:7
@@ -45063,9 +45063,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-sh-i18n.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-sh-i18n(1)"
-msgstr ""
+msgstr "git-sh-i18n(1)"
 
 #. type: Plain text
 #: en/git-sh-i18n.txt:7
@@ -45111,9 +45111,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-shortlog.txt:2
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "git-shortlog(1)"
-msgstr ""
+msgstr "git-shortlog(1)"
 
 #. type: Plain text
 #: en/git-shortlog.txt:7
@@ -45161,9 +45161,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-shortlog.txt:39
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--email"
-msgstr ""
+msgstr "--email"
 
 #. type: Plain text
 #: en/git-shortlog.txt:41
@@ -45191,9 +45191,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-shortlog.txt:51
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--committer"
-msgstr ""
+msgstr "--committer"
 
 #. type: Plain text
 #: en/git-shortlog.txt:53
@@ -45239,9 +45239,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-show-branch.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-show-branch(1)"
-msgstr ""
+msgstr "git-show-branch(1)"
 
 #. type: Plain text
 #: en/git-show-branch.txt:7
@@ -45317,9 +45317,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-show-branch.txt:51
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--current"
-msgstr ""
+msgstr "--current"
 
 #. type: Plain text
 #: en/git-show-branch.txt:55
@@ -45329,9 +45329,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-show-branch.txt:56 en/rev-list-options.txt:652
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--topo-order"
-msgstr ""
+msgstr "--topo-order"
 
 #. type: Plain text
 #: en/git-show-branch.txt:61
@@ -45341,9 +45341,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-show-branch.txt:62 en/rev-list-options.txt:644
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--date-order"
-msgstr ""
+msgstr "--date-order"
 
 #. type: Plain text
 #: en/git-show-branch.txt:66
@@ -45377,9 +45377,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-show-branch.txt:83
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--merge-base"
-msgstr ""
+msgstr "--merge-base"
 
 #. type: Plain text
 #: en/git-show-branch.txt:89
@@ -45395,9 +45395,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-show-branch.txt:94
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-name"
-msgstr ""
+msgstr "--no-name"
 
 #. type: Plain text
 #: en/git-show-branch.txt:96
@@ -45407,9 +45407,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-show-branch.txt:97
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--sha1-name"
-msgstr ""
+msgstr "--sha1-name"
 
 #. type: Plain text
 #: en/git-show-branch.txt:102
@@ -45419,9 +45419,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-show-branch.txt:103
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--topics"
-msgstr ""
+msgstr "--topics"
 
 #. type: Plain text
 #: en/git-show-branch.txt:110
@@ -45546,9 +45546,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-show-index.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-show-index(1)"
-msgstr ""
+msgstr "git-show-index(1)"
 
 #. type: Plain text
 #: en/git-show-index.txt:7
@@ -45600,9 +45600,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-show-ref.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-show-ref(1)"
-msgstr ""
+msgstr "git-show-ref(1)"
 
 #. type: Plain text
 #: en/git-show-ref.txt:7
@@ -45646,9 +45646,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-show-ref.txt:36
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--head"
-msgstr ""
+msgstr "--head"
 
 #. type: Plain text
 #: en/git-show-ref.txt:39
@@ -45664,9 +45664,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-show-ref.txt:48
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--dereference"
-msgstr ""
+msgstr "--dereference"
 
 #. type: Plain text
 #: en/git-show-ref.txt:52
@@ -45884,15 +45884,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-show-ref.txt:183
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-update-ref[1], linkgit:gitrepository-layout[5]"
-msgstr ""
+msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-update-ref[1], linkgit:gitrepository-layout[5]"
 
 #. type: Title =
 #: en/git-show.txt:2
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "git-show(1)"
-msgstr ""
+msgstr "git-show(1)"
 
 #. type: Plain text
 #: en/git-show.txt:7
@@ -46022,9 +46022,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-sh-setup.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-sh-setup(1)"
-msgstr ""
+msgstr "git-sh-setup(1)"
 
 #. type: Plain text
 #: en/git-sh-setup.txt:7
@@ -46196,9 +46196,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-stage.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-stage(1)"
-msgstr ""
+msgstr "git-stage(1)"
 
 #. type: Plain text
 #: en/git-stage.txt:7
@@ -46220,9 +46220,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-stash.txt:2
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "git-stash(1)"
-msgstr ""
+msgstr "git-stash(1)"
 
 #. type: Plain text
 #: en/git-stash.txt:7
@@ -46611,15 +46611,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-stash.txt:298
-#, priority:240
+#, ignore-same, priority:240
 msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
-msgstr ""
+msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]"
 
 #. type: Title =
 #: en/git-status.txt:2
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "git-status(1)"
-msgstr ""
+msgstr "git-status(1)"
 
 #. type: Plain text
 #: en/git-status.txt:7
@@ -46647,9 +46647,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-status.txt:35
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--show-stash"
-msgstr ""
+msgstr "--show-stash"
 
 #. type: Plain text
 #: en/git-status.txt:37
@@ -46788,15 +46788,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-status.txt:133
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--ahead-behind"
-msgstr ""
+msgstr "--ahead-behind"
 
 #. type: Labeled list
 #: en/git-status.txt:134
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--no-ahead-behind"
-msgstr ""
+msgstr "--no-ahead-behind"
 
 #. type: Plain text
 #: en/git-status.txt:137
@@ -46806,9 +46806,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-status.txt:138
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "--renames"
-msgstr ""
+msgstr "--renames"
 
 #. type: Plain text
 #: en/git-status.txt:142
@@ -47258,9 +47258,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-stripspace.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-stripspace(1)"
-msgstr ""
+msgstr "git-stripspace(1)"
 
 #. type: Plain text
 #: en/git-stripspace.txt:7
@@ -47329,9 +47329,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-stripspace.txt:39
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--strip-comments"
-msgstr ""
+msgstr "--strip-comments"
 
 #. type: Plain text
 #: en/git-stripspace.txt:41
@@ -47341,9 +47341,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-stripspace.txt:43
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--comment-lines"
-msgstr ""
+msgstr "--comment-lines"
 
 #. type: Plain text
 #: en/git-stripspace.txt:47
@@ -47415,9 +47415,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-submodule.txt:2
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "git-submodule(1)"
-msgstr ""
+msgstr "git-submodule(1)"
 
 #. type: Plain text
 #: en/git-submodule.txt:7
@@ -47838,9 +47838,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-submodule.txt:296
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--files"
-msgstr ""
+msgstr "--files"
 
 #. type: Plain text
 #: en/git-submodule.txt:300
@@ -47850,9 +47850,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-submodule.txt:302
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--summary-limit"
-msgstr ""
+msgstr "--summary-limit"
 
 #. type: Plain text
 #: en/git-submodule.txt:308
@@ -47862,9 +47862,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-submodule.txt:309
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--remote"
-msgstr ""
+msgstr "--remote"
 
 #. type: Plain text
 #: en/git-submodule.txt:318
@@ -47892,9 +47892,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-submodule.txt:341
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--no-fetch"
-msgstr ""
+msgstr "--no-fetch"
 
 #. type: Plain text
 #: en/git-submodule.txt:344
@@ -47904,9 +47904,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-submodule.txt:345
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--checkout"
-msgstr ""
+msgstr "--checkout"
 
 #. type: Plain text
 #: en/git-submodule.txt:353
@@ -47922,9 +47922,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-submodule.txt:364
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--rebase"
-msgstr ""
+msgstr "--rebase"
 
 #. type: Plain text
 #: en/git-submodule.txt:372
@@ -47934,9 +47934,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-submodule.txt:373
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--init"
-msgstr ""
+msgstr "--init"
 
 #. type: Plain text
 #: en/git-submodule.txt:377
@@ -47946,9 +47946,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-submodule.txt:378
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--name"
-msgstr ""
+msgstr "--name"
 
 #. type: Plain text
 #: en/git-submodule.txt:382
@@ -47991,9 +47991,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-submodule.txt:405
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--depth"
-msgstr ""
+msgstr "--depth"
 
 #. type: Plain text
 #: en/git-submodule.txt:409
@@ -48003,9 +48003,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-submodule.txt:410
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "--[no-]recommend-shallow"
-msgstr ""
+msgstr "--[no-]recommend-shallow"
 
 #. type: Plain text
 #: en/git-submodule.txt:415
@@ -48039,9 +48039,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-svn.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-svn(1)"
-msgstr ""
+msgstr "git-svn(1)"
 
 #. type: Plain text
 #: en/git-svn.txt:7
@@ -48123,9 +48123,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:47
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--stdlayout"
-msgstr ""
+msgstr "--stdlayout"
 
 #. type: Plain text
 #: en/git-svn.txt:58
@@ -48135,9 +48135,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:58
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-metadata"
-msgstr ""
+msgstr "--no-metadata"
 
 #. type: Plain text
 #: en/git-svn.txt:62
@@ -48147,9 +48147,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:62
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--use-svm-props"
-msgstr ""
+msgstr "--use-svm-props"
 
 #. type: Plain text
 #: en/git-svn.txt:64
@@ -48159,9 +48159,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:64
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--use-svnsync-props"
-msgstr ""
+msgstr "--use-svnsync-props"
 
 #. type: Plain text
 #: en/git-svn.txt:66
@@ -48255,9 +48255,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:110
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-minimize-url"
-msgstr ""
+msgstr "--no-minimize-url"
 
 #. type: Plain text
 #: en/git-svn.txt:121
@@ -48285,9 +48285,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:131
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--localtime"
-msgstr ""
+msgstr "--localtime"
 
 #. type: Plain text
 #: en/git-svn.txt:135
@@ -48303,9 +48303,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:142 en/git-svn.txt:536
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--parent"
-msgstr ""
+msgstr "--parent"
 
 #. type: Plain text
 #: en/git-svn.txt:144
@@ -48411,9 +48411,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:215
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--preserve-empty-dirs"
-msgstr ""
+msgstr "--preserve-empty-dirs"
 
 #. type: Plain text
 #: en/git-svn.txt:221
@@ -48581,9 +48581,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:309
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--message"
-msgstr ""
+msgstr "--message"
 
 #. type: Plain text
 #: en/git-svn.txt:311
@@ -48593,9 +48593,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:313
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--tag"
-msgstr ""
+msgstr "--tag"
 
 #. type: Plain text
 #: en/git-svn.txt:316
@@ -48635,9 +48635,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:333
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--username"
-msgstr ""
+msgstr "--username"
 
 #. type: Plain text
 #: en/git-svn.txt:336
@@ -48647,9 +48647,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:337
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--commit-url"
-msgstr ""
+msgstr "--commit-url"
 
 #. type: Plain text
 #: en/git-svn.txt:342
@@ -48665,9 +48665,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:346 en/rev-list-options.txt:889
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--parents"
-msgstr ""
+msgstr "--parents"
 
 #. type: Plain text
 #: en/git-svn.txt:350
@@ -48755,9 +48755,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:380
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--show-commit"
-msgstr ""
+msgstr "--show-commit"
 
 #. type: Plain text
 #: en/git-svn.txt:382
@@ -48767,9 +48767,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:382 en/pretty-options.txt:31
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--oneline"
-msgstr ""
+msgstr "--oneline"
 
 #. type: Plain text
 #: en/git-svn.txt:384
@@ -48803,9 +48803,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:400
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--git-format"
-msgstr ""
+msgstr "--git-format"
 
 #. type: Plain text
 #: en/git-svn.txt:405
@@ -48833,9 +48833,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:413
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--before"
-msgstr ""
+msgstr "--before"
 
 #. type: Plain text
 #: en/git-svn.txt:417
@@ -48845,9 +48845,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:419
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--after"
-msgstr ""
+msgstr "--after"
 
 #. type: Plain text
 #: en/git-svn.txt:423
@@ -49186,9 +49186,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:602
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--rmdir"
-msgstr ""
+msgstr "--rmdir"
 
 #. type: Plain text
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
@@ -49344,9 +49344,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:701
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--use-log-author"
-msgstr ""
+msgstr "--use-log-author"
 
 #. type: Plain text
 #: en/git-svn.txt:705
@@ -49362,9 +49362,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:709
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--add-author-from"
-msgstr ""
+msgstr "--add-author-from"
 
 #. type: Plain text
 #: en/git-svn.txt:715
@@ -49422,9 +49422,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:735
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--follow-parent"
-msgstr ""
+msgstr "--follow-parent"
 
 #. type: Plain text
 #: en/git-svn.txt:750
@@ -49983,9 +49983,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-switch.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-switch(1)"
-msgstr ""
+msgstr "git-switch(1)"
 
 #. type: Plain text
 #: en/git-switch.txt:7
@@ -50123,9 +50123,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-switch.txt:111
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--discard-changes"
-msgstr ""
+msgstr "--discard-changes"
 
 #. type: Plain text
 #: en/git-switch.txt:117
@@ -50284,15 +50284,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-switch.txt:270
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
-msgstr ""
+msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]"
 
 #. type: Title =
 #: en/git-symbolic-ref.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-symbolic-ref(1)"
-msgstr ""
+msgstr "git-symbolic-ref(1)"
 
 #. type: Plain text
 #: en/git-symbolic-ref.txt:7
@@ -50371,9 +50371,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-tag.txt:2
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "git-tag(1)"
-msgstr ""
+msgstr "git-tag(1)"
 
 #. type: Plain text
 #: en/git-tag.txt:7
@@ -50451,9 +50451,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-tag.txt:65
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--sign"
-msgstr ""
+msgstr "--sign"
 
 #. type: Plain text
 #: en/git-tag.txt:70
@@ -50463,9 +50463,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-tag.txt:71
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--no-sign"
-msgstr ""
+msgstr "--no-sign"
 
 #. type: Plain text
 #: en/git-tag.txt:74
@@ -51019,9 +51019,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:89
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--html-path"
-msgstr ""
+msgstr "--html-path"
 
 #. type: Plain text
 #: en/git.txt:92
@@ -51031,9 +51031,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:93
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--man-path"
-msgstr ""
+msgstr "--man-path"
 
 #. type: Plain text
 #: en/git.txt:96
@@ -51043,9 +51043,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:97
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--info-path"
-msgstr ""
+msgstr "--info-path"
 
 #. type: Plain text
 #: en/git.txt:100
@@ -51055,9 +51055,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:102
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--paginate"
-msgstr ""
+msgstr "--paginate"
 
 #. type: Plain text
 #: en/git.txt:107
@@ -51067,9 +51067,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:109
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-pager"
-msgstr ""
+msgstr "--no-pager"
 
 #. type: Plain text
 #: en/git.txt:111
@@ -51133,9 +51133,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:140
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-replace-objects"
-msgstr ""
+msgstr "--no-replace-objects"
 
 #. type: Plain text
 #: en/git.txt:143
@@ -51145,9 +51145,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:144
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--literal-pathspecs"
-msgstr ""
+msgstr "--literal-pathspecs"
 
 #. type: Plain text
 #: en/git.txt:148
@@ -51157,9 +51157,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:149
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--glob-pathspecs"
-msgstr ""
+msgstr "--glob-pathspecs"
 
 #. type: Plain text
 #: en/git.txt:154
@@ -51169,9 +51169,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:155
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--noglob-pathspecs"
-msgstr ""
+msgstr "--noglob-pathspecs"
 
 #. type: Plain text
 #: en/git.txt:160
@@ -51181,9 +51181,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:161
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--icase-pathspecs"
-msgstr ""
+msgstr "--icase-pathspecs"
 
 #. type: Plain text
 #: en/git.txt:164
@@ -51193,9 +51193,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:165
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-optional-locks"
-msgstr ""
+msgstr "--no-optional-locks"
 
 #. type: Plain text
 #: en/git.txt:168
@@ -51588,9 +51588,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:403
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_INDEX_FILE`"
-msgstr ""
+msgstr "`GIT_INDEX_FILE`"
 
 #. type: Plain text
 #: en/git.txt:407
@@ -51600,9 +51600,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:408
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_INDEX_VERSION`"
-msgstr ""
+msgstr "`GIT_INDEX_VERSION`"
 
 #. type: Plain text
 #: en/git.txt:413
@@ -51612,9 +51612,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:414
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_OBJECT_DIRECTORY`"
-msgstr ""
+msgstr "`GIT_OBJECT_DIRECTORY`"
 
 #. type: Plain text
 #: en/git.txt:419
@@ -51624,9 +51624,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:420
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
-msgstr ""
+msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
 
 #. type: Plain text
 #: en/git.txt:426
@@ -51642,9 +51642,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:433
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_DIR`"
-msgstr ""
+msgstr "`GIT_DIR`"
 
 #. type: Plain text
 #: en/git.txt:438
@@ -51654,9 +51654,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:439
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_WORK_TREE`"
-msgstr ""
+msgstr "`GIT_WORK_TREE`"
 
 #. type: Plain text
 #: en/git.txt:443
@@ -51666,9 +51666,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:444
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_NAMESPACE`"
-msgstr ""
+msgstr "`GIT_NAMESPACE`"
 
 #. type: Plain text
 #: en/git.txt:447
@@ -51678,9 +51678,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:448
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_CEILING_DIRECTORIES`"
-msgstr ""
+msgstr "`GIT_CEILING_DIRECTORIES`"
 
 #. type: Plain text
 #: en/git.txt:462
@@ -51690,9 +51690,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:463
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
-msgstr ""
+msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
 
 #. type: Plain text
 #: en/git.txt:472
@@ -51702,9 +51702,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:473
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_COMMON_DIR`"
-msgstr ""
+msgstr "`GIT_COMMON_DIR`"
 
 #. type: Plain text
 #: en/git.txt:481
@@ -51720,39 +51720,39 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:484
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_AUTHOR_NAME`"
-msgstr ""
+msgstr "`GIT_AUTHOR_NAME`"
 
 #. type: Labeled list
 #: en/git.txt:485
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_AUTHOR_EMAIL`"
-msgstr ""
+msgstr "`GIT_AUTHOR_EMAIL`"
 
 #. type: Labeled list
 #: en/git.txt:486
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_AUTHOR_DATE`"
-msgstr ""
+msgstr "`GIT_AUTHOR_DATE`"
 
 #. type: Labeled list
 #: en/git.txt:487
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_COMMITTER_NAME`"
-msgstr ""
+msgstr "`GIT_COMMITTER_NAME`"
 
 #. type: Labeled list
 #: en/git.txt:488
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_COMMITTER_EMAIL`"
-msgstr ""
+msgstr "`GIT_COMMITTER_EMAIL`"
 
 #. type: Labeled list
 #: en/git.txt:489
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_COMMITTER_DATE`"
-msgstr ""
+msgstr "`GIT_COMMITTER_DATE`"
 
 #. type: Labeled list
 #: en/git.txt:490
@@ -51774,9 +51774,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:495
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_DIFF_OPTS`"
-msgstr ""
+msgstr "`GIT_DIFF_OPTS`"
 
 #. type: Plain text
 #: en/git.txt:500
@@ -51786,9 +51786,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:501
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_EXTERNAL_DIFF`"
-msgstr ""
+msgstr "`GIT_EXTERNAL_DIFF`"
 
 #. type: Plain text
 #: en/git.txt:506
@@ -51870,9 +51870,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:528
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_DIFF_PATH_COUNTER`"
-msgstr ""
+msgstr "`GIT_DIFF_PATH_COUNTER`"
 
 #. type: Plain text
 #: en/git.txt:530
@@ -51882,9 +51882,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:531
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_DIFF_PATH_TOTAL`"
-msgstr ""
+msgstr "`GIT_DIFF_PATH_TOTAL`"
 
 #. type: Plain text
 #: en/git.txt:533
@@ -51894,9 +51894,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:536
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_MERGE_VERBOSITY`"
-msgstr ""
+msgstr "`GIT_MERGE_VERBOSITY`"
 
 #. type: Plain text
 #: en/git.txt:540
@@ -51906,9 +51906,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:541
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_PAGER`"
-msgstr ""
+msgstr "`GIT_PAGER`"
 
 #. type: Plain text
 #: en/git.txt:546
@@ -51918,9 +51918,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:547
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_EDITOR`"
-msgstr ""
+msgstr "`GIT_EDITOR`"
 
 #. type: Plain text
 #: en/git.txt:552
@@ -51930,15 +51930,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:553
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_SSH`"
-msgstr ""
+msgstr "`GIT_SSH`"
 
 #. type: Labeled list
 #: en/git.txt:554
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_SSH_COMMAND`"
-msgstr ""
+msgstr "`GIT_SSH_COMMAND`"
 
 #. type: Plain text
 #: en/git.txt:561
@@ -51960,9 +51960,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:572
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_SSH_VARIANT`"
-msgstr ""
+msgstr "`GIT_SSH_VARIANT`"
 
 #. type: Plain text
 #: en/git.txt:577
@@ -51972,9 +51972,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:578
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_ASKPASS`"
-msgstr ""
+msgstr "`GIT_ASKPASS`"
 
 #. type: Plain text
 #: en/git.txt:584
@@ -51984,9 +51984,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:585
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_TERMINAL_PROMPT`"
-msgstr ""
+msgstr "`GIT_TERMINAL_PROMPT`"
 
 #. type: Plain text
 #: en/git.txt:588
@@ -51996,9 +51996,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:589
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_CONFIG_NOSYSTEM`"
-msgstr ""
+msgstr "`GIT_CONFIG_NOSYSTEM`"
 
 #. type: Plain text
 #: en/git.txt:596
@@ -52008,9 +52008,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:597
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_FLUSH`"
-msgstr ""
+msgstr "`GIT_FLUSH`"
 
 #. type: Plain text
 #: en/git.txt:607
@@ -52029,9 +52029,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:608
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE`"
-msgstr ""
+msgstr "`GIT_TRACE`"
 
 #. type: Plain text
 #: en/git.txt:611
@@ -52065,9 +52065,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:629
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_FSMONITOR`"
-msgstr ""
+msgstr "`GIT_TRACE_FSMONITOR`"
 
 #. type: Plain text
 #: en/git.txt:632
@@ -52077,9 +52077,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:633
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_PACK_ACCESS`"
-msgstr ""
+msgstr "`GIT_TRACE_PACK_ACCESS`"
 
 #. type: Plain text
 #: en/git.txt:639
@@ -52089,9 +52089,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:640
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_PACKET`"
-msgstr ""
+msgstr "`GIT_TRACE_PACKET`"
 
 #. type: Plain text
 #: en/git.txt:646
@@ -52101,9 +52101,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:647
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_PACKFILE`"
-msgstr ""
+msgstr "`GIT_TRACE_PACKFILE`"
 
 #. type: Plain text
 #: en/git.txt:654
@@ -52119,9 +52119,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:658
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_PERFORMANCE`"
-msgstr ""
+msgstr "`GIT_TRACE_PERFORMANCE`"
 
 #. type: Plain text
 #: en/git.txt:662
@@ -52131,9 +52131,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:663
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_SETUP`"
-msgstr ""
+msgstr "`GIT_TRACE_SETUP`"
 
 #. type: Plain text
 #: en/git.txt:667
@@ -52143,9 +52143,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:668
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_SHALLOW`"
-msgstr ""
+msgstr "`GIT_TRACE_SHALLOW`"
 
 #. type: Plain text
 #: en/git.txt:672
@@ -52155,9 +52155,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:673
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_CURL`"
-msgstr ""
+msgstr "`GIT_TRACE_CURL`"
 
 #. type: Plain text
 #: en/git.txt:680
@@ -52167,9 +52167,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:681
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_CURL_NO_DATA`"
-msgstr ""
+msgstr "`GIT_TRACE_CURL_NO_DATA`"
 
 #. type: Plain text
 #: en/git.txt:684
@@ -52233,9 +52233,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:733
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDACT_COOKIES`"
-msgstr ""
+msgstr "`GIT_REDACT_COOKIES`"
 
 #. type: Plain text
 #: en/git.txt:738
@@ -52245,9 +52245,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:739
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_LITERAL_PATHSPECS`"
-msgstr ""
+msgstr "`GIT_LITERAL_PATHSPECS`"
 
 #. type: Plain text
 #: en/git.txt:747
@@ -52257,9 +52257,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:748
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_GLOB_PATHSPECS`"
-msgstr ""
+msgstr "`GIT_GLOB_PATHSPECS`"
 
 #. type: Plain text
 #: en/git.txt:751
@@ -52269,9 +52269,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:752
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOGLOB_PATHSPECS`"
-msgstr ""
+msgstr "`GIT_NOGLOB_PATHSPECS`"
 
 #. type: Plain text
 #: en/git.txt:755
@@ -52281,9 +52281,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:756
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_ICASE_PATHSPECS`"
-msgstr ""
+msgstr "`GIT_ICASE_PATHSPECS`"
 
 #. type: Plain text
 #: en/git.txt:759
@@ -52293,9 +52293,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:760
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_REFLOG_ACTION`"
-msgstr ""
+msgstr "`GIT_REFLOG_ACTION`"
 
 #. type: Plain text
 #: en/git.txt:769
@@ -52305,9 +52305,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:770
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_REF_PARANOIA`"
-msgstr ""
+msgstr "`GIT_REF_PARANOIA`"
 
 #. type: Plain text
 #: en/git.txt:780
@@ -52317,9 +52317,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:781
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_ALLOW_PROTOCOL`"
-msgstr ""
+msgstr "`GIT_ALLOW_PROTOCOL`"
 
 #. type: Plain text
 #: en/git.txt:789
@@ -52329,9 +52329,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:790
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL_FROM_USER`"
-msgstr ""
+msgstr "`GIT_PROTOCOL_FROM_USER`"
 
 #. type: Plain text
 #: en/git.txt:796
@@ -52341,9 +52341,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:797
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL`"
-msgstr ""
+msgstr "`GIT_PROTOCOL`"
 
 #. type: Plain text
 #: en/git.txt:802
@@ -52353,9 +52353,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:803
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_OPTIONAL_LOCKS`"
-msgstr ""
+msgstr "`GIT_OPTIONAL_LOCKS`"
 
 #. type: Plain text
 #: en/git.txt:810
@@ -52365,21 +52365,21 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:811
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDIN`"
-msgstr ""
+msgstr "`GIT_REDIRECT_STDIN`"
 
 #. type: Labeled list
 #: en/git.txt:812
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDOUT`"
-msgstr ""
+msgstr "`GIT_REDIRECT_STDOUT`"
 
 #. type: Labeled list
 #: en/git.txt:813
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDERR`"
-msgstr ""
+msgstr "`GIT_REDIRECT_STDERR`"
 
 #. type: Plain text
 #: en/git.txt:823
@@ -52551,9 +52551,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-unpack-file.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-unpack-file(1)"
-msgstr ""
+msgstr "git-unpack-file(1)"
 
 #. type: Plain text
 #: en/git-unpack-file.txt:7
@@ -52584,9 +52584,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-unpack-objects.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-unpack-objects(1)"
-msgstr ""
+msgstr "git-unpack-objects(1)"
 
 #. type: Plain text
 #: en/git-unpack-objects.txt:7
@@ -52650,9 +52650,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-update-index.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-update-index(1)"
-msgstr ""
+msgstr "git-update-index(1)"
 
 #. type: Plain text
 #: en/git-update-index.txt:7
@@ -52709,9 +52709,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-index.txt:49
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--remove"
-msgstr ""
+msgstr "--remove"
 
 #. type: Plain text
 #: en/git-update-index.txt:53
@@ -52739,9 +52739,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-index.txt:63
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--ignore-submodules"
-msgstr ""
+msgstr "--ignore-submodules"
 
 #. type: Plain text
 #: en/git-update-index.txt:66
@@ -52793,9 +52793,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-index.txt:82
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--index-info"
-msgstr ""
+msgstr "--index-info"
 
 #. type: Plain text
 #: en/git-update-index.txt:84
@@ -52811,9 +52811,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-index.txt:88
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]assume-unchanged"
-msgstr ""
+msgstr "--[no-]assume-unchanged"
 
 #. type: Plain text
 #: en/git-update-index.txt:100
@@ -52829,9 +52829,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-index.txt:106
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--really-refresh"
-msgstr ""
+msgstr "--really-refresh"
 
 #. type: Plain text
 #: en/git-update-index.txt:109
@@ -52841,9 +52841,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-index.txt:110
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]skip-worktree"
-msgstr ""
+msgstr "--[no-]skip-worktree"
 
 #. type: Plain text
 #: en/git-update-index.txt:115
@@ -52853,9 +52853,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-index.txt:116
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]fsmonitor-valid"
-msgstr ""
+msgstr "--[no-]fsmonitor-valid"
 
 #. type: Plain text
 #: en/git-update-index.txt:121
@@ -52865,9 +52865,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-index.txt:123
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--again"
-msgstr ""
+msgstr "--again"
 
 #. type: Plain text
 #: en/git-update-index.txt:126
@@ -52877,9 +52877,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-index.txt:127
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--unresolve"
-msgstr ""
+msgstr "--unresolve"
 
 #. type: Plain text
 #: en/git-update-index.txt:130
@@ -52889,9 +52889,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-index.txt:131
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--info-only"
-msgstr ""
+msgstr "--info-only"
 
 #. type: Plain text
 #: en/git-update-index.txt:135
@@ -52901,9 +52901,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-index.txt:136
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--force-remove"
-msgstr ""
+msgstr "--force-remove"
 
 #. type: Plain text
 #: en/git-update-index.txt:139
@@ -52913,9 +52913,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-index.txt:140
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--replace"
-msgstr ""
+msgstr "--replace"
 
 #. type: Plain text
 #: en/git-update-index.txt:147
@@ -52955,15 +52955,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-index.txt:172
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--split-index"
-msgstr ""
+msgstr "--split-index"
 
 #. type: Labeled list
 #: en/git-update-index.txt:173
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-split-index"
-msgstr ""
+msgstr "--no-split-index"
 
 #. type: Plain text
 #: en/git-update-index.txt:178
@@ -52979,15 +52979,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-index.txt:185
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--untracked-cache"
-msgstr ""
+msgstr "--untracked-cache"
 
 #. type: Labeled list
 #: en/git-update-index.txt:186
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-untracked-cache"
-msgstr ""
+msgstr "--no-untracked-cache"
 
 #. type: Plain text
 #: en/git-update-index.txt:189
@@ -53003,9 +53003,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-index.txt:196
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--test-untracked-cache"
-msgstr ""
+msgstr "--test-untracked-cache"
 
 #. type: Plain text
 #: en/git-update-index.txt:205
@@ -53015,9 +53015,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-index.txt:206
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--force-untracked-cache"
-msgstr ""
+msgstr "--force-untracked-cache"
 
 #. type: Plain text
 #: en/git-update-index.txt:211
@@ -53027,15 +53027,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-index.txt:212
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--fsmonitor"
-msgstr ""
+msgstr "--fsmonitor"
 
 #. type: Labeled list
 #: en/git-update-index.txt:213
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--no-fsmonitor"
-msgstr ""
+msgstr "--no-fsmonitor"
 
 #. type: Plain text
 #: en/git-update-index.txt:220
@@ -53512,15 +53512,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-update-index.txt:551
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
-msgstr ""
+msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
 
 #. type: Title =
 #: en/git-update-ref.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-update-ref(1)"
-msgstr ""
+msgstr "git-update-ref(1)"
 
 #. type: Plain text
 #: en/git-update-ref.txt:7
@@ -53762,9 +53762,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-update-server-info.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-update-server-info(1)"
-msgstr ""
+msgstr "git-update-server-info(1)"
 
 #. type: Plain text
 #: en/git-update-server-info.txt:7
@@ -53804,9 +53804,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-upload-archive.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-upload-archive(1)"
-msgstr ""
+msgstr "git-upload-archive(1)"
 
 #. type: Plain text
 #: en/git-upload-archive.txt:7
@@ -53882,9 +53882,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-upload-pack.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-upload-pack(1)"
-msgstr ""
+msgstr "git-upload-pack(1)"
 
 #. type: Plain text
 #: en/git-upload-pack.txt:7
@@ -53914,9 +53914,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-upload-pack.txt:28
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--[no-]strict"
-msgstr ""
+msgstr "--[no-]strict"
 
 #. type: Plain text
 #: en/git-upload-pack.txt:30
@@ -53932,9 +53932,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-upload-pack.txt:34
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--stateless-rpc"
-msgstr ""
+msgstr "--stateless-rpc"
 
 #. type: Plain text
 #: en/git-upload-pack.txt:38
@@ -53944,9 +53944,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-upload-pack.txt:39
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--advertise-refs"
-msgstr ""
+msgstr "--advertise-refs"
 
 #. type: Plain text
 #: en/git-upload-pack.txt:43
@@ -53962,15 +53962,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-upload-pack.txt:50
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:gitnamespaces[7]"
-msgstr ""
+msgstr "linkgit:gitnamespaces[7]"
 
 #. type: Title =
 #: en/git-var.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-var(1)"
-msgstr ""
+msgstr "git-var(1)"
 
 #. type: Plain text
 #: en/git-var.txt:7
@@ -54012,9 +54012,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-var.txt:34
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "GIT_AUTHOR_IDENT"
-msgstr ""
+msgstr "GIT_AUTHOR_IDENT"
 
 #. type: Plain text
 #: en/git-var.txt:36
@@ -54024,9 +54024,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-var.txt:37
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "GIT_COMMITTER_IDENT"
-msgstr ""
+msgstr "GIT_COMMITTER_IDENT"
 
 #. type: Plain text
 #: en/git-var.txt:39
@@ -54036,9 +54036,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-var.txt:40
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "GIT_EDITOR"
-msgstr ""
+msgstr "GIT_EDITOR"
 
 #. type: Plain text
 #: en/git-var.txt:48
@@ -54054,9 +54054,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-var.txt:52
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "GIT_PAGER"
-msgstr ""
+msgstr "GIT_PAGER"
 
 #. type: Plain text
 #: en/git-var.txt:58
@@ -54072,15 +54072,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-var.txt:67
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-commit-tree[1] linkgit:git-tag[1] linkgit:git-config[1]"
-msgstr ""
+msgstr "linkgit:git-commit-tree[1] linkgit:git-tag[1] linkgit:git-config[1]"
 
 #. type: Title =
 #: en/git-verify-commit.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-verify-commit(1)"
-msgstr ""
+msgstr "git-verify-commit(1)"
 
 #. type: Plain text
 #: en/git-verify-commit.txt:7
@@ -54120,9 +54120,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-verify-pack.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-verify-pack(1)"
-msgstr ""
+msgstr "git-verify-pack(1)"
 
 #. type: Plain text
 #: en/git-verify-pack.txt:7
@@ -54162,9 +54162,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-verify-pack.txt:32
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--stat-only"
-msgstr ""
+msgstr "--stat-only"
 
 #. type: Plain text
 #: en/git-verify-pack.txt:35
@@ -54210,9 +54210,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-verify-tag.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-verify-tag(1)"
-msgstr ""
+msgstr "git-verify-tag(1)"
 
 #. type: Plain text
 #: en/git-verify-tag.txt:7
@@ -54526,9 +54526,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-whatchanged.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-whatchanged(1)"
-msgstr ""
+msgstr "git-whatchanged(1)"
 
 #. type: Plain text
 #: en/git-whatchanged.txt:7
@@ -54586,9 +54586,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-worktree.txt:2
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "git-worktree(1)"
-msgstr ""
+msgstr "git-worktree(1)"
 
 #. type: Plain text
 #: en/git-worktree.txt:7
@@ -54761,9 +54761,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:147
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--[no-]checkout"
-msgstr ""
+msgstr "--[no-]checkout"
 
 #. type: Plain text
 #: en/git-worktree.txt:152
@@ -54773,9 +54773,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:153
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--[no-]guess-remote"
-msgstr ""
+msgstr "--[no-]guess-remote"
 
 #. type: Plain text
 #: en/git-worktree.txt:159
@@ -54791,9 +54791,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:163
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--[no-]track"
-msgstr ""
+msgstr "--[no-]track"
 
 #. type: Plain text
 #: en/git-worktree.txt:168
@@ -54803,9 +54803,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:169
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--lock"
-msgstr ""
+msgstr "--lock"
 
 #. type: Plain text
 #: en/git-worktree.txt:173
@@ -55086,9 +55086,9 @@ msgstr ""
 
 #. type: Title =
 #: en/git-write-tree.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-write-tree(1)"
-msgstr ""
+msgstr "git-write-tree(1)"
 
 #. type: Plain text
 #: en/git-write-tree.txt:7
@@ -55122,9 +55122,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-write-tree.txt:30
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--missing-ok"
-msgstr ""
+msgstr "--missing-ok"
 
 #. type: Plain text
 #: en/git-write-tree.txt:34
@@ -55462,9 +55462,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/merge-options.txt:53
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--ff-only"
-msgstr ""
+msgstr "--ff-only"
 
 #. type: Plain text
 #: en/merge-options.txt:57
@@ -55492,9 +55492,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/merge-options.txt:74
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--no-signoff"
-msgstr ""
+msgstr "--no-signoff"
 
 #. type: Plain text
 #: en/merge-options.txt:83
@@ -55516,15 +55516,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/merge-options.txt:93
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--squash"
-msgstr ""
+msgstr "--squash"
 
 #. type: Labeled list
 #: en/merge-options.txt:94
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--no-squash"
-msgstr ""
+msgstr "--no-squash"
 
 #. type: Plain text
 #: en/merge-options.txt:102
@@ -55564,15 +55564,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/merge-options.txt:121
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--verify-signatures"
-msgstr ""
+msgstr "--verify-signatures"
 
 #. type: Labeled list
 #: en/merge-options.txt:122
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--no-verify-signatures"
-msgstr ""
+msgstr "--no-verify-signatures"
 
 #. type: Plain text
 #: en/merge-options.txt:128
@@ -55582,9 +55582,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/merge-options.txt:130
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--no-summary"
-msgstr ""
+msgstr "--no-summary"
 
 #. type: Plain text
 #: en/merge-options.txt:133
@@ -55606,9 +55606,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/merge-options.txt:152
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "--allow-unrelated-histories"
-msgstr ""
+msgstr "--allow-unrelated-histories"
 
 #. type: Plain text
 #: en/merge-options.txt:158
@@ -55852,111 +55852,111 @@ msgstr ""
 
 #. type: Plain text
 #: en/mergetools-merge.txt:2
-#, priority:240
+#, ignore-same, priority:240
 msgid "araxis"
-msgstr ""
+msgstr "araxis"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:3
-#, priority:240
+#, ignore-same, priority:240
 msgid "bc"
-msgstr ""
+msgstr "bc"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:4
-#, priority:240
+#, ignore-same, priority:240
 msgid "bc3"
-msgstr ""
+msgstr "bc3"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:5
-#, priority:240
+#, ignore-same, priority:240
 msgid "codecompare"
-msgstr ""
+msgstr "codecompare"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:6
-#, priority:240
+#, ignore-same, priority:240
 msgid "deltawalker"
-msgstr ""
+msgstr "deltawalker"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:7
-#, priority:240
+#, ignore-same, priority:240
 msgid "diffmerge"
-msgstr ""
+msgstr "diffmerge"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:8
-#, priority:240
+#, ignore-same, priority:240
 msgid "diffuse"
-msgstr ""
+msgstr "diffuse"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:9
-#, priority:240
+#, ignore-same, priority:240
 msgid "ecmerge"
-msgstr ""
+msgstr "ecmerge"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:10
-#, priority:240
+#, ignore-same, priority:240
 msgid "emerge"
-msgstr ""
+msgstr "emerge"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:11
-#, priority:240
+#, ignore-same, priority:240
 msgid "examdiff"
-msgstr ""
+msgstr "examdiff"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:12
-#, priority:240
+#, ignore-same, priority:240
 msgid "guiffy"
-msgstr ""
+msgstr "guiffy"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:13
-#, priority:240
+#, ignore-same, priority:240
 msgid "gvimdiff"
-msgstr ""
+msgstr "gvimdiff"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:14
-#, priority:240
+#, ignore-same, priority:240
 msgid "gvimdiff2"
-msgstr ""
+msgstr "gvimdiff2"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:15
-#, priority:240
+#, ignore-same, priority:240
 msgid "gvimdiff3"
-msgstr ""
+msgstr "gvimdiff3"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:16
-#, priority:240
+#, ignore-same, priority:240
 msgid "kdiff3"
-msgstr ""
+msgstr "kdiff3"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:17
-#, priority:240
+#, ignore-same, priority:240
 msgid "meld"
-msgstr ""
+msgstr "meld"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:18
-#, priority:240
+#, ignore-same, priority:240
 msgid "opendiff"
-msgstr ""
+msgstr "opendiff"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:19
-#, priority:240
+#, ignore-same, priority:240
 msgid "p4merge"
-msgstr ""
+msgstr "p4merge"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:20
@@ -55966,45 +55966,45 @@ msgstr ""
 
 #. type: Plain text
 #: en/mergetools-merge.txt:21
-#, priority:240
+#, ignore-same, priority:240
 msgid "tkdiff"
-msgstr ""
+msgstr "tkdiff"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:22
-#, priority:240
+#, ignore-same, priority:240
 msgid "tortoisemerge"
-msgstr ""
+msgstr "tortoisemerge"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:23
-#, priority:240
+#, ignore-same, priority:240
 msgid "vimdiff"
-msgstr ""
+msgstr "vimdiff"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:24
-#, priority:240
+#, ignore-same, priority:240
 msgid "vimdiff2"
-msgstr ""
+msgstr "vimdiff2"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:25
-#, priority:240
+#, ignore-same, priority:240
 msgid "vimdiff3"
-msgstr ""
+msgstr "vimdiff3"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:26
-#, priority:240
+#, ignore-same, priority:240
 msgid "winmerge"
-msgstr ""
+msgstr "winmerge"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:26
-#, priority:240
+#, ignore-same, priority:240
 msgid "xxdiff"
-msgstr ""
+msgstr "xxdiff"
 
 #. type: Title -
 #: en/pretty-formats.txt:2
@@ -57159,9 +57159,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/pretty-options.txt:17
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--abbrev-commit"
-msgstr ""
+msgstr "--abbrev-commit"
 
 #. type: Plain text
 #: en/pretty-options.txt:22
@@ -57177,9 +57177,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/pretty-options.txt:26
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--no-abbrev-commit"
-msgstr ""
+msgstr "--no-abbrev-commit"
 
 #. type: Plain text
 #: en/pretty-options.txt:30
@@ -57207,15 +57207,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/pretty-options.txt:46
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--expand-tabs"
-msgstr ""
+msgstr "--expand-tabs"
 
 #. type: Labeled list
 #: en/pretty-options.txt:47
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--no-expand-tabs"
-msgstr ""
+msgstr "--no-expand-tabs"
 
 #. type: Plain text
 #: en/pretty-options.txt:54
@@ -57273,9 +57273,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/pretty-options.txt:89
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--[no-]standard-notes"
-msgstr ""
+msgstr "--[no-]standard-notes"
 
 #. type: Plain text
 #: en/pretty-options.txt:92
@@ -57285,9 +57285,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/pretty-options.txt:94
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--show-signature"
-msgstr ""
+msgstr "--show-signature"
 
 #. type: Plain text
 #: en/pretty-options.txt:96
@@ -58174,9 +58174,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:69
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--invert-grep"
-msgstr ""
+msgstr "--invert-grep"
 
 #. type: Plain text
 #: en/rev-list-options.txt:72
@@ -58186,9 +58186,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:74
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--regexp-ignore-case"
-msgstr ""
+msgstr "--regexp-ignore-case"
 
 #. type: Plain text
 #: en/rev-list-options.txt:77
@@ -58222,9 +58222,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:101
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--remove-empty"
-msgstr ""
+msgstr "--remove-empty"
 
 #. type: Plain text
 #: en/rev-list-options.txt:103
@@ -58234,9 +58234,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:104
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--merges"
-msgstr ""
+msgstr "--merges"
 
 #. type: Plain text
 #: en/rev-list-options.txt:106
@@ -58246,9 +58246,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:107
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--no-merges"
-msgstr ""
+msgstr "--no-merges"
 
 #. type: Plain text
 #: en/rev-list-options.txt:110
@@ -58270,15 +58270,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:113
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--no-min-parents"
-msgstr ""
+msgstr "--no-min-parents"
 
 #. type: Labeled list
 #: en/rev-list-options.txt:114
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--no-max-parents"
-msgstr ""
+msgstr "--no-max-parents"
 
 #. type: Plain text
 #: en/rev-list-options.txt:119
@@ -58360,9 +58360,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:181
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--reflog"
-msgstr ""
+msgstr "--reflog"
 
 #. type: Plain text
 #: en/rev-list-options.txt:184
@@ -58372,9 +58372,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:185
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--alternate-refs"
-msgstr ""
+msgstr "--alternate-refs"
 
 #. type: Plain text
 #: en/rev-list-options.txt:192
@@ -58396,9 +58396,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:206 en/rev-list-options.txt:586
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--bisect"
-msgstr ""
+msgstr "--bisect"
 
 #. type: Plain text
 #: en/rev-list-options.txt:211
@@ -58420,9 +58420,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:228
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--cherry-mark"
-msgstr ""
+msgstr "--cherry-mark"
 
 #. type: Plain text
 #: en/rev-list-options.txt:231
@@ -58432,9 +58432,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:232
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--cherry-pick"
-msgstr ""
+msgstr "--cherry-pick"
 
 #. type: Plain text
 #: en/rev-list-options.txt:236
@@ -58450,15 +58450,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:245
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--left-only"
-msgstr ""
+msgstr "--left-only"
 
 #. type: Labeled list
 #: en/rev-list-options.txt:246
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--right-only"
-msgstr ""
+msgstr "--right-only"
 
 #. type: Plain text
 #: en/rev-list-options.txt:250
@@ -58474,9 +58474,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:257
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--cherry"
-msgstr ""
+msgstr "--cherry"
 
 #. type: Plain text
 #: en/rev-list-options.txt:263
@@ -58486,9 +58486,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:265
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--walk-reflogs"
-msgstr ""
+msgstr "--walk-reflogs"
 
 #. type: Plain text
 #: en/rev-list-options.txt:271
@@ -58540,9 +58540,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:301
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--boundary"
-msgstr ""
+msgstr "--boundary"
 
 #. type: Plain text
 #: en/rev-list-options.txt:304
@@ -58552,9 +58552,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:306
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--use-bitmap-index"
-msgstr ""
+msgstr "--use-bitmap-index"
 
 #. type: Plain text
 #: en/rev-list-options.txt:311
@@ -58606,9 +58606,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:330
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--simplify-by-decoration"
-msgstr ""
+msgstr "--simplify-by-decoration"
 
 #. type: Plain text
 #: en/rev-list-options.txt:332
@@ -58642,9 +58642,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:343
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--full-history"
-msgstr ""
+msgstr "--full-history"
 
 #. type: Plain text
 #: en/rev-list-options.txt:345
@@ -58654,9 +58654,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:346 en/rev-list-options.txt:479
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--dense"
-msgstr ""
+msgstr "--dense"
 
 #. type: Plain text
 #: en/rev-list-options.txt:349
@@ -58672,9 +58672,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:353 en/rev-list-options.txt:490
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--simplify-merges"
-msgstr ""
+msgstr "--simplify-merges"
 
 #. type: Plain text
 #: en/rev-list-options.txt:357
@@ -58684,9 +58684,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:358 en/rev-list-options.txt:537
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--ancestry-path"
-msgstr ""
+msgstr "--ancestry-path"
 
 #. type: Plain text
 #: en/rev-list-options.txt:364
@@ -59068,9 +59068,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:610
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--bisect-vars"
-msgstr ""
+msgstr "--bisect-vars"
 
 #. type: Plain text
 #: en/rev-list-options.txt:621
@@ -59080,9 +59080,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:622
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--bisect-all"
-msgstr ""
+msgstr "--bisect-all"
 
 #. type: Plain text
 #: en/rev-list-options.txt:628
@@ -59122,9 +59122,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:648
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--author-date-order"
-msgstr ""
+msgstr "--author-date-order"
 
 #. type: Plain text
 #: en/rev-list-options.txt:651
@@ -59185,9 +59185,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:687
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--objects"
-msgstr ""
+msgstr "--objects"
 
 #. type: Plain text
 #: en/rev-list-options.txt:692
@@ -59197,9 +59197,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:693
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--in-commit-order"
-msgstr ""
+msgstr "--in-commit-order"
 
 #. type: Plain text
 #: en/rev-list-options.txt:697
@@ -59209,9 +59209,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:698
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--objects-edge"
-msgstr ""
+msgstr "--objects-edge"
 
 #. type: Plain text
 #: en/rev-list-options.txt:704
@@ -59221,9 +59221,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:705
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--objects-edge-aggressive"
-msgstr ""
+msgstr "--objects-edge-aggressive"
 
 #. type: Plain text
 #: en/rev-list-options.txt:709
@@ -59233,9 +59233,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:710
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--indexed-objects"
-msgstr ""
+msgstr "--indexed-objects"
 
 #. type: Plain text
 #: en/rev-list-options.txt:714
@@ -59251,9 +59251,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:719
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--object-names"
-msgstr ""
+msgstr "--object-names"
 
 #. type: Plain text
 #: en/rev-list-options.txt:722
@@ -59263,9 +59263,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:723
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--no-object-names"
-msgstr ""
+msgstr "--no-object-names"
 
 #. type: Plain text
 #: en/rev-list-options.txt:728
@@ -59317,9 +59317,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:763
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--filter-print-omitted"
-msgstr ""
+msgstr "--filter-print-omitted"
 
 #. type: Plain text
 #: en/rev-list-options.txt:766
@@ -59365,9 +59365,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:802
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--do-walk"
-msgstr ""
+msgstr "--do-walk"
 
 #. type: Plain text
 #: en/rev-list-options.txt:804
@@ -59389,9 +59389,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:816
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--relative-date"
-msgstr ""
+msgstr "--relative-date"
 
 #. type: Plain text
 #: en/rev-list-options.txt:818
@@ -59509,9 +59509,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:884
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--header"
-msgstr ""
+msgstr "--header"
 
 #. type: Plain text
 #: en/rev-list-options.txt:887
@@ -59527,9 +59527,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:893
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--children"
-msgstr ""
+msgstr "--children"
 
 #. type: Plain text
 #: en/rev-list-options.txt:896
@@ -59539,9 +59539,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:898
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--timestamp"
-msgstr ""
+msgstr "--timestamp"
 
 #. type: Plain text
 #: en/rev-list-options.txt:900
@@ -59551,9 +59551,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:902
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--left-right"
-msgstr ""
+msgstr "--left-right"
 
 #. type: Plain text
 #: en/rev-list-options.txt:907
@@ -59604,9 +59604,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/rev-list-options.txt:931
-#, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:260
 msgid "--graph"
-msgstr ""
+msgstr "--graph"
 
 #. type: Plain text
 #: en/rev-list-options.txt:937