diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index 06766e54d68a8cc2e4bfe829744833e8f6b85e2a..3407b624a71cf209762825688f24e5f1eb71a728 100644
--- a/po/documentation.pt_PT.po
+++ b/po/documentation.pt_PT.po
@@ -2195,9 +2195,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/config.txt:143
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "`gitdir/i`"
-msgstr ""
+msgstr "`gitdir`"
 
 #. type: Plain text
 #: en/config.txt:146
@@ -4270,9 +4270,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:328 en/merge-strategies.txt:61
-#, no-wrap, priority:280
+#, fuzzy, no-wrap, priority:280
 msgid "ignore-space-at-eol"
-msgstr ""
+msgstr "--ignore-space-at-eol"
 
 #. type: Plain text
 #: en/diff-options.txt:330 en/diff-options.txt:665
@@ -4282,9 +4282,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:330 en/merge-strategies.txt:59
-#, no-wrap, priority:280
+#, fuzzy, no-wrap, priority:280
 msgid "ignore-space-change"
-msgstr ""
+msgstr "--ignore-space-change"
 
 #. type: Plain text
 #: en/diff-options.txt:334 en/diff-options.txt:671
@@ -4294,9 +4294,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:334 en/merge-strategies.txt:60
-#, no-wrap, priority:280
+#, fuzzy, no-wrap, priority:280
 msgid "ignore-all-space"
-msgstr ""
+msgstr "--ignore-all-space"
 
 #. type: Plain text
 #: en/diff-options.txt:337
@@ -4354,9 +4354,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/diff-options.txt:362
-#, no-wrap, priority:280
+#, fuzzy, no-wrap, priority:280
 msgid "porcelain"
-msgstr ""
+msgstr "--porcelain"
 
 #. type: Plain text
 #: en/diff-options.txt:369
@@ -6029,9 +6029,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:243
-#, no-wrap, priority:300
+#, fuzzy, no-wrap, priority:300
 msgid "status"
-msgstr ""
+msgstr "--status"
 
 #. type: Plain text
 #: en/git-add.txt:250
@@ -6056,9 +6056,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:267 en/git-update-ref.txt:94
-#, no-wrap, priority:300
+#, fuzzy, no-wrap, priority:300
 msgid "update"
-msgstr ""
+msgstr "--update"
 
 #. type: Plain text
 #: en/git-add.txt:276
@@ -6845,9 +6845,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-am.txt:242
-#, priority:100
+#, fuzzy, priority:100
 msgid "linkgit:git-apply[1]."
-msgstr ""
+msgstr "linkgit:git-apply[1]"
 
 #. type: Title =
 #: en/git-annotate.txt:2
@@ -7315,9 +7315,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-apply.txt:282
-#, priority:100
+#, fuzzy, priority:100
 msgid "linkgit:git-am[1]."
-msgstr ""
+msgstr "linkgit:git-am[1]"
 
 #. type: Title =
 #: en/git-archimport.txt:2
@@ -10074,9 +10074,9 @@ msgstr "--batch"
 
 #. type: Labeled list
 #: en/git-cat-file.txt:78
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "--batch=<format>"
-msgstr ""
+msgstr "--patch-format"
 
 #. type: Plain text
 #: en/git-cat-file.txt:84
@@ -10760,9 +10760,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-check-attr.txt:117
-#, priority:100
+#, fuzzy, priority:100
 msgid "linkgit:gitattributes[5]."
-msgstr ""
+msgstr "linkgit:gitattributes[5]"
 
 #. type: Title =
 #: en/git-check-ignore.txt:2
@@ -14336,9 +14336,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-commit.txt:200
-#, no-wrap, priority:280
+#, fuzzy, no-wrap, priority:280
 msgid "whitespace"
-msgstr ""
+msgstr "--whitespace"
 
 #. type: Plain text
 #: en/git-commit.txt:202
@@ -14360,9 +14360,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-commit.txt:204
-#, no-wrap, priority:280
+#, fuzzy, no-wrap, priority:280
 msgid "scissors"
-msgstr ""
+msgstr "--scissors"
 
 #. type: Plain text
 #: en/git-commit.txt:208
@@ -17830,9 +17830,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-daemon.txt:129
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "syslog"
-msgstr ""
+msgstr "--syslog"
 
 #. type: Plain text
 #: en/git-daemon.txt:131
