diff --git a/po/documentation.de.po b/po/documentation.de.po
index fe8065fe9f938b3003d7ce2c3dbbca779533a0d7..470aafb129ec1975ec6b087645e3da8a805d8564 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -6166,7 +6166,7 @@ msgstr "Es zeigt sich, da횩 foo.png im Vergleich mit dem HEAD ge채ndert wurde, (
 
 #. type: Labeled list
 #: en/git-add.txt:267 en/git-update-ref.txt:94
-#, no-wrap, priority:300
+#, no-wrap, ignore-same, priority:300
 msgid "update"
 msgstr "update"
 
@@ -47395,9 +47395,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-stash.txt:172 en/git-update-ref.txt:100
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "create"
-msgstr ""
+msgstr "create"
 
 #. type: Plain text
 #: en/git-stash.txt:179
@@ -52764,6 +52764,7 @@ msgstr "`GIT_COMMON_DIR`"
 
 # noqa
 #. type: Plain text
+# noqa
 #: en/git.txt:481
 #, priority:100
 msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
@@ -54742,9 +54743,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:104
-#, fuzzy, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "delete"
-msgstr "--delete"
+msgstr "delete"
 
 #. type: Plain text
 #: en/git-update-ref.txt:107
@@ -54754,10 +54755,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:108
-#, fuzzy, no-wrap, priority:100
-#| msgid "--no-verify"
+#, ignore-same, no-wrap, priority:100
 msgid "verify"
-msgstr "--no-verify"
+msgstr "verify"
 
 #. type: Plain text
 #: en/git-update-ref.txt:111
@@ -54767,9 +54767,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:112
-#, fuzzy, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "option"
-msgstr "`option`"
+msgstr "option"
 
 #. type: Plain text
 #: en/git-update-ref.txt:116
diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po
index 1c7dceb5de7b59178c137591a2b8fc67ac9b43a7..25a85c933501f19abe02a1e7e3ee1ab9b363e68b 100644
--- a/po/documentation.es_MX.po
+++ b/po/documentation.es_MX.po
@@ -6102,9 +6102,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:267 en/git-update-ref.txt:94
-#, fuzzy, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "update"
-msgstr "--update"
+msgstr "update"
 
 #. type: Plain text
 #: en/git-add.txt:276
@@ -46504,9 +46504,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-stash.txt:172 en/git-update-ref.txt:100
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "create"
-msgstr "crear"
+msgstr "create"
 
 #. type: Plain text
 #: en/git-stash.txt:179
@@ -53735,9 +53735,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:104
-#, fuzzy, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "delete"
-msgstr "--delete"
+msgstr "delete"
 
 #. type: Plain text
 #: en/git-update-ref.txt:107
@@ -53747,9 +53747,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:108
-#, fuzzy, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "verify"
-msgstr "--verify"
+msgstr "verify"
 
 #. type: Plain text
 #: en/git-update-ref.txt:111
@@ -53759,9 +53759,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:112
-#, fuzzy, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "option"
-msgstr "`option`"
+msgstr "option"
 
 #. type: Plain text
 #: en/git-update-ref.txt:116
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index a8507debb62d9e7891fa6849a058dde1b92fcf73..b49076fdd2538561e489fe10412915329b0a53b9 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -6162,7 +6162,7 @@ msgstr "Cela montre que foo.png contient des diff챕rences avec HEAD (mais c'est
 
 #. type: Labeled list
 #: en/git-add.txt:267 en/git-update-ref.txt:94
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "update"
 msgstr "update"
 
@@ -46981,9 +46981,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-stash.txt:172 en/git-update-ref.txt:100
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "create"
-msgstr "cr챕er"
+msgstr "create"
 
 #. type: Plain text
 #: en/git-stash.txt:179
@@ -54341,9 +54341,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:104
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "delete"
-msgstr "supprimer"
+msgstr "delete"
 
 #. type: Plain text
 #: en/git-update-ref.txt:107
@@ -54353,9 +54353,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:108
-#, fuzzy, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "verify"
-msgstr "--verify"
+msgstr "verify"
 
 #. type: Plain text
 #: en/git-update-ref.txt:111
@@ -54365,7 +54365,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:112
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "option"
 msgstr "option"
 
diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po
index 8f6c39b118e820afed3904f13f32eaee568e1bb4..a48761204d720364ea377196a298e81a6841581a 100644
--- a/po/documentation.nb_NO.po
+++ b/po/documentation.nb_NO.po
@@ -6057,9 +6057,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:267 en/git-update-ref.txt:94
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "update"
-msgstr ""
+msgstr "update"
 
 #. type: Plain text
 #: en/git-add.txt:276
