pre-translate-po: include mergetools

Signed-off-by: Matthias Aßhauer <mha1993@live.de>

po/documentation.de.po

@@ -13623,7 +13623,7 @@ msgstr ""
 #. type: Labeled list
 #: en/git-add.txt:328
-#, no-wrap
+#, ignore-same, no-wrap
 msgid "diff"
 msgstr "diff"
@@ -24971,7 +24971,7 @@ msgstr ""
 #. type: Labeled list
 #: en/git-config.txt:287
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
 msgid "GIT_CONFIG_NOSYSTEM"
 msgstr "GIT_CONFIG_NOSYSTEM"
@@ -66243,8 +66243,8 @@ msgid ""
 msgstr ""
 "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], "
 "linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-"
-"tutorial[7], linkgit:gitcli[7], link:user-manual.html[Das "
-"Git-Benutzerhandbuch], linkgit:gitworkflows[7]"
+"tutorial[7], linkgit:gitcli[7], link:user-manual.html[Das Git-"
+"Benutzerhandbuch], linkgit:gitworkflows[7]"
 #. type: Title =
 #: en/git-unpack-file.txt:2
@@ -69899,28 +69899,33 @@ msgstr ""
 #. type: Plain text
 #: en/mergetools-merge.txt:2
+#, ignore-same
 msgid "araxis"
-msgstr ""
+msgstr "araxis"
 #. type: Plain text
 #: en/mergetools-merge.txt:3
+#, ignore-same
 msgid "bc"
-msgstr ""
+msgstr "bc"
 #. type: Plain text
 #: en/mergetools-merge.txt:4
+#, ignore-same
 msgid "bc3"
-msgstr ""
+msgstr "bc3"
 #. type: Plain text
 #: en/mergetools-merge.txt:5
+#, ignore-same
 msgid "codecompare"
-msgstr ""
+msgstr "codecompare"
 #. type: Plain text
 #: en/mergetools-merge.txt:6
+#, ignore-same
 msgid "deltawalker"
-msgstr ""
+msgstr "deltawalker"
 #. type: Plain text
 #: en/mergetools-merge.txt:7
@@ -69936,10 +69941,9 @@ msgstr "diffuse"
 #. type: Plain text
 #: en/mergetools-merge.txt:9
-#, fuzzy
-#| msgid "--merged"
+#, ignore-same
 msgid "ecmerge"
-msgstr "--merged"
+msgstr "ecmerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:10
@@ -69955,8 +69959,9 @@ msgstr "examdiff"
 #. type: Plain text
 #: en/mergetools-merge.txt:12
+#, ignore-same
 msgid "guiffy"
-msgstr ""
+msgstr "guiffy"
 #. type: Plain text
 #: en/mergetools-merge.txt:13
@@ -69984,8 +69989,9 @@ msgstr "kdiff3"
 #. type: Plain text
 #: en/mergetools-merge.txt:17
+#, ignore-same
 msgid "meld"
-msgstr ""
+msgstr "meld"
 #. type: Plain text
 #: en/mergetools-merge.txt:18
@@ -69995,10 +70001,9 @@ msgstr "opendiff"
 #. type: Plain text
 #: en/mergetools-merge.txt:19
-#, fuzzy
-#| msgid "--merged"
+#, ignore-same
 msgid "p4merge"
-msgstr "--merged"
+msgstr "p4merge"
 #. type: Plain text
 #: en/mergetools-merge.txt:20
@@ -70008,8 +70013,9 @@ msgstr "tkdiff"
 #. type: Plain text
 #: en/mergetools-merge.txt:21
+#, ignore-same
 msgid "tortoisemerge"
-msgstr ""
+msgstr "tortoisemerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:22

po/documentation.fr.po

@@ -13495,7 +13495,7 @@ msgstr ""
 #. type: Labeled list
 #: en/git-add.txt:328
-#, no-wrap
+#, no-wrap, ignore-same
 msgid "diff"
 msgstr "diff"
@@ -21919,8 +21919,8 @@ msgid ""
 msgstr ""
 "Notez que lancer `git repack` sans l'option `-l` dans un dépôt cloné avec "
 "`-s` va copier les objets depuis le dépôt source dans un paquet dans le "
-"répertoire cloné, éliminant de ce fait les économies d'espace disque de `"
-"clone -s`. Par contre, il est possible de lancer `git gc`, qui utilise "
+"répertoire cloné, éliminant de ce fait les économies d'espace disque de "
+"`clone -s`. Par contre, il est possible de lancer `git gc`, qui utilise "
 "l'option `-l` par défaut."
 #. type: Plain text
@@ -68469,126 +68469,151 @@ msgstr ""
 #. type: Plain text
 #: en/mergetools-merge.txt:2
+#, ignore-same
 msgid "araxis"
-msgstr ""
+msgstr "araxis"
 #. type: Plain text
 #: en/mergetools-merge.txt:3