@@ -20083,9 +20083,9 @@ msgstr "fastimport.unpackLimit"
 
 #. type: Plain text
 #: en/git-fast-import.txt:142
-#, priority:100
+#, fuzzy, priority:100
 msgid "See linkgit:git-config[1]"
-msgstr ""
+msgstr "linkgit:git-config[1]"
 
 #. type: Title -
 #: en/git-fast-import.txt:144 en/git-p4.txt:507
@@ -21504,9 +21504,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-import.txt:1082
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "no-relative-marks"
-msgstr ""
+msgstr "--[no-]relative-marks"
 
 #. type: Plain text
 #: en/git-fast-import.txt:1083 en/git-fast-import.txt:1150
@@ -21540,15 +21540,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-import.txt:1098
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "get-mark"
-msgstr ""
+msgstr "`get-mark`"
 
 #. type: Labeled list
 #: en/git-fast-import.txt:1099
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "cat-blob"
-msgstr ""
+msgstr "`cat-blob`"
 
 #. type: Labeled list
 #: en/git-fast-import.txt:1100
@@ -22656,9 +22656,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fetch.txt:221 en/git-push.txt:440
-#, no-wrap, priority:220
+#, fuzzy, no-wrap, priority:220
 msgid "summary"
-msgstr ""
+msgstr "--summary"
 
 #. type: Plain text
 #: en/git-fetch.txt:226
@@ -23770,9 +23770,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-for-each-ref.txt:126
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "objecttype"
-msgstr ""
+msgstr "`objecttype`"
 
 #. type: Plain text
 #: en/git-for-each-ref.txt:128
@@ -23782,9 +23782,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-for-each-ref.txt:129
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "objectsize"
-msgstr ""
+msgstr "`objectsize`"
 
 #. type: Plain text
 #: en/git-for-each-ref.txt:133
@@ -23794,9 +23794,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-for-each-ref.txt:133
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "objectname"
-msgstr ""
+msgstr "`objectname`"
 
 #. type: Plain text
 #: en/git-for-each-ref.txt:139
@@ -23806,9 +23806,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-for-each-ref.txt:139
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "deltabase"
-msgstr ""
+msgstr "`deltabase`"
 
 #. type: Plain text
 #: en/git-for-each-ref.txt:143
@@ -23896,9 +23896,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-for-each-ref.txt:211
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "symref"
-msgstr ""
+msgstr "--symref"
 
 #. type: Plain text
 #: en/git-for-each-ref.txt:216
@@ -25828,9 +25828,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-get-tar-commit-id.txt:13
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "'git get-tar-commit-id'\n"
-msgstr ""
+msgstr "git-get-tar-commit-id(1)"
 
 #. type: Plain text
 #: en/git-get-tar-commit-id.txt:22
@@ -26622,9 +26622,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-gui.txt:36
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "browser"
-msgstr ""
+msgstr "--browser"
 
 #. type: Plain text
 #: en/git-gui.txt:40
@@ -26646,9 +26646,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-gui.txt:47
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "version"
-msgstr ""
+msgstr "--version"
 
 #. type: Plain text
 #: en/git-gui.txt:49
@@ -28669,9 +28669,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-instaweb.txt:64
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "restart"
-msgstr ""
+msgstr "--restart"
 
 #. type: Labeled list
 #: en/git-instaweb.txt:65
@@ -29777,9 +29777,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-log.txt:218
-#, priority:260
+#, fuzzy, priority:260
 msgid "See linkgit:git-shortlog[1]."
-msgstr ""
+msgstr "linkgit:git-shortlog[1]"
 
 #. type: Labeled list
 #: en/git-log.txt:219 en/git-notes.txt:333
@@ -30058,9 +30058,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-ls-files.txt:126
-#, priority:100
+#, fuzzy, priority:100
 msgid "cached"
-msgstr ""
+msgstr "--cached"
 
 #. type: Labeled list
 #: en/git-ls-files.txt:126
@@ -30082,9 +30082,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-ls-files.txt:128
-#, priority:100
+#, fuzzy, priority:100
 msgid "unmerged"
-msgstr ""
+msgstr "--unmerged"
 
 #. type: Labeled list
 #: en/git-ls-files.txt:128
@@ -30432,9 +30432,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-ls-remote.txt:114
-#, priority:100
+#, fuzzy, priority:100
 msgid "linkgit:git-check-ref-format[1]."
