diff --git a/po/documentation.de.po b/po/documentation.de.po
index 470f6a2ef98a3fa1485cb8e01120d4d63b276f96..273aed79f7875e470f6b24532a31f6d3b22b8095 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -34767,10 +34767,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, fuzzy, no-wrap, priority:280
-#| msgid "--add"
+#, ignore-same, no-wrap, priority:280
msgid "add"
-msgstr "--add"
+msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
@@ -34780,9 +34779,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
-msgstr ""
+msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
@@ -34810,9 +34809,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
-msgstr "--append"
+msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
@@ -34822,10 +34821,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, fuzzy, no-wrap, priority:280
-#| msgid "--edit"
+#, ignore-same, no-wrap, priority:280
msgid "edit"
-msgstr "--edit"
+msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
@@ -34835,10 +34833,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, fuzzy, no-wrap, priority:280
-#| msgid "'show'"
+#, ignore-same, no-wrap, priority:280
msgid "show"
-msgstr "'show'"
+msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
@@ -34848,10 +34845,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, fuzzy, no-wrap, priority:280
-#| msgid "--merged"
+#, ignore-same, no-wrap, priority:280
msgid "merge"
-msgstr "--merged"
+msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
@@ -34891,10 +34887,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, fuzzy, no-wrap, priority:280
-#| msgid "--get-regexp"
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
-msgstr "--get-regexp"
+msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
@@ -60710,10 +60705,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 +60765,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 +60795,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 +60855,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..119f7c35d8c4878fb7daa952b81308816aaefc98 100644
--- a/po/documentation.es.po
+++ b/po/documentation.es.po
@@ -34301,9 +34301,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "add"
-msgstr ""
+msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
@@ -34313,9 +34313,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
-msgstr ""
+msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
@@ -34343,9 +34343,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
-msgstr "--append"
+msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
@@ -34355,9 +34355,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "edit"
-msgstr ""
+msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
@@ -34367,9 +34367,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "show"
-msgstr ""
+msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
@@ -34379,7 +34379,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "merge"
msgstr "merge"
@@ -34421,9 +34421,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
-msgstr ""
+msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
@@ -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..29b80174cfe1fb8d8452c0a8316598a5b1b68d95 100644
--- a/po/documentation.es_MX.po
+++ b/po/documentation.es_MX.po
@@ -34280,9 +34280,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "add"
-msgstr ""
+msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
@@ -34292,9 +34292,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
-msgstr ""
+msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
@@ -34322,9 +34322,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
-msgstr "--append"
+msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
@@ -34334,9 +34334,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "edit"
-msgstr ""
+msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
@@ -34346,9 +34346,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "show"
-msgstr ""
+msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
@@ -34358,9 +34358,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "merge"
-msgstr "emerge"
+msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
@@ -34400,9 +34400,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
-msgstr ""
+msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
@@ -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 43222c3251d71bf187c0fe54636d5800e53c7c7b..a3ad7f3536cb327d12b90a287f58e99f3539e355 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -34765,9 +34765,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "add"
-msgstr ""
+msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
@@ -34777,9 +34777,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
-msgstr ""
+msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
@@ -34807,7 +34807,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
msgstr "append"
@@ -34819,9 +34819,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "edit"
-msgstr ""
+msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
@@ -34831,9 +34831,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "show"
-msgstr ""
+msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
@@ -34843,7 +34843,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "merge"
msgstr "merge"
@@ -34885,9 +34885,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
-msgstr ""
+msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
@@ -60962,7 +60962,7 @@ msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, priority:100
+#, ignore-same, priority:100
msgid "bc4"
msgstr "bc4"
@@ -61022,7 +61022,7 @@ msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, priority:100
+#, ignore-same, priority:100
msgid "gvimdiff1"
msgstr "gvimdiff1"
@@ -61052,25 +61052,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"
@@ -61112,7 +61112,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..9eae8009f7fe4e081310bdf97283246704b2c756 100644
--- a/po/documentation.hu.po
+++ b/po/documentation.hu.po
@@ -34265,9 +34265,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "add"
-msgstr ""
+msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
@@ -34277,9 +34277,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
-msgstr ""
+msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
@@ -34307,9 +34307,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
-msgstr ""
+msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
@@ -34319,9 +34319,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "edit"
-msgstr ""
+msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
@@ -34331,9 +34331,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "show"
-msgstr ""
+msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
@@ -34343,9 +34343,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "merge"
-msgstr ""
+msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
@@ -34385,9 +34385,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
-msgstr ""
+msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
@@ -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..19154d22c1662f80665bcc2d9db0a7832785e348 100644
--- a/po/documentation.id.po
+++ b/po/documentation.id.po
@@ -34266,9 +34266,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "add"
-msgstr ""
+msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
@@ -34278,9 +34278,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
-msgstr ""
+msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
@@ -34308,9 +34308,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
-msgstr ""
+msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
@@ -34320,9 +34320,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "edit"
-msgstr ""
+msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
@@ -34332,9 +34332,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "show"
-msgstr ""
+msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
@@ -34344,9 +34344,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "merge"
-msgstr ""
+msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
@@ -34386,9 +34386,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
-msgstr ""
+msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
@@ -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..a5f41124959494a438ec9c946a601cf95014f154 100644
--- a/po/documentation.is.po
+++ b/po/documentation.is.po
@@ -34347,9 +34347,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "add"
-msgstr ""
+msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
@@ -34359,9 +34359,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
-msgstr ""
+msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
@@ -34389,9 +34389,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
-msgstr ""
+msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
@@ -34401,9 +34401,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "edit"
-msgstr ""
+msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
@@ -34413,9 +34413,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "show"
-msgstr ""
+msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
@@ -34425,9 +34425,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "merge"
-msgstr ""
+msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
@@ -34467,9 +34467,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
-msgstr ""
+msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
@@ -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..178e08f6645cada39a777f30d613ebb8e81571b4 100644
--- a/po/documentation.it.po
+++ b/po/documentation.it.po
@@ -34363,9 +34363,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "add"
-msgstr ""
+msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
@@ -34375,9 +34375,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
-msgstr ""
+msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
@@ -34405,9 +34405,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
-msgstr "--append"
+msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
@@ -34417,9 +34417,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "edit"
-msgstr ""
+msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
@@ -34429,9 +34429,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "show"
-msgstr ""
+msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
@@ -34441,9 +34441,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "merge"
-msgstr "emerge"
+msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
@@ -34483,9 +34483,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
-msgstr ""
+msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
@@ -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..7d6759339e4b1598043283e48aa9f60c6d884917 100644
--- a/po/documentation.ja.po
+++ b/po/documentation.ja.po
@@ -34259,9 +34259,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "add"
-msgstr ""
+msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
@@ -34271,9 +34271,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
-msgstr ""
+msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
@@ -34301,9 +34301,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
-msgstr ""
+msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
@@ -34313,9 +34313,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "edit"
-msgstr ""
+msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
@@ -34325,9 +34325,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "show"
-msgstr ""
+msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
@@ -34337,9 +34337,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "merge"
-msgstr ""
+msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
@@ -34379,9 +34379,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
-msgstr ""
+msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
@@ -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..77f0b5fe68a5b9568fad7f228da0d7819895baee 100644
--- a/po/documentation.ko.po
+++ b/po/documentation.ko.po
@@ -34266,9 +34266,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "add"
-msgstr ""
+msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
@@ -34278,9 +34278,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
-msgstr ""
+msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
@@ -34308,9 +34308,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
-msgstr ""
+msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
@@ -34320,9 +34320,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "edit"
-msgstr ""
+msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
@@ -34332,9 +34332,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "show"
-msgstr ""
+msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
@@ -34344,9 +34344,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "merge"
-msgstr ""
+msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
@@ -34386,9 +34386,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
-msgstr ""
+msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
@@ -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..a3f5fbf112839701a11b503ee615ca30880c2a1e 100644
--- a/po/documentation.mr.po
+++ b/po/documentation.mr.po
@@ -34261,9 +34261,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "add"
-msgstr ""
+msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
@@ -34273,9 +34273,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
-msgstr ""
+msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
@@ -34303,9 +34303,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
-msgstr ""
+msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
@@ -34315,9 +34315,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "edit"
-msgstr ""
+msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
@@ -34327,9 +34327,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "show"
-msgstr ""
+msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
@@ -34339,9 +34339,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "merge"
-msgstr ""
+msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
@@ -34381,9 +34381,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
-msgstr ""
+msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
@@ -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..b3c9d78724689db1f464ab318482e4eca0bd1bfa 100644
--- a/po/documentation.nb_NO.po
+++ b/po/documentation.nb_NO.po
@@ -34268,9 +34268,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "add"
-msgstr ""
+msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
@@ -34280,9 +34280,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
-msgstr ""
+msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
@@ -34310,9 +34310,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
-msgstr ""
+msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
@@ -34322,9 +34322,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "edit"
-msgstr ""
+msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
@@ -34334,9 +34334,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "show"
-msgstr ""
+msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
@@ -34346,9 +34346,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "merge"
-msgstr ""
+msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
@@ -34388,9 +34388,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
-msgstr ""
+msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
@@ -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..e504f56cd37ab2a924819ff961a543edd8d89483 100644
--- a/po/documentation.nl.po
+++ b/po/documentation.nl.po
@@ -34276,9 +34276,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "add"
-msgstr ""
+msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
@@ -34288,9 +34288,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
-msgstr ""
+msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
@@ -34318,9 +34318,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
-msgstr ""
+msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
@@ -34330,9 +34330,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "edit"
-msgstr ""
+msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
@@ -34342,9 +34342,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "show"
-msgstr ""
+msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
@@ -34354,9 +34354,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "merge"
-msgstr ""
+msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
@@ -34396,9 +34396,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
-msgstr ""
+msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
@@ -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..ff7c84a5bdbe523475d4e7f959951a437be62755 100644
--- a/po/documentation.pl.po
+++ b/po/documentation.pl.po
@@ -34283,9 +34283,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "add"
-msgstr ""
+msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
@@ -34295,9 +34295,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
-msgstr ""
+msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
@@ -34325,9 +34325,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
-msgstr ""
+msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
@@ -34337,9 +34337,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "edit"
-msgstr ""
+msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
@@ -34349,9 +34349,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "show"
-msgstr ""
+msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
@@ -34361,9 +34361,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "merge"
-msgstr ""
+msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
@@ -34403,9 +34403,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
-msgstr ""
+msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
@@ -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..4ea85e461af7f963d4efd31a7e7f020d10fdcc3e 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -35702,7 +35702,7 @@ msgstr "Liste as anotações do objeto para um determinado objeto. Caso nenhum o
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "add"
msgstr "add"
@@ -35714,7 +35714,7 @@ msgstr "Adiciona anotações para um determinado objeto (a predefinição retorn
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
msgstr "copy"
@@ -35744,7 +35744,7 @@ msgstr "na entrada padrão e copie as anotações de cada <do-objeto> para o seu
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
msgstr "append"
@@ -35756,7 +35756,7 @@ msgstr "Anexe às anotações de um objeto já existente (a predefinição retor
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "edit"
msgstr "edit"
@@ -35768,7 +35768,7 @@ msgstr "Edite as anotações para um determinado objeto (a predefinição retorn
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "show"
msgstr "show"
@@ -35780,7 +35780,7 @@ msgstr "Mostrar as anotações para um determinado objeto (a predefinição reto
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "merge"
msgstr "merge"
@@ -35822,7 +35822,7 @@ msgstr "Remova todas as anotações dos objetos inexistentes/inacessÃveis."
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
msgstr "get-ref"
@@ -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..194fcb021b9206597213606007d873b8da57225d 100644
--- a/po/documentation.pt_PT.po
+++ b/po/documentation.pt_PT.po
@@ -34258,9 +34258,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "add"
-msgstr ""
+msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
@@ -34270,9 +34270,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
-msgstr ""
+msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
@@ -34300,9 +34300,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
-msgstr "--append"
+msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
@@ -34312,9 +34312,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "edit"
-msgstr ""
+msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
@@ -34324,9 +34324,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "show"
-msgstr ""
+msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
@@ -34336,9 +34336,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "merge"
-msgstr "emerge"
+msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
@@ -34378,9 +34378,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
-msgstr ""
+msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
@@ -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..444bc2085abadb75ba5cb9ba27d25e947d0df6c6 100644
--- a/po/documentation.ru.po
+++ b/po/documentation.ru.po
@@ -34369,9 +34369,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "add"
-msgstr ""
+msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
@@ -34381,9 +34381,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
-msgstr ""
+msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
@@ -34411,9 +34411,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
-msgstr "--append"
+msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
@@ -34423,7 +34423,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "edit"
msgstr "edit"
@@ -34435,7 +34435,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "show"
msgstr "show"
@@ -34447,7 +34447,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "merge"
msgstr "merge"
@@ -34489,9 +34489,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
-msgstr ""
+msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
@@ -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..ef5beb10811d4df74725027c24a83ace5b25b1d3 100644
--- a/po/documentation.sk.po
+++ b/po/documentation.sk.po
@@ -34228,9 +34228,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "add"
-msgstr ""
+msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
@@ -34240,9 +34240,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
-msgstr ""
+msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
@@ -34270,9 +34270,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
-msgstr ""
+msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
@@ -34282,9 +34282,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "edit"
-msgstr ""
+msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
@@ -34294,9 +34294,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "show"
-msgstr ""
+msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
@@ -34306,9 +34306,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "merge"
-msgstr ""
+msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
@@ -34348,9 +34348,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
-msgstr ""
+msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
@@ -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..fa183cdde55afc06d865fa4806eac42c867ae203 100644
--- a/po/documentation.tr.po
+++ b/po/documentation.tr.po
@@ -34260,9 +34260,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "add"
-msgstr ""
+msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
@@ -34272,9 +34272,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
-msgstr ""
+msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
@@ -34302,9 +34302,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
-msgstr ""
+msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
@@ -34314,9 +34314,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "edit"
-msgstr ""
+msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
@@ -34326,9 +34326,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "show"
-msgstr ""
+msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
@@ -34338,9 +34338,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "merge"
-msgstr ""
+msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
@@ -34380,9 +34380,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
-msgstr ""
+msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
@@ -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..56bf472980da7659b5ecd154dbc9e5c5cfbbf6f1 100644
--- a/po/documentation.zh_HANS-CN.po
+++ b/po/documentation.zh_HANS-CN.po
@@ -34808,9 +34808,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "add"
-msgstr "æ·»åŠ "
+msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
@@ -34820,9 +34820,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
-msgstr "å¤åˆ¶"
+msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
@@ -34850,9 +34850,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
-msgstr "è¿½åŠ "
+msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
@@ -34862,9 +34862,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "edit"
-msgstr "编辑"
+msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
@@ -34874,9 +34874,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "show"
-msgstr "显示"
+msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
@@ -34886,9 +34886,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "merge"
-msgstr "åˆå¹¶"
+msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
@@ -34928,9 +34928,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
-msgstr ""
+msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
@@ -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..4bda5dc7ad5d3096bb83371cfc9988e4a3bc5106 100644
--- a/po/documentation.zh_HANT.po
+++ b/po/documentation.zh_HANT.po
@@ -34286,9 +34286,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "add"
-msgstr ""
+msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
@@ -34298,9 +34298,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "copy"
-msgstr ""
+msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
@@ -34328,9 +34328,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "append"
-msgstr ""
+msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
@@ -34340,9 +34340,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "edit"
-msgstr ""
+msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
@@ -34352,9 +34352,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "show"
-msgstr ""
+msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
@@ -34364,9 +34364,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "merge"
-msgstr ""
+msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
@@ -34406,9 +34406,9 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "get-ref"
-msgstr ""
+msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
@@ -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..9a498646db73993a6626f2e1a35b58ee6ea1a917 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|add|copy|append|edit|show|merge|get-ref')
env_var_re = re.compile(r'`?GIT_[A-Z_\d]+`?')
if not d is None:
po_file=polib.pofile(d)