diff --git a/po/documentation.de.po b/po/documentation.de.po
index f5120bdb796bb88b424793cf638b0e36fc3ae3ec..ccd4251e0d4cc782888c8ec4d550a900cb38687a 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -10854,9 +10854,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:60
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'unspecified'"
-msgstr ""
+msgstr "'unspecified'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:61
@@ -10866,10 +10866,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:61
-#, fuzzy, no-wrap, priority:100
-#| msgid "--unset"
+#, ignore-same, no-wrap, priority:100
 msgid "'unset'"
-msgstr "--unset"
+msgstr "'unset'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:62
@@ -10879,9 +10878,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:62
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'set'"
-msgstr ""
+msgstr "'set'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:63
diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po
index a29965ba6b4169df0ee7459d225d627ca4561343..a17931ffbd562cdd034fb7c7bc8f8bf8ea43bdbd 100644
--- a/po/documentation.es_MX.po
+++ b/po/documentation.es_MX.po
@@ -10663,9 +10663,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:60
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'unspecified'"
-msgstr ""
+msgstr "'unspecified'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:61
@@ -10675,9 +10675,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:61
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'unset'"
-msgstr ""
+msgstr "'unset'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:62
@@ -10687,9 +10687,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:62
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'set'"
-msgstr ""
+msgstr "'set'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:63
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index b72f5b5917e70e018bf7fc281f03555bd25cc61c..42a34655093e67aa5dc8f97a58e4e86c2adf0f62 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -10758,9 +10758,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:60
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'unspecified'"
-msgstr ""
+msgstr "'unspecified'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:61
@@ -10770,9 +10770,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:61
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'unset'"
-msgstr ""
+msgstr "'unset'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:62
@@ -10782,9 +10782,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:62
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'set'"
-msgstr ""
+msgstr "'set'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:63
diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po
index b1e74ced4cc28d1f367298c9381597d5119e37eb..8011f6e3691fb78baba8a654d5b5406a428c8250 100644
--- a/po/documentation.nb_NO.po
+++ b/po/documentation.nb_NO.po
@@ -10618,9 +10618,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:60
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'unspecified'"
-msgstr ""
+msgstr "'unspecified'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:61
@@ -10630,9 +10630,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:61
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'unset'"
-msgstr ""
+msgstr "'unset'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:62
@@ -10642,9 +10642,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:62
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'set'"
-msgstr ""
+msgstr "'set'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:63
diff --git a/po/documentation.pot b/po/documentation.pot
index 1a15cc3dfe28ad17304622726945ee269ec465c3..c5e411796afba5b87718633789b093e0f1407505 100644
--- a/po/documentation.pot
+++ b/po/documentation.pot
@@ -10618,9 +10618,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:60
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'unspecified'"
-msgstr ""
+msgstr "'unspecified'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:61
@@ -10630,9 +10630,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:61
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'unset'"
-msgstr ""
+msgstr "'unset'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:62
@@ -10642,9 +10642,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:62
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'set'"
-msgstr ""
+msgstr "'set'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:63
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 6610fe66874ce18e26442f525a1dafc40532ecc8..17efb8c5148583de8eddf08103bbdde2ca748693 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -10877,9 +10877,9 @@ msgstr "<path> é o caminho de um arquivo sendo consultado, <atributo> é um atr
 
 #. type: Labeled list
 #: en/git-check-attr.txt:60
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'unspecified'"
-msgstr "'não especificado'"
+msgstr "'unspecified'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:61
@@ -10889,9 +10889,9 @@ msgstr "quando o atributo não está definido para o path."
 
 #. type: Labeled list
 #: en/git-check-attr.txt:61
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'unset'"
-msgstr "'não definido'"
+msgstr "'unset'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:62
@@ -10901,9 +10901,9 @@ msgstr "quando o atributo é definido como falso."
 
 #. type: Labeled list
 #: en/git-check-attr.txt:62
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'set'"
-msgstr "'conjunto'"
+msgstr "'set'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:63
diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index 72cadc64c0c390c33db812a7ad87c6fabb7a3311..fcb64cea2e4d5030958e670c14cd11c7d5e5be9f 100644
--- a/po/documentation.pt_PT.po
+++ b/po/documentation.pt_PT.po
@@ -10617,9 +10617,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:60
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'unspecified'"
-msgstr ""
+msgstr "'unspecified'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:61
@@ -10629,9 +10629,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:61
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'unset'"
-msgstr ""
+msgstr "'unset'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:62
@@ -10641,9 +10641,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:62
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'set'"
-msgstr ""
+msgstr "'set'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:63
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index ea726d1ffd70594f0cc7ec7c0fea332a94dd91d8..72d08b25d1a1cb691e760c482b2cdf27ebdce0f1 100644
--- a/po/documentation.ru.po
+++ b/po/documentation.ru.po
@@ -10628,9 +10628,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:60
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'unspecified'"
-msgstr ""
+msgstr "'unspecified'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:61
@@ -10640,9 +10640,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:61
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'unset'"
-msgstr ""
+msgstr "'unset'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:62
@@ -10652,9 +10652,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:62
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'set'"
-msgstr ""
+msgstr "'set'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:63
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index 397c9e1f43e90bf6dcea50cdbe2fb8ac1c5a454f..455ace8d24a33eddd6df356d3443d331498c97e0 100644
--- a/po/documentation.zh_HANT.po
+++ b/po/documentation.zh_HANT.po
@@ -10117,9 +10117,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:60
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'unspecified'"
-msgstr ""
+msgstr "'unspecified'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:61
@@ -10129,9 +10129,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:61
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'unset'"
-msgstr ""
+msgstr "'unset'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:62
@@ -10141,9 +10141,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-check-attr.txt:62
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'set'"
-msgstr ""
+msgstr "'set'"
 
 #. type: Plain text
 #: en/git-check-attr.txt:63
diff --git a/scripts/pre-translate-po b/scripts/pre-translate-po
index a19ea465a9355d45a3d0a39884fb69074ecaf1c7..f8cb4e473eb6e40215db3376d522a3d2b9292a3d 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-_]+`|\'(oneline|short|medium|full(er)?|email|raw)\'|(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|resolve|recursive|octopus|ours|subtree|theirs|patience|diff-algorithm=\[[a-z\|]+\]|ignore-(space-change|all-space|(cr|space)-at-eol)|(no-)?renormalize|no-renames')
+    quoted_re = re.compile(r'`[a-zA-Z-_]+`|\'(oneline|short|medium|full(er)?|email|raw|(un)?set|unspecified)\'|(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|resolve|recursive|octopus|ours|subtree|theirs|patience|diff-algorithm=\[[a-z\|]+\]|ignore-(space-change|all-space|(cr|space)-at-eol)|(no-)?renormalize|no-renames')
     env_var_re = re.compile(r'`?GIT_[A-Z_\d]+`?')
     if not d is None:
             po_file=polib.pofile(d)