-msgstr ""
+msgstr "linkgit:git-check-ref-format[1]"
 
 #. type: Title =
 #: en/git-ls-tree.txt:2
@@ -30785,9 +30785,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-mailsplit.txt:32
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "-o<directory>"
-msgstr ""
+msgstr "--directory"
 
 #. type: Plain text
 #: en/git-mailsplit.txt:34
@@ -31450,9 +31450,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-merge-one-file.txt:13
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "'git merge-one-file'\n"
-msgstr ""
+msgstr "git-merge-one-file(1)"
 
 #. type: Plain text
 #: en/git-merge-one-file.txt:18
@@ -32631,9 +32631,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:87
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "append"
-msgstr ""
+msgstr "--append"
 
 #. type: Plain text
 #: en/git-notes.txt:90
@@ -32667,9 +32667,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:97 en/git-submodule.txt:155
-#, no-wrap, priority:220
+#, fuzzy, no-wrap, priority:220
 msgid "merge"
-msgstr ""
+msgstr "emerge"
 
 #. type: Plain text
 #: en/git-notes.txt:102
@@ -32685,9 +32685,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:112 en/git-worktree.txt:105
-#, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:240
 msgid "remove"
-msgstr ""
+msgstr "--remove"
 
 #. type: Plain text
 #: en/git-notes.txt:117
@@ -33399,9 +33399,9 @@ msgstr ""
 
 #. type: Title ~
 #: en/git-p4.txt:175
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "Unshelve"
-msgstr ""
+msgstr "--shelve"
 
 #. type: Plain text
 #: en/git-p4.txt:178
@@ -37944,9 +37944,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rebase.txt:294
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "-X <strategy-option>"
-msgstr ""
+msgstr "--strategy-option"
 
 #. type: Labeled list
 #: en/git-rebase.txt:295
@@ -38481,9 +38481,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:610
-#, priority:100
+#, fuzzy, priority:100
 msgid "commit"
-msgstr ""
+msgstr "`commit`"
 
 #. type: Plain text
 #: en/git-rebase.txt:612
@@ -43631,9 +43631,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rm.txt:125
-#, priority:280
+#, fuzzy, priority:280
 msgid "See linkgit:git-add[1]."
-msgstr ""
+msgstr "linkgit:git-add[1]"
 
 #. type: Title ~
 #: en/git-rm.txt:127
@@ -46106,9 +46106,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-sh-setup.txt:55
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "is_bare_repository"
-msgstr ""
+msgstr "--is-bare-repository"
 
 #. type: Plain text
 #: en/git-sh-setup.txt:59
@@ -47594,9 +47594,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-submodule.txt:144
-#, no-wrap, priority:220
+#, fuzzy, no-wrap, priority:220
 msgid "checkout"
-msgstr ""
+msgstr "--checkout"
 
 #. type: Plain text
 #: en/git-submodule.txt:145
@@ -47618,9 +47618,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-submodule.txt:152
-#, no-wrap, priority:220
+#, fuzzy, no-wrap, priority:220
 msgid "rebase"
-msgstr ""
+msgstr "--rebase"
 
 #. type: Plain text
 #: en/git-submodule.txt:153
@@ -49302,9 +49302,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-svn.txt:677
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "-s<strategy>"
-msgstr ""
+msgstr "--strategy"
 
 #. type: Plain text
 #: en/git-svn.txt:682
@@ -50649,9 +50649,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-tag.txt:209 en/git.txt:334
-#, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:240
 msgid "<commit>"
-msgstr ""
+msgstr "`commit`"
 
 #. type: Plain text
 #: en/git-tag.txt:213
@@ -51762,9 +51762,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git.txt:492
-#, priority:100
+#, fuzzy, priority:100
 msgid "see linkgit:git-commit-tree[1]"
-msgstr ""
+msgstr "linkgit:git-commit-tree[1]"
 
 #. type: Title ~
 #: en/git.txt:494
@@ -52179,9 +52179,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:685
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "`GIT_TRACE2`"
-msgstr ""
+msgstr "`GIT_TRACE`"
 
 #. type: Plain text
 #: en/git.txt:689
