diff --git a/po/documentation.de.po b/po/documentation.de.po
index 470f6a2ef98a3fa1485cb8e01120d4d63b276f96..ec297c9dd3a24be0e2d100bf471cc49436070fbf 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -60710,10 +60710,9 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:100
-#| msgid "bc"
+#, ignore-same, priority:100
msgid "bc4"
-msgstr "bc"
+msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
@@ -60771,10 +60770,9 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:100
-#| msgid "gvimdiff"
+#, ignore-same, priority:100
msgid "gvimdiff1"
-msgstr "gvimdiff"
+msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -60802,31 +60800,27 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff"
-msgstr "vimdiff"
+msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff1"
-msgstr "vimdiff"
+msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:100
-#| msgid "vimdiff2"
+#, ignore-same, priority:100
msgid "nvimdiff2"
-msgstr "vimdiff2"
+msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:100
-#| msgid "vimdiff3"
+#, ignore-same, priority:100
msgid "nvimdiff3"
-msgstr "vimdiff3"
+msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
@@ -60866,10 +60860,9 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "vimdiff1"
-msgstr "vimdiff"
+msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
diff --git a/po/documentation.es.po b/po/documentation.es.po
index 75bc0fb17c5705b78bf9de407743c6bfd1047d3b..3153e3a87864dae59ba631366c4df779990cbd54 100644
--- a/po/documentation.es.po
+++ b/po/documentation.es.po
@@ -60041,10 +60041,9 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:100
-#| msgid "bc"
+#, ignore-same, priority:100
msgid "bc4"
-msgstr "bc"
+msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
@@ -60102,10 +60101,9 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:100
-#| msgid "gvimdiff"
+#, ignore-same, priority:100
msgid "gvimdiff1"
-msgstr "gvimdiff"
+msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -60133,26 +60131,25 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, priority:100
+#, ignore-same, priority:100
msgid "nvimdiff"
msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:100
-#| msgid "nvimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff1"
-msgstr "nvimdiff"
+msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, priority:100
+#, ignore-same, priority:100
msgid "nvimdiff2"
msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, priority:100
+#, ignore-same, priority:100
msgid "nvimdiff3"
msgstr "nvimdiff3"
@@ -60194,10 +60191,9 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "vimdiff1"
-msgstr "vimdiff"
+msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po
index ceaadccf7f76e3db91e2a0f380e482724afbeb3c..6a9240cf626e8745e387cd74f30134aa755cd435 100644
--- a/po/documentation.es_MX.po
+++ b/po/documentation.es_MX.po
@@ -60025,10 +60025,9 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:100
-#| msgid "bc"
+#, ignore-same, priority:100
msgid "bc4"
-msgstr "bc"
+msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
@@ -60086,10 +60085,9 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:100
-#| msgid "gvimdiff"
+#, ignore-same, priority:100
msgid "gvimdiff1"
-msgstr "gvimdiff"
+msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -60117,31 +60115,27 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff"
-msgstr "vimdiff"
+msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff1"
-msgstr "vimdiff"
+msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:100
-#| msgid "vimdiff2"
+#, ignore-same, priority:100
msgid "nvimdiff2"
-msgstr "vimdiff2"
+msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:100
-#| msgid "vimdiff3"
+#, ignore-same, priority:100
msgid "nvimdiff3"
-msgstr "vimdiff3"
+msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
@@ -60181,10 +60175,9 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "vimdiff1"
-msgstr "vimdiff"
+msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index c4ee0e6d7fda4645b14aeed86df9ea1305b7c5a4..31afde05e4417419121b7300f0fcbe77beba8e5f 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -60974,7 +60974,7 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, priority:100
+#, ignore-same, priority:100
msgid "bc4"
msgstr "bc4"
@@ -61034,7 +61034,7 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, priority:100
+#, ignore-same, priority:100
msgid "gvimdiff1"
msgstr "gvimdiff1"
@@ -61064,25 +61064,25 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, priority:100
+#, ignore-same, priority:100
msgid "nvimdiff"
msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, priority:100
+#, ignore-same, priority:100
msgid "nvimdiff1"
msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, priority:100
+#, ignore-same, priority:100
msgid "nvimdiff2"
msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, priority:100
+#, ignore-same, priority:100
msgid "nvimdiff3"
msgstr "nvimdiff3"
@@ -61124,7 +61124,7 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, priority:100
+#, ignore-same, priority:100
msgid "vimdiff1"
msgstr "vimdiff1"
diff --git a/po/documentation.hu.po b/po/documentation.hu.po
index 8db689af395c6af477f99123c04dad300097521e..95787c251430c0241f4a073eec07384a20f97d6a 100644
--- a/po/documentation.hu.po
+++ b/po/documentation.hu.po
@@ -59997,10 +59997,9 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:100
-#| msgid "bc"
+#, ignore-same, priority:100
msgid "bc4"
-msgstr "bc"
+msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
@@ -60058,10 +60057,9 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:100
-#| msgid "gvimdiff"
+#, ignore-same, priority:100
msgid "gvimdiff1"
-msgstr "gvimdiff"
+msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -60089,31 +60087,27 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff"
-msgstr "vimdiff"
+msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff1"
-msgstr "vimdiff"
+msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:100
-#| msgid "vimdiff2"
+#, ignore-same, priority:100
msgid "nvimdiff2"
-msgstr "vimdiff2"
+msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:100
-#| msgid "vimdiff3"
+#, ignore-same, priority:100
msgid "nvimdiff3"
-msgstr "vimdiff3"
+msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
@@ -60153,10 +60147,9 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "vimdiff1"
-msgstr "vimdiff"
+msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
diff --git a/po/documentation.id.po b/po/documentation.id.po
index 78d3315d43e318f59dc3cd512c84cf465754f684..5cef85f9935ff149cba0f1f4a88c378cd7f7f929 100644
--- a/po/documentation.id.po
+++ b/po/documentation.id.po
@@ -59998,10 +59998,9 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:100
-#| msgid "bc"
+#, ignore-same, priority:100
msgid "bc4"
-msgstr "bc"
+msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
@@ -60059,10 +60058,9 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:100
-#| msgid "gvimdiff"
+#, ignore-same, priority:100
msgid "gvimdiff1"
-msgstr "gvimdiff"
+msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -60090,31 +60088,27 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff"
-msgstr "vimdiff"
+msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff1"
-msgstr "vimdiff"
+msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:100
-#| msgid "vimdiff2"
+#, ignore-same, priority:100
msgid "nvimdiff2"
-msgstr "vimdiff2"
+msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:100
-#| msgid "vimdiff3"
+#, ignore-same, priority:100
msgid "nvimdiff3"
-msgstr "vimdiff3"
+msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
@@ -60154,10 +60148,9 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "vimdiff1"
-msgstr "vimdiff"
+msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
diff --git a/po/documentation.is.po b/po/documentation.is.po
index 29a9a6d7bd45572fe1c4ab4b3aeb92d26cc1b8fc..ddfefb6a13872d26d8ba9ada8f6ee81653bcc2bb 100644
--- a/po/documentation.is.po
+++ b/po/documentation.is.po
@@ -60067,10 +60067,9 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:100
-#| msgid "bc"
+#, ignore-same, priority:100
msgid "bc4"
-msgstr "bc"
+msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
@@ -60128,10 +60127,9 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:100
-#| msgid "gvimdiff"
+#, ignore-same, priority:100
msgid "gvimdiff1"
-msgstr "gvimdiff"
+msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -60159,31 +60157,27 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff"
-msgstr "vimdiff"
+msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff1"
-msgstr "vimdiff"
+msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:100
-#| msgid "vimdiff2"
+#, ignore-same, priority:100
msgid "nvimdiff2"
-msgstr "vimdiff2"
+msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:100
-#| msgid "vimdiff3"
+#, ignore-same, priority:100
msgid "nvimdiff3"
-msgstr "vimdiff3"
+msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
@@ -60223,10 +60217,9 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "vimdiff1"
-msgstr "vimdiff"
+msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
diff --git a/po/documentation.it.po b/po/documentation.it.po
index 7c2f5ecfb21689922b8ac2d8d872e9f26fd9d022..6e29349c91eed525c7d6ec060300956788b68b6f 100644
--- a/po/documentation.it.po
+++ b/po/documentation.it.po
@@ -60102,10 +60102,9 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:100
-#| msgid "bc"
+#, ignore-same, priority:100
msgid "bc4"
-msgstr "bc"
+msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
@@ -60163,10 +60162,9 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:100
-#| msgid "gvimdiff"
+#, ignore-same, priority:100
msgid "gvimdiff1"
-msgstr "gvimdiff"
+msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -60194,31 +60192,27 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff"
-msgstr "vimdiff"
+msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff1"
-msgstr "vimdiff"
+msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:100
-#| msgid "vimdiff2"
+#, ignore-same, priority:100
msgid "nvimdiff2"
-msgstr "vimdiff2"
+msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:100
-#| msgid "vimdiff3"
+#, ignore-same, priority:100
msgid "nvimdiff3"
-msgstr "vimdiff3"
+msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
@@ -60258,10 +60252,9 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "vimdiff1"
-msgstr "vimdiff"
+msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
diff --git a/po/documentation.ja.po b/po/documentation.ja.po
index 1bc6ef35e336e424ea86080f6be099046ed6ad8d..450e7d722e2a1aa87c3b268a0df5c8ae673c2a5d 100644
--- a/po/documentation.ja.po
+++ b/po/documentation.ja.po
@@ -59977,10 +59977,9 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:100
-#| msgid "bc"
+#, ignore-same, priority:100
msgid "bc4"
-msgstr "bc"
+msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
@@ -60038,10 +60037,9 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:100
-#| msgid "gvimdiff"
+#, ignore-same, priority:100
msgid "gvimdiff1"
-msgstr "gvimdiff"
+msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -60069,31 +60067,27 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff"
-msgstr "vimdiff"
+msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff1"
-msgstr "vimdiff"
+msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:100
-#| msgid "vimdiff2"
+#, ignore-same, priority:100
msgid "nvimdiff2"
-msgstr "vimdiff2"
+msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:100
-#| msgid "vimdiff3"
+#, ignore-same, priority:100
msgid "nvimdiff3"
-msgstr "vimdiff3"
+msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
@@ -60133,10 +60127,9 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "vimdiff1"
-msgstr "vimdiff"
+msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
diff --git a/po/documentation.ko.po b/po/documentation.ko.po
index 3edaa8a50c1208b84ec3402b7e3193f645dfac79..a151c8012e66ad45e61ee7efc1413d7df2ef0ad4 100644
--- a/po/documentation.ko.po
+++ b/po/documentation.ko.po
@@ -59990,10 +59990,9 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:100
-#| msgid "bc"
+#, ignore-same, priority:100
msgid "bc4"
-msgstr "bc"
+msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
@@ -60051,10 +60050,9 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:100
-#| msgid "gvimdiff"
+#, ignore-same, priority:100
msgid "gvimdiff1"
-msgstr "gvimdiff"
+msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -60082,31 +60080,27 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff"
-msgstr "vimdiff"
+msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff1"
-msgstr "vimdiff"
+msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:100
-#| msgid "vimdiff2"
+#, ignore-same, priority:100
msgid "nvimdiff2"
-msgstr "vimdiff2"
+msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:100
-#| msgid "vimdiff3"
+#, ignore-same, priority:100
msgid "nvimdiff3"
-msgstr "vimdiff3"
+msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
@@ -60146,10 +60140,9 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "vimdiff1"
-msgstr "vimdiff"
+msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
diff --git a/po/documentation.mr.po b/po/documentation.mr.po
index 7571e3fbba88cc524cbc309ec7f9055e6649fd04..930976b37f075dceaa536183d0c45d1a36387881 100644
--- a/po/documentation.mr.po
+++ b/po/documentation.mr.po
@@ -59990,10 +59990,9 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:100
-#| msgid "bc"
+#, ignore-same, priority:100
msgid "bc4"
-msgstr "bc"
+msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
@@ -60051,10 +60050,9 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:100
-#| msgid "gvimdiff"
+#, ignore-same, priority:100
msgid "gvimdiff1"
-msgstr "gvimdiff"
+msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -60082,31 +60080,27 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff"
-msgstr "vimdiff"
+msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff1"
-msgstr "vimdiff"
+msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:100
-#| msgid "vimdiff2"
+#, ignore-same, priority:100
msgid "nvimdiff2"
-msgstr "vimdiff2"
+msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:100
-#| msgid "vimdiff3"
+#, ignore-same, priority:100
msgid "nvimdiff3"
-msgstr "vimdiff3"
+msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
@@ -60146,10 +60140,9 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "vimdiff1"
-msgstr "vimdiff"
+msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po
index 72cc0cd4926ae362cd646bfba57bc151002a9d11..300695163de03531fd6c3253306aee33b5eb527a 100644
--- a/po/documentation.nb_NO.po
+++ b/po/documentation.nb_NO.po
@@ -60008,10 +60008,9 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:100
-#| msgid "bc"
+#, ignore-same, priority:100
msgid "bc4"
-msgstr "bc"
+msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
@@ -60069,10 +60068,9 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:100
-#| msgid "gvimdiff"
+#, ignore-same, priority:100
msgid "gvimdiff1"
-msgstr "gvimdiff"
+msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -60100,31 +60098,27 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff"
-msgstr "vimdiff"
+msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff1"
-msgstr "vimdiff"
+msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:100
-#| msgid "vimdiff2"
+#, ignore-same, priority:100
msgid "nvimdiff2"
-msgstr "vimdiff2"
+msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:100
-#| msgid "vimdiff3"
+#, ignore-same, priority:100
msgid "nvimdiff3"
-msgstr "vimdiff3"
+msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
@@ -60164,10 +60158,9 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "vimdiff1"
-msgstr "vimdiff"
+msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
diff --git a/po/documentation.nl.po b/po/documentation.nl.po
index dd91655f36d21ffd02ab5c67df614521ca07f002..fd65379aaea5a32638f694ca13d08f567f0a2af0 100644
--- a/po/documentation.nl.po
+++ b/po/documentation.nl.po
@@ -60129,10 +60129,9 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:100
-#| msgid "bc"
+#, ignore-same, priority:100
msgid "bc4"
-msgstr "bc"
+msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
@@ -60190,10 +60189,9 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:100
-#| msgid "gvimdiff"
+#, ignore-same, priority:100
msgid "gvimdiff1"
-msgstr "gvimdiff"
+msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -60221,31 +60219,27 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff"
-msgstr "vimdiff"
+msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff1"
-msgstr "vimdiff"
+msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:100
-#| msgid "vimdiff2"
+#, ignore-same, priority:100
msgid "nvimdiff2"
-msgstr "vimdiff2"
+msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:100
-#| msgid "vimdiff3"
+#, ignore-same, priority:100
msgid "nvimdiff3"
-msgstr "vimdiff3"
+msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
@@ -60285,10 +60279,9 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "vimdiff1"
-msgstr "vimdiff"
+msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
diff --git a/po/documentation.pl.po b/po/documentation.pl.po
index 9b8f927d5a646f205cd29b50199fc1f926383978..ef53f54818454214308077f20c02f4a111a987ab 100644
--- a/po/documentation.pl.po
+++ b/po/documentation.pl.po
@@ -60048,10 +60048,9 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:100
-#| msgid "bc"
+#, ignore-same, priority:100
msgid "bc4"
-msgstr "bc"
+msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
@@ -60109,10 +60108,9 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:100
-#| msgid "gvimdiff"
+#, ignore-same, priority:100
msgid "gvimdiff1"
-msgstr "gvimdiff"
+msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -60140,31 +60138,27 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff"
-msgstr "vimdiff"
+msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff1"
-msgstr "vimdiff"
+msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:100
-#| msgid "vimdiff2"
+#, ignore-same, priority:100
msgid "nvimdiff2"
-msgstr "vimdiff2"
+msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:100
-#| msgid "vimdiff3"
+#, ignore-same, priority:100
msgid "nvimdiff3"
-msgstr "vimdiff3"
+msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
@@ -60204,10 +60198,9 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "vimdiff1"
-msgstr "vimdiff"
+msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index dc768e3485fbdf81c18571995ccad6c06233c886..3089ff9b9b984eb23adfc213ce28f824f03c2317 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -62574,7 +62574,7 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, priority:100
+#, ignore-same, priority:100
msgid "bc4"
msgstr "bc4"
@@ -62634,7 +62634,7 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, priority:100
+#, ignore-same, priority:100
msgid "gvimdiff1"
msgstr "gvimdiff1"
@@ -62664,25 +62664,25 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, priority:100
+#, ignore-same, priority:100
msgid "nvimdiff"
msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, priority:100
+#, ignore-same, priority:100
msgid "nvimdiff1"
msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, priority:100
+#, ignore-same, priority:100
msgid "nvimdiff2"
msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, priority:100
+#, ignore-same, priority:100
msgid "nvimdiff3"
msgstr "nvimdiff3"
@@ -62724,7 +62724,7 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, priority:100
+#, ignore-same, priority:100
msgid "vimdiff1"
msgstr "vimdiff1"
diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index 01e0b15c0353d7f3e9d6b2a2c33bb35f0ab03495..713541d7b3e2c55032abb66b3a78f1cb2c12a60d 100644
--- a/po/documentation.pt_PT.po
+++ b/po/documentation.pt_PT.po
@@ -59988,10 +59988,9 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:100
-#| msgid "bc"
+#, ignore-same, priority:100
msgid "bc4"
-msgstr "bc"
+msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
@@ -60049,10 +60048,9 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:100
-#| msgid "gvimdiff"
+#, ignore-same, priority:100
msgid "gvimdiff1"
-msgstr "gvimdiff"
+msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -60080,31 +60078,27 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff"
-msgstr "vimdiff"
+msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff1"
-msgstr "vimdiff"
+msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:100
-#| msgid "vimdiff2"
+#, ignore-same, priority:100
msgid "nvimdiff2"
-msgstr "vimdiff2"
+msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:100
-#| msgid "vimdiff3"
+#, ignore-same, priority:100
msgid "nvimdiff3"
-msgstr "vimdiff3"
+msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
@@ -60144,10 +60138,9 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "vimdiff1"
-msgstr "vimdiff"
+msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index d6daea813e46ecacab4d457aadde83fc6935c490..df877990929e6284ba776217227a664eaab011ed 100644
--- a/po/documentation.ru.po
+++ b/po/documentation.ru.po
@@ -60129,10 +60129,9 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:100
-#| msgid "bc"
+#, ignore-same, priority:100
msgid "bc4"
-msgstr "bc"
+msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
@@ -60190,10 +60189,9 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:100
-#| msgid "gvimdiff"
+#, ignore-same, priority:100
msgid "gvimdiff1"
-msgstr "gvimdiff"
+msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -60221,31 +60219,27 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff"
-msgstr "vimdiff"
+msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff1"
-msgstr "vimdiff"
+msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:100
-#| msgid "vimdiff2"
+#, ignore-same, priority:100
msgid "nvimdiff2"
-msgstr "vimdiff2"
+msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:100
-#| msgid "vimdiff3"
+#, ignore-same, priority:100
msgid "nvimdiff3"
-msgstr "vimdiff3"
+msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
@@ -60285,10 +60279,9 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "vimdiff1"
-msgstr "vimdiff"
+msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
diff --git a/po/documentation.sk.po b/po/documentation.sk.po
index ba4182b5688946cab2489d43f065776306e06657..e85605c27fd9f96d3ede3d7affd1efaac5170533 100644
--- a/po/documentation.sk.po
+++ b/po/documentation.sk.po
@@ -59937,9 +59937,9 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, priority:100
+#, ignore-same, priority:100
msgid "bc4"
-msgstr ""
+msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
@@ -59997,9 +59997,9 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, priority:100
+#, ignore-same, priority:100
msgid "gvimdiff1"
-msgstr ""
+msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -60027,27 +60027,27 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, priority:100
+#, ignore-same, priority:100
msgid "nvimdiff"
-msgstr ""
+msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, priority:100
+#, ignore-same, priority:100
msgid "nvimdiff1"
-msgstr ""
+msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, priority:100
+#, ignore-same, priority:100
msgid "nvimdiff2"
-msgstr ""
+msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, priority:100
+#, ignore-same, priority:100
msgid "nvimdiff3"
-msgstr ""
+msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
@@ -60087,9 +60087,9 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, priority:100
+#, ignore-same, priority:100
msgid "vimdiff1"
-msgstr ""
+msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
diff --git a/po/documentation.tr.po b/po/documentation.tr.po
index 620833c26c34d1845d56a1262adea38ccdbfe8fc..5639118072b27ef1e78db4c658f75a95dbd6d89f 100644
--- a/po/documentation.tr.po
+++ b/po/documentation.tr.po
@@ -59976,10 +59976,9 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:100
-#| msgid "bc"
+#, ignore-same, priority:100
msgid "bc4"
-msgstr "bc"
+msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
@@ -60037,10 +60036,9 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:100
-#| msgid "gvimdiff"
+#, ignore-same, priority:100
msgid "gvimdiff1"
-msgstr "gvimdiff"
+msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -60068,26 +60066,25 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, priority:100
+#, ignore-same, priority:100
msgid "nvimdiff"
msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:100
-#| msgid "nvimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff1"
-msgstr "nvimdiff"
+msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, priority:100
+#, ignore-same, priority:100
msgid "nvimdiff2"
msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, priority:100
+#, ignore-same, priority:100
msgid "nvimdiff3"
msgstr "nvimdiff3"
@@ -60129,10 +60126,9 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "vimdiff1"
-msgstr "vimdiff"
+msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po
index f1feffaf3f0a3ea9347e8d67dc8139e0d58f7095..0557067dc63a8996a2168edbe8785dfef48f098d 100644
--- a/po/documentation.zh_HANS-CN.po
+++ b/po/documentation.zh_HANS-CN.po
@@ -60920,10 +60920,9 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:100
-#| msgid "bc"
+#, ignore-same, priority:100
msgid "bc4"
-msgstr "bc"
+msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
@@ -60981,10 +60980,9 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:100
-#| msgid "gvimdiff"
+#, ignore-same, priority:100
msgid "gvimdiff1"
-msgstr "gvimdiff"
+msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -61012,29 +61010,25 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff"
msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff1"
-msgstr "nvimdiff"
+msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:100
-#| msgid "vimdiff2"
+#, ignore-same, priority:100
msgid "nvimdiff2"
msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:100
-#| msgid "vimdiff3"
+#, ignore-same, priority:100
msgid "nvimdiff3"
msgstr "nvimdiff3"
@@ -61076,10 +61070,9 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "vimdiff1"
-msgstr "vimdiff"
+msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index c2b16b6f41cd3c63341c6f561da378866abb28ea..fabd70d20078a160a022d0f4938e3e44969ecfc6 100644
--- a/po/documentation.zh_HANT.po
+++ b/po/documentation.zh_HANT.po
@@ -60029,10 +60029,9 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:100
-#| msgid "bc"
+#, ignore-same, priority:100
msgid "bc4"
-msgstr "bc"
+msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
@@ -60090,10 +60089,9 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:100
-#| msgid "gvimdiff"
+#, ignore-same, priority:100
msgid "gvimdiff1"
-msgstr "gvimdiff"
+msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -60121,31 +60119,27 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff"
-msgstr "vimdiff"
+msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "nvimdiff1"
-msgstr "vimdiff"
+msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:100
-#| msgid "vimdiff2"
+#, ignore-same, priority:100
msgid "nvimdiff2"
-msgstr "vimdiff2"
+msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:100
-#| msgid "vimdiff3"
+#, ignore-same, priority:100
msgid "nvimdiff3"
-msgstr "vimdiff3"
+msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
@@ -60185,10 +60179,9 @@ msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:100
-#| msgid "vimdiff"
+#, ignore-same, priority:100
msgid "vimdiff1"
-msgstr "vimdiff"
+msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
diff --git a/scripts/pre-translate-po b/scripts/pre-translate-po
index 93f321c73fcae9fba42868b789678d2aa4bc6fa7..95cf0030298235350f958a6fab81b5065be11f62 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[\]]+|--exec=<git-upload-archive>')
linkgit_re = re.compile(r'((linkgit:)?(git[-a-z0-9[\]]+|mail)(\[[157]\]|\([157]\))(,|;)?(\n| )?)+\.?')
- quoted_re = re.compile(r'\'?%[a-zA-Z]+\'?|(`[a-zA-Z-_]+`(, )?)+|\'(oneline|short|medium|full(er)?|email|raw|(un)?set|unspecified|init|fetch|clone|rebase|dcommit|branch|tag|log|blame|find-rev|set-tree|(create|show)-ignore|mkdirs|commit-diff)\'|(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|no|default|plain|blocks|(dimmed-)?zebra|allow-indentation-change|color|porcelain|none|list|(un)?lock|(re)?move|prune|die|usage|set_reflog_action|git_editor|cd_to_toplevel|require_work_tree(_exists)?|get_author_ident_from_commit|create_virtual_base')
+ quoted_re = re.compile(r'\'?%[a-zA-Z]+\'?|(`[a-zA-Z-_]+`(, )?)+|\'(oneline|short|medium|full(er)?|email|raw|(un)?set|unspecified|init|fetch|clone|rebase|dcommit|branch|tag|log|blame|find-rev|set-tree|(create|show)-ignore|mkdirs|commit-diff)\'|(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|bc[34]?|codecompare|deltawalker|guiffy|meld|diff(use|merge)|(exam|[gn]?vim|t?k|open|xx)?diff[123]?|(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|no|default|plain|blocks|(dimmed-)?zebra|allow-indentation-change|color|porcelain|none|list|(un)?lock|(re)?move|prune|die|usage|set_reflog_action|git_editor|cd_to_toplevel|require_work_tree(_exists)?|get_author_ident_from_commit|create_virtual_base')
env_var_re = re.compile(r'`?GIT_[A-Z_\d]+`?')
if not d is None:
po_file=polib.pofile(d)