+#, ignore-same
 msgid "bc"
-msgstr ""
+msgstr "bc"
 #. type: Plain text
 #: en/mergetools-merge.txt:4
+#, ignore-same
 msgid "bc3"
-msgstr ""
+msgstr "bc3"
 #. type: Plain text
 #: en/mergetools-merge.txt:5
+#, ignore-same
 msgid "codecompare"
-msgstr ""
+msgstr "codecompare"
 #. type: Plain text
 #: en/mergetools-merge.txt:6
+#, ignore-same
 msgid "deltawalker"
-msgstr ""
+msgstr "deltawalker"
 #. type: Plain text
 #: en/mergetools-merge.txt:7
+#, ignore-same
 msgid "diffmerge"
 msgstr "diffmerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:8
+#, ignore-same
 msgid "diffuse"
 msgstr "diffuse"
 #. type: Plain text
 #: en/mergetools-merge.txt:9
+#, ignore-same
 msgid "ecmerge"
-msgstr ""
+msgstr "ecmerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:10
+#, ignore-same
 msgid "emerge"
 msgstr "emerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:11
+#, ignore-same
 msgid "examdiff"
 msgstr "examdiff"
 #. type: Plain text
 #: en/mergetools-merge.txt:12
+#, ignore-same
 msgid "guiffy"
-msgstr ""
+msgstr "guiffy"
 #. type: Plain text
 #: en/mergetools-merge.txt:13
+#, ignore-same
 msgid "gvimdiff"
 msgstr "gvimdiff"
 #. type: Plain text
 #: en/mergetools-merge.txt:14
+#, ignore-same
 msgid "gvimdiff2"
 msgstr "gvimdiff2"
 #. type: Plain text
 #: en/mergetools-merge.txt:15
+#, ignore-same
 msgid "gvimdiff3"
 msgstr "gvimdiff3"
 #. type: Plain text
 #: en/mergetools-merge.txt:16
+#, ignore-same
 msgid "kdiff3"
 msgstr "kdiff3"
 #. type: Plain text
 #: en/mergetools-merge.txt:17
+#, ignore-same
 msgid "meld"
-msgstr ""
+msgstr "meld"
 #. type: Plain text
 #: en/mergetools-merge.txt:18
+#, ignore-same
 msgid "opendiff"
 msgstr "opendiff"
 #. type: Plain text
 #: en/mergetools-merge.txt:19
+#, ignore-same
 msgid "p4merge"
-msgstr ""
+msgstr "p4merge"
 #. type: Plain text
 #: en/mergetools-merge.txt:20
+#, ignore-same
 msgid "tkdiff"
 msgstr "tkdiff"
 #. type: Plain text
 #: en/mergetools-merge.txt:21
+#, ignore-same
 msgid "tortoisemerge"
-msgstr ""
+msgstr "tortoisemerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:22
+#, ignore-same
 msgid "vimdiff"
 msgstr "vimdiff"
 #. type: Plain text
 #: en/mergetools-merge.txt:23
+#, ignore-same
 msgid "vimdiff2"
 msgstr "vimdiff2"
 #. type: Plain text
 #: en/mergetools-merge.txt:24
+#, ignore-same
 msgid "vimdiff3"
 msgstr "vimdiff3"
 #. type: Plain text
 #: en/mergetools-merge.txt:25
+#, ignore-same
 msgid "winmerge"
 msgstr "winmerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:25
+#, ignore-same
 msgid "xxdiff"
 msgstr "xxdiff"

po/documentation.nl.po

@@ -13273,9 +13273,9 @@ msgstr ""
 #. type: Labeled list
 #: en/git-add.txt:328
-#, no-wrap
+#, ignore-same, no-wrap
 msgid "diff"
-msgstr ""
+msgstr "diff"
 #. type: Plain text
 #: en/git-add.txt:332
@@ -67204,128 +67204,153 @@ msgstr ""
 #. type: Plain text
 #: en/mergetools-merge.txt:2
+#, ignore-same
 msgid "araxis"
-msgstr ""
+msgstr "araxis"
 #. type: Plain text
 #: en/mergetools-merge.txt:3
+#, ignore-same
 msgid "bc"
-msgstr ""
+msgstr "bc"
 #. type: Plain text
 #: en/mergetools-merge.txt:4
+#, ignore-same
 msgid "bc3"
-msgstr ""
+msgstr "bc3"
 #. type: Plain text
 #: en/mergetools-merge.txt:5
+#, ignore-same
 msgid "codecompare"
-msgstr ""
+msgstr "codecompare"
 #. type: Plain text
 #: en/mergetools-merge.txt:6
+#, ignore-same
 msgid "deltawalker"
-msgstr ""
+msgstr "deltawalker"
 #. type: Plain text
 #: en/mergetools-merge.txt:7