@@ -52221,9 +52221,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git.txt:726
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "`GIT_TRACE2_PERF`"
-msgstr ""
+msgstr "`GIT_TRACE_CURL`"
 
 #. type: Plain text
 #: en/git.txt:732
@@ -53672,9 +53672,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:104
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "delete"
-msgstr ""
+msgstr "--delete"
 
 #. type: Plain text
 #: en/git-update-ref.txt:107
@@ -53684,9 +53684,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:108
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "verify"
-msgstr ""
+msgstr "--verify"
 
 #. type: Plain text
 #: en/git-update-ref.txt:111
@@ -53696,9 +53696,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:112
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "option"
-msgstr ""
+msgstr "`option`"
 
 #. type: Plain text
 #: en/git-update-ref.txt:116
@@ -53774,9 +53774,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-update-server-info.txt:13
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "'git update-server-info'\n"
-msgstr ""
+msgstr "git-update-server-info(1)"
 
 #. type: Plain text
 #: en/git-update-server-info.txt:21
@@ -55642,9 +55642,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/merge-strategies.txt:16
-#, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:240
 msgid "recursive"
-msgstr ""
+msgstr "--recursive"
 
 #. type: Plain text
 #: en/merge-strategies.txt:29
@@ -55678,9 +55678,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/merge-strategies.txt:42
-#, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:240
 msgid "theirs"
-msgstr ""
+msgstr "--theirs"
 
 #. type: Plain text
 #: en/merge-strategies.txt:45
@@ -55690,9 +55690,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/merge-strategies.txt:46
-#, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:240
 msgid "patience"
-msgstr ""
+msgstr "--patience"
 
 #. type: Plain text
 #: en/merge-strategies.txt:52
@@ -55714,9 +55714,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/merge-strategies.txt:62
-#, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:240
 msgid "ignore-cr-at-eol"
-msgstr ""
+msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
 #: en/merge-strategies.txt:68
@@ -55744,9 +55744,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/merge-strategies.txt:75
-#, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:240
 msgid "renormalize"
-msgstr ""
+msgstr "--renormalize"
 
 #. type: Plain text
 #: en/merge-strategies.txt:82
@@ -55756,9 +55756,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/merge-strategies.txt:83
-#, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:240
 msgid "no-renormalize"
-msgstr ""
+msgstr "--renormalize"
 
 #. type: Plain text
 #: en/merge-strategies.txt:86
@@ -55768,9 +55768,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/merge-strategies.txt:87
-#, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:240
 msgid "no-renames"
-msgstr ""
+msgstr "--no-renames"
 
 #. type: Plain text
 #: en/merge-strategies.txt:91
@@ -55816,9 +55816,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/merge-strategies.txt:108
-#, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:240
 msgid "octopus"
-msgstr ""
+msgstr "--octopus"
 
 #. type: Plain text
 #: en/merge-strategies.txt:114
@@ -55960,9 +55960,9 @@ msgstr "p4merge"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:20
-#, priority:240
+#, fuzzy, priority:240
 msgid "smerge"
-msgstr ""
+msgstr "emerge"
 
 #. type: Plain text
 #: en/mergetools-merge.txt:21
@@ -56309,9 +56309,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/pretty-formats.txt:132
-#, priority:260
+#, fuzzy, priority:260
 msgid "linkgit:git-shortlog[1]."
-msgstr ""
+msgstr "linkgit:git-shortlog[1]"
 
 #. type: Labeled list
 #: en/pretty-formats.txt:132
@@ -56507,9 +56507,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/pretty-formats.txt:163 en/pretty-formats.txt:166
-#, priority:260
+#, fuzzy, priority:260
 msgid "or linkgit:git-blame[1])"
-msgstr ""
+msgstr "linkgit:git-blame[1]"
 
 #. type: Labeled list
 #: en/pretty-formats.txt:163
@@ -56777,9 +56777,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/pretty-formats.txt:189
-#, priority:260
+#, fuzzy, priority:260
 msgid "encoding"
-msgstr ""
+msgstr "`encoding`"
 
 #. type: Plain text
 #: en/pretty-formats.txt:190
@@ -57201,9 +57201,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/pretty-options.txt:45
-#, no-wrap, priority:260
+#, fuzzy, no-wrap, priority:260
 msgid "--expand-tabs=<n>"
-msgstr ""
+msgstr "--expand-tabs"
 
 #. type: Labeled list
 #: en/pretty-options.txt:46