@@ -46452,9 +46452,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-stash.txt:172 en/git-update-ref.txt:100
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "create"
-msgstr ""
+msgstr "create"
 
 #. type: Plain text
 #: en/git-stash.txt:179
@@ -53681,9 +53681,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:104
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "delete"
-msgstr ""
+msgstr "delete"
 
 #. type: Plain text
 #: en/git-update-ref.txt:107
@@ -53693,9 +53693,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:108
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "verify"
-msgstr ""
+msgstr "verify"
 
 #. type: Plain text
 #: en/git-update-ref.txt:111
@@ -53705,9 +53705,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:112
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "option"
-msgstr ""
+msgstr "option"
 
 #. type: Plain text
 #: en/git-update-ref.txt:116
diff --git a/po/documentation.pot b/po/documentation.pot
index 15c26d3535a7f9e03148d1aa12b41de559f9a786..4afaadf182b18b799c39d8f949c817e507091462 100644
--- a/po/documentation.pot
+++ b/po/documentation.pot
@@ -6057,9 +6057,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:267 en/git-update-ref.txt:94
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "update"
-msgstr ""
+msgstr "update"
 
 #. type: Plain text
 #: en/git-add.txt:276
@@ -46450,9 +46450,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-stash.txt:172 en/git-update-ref.txt:100
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "create"
-msgstr ""
+msgstr "create"
 
 #. type: Plain text
 #: en/git-stash.txt:179
@@ -53673,9 +53673,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:104
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "delete"
-msgstr ""
+msgstr "delete"
 
 #. type: Plain text
 #: en/git-update-ref.txt:107
@@ -53685,9 +53685,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:108
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "verify"
-msgstr ""
+msgstr "verify"
 
 #. type: Plain text
 #: en/git-update-ref.txt:111
@@ -53697,9 +53697,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:112
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "option"
-msgstr ""
+msgstr "option"
 
 #. type: Plain text
 #: en/git-update-ref.txt:116
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index b67d08a52b826ff491574d518418ed55abc5e56f..8d649f2677dd1b072b5fb6cff0cffb99e981eecd 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -6201,9 +6201,9 @@ msgstr "Ele mostra que foo.png tem diferen챌as de HEAD (mas isso 챕 bin찼rio, en
 
 #. type: Labeled list
 #: en/git-add.txt:267 en/git-update-ref.txt:94
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "update"
-msgstr "atualizar"
+msgstr "update"
 
 #. type: Plain text
 #: en/git-add.txt:276
@@ -46855,9 +46855,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-stash.txt:172 en/git-update-ref.txt:100
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "create"
-msgstr ""
+msgstr "create"
 
 #. type: Plain text
 #: en/git-stash.txt:179
@@ -54119,9 +54119,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:104
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "delete"
-msgstr ""
+msgstr "delete"
 
 #. type: Plain text
 #: en/git-update-ref.txt:107
@@ -54131,9 +54131,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:108
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "verify"
-msgstr ""
+msgstr "verify"
 
 #. type: Plain text
 #: en/git-update-ref.txt:111
@@ -54143,9 +54143,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:112
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "option"
-msgstr ""
+msgstr "option"
 
 #. type: Plain text
 #: en/git-update-ref.txt:116
diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index bec5a0ab59746fa1005af4b6031eac74e9a76ccb..4e7e388e09baff0a32dc60f86df07e08d5dccbe1 100644
--- a/po/documentation.pt_PT.po
+++ b/po/documentation.pt_PT.po
@@ -6056,9 +6056,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:267 en/git-update-ref.txt:94
-#, fuzzy, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "update"
-msgstr "--update"
+msgstr "update"
 
 #. type: Plain text
 #: en/git-add.txt:276
@@ -46449,9 +46449,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-stash.txt:172 en/git-update-ref.txt:100
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "create"
-msgstr ""
+msgstr "create"
 
 #. type: Plain text
 #: en/git-stash.txt:179
@@ -53672,9 +53672,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:104
-#, fuzzy, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "delete"
-msgstr "--delete"
+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
-#, fuzzy, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "verify"
-msgstr "--verify"
+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
-#, fuzzy, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "option"
-msgstr "`option`"
+msgstr "option"
 
 #. type: Plain text
 #: en/git-update-ref.txt:116
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index 6a888f35fd6bf3bccdd1d986de24d40e7adae57e..579f2ac4d0a814cd585f3a449105cfbf358e0bc1 100644
--- a/po/documentation.ru.po
+++ b/po/documentation.ru.po
@@ -6059,9 +6059,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:267 en/git-update-ref.txt:94
-#, fuzzy, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "update"
-msgstr "--update"
+msgstr "update"
 
 #. type: Plain text
 #: en/git-add.txt:276