+#, ignore-same
 msgid "diffmerge"
-msgstr ""
+msgstr "diffmerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:8
+#, ignore-same
 msgid "diffuse"
-msgstr ""
+msgstr "diffuse"
 #. type: Plain text
 #: en/mergetools-merge.txt:9
+#, ignore-same
 msgid "ecmerge"
-msgstr ""
+msgstr "ecmerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:10
+#, ignore-same
 msgid "emerge"
-msgstr ""
+msgstr "emerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:11
+#, ignore-same
 msgid "examdiff"
-msgstr ""
+msgstr "examdiff"
 #. type: Plain text
 #: en/mergetools-merge.txt:12
+#, ignore-same
 msgid "guiffy"
-msgstr ""
+msgstr "guiffy"
 #. type: Plain text
 #: en/mergetools-merge.txt:13
+#, ignore-same
 msgid "gvimdiff"
-msgstr ""
+msgstr "gvimdiff"
 #. type: Plain text
 #: en/mergetools-merge.txt:14
+#, ignore-same
 msgid "gvimdiff2"
-msgstr ""
+msgstr "gvimdiff2"
 #. type: Plain text
 #: en/mergetools-merge.txt:15
+#, ignore-same
 msgid "gvimdiff3"
-msgstr ""
+msgstr "gvimdiff3"
 #. type: Plain text
 #: en/mergetools-merge.txt:16
+#, ignore-same
 msgid "kdiff3"
-msgstr ""
+msgstr "kdiff3"
 #. type: Plain text
 #: en/mergetools-merge.txt:17
+#, ignore-same
 msgid "meld"
-msgstr ""
+msgstr "meld"
 #. type: Plain text
 #: en/mergetools-merge.txt:18
+#, ignore-same
 msgid "opendiff"
-msgstr ""
+msgstr "opendiff"
 #. type: Plain text
 #: en/mergetools-merge.txt:19
+#, ignore-same
 msgid "p4merge"
-msgstr ""
+msgstr "p4merge"
 #. type: Plain text
 #: en/mergetools-merge.txt:20
+#, ignore-same
 msgid "tkdiff"
-msgstr ""
+msgstr "tkdiff"
 #. type: Plain text
 #: en/mergetools-merge.txt:21
+#, ignore-same
 msgid "tortoisemerge"
-msgstr ""
+msgstr "tortoisemerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:22
+#, ignore-same
 msgid "vimdiff"
-msgstr ""
+msgstr "vimdiff"
 #. type: Plain text
 #: en/mergetools-merge.txt:23
+#, ignore-same
 msgid "vimdiff2"
-msgstr ""
+msgstr "vimdiff2"
 #. type: Plain text
 #: en/mergetools-merge.txt:24
+#, ignore-same
 msgid "vimdiff3"
-msgstr ""
+msgstr "vimdiff3"
 #. type: Plain text
 #: en/mergetools-merge.txt:25
+#, ignore-same
 msgid "winmerge"
-msgstr ""
+msgstr "winmerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:25
+#, ignore-same
 msgid "xxdiff"
-msgstr ""
+msgstr "xxdiff"
 #. type: Title -
 #: en/pretty-formats.txt:2

scripts/pre-translate-po

@@ -10,7 +10,7 @@ def main (f):
     for entry in po:
         if (re.fullmatch(r'-[-a-z0-9[\]]+', entry.msgid)) \
            or re.fullmatch(r'((linkgit:)?(git[-a-z0-9[\]]+|mail)(\[[157]\]|\([157]\))(,|;)?(\n| )?)+', entry.msgid) \
-           or re.fullmatch(r'`[a-zA-Z-_]+`|(user|transfer|submodule|stash|status|splitIndex|showbranch|sendemail|repack|remote|receive|push|merge(tool)?|mailinfo|log|interactive|instaweb|i18n|help|gui|gitweb|fastimport|format|fetch|diff(tool)?|credential|commit|column|core|branch|apply|color|git-p4)\.[a-zA-Z_.]+', entry.msgid)\
+           or re.fullmatch(r'`[a-zA-Z-_]+`|(user|transfer|submodule|stash|status|splitIndex|showbranch|sendemail|repack|remote|receive|push|merge(tool)?|mailinfo|log|interactive|instaweb|i18n|help|gui|gitweb|fastimport|format|fetch|diff(tool)?|credential|commit|column|core|branch|apply|color|git-p4)\.[a-zA-Z_.]+|araxis|bc3?|codecompare|deltawalker|guiffy|meld|diff(use|merge)|ec?merge|(exam|g?vim|t?k|open|xx)?diff[23]?|(p4|tortoise|win)merge', entry.msgid)\
            or re.fullmatch(r'`?GIT_[A-Z_]+`?', entry.msgid):
             entry.msgstr = entry.msgid
             entry.flags.append("ignore-same")