diff --git a/po/documentation.de.po b/po/documentation.de.po
index 470aafb129ec1975ec6b087645e3da8a805d8564..147f71e19a63513491dbbd3b4fe654d1c481c28e 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -4338,9 +4338,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:328 en/merge-strategies.txt:61
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "ignore-space-at-eol"
-msgstr "--ignore-space-at-eol"
+msgstr "ignore-space-at-eol"
#. type: Plain text
#: en/diff-options.txt:330 en/diff-options.txt:665
@@ -4350,9 +4350,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:330 en/merge-strategies.txt:59
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "ignore-space-change"
-msgstr "--ignore-space-change"
+msgstr "ignore-space-change"
#. type: Plain text
#: en/diff-options.txt:334 en/diff-options.txt:671
@@ -4362,9 +4362,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:334 en/merge-strategies.txt:60
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "ignore-all-space"
-msgstr "--ignore-all-space"
+msgstr "ignore-all-space"
#. type: Plain text
#: en/diff-options.txt:337
@@ -56730,9 +56730,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:9
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "resolve"
-msgstr ""
+msgstr "resolve"
#. type: Plain text
#: en/merge-strategies.txt:15
@@ -56742,9 +56742,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:16
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "recursive"
-msgstr "--recursive"
+msgstr "recursive"
#. type: Plain text
#: en/merge-strategies.txt:29
@@ -56760,9 +56760,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:32 en/merge-strategies.txt:115
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "ours"
-msgstr ""
+msgstr "ours"
#. type: Plain text
#: en/merge-strategies.txt:37
@@ -56778,9 +56778,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:42
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "theirs"
-msgstr "--theirs"
+msgstr "theirs"
#. type: Plain text
#: en/merge-strategies.txt:45
@@ -56790,9 +56790,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:46
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "patience"
-msgstr "--patience"
+msgstr "patience"
#. type: Plain text
#: en/merge-strategies.txt:52
@@ -56802,9 +56802,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:53
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "diff-algorithm=[patience|minimal|histogram|myers]"
-msgstr ""
+msgstr "diff-algorithm=[patience|minimal|histogram|myers]"
#. type: Plain text
#: en/merge-strategies.txt:58
@@ -56814,10 +56814,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:62
-#, fuzzy, no-wrap, priority:240
-#| msgid "--ignore-space-at-eol"
+#, ignore-same, no-wrap, priority:240
msgid "ignore-cr-at-eol"
-msgstr "--ignore-space-at-eol"
+msgstr "ignore-cr-at-eol"
#. type: Plain text
#: en/merge-strategies.txt:68
@@ -56845,9 +56844,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:75
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "renormalize"
-msgstr "--renormalize"
+msgstr "renormalize"
#. type: Plain text
#: en/merge-strategies.txt:82
@@ -56857,9 +56856,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:83
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "no-renormalize"
-msgstr "--renormalize"
+msgstr "no-renormalize"
#. type: Plain text
#: en/merge-strategies.txt:86
@@ -56869,10 +56868,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:87
-#, fuzzy, no-wrap, priority:240
-#| msgid "--rename-section"
+#, ignore-same, no-wrap, priority:240
msgid "no-renames"
-msgstr "--rename-section"
+msgstr "no-renames"
#. type: Plain text
#: en/merge-strategies.txt:91
@@ -56918,9 +56916,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:108
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "octopus"
-msgstr "--octopus"
+msgstr "octopus"
#. type: Plain text
#: en/merge-strategies.txt:114
@@ -56936,9 +56934,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:123
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "subtree"
-msgstr ""
+msgstr "subtree"
#. type: Plain text
#: en/merge-strategies.txt:129
diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po
index 25a85c933501f19abe02a1e7e3ee1ab9b363e68b..44b90d7a698c2b5078d630fab37049be6f316605 100644
--- a/po/documentation.es_MX.po
+++ b/po/documentation.es_MX.po
@@ -4273,9 +4273,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:328 en/merge-strategies.txt:61
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "ignore-space-at-eol"
-msgstr "--ignore-space-at-eol"
+msgstr "ignore-space-at-eol"
#. type: Plain text
#: en/diff-options.txt:330 en/diff-options.txt:665
@@ -4285,9 +4285,9 @@ msgstr "ignorar cambios en espacios en blanco en EOL"
#. type: Labeled list
#: en/diff-options.txt:330 en/merge-strategies.txt:59
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "ignore-space-change"
-msgstr "--ignore-space-change"
+msgstr "ignore-space-change"
#. type: Plain text
#: en/diff-options.txt:334 en/diff-options.txt:671
@@ -4297,9 +4297,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:334 en/merge-strategies.txt:60
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "ignore-all-space"
-msgstr "--ignore-all-space"
+msgstr "ignore-all-space"
#. type: Plain text
#: en/diff-options.txt:337
@@ -55694,9 +55694,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:9
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "resolve"
-msgstr ""
+msgstr "resolve"
#. type: Plain text
#: en/merge-strategies.txt:15
@@ -55706,9 +55706,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:16
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "recursive"
-msgstr "--recursive"
+msgstr "recursive"
#. type: Plain text
#: en/merge-strategies.txt:29
@@ -55724,9 +55724,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:32 en/merge-strategies.txt:115
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "ours"
-msgstr ""
+msgstr "ours"
#. type: Plain text
#: en/merge-strategies.txt:37
@@ -55742,9 +55742,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:42
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "theirs"
-msgstr "--theirs"
+msgstr "theirs"
#. type: Plain text
#: en/merge-strategies.txt:45
@@ -55754,9 +55754,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:46
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "patience"
-msgstr "--patience"
+msgstr "patience"
#. type: Plain text
#: en/merge-strategies.txt:52
@@ -55766,9 +55766,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:53
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "diff-algorithm=[patience|minimal|histogram|myers]"
-msgstr ""
+msgstr "diff-algorithm=[patience|minimal|histogram|myers]"
#. type: Plain text
#: en/merge-strategies.txt:58
@@ -55778,9 +55778,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:62
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "ignore-cr-at-eol"
-msgstr "--ignore-cr-at-eol"
+msgstr "ignore-cr-at-eol"
#. type: Plain text
#: en/merge-strategies.txt:68
@@ -55808,9 +55808,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:75
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "renormalize"
-msgstr "--renormalize"
+msgstr "renormalize"
#. type: Plain text
#: en/merge-strategies.txt:82
@@ -55820,9 +55820,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:83
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "no-renormalize"
-msgstr "--renormalize"
+msgstr "no-renormalize"
#. type: Plain text
#: en/merge-strategies.txt:86
@@ -55832,9 +55832,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:87
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "no-renames"
-msgstr "--no-renames"
+msgstr "no-renames"
#. type: Plain text
#: en/merge-strategies.txt:91
@@ -55880,9 +55880,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:108
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "octopus"
-msgstr "--octopus"
+msgstr "octopus"
#. type: Plain text
#: en/merge-strategies.txt:114
@@ -55898,9 +55898,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:123
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "subtree"
-msgstr ""
+msgstr "subtree"
#. type: Plain text
#: en/merge-strategies.txt:129
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index b49076fdd2538561e489fe10412915329b0a53b9..26f5048ade1eb90a4240b88b81e1d3863adfc18f 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -4350,7 +4350,7 @@ msgstr "Ne pas ignorer les espaces lors de la détection de déplacement."
#. type: Labeled list
#: en/diff-options.txt:328 en/merge-strategies.txt:61
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "ignore-space-at-eol"
msgstr "ignore-space-at-eol"
@@ -4362,7 +4362,7 @@ msgstr "Ignorer les modifications d'espaces en fin de ligne."
#. type: Labeled list
#: en/diff-options.txt:330 en/merge-strategies.txt:59
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "ignore-space-change"
msgstr "ignore-space-change"
@@ -4374,7 +4374,7 @@ msgstr "Ignorer les modifications de nombre d'espaces. Cela ignore les espaces e
#. type: Labeled list
#: en/diff-options.txt:334 en/merge-strategies.txt:60
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "ignore-all-space"
msgstr "ignore-all-space"
@@ -56345,9 +56345,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:9
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "resolve"
-msgstr ""
+msgstr "resolve"
#. type: Plain text
#: en/merge-strategies.txt:15
@@ -56357,9 +56357,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:16
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "recursive"
-msgstr "--recursive"
+msgstr "recursive"
#. type: Plain text
#: en/merge-strategies.txt:29
@@ -56375,9 +56375,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:32 en/merge-strategies.txt:115
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "ours"
-msgstr ""
+msgstr "ours"
#. type: Plain text
#: en/merge-strategies.txt:37
@@ -56393,9 +56393,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:42
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "theirs"
-msgstr "--theirs"
+msgstr "theirs"
#. type: Plain text
#: en/merge-strategies.txt:45
@@ -56405,9 +56405,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:46
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "patience"
-msgstr "--patience"
+msgstr "patience"
#. type: Plain text
#: en/merge-strategies.txt:52
@@ -56417,9 +56417,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:53
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "diff-algorithm=[patience|minimal|histogram|myers]"
-msgstr "--diff-algorithm={patience|minimal|histogram|myers}"
+msgstr "diff-algorithm=[patience|minimal|histogram|myers]"
#. type: Plain text
#: en/merge-strategies.txt:58
@@ -56429,7 +56429,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:62
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "ignore-cr-at-eol"
msgstr "ignore-cr-at-eol"
@@ -56459,9 +56459,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:75
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "renormalize"
-msgstr "--renormalize"
+msgstr "renormalize"
#. type: Plain text
#: en/merge-strategies.txt:82
@@ -56471,9 +56471,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:83
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "no-renormalize"
-msgstr "--renormalize"
+msgstr "no-renormalize"
#. type: Plain text
#: en/merge-strategies.txt:86
@@ -56483,9 +56483,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:87
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "no-renames"
-msgstr "--no-renames"
+msgstr "no-renames"
#. type: Plain text
#: en/merge-strategies.txt:91
@@ -56531,9 +56531,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:108
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "octopus"
-msgstr "--octopus"
+msgstr "octopus"
#. type: Plain text
#: en/merge-strategies.txt:114
@@ -56549,9 +56549,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:123
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "subtree"
-msgstr ""
+msgstr "subtree"
#. type: Plain text
#: en/merge-strategies.txt:129
diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po
index a48761204d720364ea377196a298e81a6841581a..1e378da447ec88f45389b5ed9238a41c32114ead 100644
--- a/po/documentation.nb_NO.po
+++ b/po/documentation.nb_NO.po
@@ -4271,9 +4271,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:328 en/merge-strategies.txt:61
-#, no-wrap, priority:280
+#, ignore-same, 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
@@ -4283,9 +4283,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:330 en/merge-strategies.txt:59
-#, no-wrap, priority:280
+#, ignore-same, 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
@@ -4295,9 +4295,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:334 en/merge-strategies.txt:60
-#, 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:337
@@ -55640,9 +55640,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:9
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "resolve"
-msgstr ""
+msgstr "resolve"
#. type: Plain text
#: en/merge-strategies.txt:15
@@ -55652,9 +55652,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:16
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "recursive"
-msgstr ""
+msgstr "recursive"
#. type: Plain text
#: en/merge-strategies.txt:29
@@ -55670,9 +55670,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:32 en/merge-strategies.txt:115
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "ours"
-msgstr ""
+msgstr "ours"
#. type: Plain text
#: en/merge-strategies.txt:37
@@ -55688,9 +55688,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:42
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "theirs"
-msgstr ""
+msgstr "theirs"
#. type: Plain text
#: en/merge-strategies.txt:45
@@ -55700,9 +55700,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:46
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "patience"
-msgstr ""
+msgstr "patience"
#. type: Plain text
#: en/merge-strategies.txt:52
@@ -55712,9 +55712,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:53
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "diff-algorithm=[patience|minimal|histogram|myers]"
-msgstr ""
+msgstr "diff-algorithm=[patience|minimal|histogram|myers]"
#. type: Plain text
#: en/merge-strategies.txt:58
@@ -55724,9 +55724,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:62
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "ignore-cr-at-eol"
-msgstr ""
+msgstr "ignore-cr-at-eol"
#. type: Plain text
#: en/merge-strategies.txt:68
@@ -55754,9 +55754,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:75
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "renormalize"
-msgstr ""
+msgstr "renormalize"
#. type: Plain text
#: en/merge-strategies.txt:82
@@ -55766,9 +55766,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:83
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "no-renormalize"
-msgstr ""
+msgstr "no-renormalize"
#. type: Plain text
#: en/merge-strategies.txt:86
@@ -55778,9 +55778,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:87
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "no-renames"
-msgstr ""
+msgstr "no-renames"
#. type: Plain text
#: en/merge-strategies.txt:91
@@ -55826,9 +55826,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:108
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "octopus"
-msgstr ""
+msgstr "octopus"
#. type: Plain text
#: en/merge-strategies.txt:114
@@ -55844,9 +55844,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:123
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "subtree"
-msgstr ""
+msgstr "subtree"
#. type: Plain text
#: en/merge-strategies.txt:129
diff --git a/po/documentation.pot b/po/documentation.pot
index 4afaadf182b18b799c39d8f949c817e507091462..a077b72da2b8c5a5e7d0501b82c23688c48e34d4 100644
--- a/po/documentation.pot
+++ b/po/documentation.pot
@@ -4271,9 +4271,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:328 en/merge-strategies.txt:61
-#, no-wrap, priority:280
+#, ignore-same, 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
@@ -4283,9 +4283,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:330 en/merge-strategies.txt:59
-#, no-wrap, priority:280
+#, ignore-same, 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
@@ -4295,9 +4295,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:334 en/merge-strategies.txt:60
-#, 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:337
@@ -55631,9 +55631,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:9
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "resolve"
-msgstr ""
+msgstr "resolve"
#. type: Plain text
#: en/merge-strategies.txt:15
@@ -55643,9 +55643,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:16
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "recursive"
-msgstr ""
+msgstr "recursive"
#. type: Plain text
#: en/merge-strategies.txt:29
@@ -55661,9 +55661,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:32 en/merge-strategies.txt:115
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "ours"
-msgstr ""
+msgstr "ours"
#. type: Plain text
#: en/merge-strategies.txt:37
@@ -55679,9 +55679,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:42
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "theirs"
-msgstr ""
+msgstr "theirs"
#. type: Plain text
#: en/merge-strategies.txt:45
@@ -55691,9 +55691,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:46
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "patience"
-msgstr ""
+msgstr "patience"
#. type: Plain text
#: en/merge-strategies.txt:52
@@ -55703,9 +55703,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:53
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "diff-algorithm=[patience|minimal|histogram|myers]"
-msgstr ""
+msgstr "diff-algorithm=[patience|minimal|histogram|myers]"
#. type: Plain text
#: en/merge-strategies.txt:58
@@ -55715,9 +55715,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:62
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "ignore-cr-at-eol"
-msgstr ""
+msgstr "ignore-cr-at-eol"
#. type: Plain text
#: en/merge-strategies.txt:68
@@ -55745,9 +55745,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:75
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "renormalize"
-msgstr ""
+msgstr "renormalize"
#. type: Plain text
#: en/merge-strategies.txt:82
@@ -55757,9 +55757,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:83
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "no-renormalize"
-msgstr ""
+msgstr "no-renormalize"
#. type: Plain text
#: en/merge-strategies.txt:86
@@ -55769,9 +55769,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:87
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "no-renames"
-msgstr ""
+msgstr "no-renames"
#. type: Plain text
#: en/merge-strategies.txt:91
@@ -55817,9 +55817,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:108
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "octopus"
-msgstr ""
+msgstr "octopus"
#. type: Plain text
#: en/merge-strategies.txt:114
@@ -55835,9 +55835,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:123
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "subtree"
-msgstr ""
+msgstr "subtree"
#. type: Plain text
#: en/merge-strategies.txt:129
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 8d649f2677dd1b072b5fb6cff0cffb99e981eecd..4c60c2c74c6f107fbfd3074a0666d30a1e01a5cd 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -4387,9 +4387,9 @@ msgstr "Não ignore espaços em branco ao realizar a detecção de movimento."
#. type: Labeled list
#: en/diff-options.txt:328 en/merge-strategies.txt:61
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "ignore-space-at-eol"
-msgstr "ignorar-espaço-at-eol"
+msgstr "ignore-space-at-eol"
#. type: Plain text
#: en/diff-options.txt:330 en/diff-options.txt:665
@@ -4399,9 +4399,9 @@ msgstr "Ignore as alterações no espaço em branco na EOL."
#. type: Labeled list
#: en/diff-options.txt:330 en/merge-strategies.txt:59
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "ignore-space-change"
-msgstr "ignorar-mudança-de espaço"
+msgstr "ignore-space-change"
#. type: Plain text
#: en/diff-options.txt:334 en/diff-options.txt:671
@@ -4411,9 +4411,9 @@ msgstr "Ignore as alterações na quantidade de espaço em branco. Isso ignora o
#. type: Labeled list
#: en/diff-options.txt:334 en/merge-strategies.txt:60
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "ignore-all-space"
-msgstr "ignore-todo-espaço"
+msgstr "ignore-all-space"
#. type: Plain text
#: en/diff-options.txt:337
@@ -56078,9 +56078,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:9
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "resolve"
-msgstr ""
+msgstr "resolve"
#. type: Plain text
#: en/merge-strategies.txt:15
@@ -56090,9 +56090,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:16
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "recursive"
-msgstr ""
+msgstr "recursive"
#. type: Plain text
#: en/merge-strategies.txt:29
@@ -56108,9 +56108,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:32 en/merge-strategies.txt:115
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "ours"
-msgstr ""
+msgstr "ours"
#. type: Plain text
#: en/merge-strategies.txt:37
@@ -56126,9 +56126,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:42
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "theirs"
-msgstr ""
+msgstr "theirs"
#. type: Plain text
#: en/merge-strategies.txt:45
@@ -56138,9 +56138,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:46
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "patience"
-msgstr ""
+msgstr "patience"
#. type: Plain text
#: en/merge-strategies.txt:52
@@ -56150,9 +56150,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:53
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "diff-algorithm=[patience|minimal|histogram|myers]"
-msgstr ""
+msgstr "diff-algorithm=[patience|minimal|histogram|myers]"
#. type: Plain text
#: en/merge-strategies.txt:58
@@ -56162,9 +56162,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:62
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "ignore-cr-at-eol"
-msgstr ""
+msgstr "ignore-cr-at-eol"
#. type: Plain text
#: en/merge-strategies.txt:68
@@ -56192,9 +56192,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:75
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "renormalize"
-msgstr ""
+msgstr "renormalize"
#. type: Plain text
#: en/merge-strategies.txt:82
@@ -56204,9 +56204,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:83
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "no-renormalize"
-msgstr ""
+msgstr "no-renormalize"
#. type: Plain text
#: en/merge-strategies.txt:86
@@ -56216,9 +56216,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:87
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "no-renames"
-msgstr ""
+msgstr "no-renames"
#. type: Plain text
#: en/merge-strategies.txt:91
@@ -56264,9 +56264,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:108
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "octopus"
-msgstr ""
+msgstr "octopus"
#. type: Plain text
#: en/merge-strategies.txt:114
@@ -56282,9 +56282,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:123
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "subtree"
-msgstr ""
+msgstr "subtree"
#. type: Plain text
#: en/merge-strategies.txt:129
diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index 4e7e388e09baff0a32dc60f86df07e08d5dccbe1..27af5e872f51f5587381371fd370e9bd6689715b 100644
--- a/po/documentation.pt_PT.po
+++ b/po/documentation.pt_PT.po
@@ -4270,9 +4270,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:328 en/merge-strategies.txt:61
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "ignore-space-at-eol"
-msgstr "--ignore-space-at-eol"
+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
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "ignore-space-change"
-msgstr "--ignore-space-change"
+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
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "ignore-all-space"
-msgstr "--ignore-all-space"
+msgstr "ignore-all-space"
#. type: Plain text
#: en/diff-options.txt:337
@@ -55630,9 +55630,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:9
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "resolve"
-msgstr ""
+msgstr "resolve"
#. type: Plain text
#: en/merge-strategies.txt:15
@@ -55642,9 +55642,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:16
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "recursive"
-msgstr "--recursive"
+msgstr "recursive"
#. type: Plain text
#: en/merge-strategies.txt:29
@@ -55660,9 +55660,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:32 en/merge-strategies.txt:115
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "ours"
-msgstr ""
+msgstr "ours"
#. type: Plain text
#: en/merge-strategies.txt:37
@@ -55678,9 +55678,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:42
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "theirs"
-msgstr "--theirs"
+msgstr "theirs"
#. type: Plain text
#: en/merge-strategies.txt:45
@@ -55690,9 +55690,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:46
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "patience"
-msgstr "--patience"
+msgstr "patience"
#. type: Plain text
#: en/merge-strategies.txt:52
@@ -55702,9 +55702,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:53
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "diff-algorithm=[patience|minimal|histogram|myers]"
-msgstr ""
+msgstr "diff-algorithm=[patience|minimal|histogram|myers]"
#. type: Plain text
#: en/merge-strategies.txt:58
@@ -55714,9 +55714,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:62
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "ignore-cr-at-eol"
-msgstr "--ignore-cr-at-eol"
+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
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "renormalize"
-msgstr "--renormalize"
+msgstr "renormalize"
#. type: Plain text
#: en/merge-strategies.txt:82
@@ -55756,9 +55756,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:83
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "no-renormalize"
-msgstr "--renormalize"
+msgstr "no-renormalize"
#. type: Plain text
#: en/merge-strategies.txt:86
@@ -55768,9 +55768,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:87
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "no-renames"
-msgstr "--no-renames"
+msgstr "no-renames"
#. type: Plain text
#: en/merge-strategies.txt:91
@@ -55816,9 +55816,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:108
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "octopus"
-msgstr "--octopus"
+msgstr "octopus"
#. type: Plain text
#: en/merge-strategies.txt:114
@@ -55834,9 +55834,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:123
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "subtree"
-msgstr ""
+msgstr "subtree"
#. type: Plain text
#: en/merge-strategies.txt:129
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index 579f2ac4d0a814cd585f3a449105cfbf358e0bc1..7a9e6b637ade8a14949b1a43e9615d4d34ce5d89 100644
--- a/po/documentation.ru.po
+++ b/po/documentation.ru.po
@@ -4273,9 +4273,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:328 en/merge-strategies.txt:61
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "ignore-space-at-eol"
-msgstr "--ignore-space-at-eol"
+msgstr "ignore-space-at-eol"
#. type: Plain text
#: en/diff-options.txt:330 en/diff-options.txt:665
@@ -4285,9 +4285,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:330 en/merge-strategies.txt:59
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "ignore-space-change"
-msgstr "--ignore-space-change"
+msgstr "ignore-space-change"
#. type: Plain text
#: en/diff-options.txt:334 en/diff-options.txt:671
@@ -4297,9 +4297,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:334 en/merge-strategies.txt:60
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "ignore-all-space"
-msgstr "--ignore-all-space"
+msgstr "ignore-all-space"
#. type: Plain text
#: en/diff-options.txt:337
@@ -55659,9 +55659,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:9
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "resolve"
-msgstr ""
+msgstr "resolve"
#. type: Plain text
#: en/merge-strategies.txt:15
@@ -55671,9 +55671,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:16
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "recursive"
-msgstr "--recursive"
+msgstr "recursive"
#. type: Plain text
#: en/merge-strategies.txt:29
@@ -55689,9 +55689,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:32 en/merge-strategies.txt:115
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "ours"
-msgstr ""
+msgstr "ours"
#. type: Plain text
#: en/merge-strategies.txt:37
@@ -55707,9 +55707,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:42
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "theirs"
-msgstr "--theirs"
+msgstr "theirs"
#. type: Plain text
#: en/merge-strategies.txt:45
@@ -55719,9 +55719,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:46
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "patience"
-msgstr "--patience"
+msgstr "patience"
#. type: Plain text
#: en/merge-strategies.txt:52
@@ -55731,9 +55731,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:53
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "diff-algorithm=[patience|minimal|histogram|myers]"
-msgstr ""
+msgstr "diff-algorithm=[patience|minimal|histogram|myers]"
#. type: Plain text
#: en/merge-strategies.txt:58
@@ -55743,9 +55743,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:62
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "ignore-cr-at-eol"
-msgstr "--ignore-cr-at-eol"
+msgstr "ignore-cr-at-eol"
#. type: Plain text
#: en/merge-strategies.txt:68
@@ -55773,9 +55773,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:75
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "renormalize"
-msgstr "--renormalize"
+msgstr "renormalize"
#. type: Plain text
#: en/merge-strategies.txt:82
@@ -55785,9 +55785,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:83
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "no-renormalize"
-msgstr "--renormalize"
+msgstr "no-renormalize"
#. type: Plain text
#: en/merge-strategies.txt:86
@@ -55797,9 +55797,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:87
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "no-renames"
-msgstr "--no-renames"
+msgstr "no-renames"
#. type: Plain text
#: en/merge-strategies.txt:91
@@ -55845,9 +55845,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:108
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "octopus"
-msgstr "--octopus"
+msgstr "octopus"
#. type: Plain text
#: en/merge-strategies.txt:114
@@ -55863,9 +55863,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:123
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "subtree"
-msgstr ""
+msgstr "subtree"
#. type: Plain text
#: en/merge-strategies.txt:129
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index 005d890b512e7b67bf8d80c62f5c170ebf3e1d8c..6500c0bd44e5ddd0884a2ba7fadcd0727c2d72fe 100644
--- a/po/documentation.zh_HANT.po
+++ b/po/documentation.zh_HANT.po
@@ -3883,9 +3883,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:311 en/merge-strategies.txt:61
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "ignore-space-at-eol"
-msgstr ""
+msgstr "ignore-space-at-eol"
#. type: Plain text
#: en/diff-options.txt:313 en/diff-options.txt:645
@@ -3895,9 +3895,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:313 en/merge-strategies.txt:59
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "ignore-space-change"
-msgstr ""
+msgstr "ignore-space-change"
#. type: Plain text
#: en/diff-options.txt:317 en/diff-options.txt:651
@@ -3907,9 +3907,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:317 en/merge-strategies.txt:60
-#, 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:320
@@ -54319,9 +54319,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:9
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "resolve"
-msgstr ""
+msgstr "resolve"
#. type: Plain text
#: en/merge-strategies.txt:15
@@ -54331,9 +54331,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:16
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "recursive"
-msgstr ""
+msgstr "recursive"
#. type: Plain text
#: en/merge-strategies.txt:29
@@ -54349,9 +54349,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:32 en/merge-strategies.txt:115
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "ours"
-msgstr ""
+msgstr "ours"
#. type: Plain text
#: en/merge-strategies.txt:37
@@ -54367,9 +54367,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:42
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "theirs"
-msgstr ""
+msgstr "theirs"
#. type: Plain text
#: en/merge-strategies.txt:45
@@ -54379,9 +54379,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:46
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "patience"
-msgstr ""
+msgstr "patience"
#. type: Plain text
#: en/merge-strategies.txt:52
@@ -54391,9 +54391,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:53
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "diff-algorithm=[patience|minimal|histogram|myers]"
-msgstr ""
+msgstr "diff-algorithm=[patience|minimal|histogram|myers]"
#. type: Plain text
#: en/merge-strategies.txt:58
@@ -54403,9 +54403,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:62
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "ignore-cr-at-eol"
-msgstr ""
+msgstr "ignore-cr-at-eol"
#. type: Plain text
#: en/merge-strategies.txt:68
@@ -54433,9 +54433,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:75
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "renormalize"
-msgstr ""
+msgstr "renormalize"
#. type: Plain text
#: en/merge-strategies.txt:82
@@ -54445,9 +54445,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:83
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "no-renormalize"
-msgstr ""
+msgstr "no-renormalize"
#. type: Plain text
#: en/merge-strategies.txt:86
@@ -54457,9 +54457,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:87
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "no-renames"
-msgstr ""
+msgstr "no-renames"
#. type: Plain text
#: en/merge-strategies.txt:91
@@ -54505,9 +54505,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:108
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "octopus"
-msgstr ""
+msgstr "octopus"
#. type: Plain text
#: en/merge-strategies.txt:114
@@ -54523,9 +54523,9 @@ msgstr ""
#. type: Labeled list
#: en/merge-strategies.txt:123
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
msgid "subtree"
-msgstr ""
+msgstr "subtree"
#. type: Plain text
#: en/merge-strategies.txt:129
diff --git a/scripts/pre-translate-po b/scripts/pre-translate-po
index aca66ce98fce25407a2ca4c5e6cfae8eabf2ab7d..77bbe10ce1d83c7bb94f43245464944e5ec0c0b7 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|update|create|delete|verify|option')
+ 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|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)