@@ -46469,9 +46469,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-stash.txt:172 en/git-update-ref.txt:100
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "create"
-msgstr "�棘鈞畇逵戟逵"
+msgstr "create"
 
 #. type: Plain text
 #: en/git-stash.txt:179
@@ -53700,9 +53700,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:104
-#, fuzzy, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "delete"
-msgstr "--delete"
+msgstr "delete"
 
 #. type: Plain text
 #: en/git-update-ref.txt:107
@@ -53712,9 +53712,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:108
-#, fuzzy, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "verify"
-msgstr "--verify"
+msgstr "verify"
 
 #. type: Plain text
 #: en/git-update-ref.txt:111
@@ -53724,9 +53724,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:112
-#, fuzzy, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "option"
-msgstr "`option`"
+msgstr "option"
 
 #. type: Plain text
 #: en/git-update-ref.txt:116
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index 83fa2965d25a50679acb944902a34761a5a1d394..005d890b512e7b67bf8d80c62f5c170ebf3e1d8c 100644
--- a/po/documentation.zh_HANT.po
+++ b/po/documentation.zh_HANT.po
@@ -5633,9 +5633,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-add.txt:276 en/git-update-ref.txt:94
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "update"
-msgstr ""
+msgstr "update"
 
 #. type: Plain text
 #: en/git-add.txt:285
@@ -45585,9 +45585,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-stash.txt:172 en/git-update-ref.txt:100
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "create"
-msgstr ""
+msgstr "create"
 
 #. type: Plain text
 #: en/git-stash.txt:179
@@ -52373,9 +52373,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:104
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "delete"
-msgstr ""
+msgstr "delete"
 
 #. type: Plain text
 #: en/git-update-ref.txt:107
@@ -52385,9 +52385,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:108
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "verify"
-msgstr ""
+msgstr "verify"
 
 #. type: Plain text
 #: en/git-update-ref.txt:111
@@ -52397,9 +52397,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-update-ref.txt:112
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "option"
-msgstr ""
+msgstr "option"
 
 #. type: Plain text
 #: en/git-update-ref.txt:116
diff --git a/scripts/pre-translate-po b/scripts/pre-translate-po
index 56e513f505d0f6439a42d27df5cc56c26c8dcbe3..aca66ce98fce25407a2ca4c5e6cfae8eabf2ab7d 100755
--- a/scripts/pre-translate-po
+++ b/scripts/pre-translate-po
@@ -8,7 +8,7 @@ def main (f, d=None):
     po = polib.pofile(f, wrapwidth=0)
     option_re = re.compile(r'-[-a-z0-9[\]]+')
     linkgit_re = re.compile(r'((linkgit:)?(git[-a-z0-9[\]]+|mail)(\[[157]\]|\([157]\))(,|;)?(\n| )?)+')
-    quoted_re = re.compile(r'`[a-zA-Z-_]+`|(user|transfer|submodule|stash|status|splitIndex|showbranch|sendemail|repack|remote|receive|push|merge(tool)?|mailinfo|log|interactive|instaweb|i18n|help|gui|gitweb|fastimport|format|fetch|diff(tool)?|credential|commit|column|core|branch|apply|color|git-p4)\.[a-zA-Z_.]+|araxis|bc3?|codecompare|deltawalker|guiffy|meld|diff(use|merge)|(exam|g?vim|t?k|open|xx)?diff[23]?|(ec?|p4|s|tortoise|win)merge')
+    quoted_re = re.compile(r'`[a-zA-Z-_]+`|(user|transfer|submodule|stash|status|splitIndex|showbranch|sendemail|repack|remote|receive|push|merge(tool)?|mailinfo|log|interactive|instaweb|i18n|help|gui|gitweb|fastimport|format|fetch|diff(tool)?|credential|commit|column|core|branch|apply|color|git-p4)\.[a-zA-Z_.]+|araxis|bc3?|codecompare|deltawalker|guiffy|meld|diff(use|merge)|(exam|g?vim|t?k|open|xx)?diff[23]?|(ec?|p4|s|tortoise|win)merge|update|create|delete|verify|option')
     env_var_re = re.compile(r'`?GIT_[A-Z_\d]+`?')
     if not d is None:
             po_file=polib.pofile(d)